replace CoreInterface syntool calls with DataDirectory calls
This commit is contained in:
parent
451bd72b30
commit
6e5b340bcc
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
#include "Fingerprint.h"
|
#include "Fingerprint.h"
|
||||||
|
|
||||||
#include "CoreInterface.h"
|
#include "common/DataDirectories.h"
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
|
@ -125,8 +125,7 @@ void Fingerprint::persistDirectory()
|
||||||
|
|
||||||
QString Fingerprint::directoryPath()
|
QString Fingerprint::directoryPath()
|
||||||
{
|
{
|
||||||
CoreInterface coreInterface;
|
auto profileDir = QString::fromStdString(DataDirectories::profile());
|
||||||
QString profileDir = coreInterface.getProfileDir();
|
|
||||||
|
|
||||||
return QString("%1/%2")
|
return QString("%1/%2")
|
||||||
.arg(profileDir)
|
.arg(profileDir)
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include "ProcessorArch.h"
|
#include "ProcessorArch.h"
|
||||||
#include "SslCertificate.h"
|
#include "SslCertificate.h"
|
||||||
#include "ShutdownCh.h"
|
#include "ShutdownCh.h"
|
||||||
|
#include "common/DataDirectories.h"
|
||||||
|
|
||||||
#include <QtCore>
|
#include <QtCore>
|
||||||
#include <QtGui>
|
#include <QtGui>
|
||||||
|
@ -1254,8 +1255,7 @@ void MainWindow::bonjourInstallFinished()
|
||||||
|
|
||||||
QString MainWindow::getProfileRootForArg()
|
QString MainWindow::getProfileRootForArg()
|
||||||
{
|
{
|
||||||
CoreInterface coreInterface;
|
auto dir = QString::fromStdString(DataDirectories::profile());
|
||||||
QString dir = coreInterface.getProfileDir();
|
|
||||||
|
|
||||||
// HACK: strip our app name since we're returning the root dir.
|
// HACK: strip our app name since we're returning the root dir.
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
|
|
||||||
#include "SettingsDialog.h"
|
#include "SettingsDialog.h"
|
||||||
|
|
||||||
#include "CoreInterface.h"
|
|
||||||
#include "BarrierLocale.h"
|
#include "BarrierLocale.h"
|
||||||
#include "QBarrierApplication.h"
|
#include "QBarrierApplication.h"
|
||||||
#include "QUtility.h"
|
#include "QUtility.h"
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include "ui_SettingsDialogBase.h"
|
#include "ui_SettingsDialogBase.h"
|
||||||
#include "BarrierLocale.h"
|
#include "BarrierLocale.h"
|
||||||
#include "CoreInterface.h"
|
|
||||||
|
|
||||||
class AppConfig;
|
class AppConfig;
|
||||||
|
|
||||||
|
@ -43,7 +42,6 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialogBase
|
||||||
private:
|
private:
|
||||||
AppConfig& m_appConfig;
|
AppConfig& m_appConfig;
|
||||||
BarrierLocale m_Locale;
|
BarrierLocale m_Locale;
|
||||||
CoreInterface m_CoreInterface;
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void on_m_pComboLanguage_currentIndexChanged(int index);
|
void on_m_pComboLanguage_currentIndexChanged(int index);
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
#include "SetupWizard.h"
|
#include "SetupWizard.h"
|
||||||
#include "MainWindow.h"
|
#include "MainWindow.h"
|
||||||
#include "WebClient.h"
|
|
||||||
#include "QBarrierApplication.h"
|
#include "QBarrierApplication.h"
|
||||||
#include "QUtility.h"
|
#include "QUtility.h"
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "SslCertificate.h"
|
#include "SslCertificate.h"
|
||||||
|
|
||||||
#include "Fingerprint.h"
|
#include "Fingerprint.h"
|
||||||
|
#include "common/DataDirectories.h"
|
||||||
|
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
@ -37,7 +37,7 @@ static const char kConfigFile[] = "barrier.conf";
|
||||||
SslCertificate::SslCertificate(QObject *parent) :
|
SslCertificate::SslCertificate(QObject *parent) :
|
||||||
QObject(parent)
|
QObject(parent)
|
||||||
{
|
{
|
||||||
m_ProfileDir = m_CoreInterface.getProfileDir();
|
m_ProfileDir = QString::fromStdString(DataDirectories::profile());
|
||||||
if (m_ProfileDir.isEmpty()) {
|
if (m_ProfileDir.isEmpty()) {
|
||||||
emit error(tr("Failed to get profile directory."));
|
emit error(tr("Failed to get profile directory."));
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CoreInterface.h"
|
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
class SslCertificate : public QObject
|
class SslCertificate : public QObject
|
||||||
|
@ -43,5 +41,4 @@ private:
|
||||||
private:
|
private:
|
||||||
QString m_ProfileDir;
|
QString m_ProfileDir;
|
||||||
QString m_ToolOutput;
|
QString m_ToolOutput;
|
||||||
CoreInterface m_CoreInterface;
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue