From 3e9385bf1b88a6fa0c09f7606d616b9a6434e852 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 10 Dec 2020 00:59:50 +0100 Subject: [PATCH] Core: Make member functions const/static readability-make-member-function-const finds lots of member functions that could be made const. This change just picks getter functions that really should be const. readability-convert-member-functions-to-static finds non-static member functions which do not access this. This change turns most of them into static ones, but leaves some non static to keep the class API consistent. Change-Id: I004d6f7fab4375f9902f940f29b4a4f561fc7604 Reviewed-by: Jarek Kobus Reviewed-by: Eike Ziller --- .../actionmanager/actioncontainer.cpp | 2 +- .../actionmanager/actioncontainer_p.h | 2 +- .../coreplugin/actionmanager/actionmanager.cpp | 2 +- .../coreplugin/actionmanager/actionmanager_p.h | 6 +++--- .../coreplugin/actionmanager/commandmappings.h | 2 +- src/plugins/coreplugin/basefilewizard.cpp | 2 +- .../coreplugin/basefilewizardfactory.cpp | 2 +- src/plugins/coreplugin/basefilewizardfactory.h | 4 ++-- src/plugins/coreplugin/coreplugin.cpp | 2 +- src/plugins/coreplugin/coreplugin.h | 2 +- .../coreplugin/dialogs/externaltoolconfig.cpp | 18 +++++++++--------- .../coreplugin/dialogs/settingsdialog.cpp | 2 +- .../coreplugin/dialogs/shortcutsettings.cpp | 8 +++----- .../coreplugin/editormanager/editorview.cpp | 6 +++--- .../coreplugin/editormanager/editorview.h | 6 +++--- .../editormanager/openeditorswindow.h | 2 +- src/plugins/coreplugin/editortoolbar.h | 4 ++-- src/plugins/coreplugin/find/findplugin.cpp | 5 +++-- src/plugins/coreplugin/find/findtoolbar.cpp | 2 +- src/plugins/coreplugin/find/findtoolbar.h | 2 +- src/plugins/coreplugin/find/findtoolwindow.h | 2 +- .../coreplugin/find/searchresulttreemodel.cpp | 2 +- .../coreplugin/find/searchresulttreemodel.h | 2 +- src/plugins/coreplugin/generalsettings.cpp | 14 +++++++------- src/plugins/coreplugin/generalsettings.h | 2 +- src/plugins/coreplugin/icore.cpp | 2 +- src/plugins/coreplugin/iwizardfactory.cpp | 6 +++--- src/plugins/coreplugin/iwizardfactory.h | 6 +++--- .../coreplugin/locator/basefilefilter.cpp | 2 +- .../coreplugin/locator/basefilefilter.h | 3 ++- .../coreplugin/locator/filesystemfilter.cpp | 2 +- .../coreplugin/locator/filesystemfilter.h | 2 +- .../coreplugin/locator/ilocatorfilter.h | 2 +- src/plugins/coreplugin/locator/locatorwidget.h | 4 ++-- src/plugins/coreplugin/mainwindow.cpp | 2 +- src/plugins/coreplugin/mainwindow.h | 12 ++++++------ src/plugins/coreplugin/manhattanstyle.cpp | 2 +- src/plugins/coreplugin/manhattanstyle.h | 2 +- src/plugins/coreplugin/mimetypemagicdialog.cpp | 2 +- src/plugins/coreplugin/mimetypemagicdialog.h | 2 +- src/plugins/coreplugin/mimetypesettings.cpp | 2 +- src/plugins/coreplugin/outputpanemanager.h | 2 +- src/plugins/coreplugin/rightpane.cpp | 4 ++-- src/plugins/coreplugin/rightpane.h | 4 ++-- src/plugins/coreplugin/vcsmanager.cpp | 2 +- 45 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index 54f57f154d9..f902b1b1cbc 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -398,7 +398,7 @@ TouchBar *ActionContainerPrivate::touchBar() const return nullptr; } -bool ActionContainerPrivate::canAddAction(Command *action) const +bool ActionContainerPrivate::canAddAction(Command *action) { return action && action->action(); } diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h index c563563e33f..8d5e55c3247 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h @@ -80,7 +80,7 @@ public: virtual bool updateInternal() = 0; protected: - bool canAddAction(Command *action) const; + static bool canAddAction(Command *action); bool canAddMenu(ActionContainer *menu) const; virtual bool canBeAddedToContainer(ActionContainerPrivate *container) const = 0; diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index d9e13404c3d..411b7f2cfb9 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -328,7 +328,7 @@ void ActionManager::unregisterAction(QAction *action, Id id) a->removeOverrideAction(action); if (a->isEmpty()) { // clean up - d->saveSettings(a); + ActionManagerPrivate::saveSettings(a); ICore::mainWindow()->removeAction(a->action()); // ActionContainers listen to the commands' destroyed signals delete a->action(); diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h index e8627a3244b..9fdc96aef1a 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h @@ -55,13 +55,13 @@ public: bool hasContext(int context) const; void saveSettings(); - void saveSettings(Action *cmd); + static void saveSettings(Action *cmd); - void showShortcutPopup(const QString &shortcut); + static void showShortcutPopup(const QString &shortcut); bool hasContext(const Context &context) const; Action *overridableAction(Utils::Id id); - void readUserSettings(Utils::Id id, Action *cmd); + static void readUserSettings(Utils::Id id, Action *cmd); void containerDestroyed(); void actionTriggered(); diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index 2d8b8ac017c..3804c795fd3 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -70,7 +70,7 @@ protected: void setFilterText(const QString &text); void setPageTitle(const QString &s); void setTargetHeader(const QString &s); - void setModified(QTreeWidgetItem *item, bool modified); + static void setModified(QTreeWidgetItem *item, bool modified); private: bool filter(const QString &filterString, QTreeWidgetItem *item); diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index b388b7f7d88..3c608336691 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -84,7 +84,7 @@ void BaseFileWizard::accept() QString errorMessage; // Compile result list and prompt for overwrite - switch (m_factory->promptOverwrite(&m_files, &errorMessage)) { + switch (BaseFileWizardFactory::promptOverwrite(&m_files, &errorMessage)) { case BaseFileWizardFactory::OverwriteCanceled: reject(); return; diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp index 358efd6caf9..60668da675c 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.cpp +++ b/src/plugins/coreplugin/basefilewizardfactory.cpp @@ -203,7 +203,7 @@ bool BaseFileWizardFactory::postGenerateOpenEditors(const GeneratedFiles &l, QSt */ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(GeneratedFiles *files, - QString *errorMessage) const + QString *errorMessage) { if (debugWizard) qDebug() << Q_FUNC_INFO << files; diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h index 26f8a164f48..12e0f0d3195 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.h +++ b/src/plugins/coreplugin/basefilewizardfactory.h @@ -109,8 +109,8 @@ protected: static QString preferredSuffix(const QString &mimeType); enum OverwriteResult { OverwriteOk, OverwriteError, OverwriteCanceled }; - OverwriteResult promptOverwrite(GeneratedFiles *files, - QString *errorMessage) const; + static OverwriteResult promptOverwrite(GeneratedFiles *files, + QString *errorMessage); static bool postGenerateOpenEditors(const GeneratedFiles &l, QString *errorMessage = nullptr); private: diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 268b6997966..1a40a1d21d3 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -270,7 +270,7 @@ QObject *CorePlugin::remoteCommand(const QStringList & /* options */, }); return nullptr; } - IDocument *res = m_mainWindow->openFiles( + IDocument *res = MainWindow::openFiles( args, ICore::OpenFilesFlags(ICore::SwitchMode | ICore::CanContainLineAndColumnNumbers | ICore::SwitchSplitIfAlreadyVisible), workingDirectory); m_mainWindow->raiseWindow(); diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h index 75097510ff0..8d65f81ba7d 100644 --- a/src/plugins/coreplugin/coreplugin.h +++ b/src/plugins/coreplugin/coreplugin.h @@ -87,7 +87,7 @@ private slots: private: static void addToPathChooserContextMenu(Utils::PathChooser *pathChooser, QMenu *menu); - void setupSystemEnvironment(); + static void setupSystemEnvironment(); void checkSettings(); MainWindow *m_mainWindow = nullptr; diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 6dd1f788081..87b713f4536 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -88,7 +88,7 @@ public: void setTools(const QMap > &tools); QMap > tools() const { return m_tools; } - ExternalTool *toolForIndex(const QModelIndex &modelIndex) const; + static ExternalTool *toolForIndex(const QModelIndex &modelIndex); QString categoryForIndex(const QModelIndex &modelIndex, bool *found) const; void revertTool(const QModelIndex &modelIndex); QModelIndex addCategory(); @@ -97,8 +97,8 @@ public: Qt::DropActions supportedDropActions() const override { return Qt::MoveAction; } private: - QVariant data(ExternalTool *tool, int role = Qt::DisplayRole) const; - QVariant data(const QString &category, int role = Qt::DisplayRole) const; + static QVariant data(ExternalTool *tool, int role = Qt::DisplayRole); + static QVariant data(const QString &category, int role = Qt::DisplayRole); QMap > m_tools; }; @@ -129,7 +129,7 @@ QVariant ExternalToolModel::data(const QModelIndex &index, int role) const return QVariant(); } -QVariant ExternalToolModel::data(ExternalTool *tool, int role) const +QVariant ExternalToolModel::data(ExternalTool *tool, int role) { switch (role) { case Qt::DisplayRole: @@ -141,7 +141,7 @@ QVariant ExternalToolModel::data(ExternalTool *tool, int role) const return QVariant(); } -QVariant ExternalToolModel::data(const QString &category, int role) const +QVariant ExternalToolModel::data(const QString &category, int role) { switch (role) { case Qt::DisplayRole: @@ -315,7 +315,7 @@ void ExternalToolModel::setTools(const QMap > &to endResetModel(); } -ExternalTool *ExternalToolModel::toolForIndex(const QModelIndex &index) const +ExternalTool *ExternalToolModel::toolForIndex(const QModelIndex &index) { return static_cast(index.internalPointer()); } @@ -547,7 +547,7 @@ void ExternalToolConfig::handleCurrentChanged(const QModelIndex &now, const QMod void ExternalToolConfig::updateButtons(const QModelIndex &index) { - ExternalTool *tool = m_model.toolForIndex(index); + const ExternalTool *tool = ExternalToolModel::toolForIndex(index); if (!tool) { m_ui.removeButton->setEnabled(false); m_ui.revertButton->setEnabled(false); @@ -571,7 +571,7 @@ void ExternalToolConfig::updateCurrentItem() void ExternalToolConfig::updateItem(const QModelIndex &index) { - ExternalTool *tool = m_model.toolForIndex(index); + ExternalTool *tool = ExternalToolModel::toolForIndex(index); if (!tool) return; tool->setDescription(m_ui.description->text()); @@ -594,7 +594,7 @@ void ExternalToolConfig::updateItem(const QModelIndex &index) void ExternalToolConfig::showInfoForItem(const QModelIndex &index) { updateButtons(index); - ExternalTool *tool = m_model.toolForIndex(index); + const ExternalTool *tool = ExternalToolModel::toolForIndex(index); if (!tool) { m_ui.description->clear(); m_ui.executable->setPath(QString()); diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index 7efee37f4e3..aba417f77c3 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -417,7 +417,7 @@ private: void createGui(); void showCategory(int index); - void updateEnabledTabs(Category *category, const QString &searchText); + static void updateEnabledTabs(Category *category, const QString &searchText); void ensureCategoryWidget(Category *category); void disconnectTabWidgets(); diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 7b95dea3147..83b6c279ce4 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -428,12 +428,10 @@ bool ShortcutSettingsWidget::updateAndCheckForConflicts(const QKeySequence &key, while (index >= item->m_keys.size()) item->m_keys.append(QKeySequence()); item->m_keys[index] = key; - auto that = const_cast(this); - if (cleanKeys(item->m_keys) != item->m_cmd->defaultKeySequences()) - that->setModified(current, true); - else - that->setModified(current, false); + CommandMappings::setModified(current, + cleanKeys(item->m_keys) != item->m_cmd->defaultKeySequences()); current->setText(2, keySequencesToNativeString(item->m_keys)); + auto that = const_cast(this); return that->markCollisions(item, index); } diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index 78c9993e12e..35657df79e8 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -159,7 +159,7 @@ SplitterOrView *EditorView::parentSplitterOrView() const return m_parentSplitterOrView; } -EditorView *EditorView::findNextView() +EditorView *EditorView::findNextView() const { SplitterOrView *current = parentSplitterOrView(); QTC_ASSERT(current, return nullptr); @@ -182,7 +182,7 @@ EditorView *EditorView::findNextView() return nullptr; } -EditorView *EditorView::findPreviousView() +EditorView *EditorView::findPreviousView() const { SplitterOrView *current = parentSplitterOrView(); QTC_ASSERT(current, return nullptr); @@ -363,7 +363,7 @@ void EditorView::listSelectionActivated(int index) EditorManagerPrivate::activateEditorForEntry(this, DocumentModel::entryAtRow(index)); } -void EditorView::fillListContextMenu(QMenu *menu) +void EditorView::fillListContextMenu(QMenu *menu) const { IEditor *editor = currentEditor(); DocumentModel::Entry *entry = editor ? DocumentModel::entryForDocument(editor->document()) diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h index 3b7e1519e7d..ebf98dfa1c6 100644 --- a/src/plugins/coreplugin/editormanager/editorview.h +++ b/src/plugins/coreplugin/editormanager/editorview.h @@ -78,8 +78,8 @@ public: ~EditorView() override; SplitterOrView *parentSplitterOrView() const; - EditorView *findNextView(); - EditorView *findPreviousView(); + EditorView *findNextView() const; + EditorView *findPreviousView() const; int editorCount() const; void addEditor(IEditor *editor); @@ -123,7 +123,7 @@ private: void setParentSplitterOrView(SplitterOrView *splitterOrView); - void fillListContextMenu(QMenu *menu); + void fillListContextMenu(QMenu *menu) const; void updateNavigatorActions(); void updateToolBar(IEditor *editor); void checkProjectLoaded(IEditor *editor); diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.h b/src/plugins/coreplugin/editormanager/openeditorswindow.h index 4786620c164..d8d1c62e2b4 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.h +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.h @@ -74,7 +74,7 @@ public slots: private: void editorClicked(QTreeWidgetItem *item); - void selectEditor(QTreeWidgetItem *item); + static void selectEditor(QTreeWidgetItem *item); void addHistoryItems(const QList &history, EditorView *view, QSet &entriesDone); diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h index 0d82e58303a..4026ce3c1f0 100644 --- a/src/plugins/coreplugin/editortoolbar.h +++ b/src/plugins/coreplugin/editortoolbar.h @@ -97,8 +97,8 @@ protected: bool eventFilter(QObject *obj, QEvent *event) override; private: - void changeActiveEditor(int row); - void makeEditorWritable(); + static void changeActiveEditor(int row); + static void makeEditorWritable(); void checkDocumentStatus(); void closeEditor(); diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp index 20219c16bef..4376553bee4 100644 --- a/src/plugins/coreplugin/find/findplugin.cpp +++ b/src/plugins/coreplugin/find/findplugin.cpp @@ -182,7 +182,8 @@ public: bool isAnyFilterEnabled() const; void writeSettings(); void setFindFlag(Core::FindFlag flag, bool enabled); - void updateCompletion(const QString &text, QStringList &completions, QStringListModel *model); + static void updateCompletion(const QString &text, QStringList &completions, + QStringListModel *model); void setupMenu(); void setupFilterMenuItems(); void readSettings(); @@ -429,7 +430,7 @@ void Find::updateFindCompletion(const QString &text, FindFlags flags) void Find::updateReplaceCompletion(const QString &text) { - d->updateCompletion(text, d->m_replaceCompletions, &d->m_replaceCompletionModel); + FindPrivate::updateCompletion(text, d->m_replaceCompletions, &d->m_replaceCompletionModel); } void FindPrivate::updateCompletion(const QString &text, QStringList &completions, QStringListModel *model) diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index 912da4100e2..f78aaa78958 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -733,7 +733,7 @@ void FindToolBar::hideAndResetFocus() hide(); } -FindToolBarPlaceHolder *FindToolBar::findToolBarPlaceHolder() const +FindToolBarPlaceHolder *FindToolBar::findToolBarPlaceHolder() { const QList placeholders = FindToolBarPlaceHolder::allFindToolbarPlaceHolders(); QWidget *candidate = QApplication::focusWidget(); diff --git a/src/plugins/coreplugin/find/findtoolbar.h b/src/plugins/coreplugin/find/findtoolbar.h index 4239282ec8a..34103b234ac 100644 --- a/src/plugins/coreplugin/find/findtoolbar.h +++ b/src/plugins/coreplugin/find/findtoolbar.h @@ -124,7 +124,7 @@ private: void setFindFlag(FindFlag flag, bool enabled); bool hasFindFlag(FindFlag flag); FindFlags effectiveFindFlags(); - FindToolBarPlaceHolder *findToolBarPlaceHolder() const; + static FindToolBarPlaceHolder *findToolBarPlaceHolder(); bool toolBarHasFocus() const; ControlStyle controlStyle(bool replaceIsVisible); void setFindButtonStyle(Qt::ToolButtonStyle style); diff --git a/src/plugins/coreplugin/find/findtoolwindow.h b/src/plugins/coreplugin/find/findtoolwindow.h index 91db0bd4db9..ca777467de9 100644 --- a/src/plugins/coreplugin/find/findtoolwindow.h +++ b/src/plugins/coreplugin/find/findtoolwindow.h @@ -65,7 +65,7 @@ private: void updateButtonStates(); void updateFindFlags(); void updateFindFilterName(IFindFilter *filter); - void findCompleterActivated(const QModelIndex &index); + static void findCompleterActivated(const QModelIndex &index); void acceptAndGetParameters(QString *term, IFindFilter **filter); diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.cpp b/src/plugins/coreplugin/find/searchresulttreemodel.cpp index 67fee6f98b8..92097fbedd0 100644 --- a/src/plugins/coreplugin/find/searchresulttreemodel.cpp +++ b/src/plugins/coreplugin/find/searchresulttreemodel.cpp @@ -149,7 +149,7 @@ int SearchResultTreeModel::columnCount(const QModelIndex &parent) const return 1; } -SearchResultTreeItem *SearchResultTreeModel::treeItemAtIndex(const QModelIndex &idx) const +SearchResultTreeItem *SearchResultTreeModel::treeItemAtIndex(const QModelIndex &idx) { return static_cast(idx.internalPointer()); } diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.h b/src/plugins/coreplugin/find/searchresulttreemodel.h index 09762c51471..09a24f4191d 100644 --- a/src/plugins/coreplugin/find/searchresulttreemodel.h +++ b/src/plugins/coreplugin/find/searchresulttreemodel.h @@ -76,7 +76,7 @@ private: bool setCheckState(const QModelIndex &idx, Qt::CheckState checkState, bool firstCall = true); QModelIndex nextIndex(const QModelIndex &idx, bool *wrapped = nullptr) const; QModelIndex prevIndex(const QModelIndex &idx, bool *wrapped = nullptr) const; - SearchResultTreeItem *treeItemAtIndex(const QModelIndex &idx) const; + static SearchResultTreeItem *treeItemAtIndex(const QModelIndex &idx); SearchResultTreeItem *m_rootItem; SearchResultTreeItem *m_currentParent; diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 80822675ac1..e438a3ea2ae 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -64,10 +64,10 @@ public: void resetWarnings(); void resetLanguage(); - bool canResetWarnings() const; + static bool canResetWarnings(); void fillLanguageBox() const; - QString language() const; - void setLanguage(const QString&); + static QString language(); + static void setLanguage(const QString&); GeneralSettings *q; Ui::GeneralSettings m_ui; @@ -86,7 +86,7 @@ GeneralSettingsWidget::GeneralSettingsWidget(GeneralSettings *q) m_ui.showShortcutsInContextMenus->setText( tr("Show keyboard shortcuts in context menus (default: %1)") .arg(q->m_defaultShowShortcutsInContextMenu ? tr("on") : tr("off"))); - m_ui.showShortcutsInContextMenus->setChecked(q->showShortcutsInContextMenu()); + m_ui.showShortcutsInContextMenus->setChecked(GeneralSettings::showShortcutsInContextMenu()); #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0)) m_ui.showShortcutsInContextMenus->setVisible(false); #endif @@ -157,7 +157,7 @@ void GeneralSettingsWidget::apply() m_ui.themeChooser->apply(); } -bool GeneralSettings::showShortcutsInContextMenu() const +bool GeneralSettings::showShortcutsInContextMenu() { return ICore::settings() ->value(settingsKeyShortcutsInContextMenu, @@ -177,7 +177,7 @@ void GeneralSettingsWidget::resetWarnings() m_ui.resetWarningsButton->setEnabled(false); } -bool GeneralSettingsWidget::canResetWarnings() const +bool GeneralSettingsWidget::canResetWarnings() { return InfoBar::anyGloballySuppressed() || CheckableMessageBox::hasSuppressedQuestions(ICore::settings()); @@ -189,7 +189,7 @@ void GeneralSettingsWidget::resetLanguage() m_ui.languageBox->setCurrentIndex(0); } -QString GeneralSettingsWidget::language() const +QString GeneralSettingsWidget::language() { QSettings *settings = ICore::settings(); return settings->value(QLatin1String("General/OverrideLanguage")).toString(); diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h index f8b342946ee..fb272263a4f 100644 --- a/src/plugins/coreplugin/generalsettings.h +++ b/src/plugins/coreplugin/generalsettings.h @@ -35,7 +35,7 @@ class GeneralSettings : public IOptionsPage public: GeneralSettings(); - bool showShortcutsInContextMenu() const; + static bool showShortcutsInContextMenu(); void setShowShortcutsInContextMenu(bool show); private: diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 02056cbc15d..af41bfd6a62 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -769,7 +769,7 @@ void ICore::registerWindow(QWidget *window, const Context &context) void ICore::openFiles(const QStringList &arguments, ICore::OpenFilesFlags flags) { - m_mainwindow->openFiles(arguments, flags); + MainWindow::openFiles(arguments, flags); } /*! diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp index 3dff6e023de..94b21a3c091 100644 --- a/src/plugins/coreplugin/iwizardfactory.cpp +++ b/src/plugins/coreplugin/iwizardfactory.cpp @@ -227,7 +227,7 @@ QList IWizardFactory::allWizardFactories() return s_allFactories; } -QString IWizardFactory::runPath(const QString &defaultPath) +QString IWizardFactory::runPath(const QString &defaultPath) const { QString path = defaultPath; if (path.isEmpty()) { @@ -381,7 +381,7 @@ void IWizardFactory::clearWizardFactories() s_areFactoriesLoaded = false; } -QSet IWizardFactory::pluginFeatures() const +QSet IWizardFactory::pluginFeatures() { static QSet plugins; if (plugins.isEmpty()) { @@ -394,7 +394,7 @@ QSet IWizardFactory::pluginFeatures() const return plugins; } -QSet IWizardFactory::availableFeatures(Id platformId) const +QSet IWizardFactory::availableFeatures(Id platformId) { QSet availableFeatures; diff --git a/src/plugins/coreplugin/iwizardfactory.h b/src/plugins/coreplugin/iwizardfactory.h index 40e485f3c6e..b49bcab7223 100644 --- a/src/plugins/coreplugin/iwizardfactory.h +++ b/src/plugins/coreplugin/iwizardfactory.h @@ -83,7 +83,7 @@ public: void addRequiredFeature(const Utils::Id &feature) { m_requiredFeatures |= feature; } void setFlags(WizardFlags flags) { m_flags = flags; } - QString runPath(const QString &defaultPath); + QString runPath(const QString &defaultPath) const; // Does bookkeeping and the calls runWizardImpl. Please implement that. Utils::Wizard *runWizard(const QString &path, QWidget *parent, Utils::Id platform, @@ -111,8 +111,8 @@ public: const QVariantMap &extraVariables); protected: - QSet pluginFeatures() const; - QSet availableFeatures(Utils::Id platformId) const; + static QSet pluginFeatures(); + static QSet availableFeatures(Utils::Id platformId); virtual Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Utils::Id platform, const QVariantMap &variables) = 0; diff --git a/src/plugins/coreplugin/locator/basefilefilter.cpp b/src/plugins/coreplugin/locator/basefilefilter.cpp index b70c4fde66a..37fb9dd73b6 100644 --- a/src/plugins/coreplugin/locator/basefilefilter.cpp +++ b/src/plugins/coreplugin/locator/basefilefilter.cpp @@ -118,7 +118,7 @@ void BaseFileFilter::prepareSearch(const QString &entry) } ILocatorFilter::MatchLevel BaseFileFilter::matchLevelFor(const QRegularExpressionMatch &match, - const QString &matchText) const + const QString &matchText) { const int consecutivePos = match.capturedStart(1); if (consecutivePos == 0) diff --git a/src/plugins/coreplugin/locator/basefilefilter.h b/src/plugins/coreplugin/locator/basefilefilter.h index 29e0546e9b2..3757a2b77de 100644 --- a/src/plugins/coreplugin/locator/basefilefilter.h +++ b/src/plugins/coreplugin/locator/basefilefilter.h @@ -76,7 +76,8 @@ protected: QSharedPointer fileIterator(); private: - MatchLevel matchLevelFor(const QRegularExpressionMatch &match, const QString &matchText) const; + static MatchLevel matchLevelFor(const QRegularExpressionMatch &match, + const QString &matchText); void updatePreviousResultData(); Internal::BaseFileFilterPrivate *d = nullptr; diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp index 245581aa3c4..9c3f8ae06aa 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.cpp +++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp @@ -47,7 +47,7 @@ using namespace Core::Internal; using namespace Utils; ILocatorFilter::MatchLevel FileSystemFilter::matchLevelFor(const QRegularExpressionMatch &match, - const QString &matchText) const + const QString &matchText) { const int consecutivePos = match.capturedStart(1); if (consecutivePos == 0) diff --git a/src/plugins/coreplugin/locator/filesystemfilter.h b/src/plugins/coreplugin/locator/filesystemfilter.h index a1391060837..75462a51eda 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.h +++ b/src/plugins/coreplugin/locator/filesystemfilter.h @@ -53,7 +53,7 @@ public: void refresh(QFutureInterface &) override {} private: - MatchLevel matchLevelFor(const QRegularExpressionMatch &match, const QString &matchText) const; + static MatchLevel matchLevelFor(const QRegularExpressionMatch &match, const QString &matchText); bool m_includeHidden = true; QString m_currentDocumentDirectory; diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h index e506a567b90..20b129e0b16 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.h +++ b/src/plugins/coreplugin/locator/ilocatorfilter.h @@ -156,7 +156,7 @@ public: static Qt::CaseSensitivity caseSensitivity(const QString &str); static QRegularExpression createRegExp(const QString &text, Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive); - LocatorFilterEntry::HighlightInfo highlightInfo(const QRegularExpressionMatch &match, + static LocatorFilterEntry::HighlightInfo highlightInfo(const QRegularExpressionMatch &match, LocatorFilterEntry::HighlightInfo::DataType dataType = LocatorFilterEntry::HighlightInfo::DisplayName); static QString msgConfigureDialogTitle(); diff --git a/src/plugins/coreplugin/locator/locatorwidget.h b/src/plugins/coreplugin/locator/locatorwidget.h index d28d6a9497e..99b4afdee5d 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.h +++ b/src/plugins/coreplugin/locator/locatorwidget.h @@ -76,7 +76,7 @@ private: void showPopupDelayed(); void showPopupNow(); void acceptEntry(int row); - void showConfigureDialog(); + static void showConfigureDialog(); void addSearchResults(int firstIndex, int endIndex); void handleSearchFinished(); void updateFilterList(); @@ -86,7 +86,7 @@ private: bool eventFilter(QObject *obj, QEvent *event) override; void updateCompletionList(const QString &text); - QList filtersFor(const QString &text, QString &searchText); + static QList filtersFor(const QString &text, QString &searchText); void setProgressIndicatorVisible(bool visible); LocatorModel *m_locatorModel = nullptr; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 6ec5f7eaa14..85a825ac7a3 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -148,7 +148,7 @@ MainWindow::MainWindow() QApplication::setStyle(new ManhattanStyle(baseName)); m_generalSettings->setShowShortcutsInContextMenu( - m_generalSettings->showShortcutsInContextMenu()); + GeneralSettings::showShortcutsInContextMenu()); setDockNestingEnabled(true); diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 3c56062d437..d9105ba93b3 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -89,9 +89,9 @@ public: void addContextObject(IContext *context); void removeContextObject(IContext *context); - IDocument *openFiles(const QStringList &fileNames, - ICore::OpenFilesFlags flags, - const QString &workingDirectory = QString()); + static IDocument *openFiles(const QStringList &fileNames, + ICore::OpenFilesFlags flags, + const QString &workingDirectory = QString()); inline SettingsDatabase *settingsDatabase() const { return m_settingsDatabase; } virtual QPrinter *printer() const; @@ -117,16 +117,16 @@ public: void restart(); public slots: - void openFileWith(); + static void openFileWith(); void exit(); protected: void closeEvent(QCloseEvent *event) override; private: - void openFile(); + static void openFile(); void aboutToShowRecentFiles(); - void setFocusToEditor(); + static void setFocusToEditor(); void aboutQtCreator(); void aboutPlugins(); void updateFocusWidget(QWidget *old, QWidget *now); diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index c043b05e8ad..875c228ab57 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -1174,7 +1174,7 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti } } -void ManhattanStyle::drawButtonSeparator(QPainter *painter, const QRect &rect, bool reverse) const +void ManhattanStyle::drawButtonSeparator(QPainter *painter, const QRect &rect, bool reverse) { const QRectF borderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5); if (creatorTheme()->flag(Theme::FlatToolBars)) { diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h index fc136ee0447..a25795411e8 100644 --- a/src/plugins/coreplugin/manhattanstyle.h +++ b/src/plugins/coreplugin/manhattanstyle.h @@ -67,7 +67,7 @@ public: void unpolish(QApplication *app) override; private: - void drawButtonSeparator(QPainter *painter, const QRect &rect, bool reverse) const; + static void drawButtonSeparator(QPainter *painter, const QRect &rect, bool reverse); ManhattanStylePrivate *d; }; diff --git a/src/plugins/coreplugin/mimetypemagicdialog.cpp b/src/plugins/coreplugin/mimetypemagicdialog.cpp index 36a5f099c6f..18bd8516732 100644 --- a/src/plugins/coreplugin/mimetypemagicdialog.cpp +++ b/src/plugins/coreplugin/mimetypemagicdialog.cpp @@ -121,7 +121,7 @@ MagicData MimeTypeMagicDialog::magicData() const } -bool MagicData::operator==(const MagicData &other) +bool MagicData::operator==(const MagicData &other) const { return m_priority == other.m_priority && m_rule == other.m_rule; } diff --git a/src/plugins/coreplugin/mimetypemagicdialog.h b/src/plugins/coreplugin/mimetypemagicdialog.h index f2140b28f6b..9480369e2eb 100644 --- a/src/plugins/coreplugin/mimetypemagicdialog.h +++ b/src/plugins/coreplugin/mimetypemagicdialog.h @@ -46,7 +46,7 @@ public: { } - bool operator==(const MagicData &other); + bool operator==(const MagicData &other) const; bool operator!=(const MagicData &other) { return !(*this == other); } static QByteArray normalizedMask(const Utils::Internal::MimeMagicRule &rule); diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index 4a15cd45a15..5cfe6ea84c8 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -84,7 +84,7 @@ public: class UserMimeType { public: - bool isValid() { return !name.isEmpty(); } + bool isValid() const { return !name.isEmpty(); } QString name; QStringList globPatterns; QMap > rules; diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h index 8d32527a9be..570aaeb6769 100644 --- a/src/plugins/coreplugin/outputpanemanager.h +++ b/src/plugins/coreplugin/outputpanemanager.h @@ -59,7 +59,7 @@ public slots: void slotHide(); void slotNext(); void slotPrev(); - void toggleMaximized(); + static void toggleMaximized(); protected: void focusInEvent(QFocusEvent *e) override; diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp index 5b46581cf8d..c39badf2219 100644 --- a/src/plugins/coreplugin/rightpane.cpp +++ b/src/plugins/coreplugin/rightpane.cpp @@ -159,7 +159,7 @@ QWidget *RightPaneWidget::widget() const return m_widget; } -int RightPaneWidget::storedWidth() +int RightPaneWidget::storedWidth() const { return m_width; } @@ -197,7 +197,7 @@ void RightPaneWidget::setShown(bool b) m_shown = b; } -bool RightPaneWidget::isShown() +bool RightPaneWidget::isShown() const { return m_shown; } diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h index a0ea919a04e..d0750a38546 100644 --- a/src/plugins/coreplugin/rightpane.h +++ b/src/plugins/coreplugin/rightpane.h @@ -72,7 +72,7 @@ public: void saveSettings(Utils::QtcSettings *settings); void readSettings(QSettings *settings); - bool isShown(); + bool isShown() const; void setShown(bool b); static RightPaneWidget *instance(); @@ -80,7 +80,7 @@ public: void setWidget(QWidget *widget); QWidget *widget() const; - int storedWidth(); + int storedWidth() const; protected: void resizeEvent(QResizeEvent *) override; diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index b4a8147c9d6..7c39751ab56 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -79,7 +79,7 @@ public: QString topLevel; }; - Utils::optional findInCache(const QString &dir) + Utils::optional findInCache(const QString &dir) const { QTC_ASSERT(QDir(dir).isAbsolute(), return Utils::nullopt); QTC_ASSERT(!dir.endsWith(QLatin1Char('/')), return Utils::nullopt);