diff options
Diffstat (limited to 'src/plugins/remotelinux')
7 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/remotelinux/deploymentsettingsassistant.cpp b/src/plugins/remotelinux/deploymentsettingsassistant.cpp index 30355e6272..6bf91386ee 100644 --- a/src/plugins/remotelinux/deploymentsettingsassistant.cpp +++ b/src/plugins/remotelinux/deploymentsettingsassistant.cpp @@ -110,7 +110,7 @@ bool DeploymentSettingsAssistant::addLinesToProFile(const DeployableFilesPerProF + separator + lines.join(separator) + QLatin1String("\n}\n"); Utils::FileSaver saver(proFileInfo->proFilePath(), QIODevice::Append); saver.write(proFileString.toLocal8Bit()); - return saver.finalize(Core::ICore::instance()->mainWindow()); + return saver.finalize(Core::ICore::mainWindow()); } void DeploymentSettingsAssistant::handleDeploymentInfoUpdated() diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp index 0598a93746..d80ba35031 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp @@ -127,7 +127,7 @@ void LinuxDeviceConfigurations::copy(const LinuxDeviceConfigurations *source, void LinuxDeviceConfigurations::save() { - QSettings *settings = Core::ICore::instance()->settings(); + QSettings *settings = Core::ICore::settings(); settings->beginGroup(SettingsGroup); settings->setValue(IdCounterKey, d->nextId); settings->setValue(DefaultKeyFilePathKey, d->defaultSshKeyFilePath); @@ -280,7 +280,7 @@ LinuxDeviceConfigurations::~LinuxDeviceConfigurations() void LinuxDeviceConfigurations::load() { - QSettings *settings = Core::ICore::instance()->settings(); + QSettings *settings = Core::ICore::settings(); settings->beginGroup(SettingsGroup); d->nextId = settings->value(IdCounterKey, 1).toULongLong(); d->defaultSshKeyFilePath = settings->value(DefaultKeyFilePathKey, diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp index 8fb6709539..1c73eb1f59 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp @@ -113,7 +113,7 @@ LinuxDeviceConfigurationsSettingsWidget::LinuxDeviceConfigurationsSettingsWidget LinuxDeviceConfigurationsSettingsWidget::~LinuxDeviceConfigurationsSettingsWidget() { if (m_saveSettingsRequested) { - Core::ICore::instance()->settings()->setValue(LastDeviceConfigIndexKey, + Core::ICore::settings()->setValue(LastDeviceConfigIndexKey, currentIndex()); LinuxDeviceConfigurations::replaceInstance(m_devConfigs.data()); } @@ -161,7 +161,7 @@ void LinuxDeviceConfigurationsSettingsWidget::initGui() m_ui->portsLineEdit->setValidator(portsValidator); connect(m_ui->makeKeyFileDefaultButton, SIGNAL(clicked()), SLOT(setDefaultKeyFilePath())); - int lastIndex = Core::ICore::instance()->settings() + int lastIndex = Core::ICore::settings() ->value(LastDeviceConfigIndexKey, 0).toInt(); if (lastIndex == -1) lastIndex = 0; diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp index fef99bf855..b4ae814d47 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp +++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp @@ -57,7 +57,7 @@ PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(const LinuxDe { const QString &dir = QFileInfo(deviceConfig->sshParameters().privateKeyFile).path(); const QString publicKeyFileName = QFileDialog::getOpenFileName(parent - ? parent : Core::ICore::instance()->mainWindow(), + ? parent : Core::ICore::mainWindow(), tr("Choose Public Key File"), dir, tr("Public Key Files (*.pub);;All Files (*)")); if (publicKeyFileName.isEmpty()) diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp index 82c4da93f9..f58f7066a9 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp @@ -194,7 +194,7 @@ void RemoteLinuxDeployConfigurationWidget::handleDeviceConfigurationListChanged( void RemoteLinuxDeployConfigurationWidget::showDeviceConfigurations() { - Core::ICore::instance()->showOptionsDialog(LinuxDeviceConfigurationsSettingsPage::pageCategory(), + Core::ICore::showOptionsDialog(LinuxDeviceConfigurationsSettingsPage::pageCategory(), LinuxDeviceConfigurationsSettingsPage::pageId()); } diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp index 8a7ef4c27c..41da017e3c 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp @@ -312,10 +312,10 @@ void RemoteLinuxRunConfigurationWidget::handleWorkingDirectoryChanged() void RemoteLinuxRunConfigurationWidget::showDeviceConfigurationsDialog(const QString &link) { if (link == QLatin1String("deviceconfig")) { - Core::ICore::instance()->showOptionsDialog(LinuxDeviceConfigurationsSettingsPage::pageCategory(), + Core::ICore::showOptionsDialog(LinuxDeviceConfigurationsSettingsPage::pageCategory(), LinuxDeviceConfigurationsSettingsPage::pageId()); } else if (link == QLatin1String("debugger")) { - Core::ICore::instance()->showOptionsDialog(QLatin1String("O.Debugger"), + Core::ICore::showOptionsDialog(QLatin1String("O.Debugger"), QLatin1String("M.Gdb")); } } diff --git a/src/plugins/remotelinux/startgdbserverdialog.cpp b/src/plugins/remotelinux/startgdbserverdialog.cpp index 0d8e941983..f8633d7d78 100644 --- a/src/plugins/remotelinux/startgdbserverdialog.cpp +++ b/src/plugins/remotelinux/startgdbserverdialog.cpp @@ -112,7 +112,7 @@ public: StartGdbServerDialogPrivate::StartGdbServerDialogPrivate(StartGdbServerDialog *q) : q(q), processList(0) { - settings = ICore::instance()->settings(); + settings = ICore::settings(); deviceComboBox = new QComboBox(q); |