diff options
Diffstat (limited to 'src/plugins/coreplugin/icore.h')
-rw-r--r-- | src/plugins/coreplugin/icore.h | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index 8610023e6a..d39055a57e 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -67,9 +67,6 @@ public: Low }; - // This should only be used to acccess the signals, so it could - // theoretically return an QObject *. For source compatibility - // it returns a ICore. static ICore *instance(); static bool isNewItemDialogRunning(); @@ -79,7 +76,7 @@ public: const QString &defaultLocation = QString(), const QVariantMap &extraVariables = QVariantMap()); - static bool showOptionsDialog(Id page, QWidget *parent = nullptr); + static bool showOptionsDialog(const Id page, QWidget *parent = nullptr); static QString msgShowOptionsDialog(); static QString msgShowOptionsDialogToolTip(); @@ -97,31 +94,19 @@ public: static QString userResourcePath(); static QString cacheResourcePath(); static QString installerResourcePath(); - static QString pluginPath(); - static QString userPluginPath(); static QString libexecPath(); - static QString clangExecutable(const QString &clangBinDirectory); - static QString clangTidyExecutable(const QString &clangBinDirectory); - static QString clazyStandaloneExecutable(const QString &clangBinDirectory); - static QString clangIncludeDirectory(const QString &clangVersion, - const QString &clangResourceDirectory); static QString versionString(); - static QString buildCompatibilityString(); static QMainWindow *mainWindow(); static QWidget *dialogParent(); - static QStatusBar *statusBar(); static InfoBar *infoBar(); - /* Raises and activates the window for the widget. This contains workarounds for X11. */ static void raiseWindow(QWidget *widget); static IContext *currentContextObject(); static QWidget *currentContextWidget(); static IContext *contextObject(QWidget *widget); - // Adds and removes additional active contexts, these contexts are appended - // to the currently active contexts. static void updateAdditionalContexts(const Context &remove, const Context &add, ContextPriority priority = ContextPriority::Low); static void addAdditionalContext(const Context &context, @@ -130,7 +115,6 @@ public: static void addContextObject(IContext *context); static void removeContextObject(IContext *context); - // manages the minimize, zoom and fullscreen actions for the window static void registerWindow(QWidget *window, const Context &context); enum OpenFilesFlags { @@ -145,8 +129,7 @@ public: static void addPreCloseListener(const std::function<bool()> &listener); - static QString systemInformation(); - static void setupScreenShooter(const QString &name, QWidget *w, const QRect &rc = QRect()); + static void restart(); enum SaveSettingsReason { InitializationDone, @@ -155,11 +138,6 @@ public: MainWindowClosing, }; - static void restart(); - -public slots: - static void saveSettings(SaveSettingsReason reason); - signals: void coreAboutToOpen(); void coreOpened(); @@ -173,6 +151,19 @@ public: /* internal use */ static QStringList additionalAboutInformation(); static void appendAboutInformation(const QString &line); + static QString systemInformation(); + static void setupScreenShooter(const QString &name, QWidget *w, const QRect &rc = QRect()); + static QString pluginPath(); + static QString userPluginPath(); + static QString clangExecutable(const QString &clangBinDirectory); + static QString clangTidyExecutable(const QString &clangBinDirectory); + static QString clazyStandaloneExecutable(const QString &clangBinDirectory); + static QString clangIncludeDirectory(const QString &clangVersion, + const QString &clangResourceDirectory); + static QString buildCompatibilityString(); + static QStatusBar *statusBar(); + + static void saveSettings(SaveSettingsReason reason); private: static void updateNewItemDialogState(); |