diff options
Diffstat (limited to 'src/plugins/coreplugin/fileutils.cpp')
| -rw-r--r-- | src/plugins/coreplugin/fileutils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp index f5bd4ed56a..19327a5f97 100644 --- a/src/plugins/coreplugin/fileutils.cpp +++ b/src/plugins/coreplugin/fileutils.cpp @@ -72,7 +72,7 @@ static inline void showGraphicalShellError(QWidget *parent, QMessageBox::ActionRole); mbox.exec(); if (mbox.clickedButton() == settingsButton) - Core::ICore::instance()->showOptionsDialog(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE), + Core::ICore::showOptionsDialog(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE), QLatin1String(Core::Constants::SETTINGS_ID_ENVIRONMENT)); } #endif @@ -110,7 +110,7 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const QString &pathIn) // we cannot select a file here, because no file browser really supports it... const QFileInfo fileInfo(pathIn); const QString folder = fileInfo.isDir() ? fileInfo.absoluteFilePath() : fileInfo.filePath(); - const QString app = Utils::UnixUtils::fileBrowser(Core::ICore::instance()->settings()); + const QString app = Utils::UnixUtils::fileBrowser(Core::ICore::settings()); QProcess browserProc; const QString browserArgs = Utils::UnixUtils::substituteFileBrowserParameters(app, folder); bool success = browserProc.startDetached(browserArgs); @@ -128,12 +128,12 @@ void FileUtils::openTerminal(const QString &path) const QString terminalEmulator = QString::fromLocal8Bit(qgetenv("COMSPEC")); const QStringList args; // none #elif defined(Q_WS_MAC) - const QString terminalEmulator = Core::ICore::instance()->resourcePath() + const QString terminalEmulator = Core::ICore::resourcePath() + QLatin1String("/scripts/openTerminal.command"); QStringList args; #else QStringList args = Utils::QtcProcess::splitArgs( - Utils::ConsoleProcess::terminalEmulator(Core::ICore::instance()->settings())); + Utils::ConsoleProcess::terminalEmulator(Core::ICore::settings())); const QString terminalEmulator = args.takeFirst(); const QString shell = QString::fromLocal8Bit(qgetenv("SHELL")); args.append(shell); |