diff options
35 files changed, 52 insertions, 56 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/theme.cpp b/src/libs/3rdparty/syntax-highlighting/src/lib/theme.cpp index beb1e877972..56b244a8ee6 100644 --- a/src/libs/3rdparty/syntax-highlighting/src/lib/theme.cpp +++ b/src/libs/3rdparty/syntax-highlighting/src/lib/theme.cpp @@ -47,7 +47,7 @@ QString Theme::name() const QString Theme::translatedName() const { - return m_data ? QCoreApplication::instance()->translate("Theme", m_data->name().toUtf8().constData()) : QString(); + return m_data ? QCoreApplication::translate("Theme", m_data->name().toUtf8().constData()) : QString(); } bool Theme::isReadOnly() const diff --git a/src/libs/clangsupport/connectionclient.cpp b/src/libs/clangsupport/connectionclient.cpp index ed9f4c53f45..07754a9490a 100644 --- a/src/libs/clangsupport/connectionclient.cpp +++ b/src/libs/clangsupport/connectionclient.cpp @@ -288,7 +288,7 @@ bool ConnectionClient::waitForConnected() return isConnected; else { QThread::msleep(30); - QCoreApplication::instance()->processEvents(); + QCoreApplication::processEvents(); } } diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp index ab971a4e791..99b370436c0 100644 --- a/src/plugins/autotest/testcodeparser.cpp +++ b/src/plugins/autotest/testcodeparser.cpp @@ -114,7 +114,7 @@ void TestCodeParser::syncTestFrameworks(const QList<ITestFramework *> &framework // there's a running parse m_fullUpdatePostponed = m_partialUpdatePostponed = false; m_postponedFiles.clear(); - Core::ProgressManager::instance()->cancelTasks(Constants::TASK_PARSE); + Core::ProgressManager::cancelTasks(Constants::TASK_PARSE); } m_testCodeParsers.clear(); qCDebug(LOG) << "Setting" << frameworks << "as current parsers"; @@ -206,7 +206,7 @@ void TestCodeParser::onStartupProjectChanged(Project *project) { if (m_parserState == FullParse || m_parserState == PartialParse) { qCDebug(LOG) << "Canceling scanForTest (startup project changed)"; - Core::ProgressManager::instance()->cancelTasks(Constants::TASK_PARSE); + Core::ProgressManager::cancelTasks(Constants::TASK_PARSE); } emit aboutToPerformFullParse(); if (project) @@ -271,7 +271,7 @@ bool TestCodeParser::postponed(const QStringList &fileList) m_postponedFiles.clear(); m_fullUpdatePostponed = true; qCDebug(LOG) << "Canceling scanForTest (full parse triggered while running a scan)"; - Core::ProgressManager::instance()->cancelTasks(Constants::TASK_PARSE); + Core::ProgressManager::cancelTasks(Constants::TASK_PARSE); } else { // partial parse triggered, but full parse is postponed already, ignoring this if (m_fullUpdatePostponed) @@ -393,7 +393,7 @@ void TestCodeParser::onTaskStarted(Utils::Id type) m_partialUpdatePostponed = !m_fullUpdatePostponed; qCDebug(LOG) << "Canceling scan for test (CppModelParsing started)"; parsingHasFailed = true; - Core::ProgressManager::instance()->cancelTasks(Constants::TASK_PARSE); + Core::ProgressManager::cancelTasks(Constants::TASK_PARSE); } } } diff --git a/src/plugins/beautifier/configurationdialog.cpp b/src/plugins/beautifier/configurationdialog.cpp index 7d84c730237..2b8a6f650cb 100644 --- a/src/plugins/beautifier/configurationdialog.cpp +++ b/src/plugins/beautifier/configurationdialog.cpp @@ -55,7 +55,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent) : this, &ConfigurationDialog::updateDocumentation); // Set palette and font according to settings - const TextEditor::FontSettings fs = TextEditor::TextEditorSettings::instance()->fontSettings(); + const TextEditor::FontSettings fs = TextEditor::TextEditorSettings::fontSettings(); const QTextCharFormat tf = fs.toTextCharFormat(TextEditor::C_TEXT); const QTextCharFormat selectionFormat = fs.toTextCharFormat(TextEditor::C_SELECTION); diff --git a/src/plugins/beautifier/configurationeditor.cpp b/src/plugins/beautifier/configurationeditor.cpp index 179864b0b9c..fdfcc46c094 100644 --- a/src/plugins/beautifier/configurationeditor.cpp +++ b/src/plugins/beautifier/configurationeditor.cpp @@ -42,7 +42,7 @@ namespace Internal { ConfigurationSyntaxHighlighter::ConfigurationSyntaxHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent) { - const TextEditor::FontSettings fs = TextEditor::TextEditorSettings::instance()->fontSettings(); + const TextEditor::FontSettings fs = TextEditor::TextEditorSettings::fontSettings(); m_formatKeyword = fs.toTextCharFormat(TextEditor::C_FIELD); m_formatComment = fs.toTextCharFormat(TextEditor::C_COMMENT); diff --git a/src/plugins/bineditor/bineditorwidget.cpp b/src/plugins/bineditor/bineditorwidget.cpp index f0fd2377927..15bff75cd45 100644 --- a/src/plugins/bineditor/bineditorwidget.cpp +++ b/src/plugins/bineditor/bineditorwidget.cpp @@ -1469,7 +1469,7 @@ void BinEditorWidget::zoomF(float delta) else if (step < 0 && step > -1) step = -1; - const int newZoom = TextEditor::TextEditorSettings::instance()->increaseFontZoom(int(step)); + const int newZoom = TextEditor::TextEditorSettings::increaseFontZoom(int(step)); showZoomIndicator(this, newZoom); } diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.cpp b/src/plugins/clangcodemodel/clangassistproposalitem.cpp index a938def8d00..034504df4ba 100644 --- a/src/plugins/clangcodemodel/clangassistproposalitem.cpp +++ b/src/plugins/clangcodemodel/clangassistproposalitem.cpp @@ -220,7 +220,7 @@ void ClangAssistProposalItem::apply(TextDocumentManipulatorInterface &manipulato textToBeInserted.chop(2); } else if (!ccr.text.isEmpty()) { const CompletionSettings &completionSettings = - TextEditorSettings::instance()->completionSettings(); + TextEditorSettings::completionSettings(); const bool autoInsertBrackets = completionSettings.m_autoInsertBrackets; if (autoInsertBrackets && diff --git a/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp b/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp index 4cc9cd7f8fe..666282d8fda 100644 --- a/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp +++ b/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp @@ -156,7 +156,7 @@ void addWarningSelections(const QVector<ClangBackEnd::DiagnosticContainer> &diag QTextDocument *textDocument, QList<QTextEdit::ExtraSelection> &extraSelections) { - const auto fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings(); + const auto fontSettings = TextEditor::TextEditorSettings::fontSettings(); QTextCharFormat warningFormat = fontSettings.toTextCharFormat(TextEditor::C_WARNING); @@ -169,7 +169,7 @@ void addErrorSelections(const QVector<ClangBackEnd::DiagnosticContainer> &diagno QTextDocument *textDocument, QList<QTextEdit::ExtraSelection> &extraSelections) { - const auto fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings(); + const auto fontSettings = TextEditor::TextEditorSettings::fontSettings(); QTextCharFormat errorFormat = fontSettings.toTextCharFormat(TextEditor::C_ERROR); QTextCharFormat errorContextFormat = fontSettings.toTextCharFormat(TextEditor::C_ERROR_CONTEXT); diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index cd62339d80e..35b397d4cfe 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -570,7 +570,7 @@ void FancyTabWidget::paintEvent(QPaintEvent *event) QPainter painter(this); QRect rect = m_selectionWidget->rect().adjusted(0, 0, 1, 0); - rect = style()->visualRect(layoutDirection(), geometry(), rect); + rect = QStyle::visualRect(layoutDirection(), geometry(), rect); const QRectF boderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5); if (creatorTheme()->flag(Theme::FlatToolBars)) { diff --git a/src/plugins/coreplugin/imode.cpp b/src/plugins/coreplugin/imode.cpp index f3faeab19b9..2e8e27c3bed 100644 --- a/src/plugins/coreplugin/imode.cpp +++ b/src/plugins/coreplugin/imode.cpp @@ -122,7 +122,7 @@ namespace Core { */ IMode::IMode(QObject *parent) : IContext(parent) { - ModeManager::instance()->addMode(this); + ModeManager::addMode(this); } /*! @@ -130,7 +130,7 @@ IMode::IMode(QObject *parent) : IContext(parent) */ IMode::~IMode() { - ModeManager::instance()->removeMode(this); + ModeManager::removeMode(this); } void IMode::setEnabled(bool enabled) diff --git a/src/plugins/cpptools/abstracteditorsupport.cpp b/src/plugins/cpptools/abstracteditorsupport.cpp index 05c91125554..9689f05e59d 100644 --- a/src/plugins/cpptools/abstracteditorsupport.cpp +++ b/src/plugins/cpptools/abstracteditorsupport.cpp @@ -71,7 +71,7 @@ QString AbstractEditorSupport::licenseTemplate(const QString &file, const QStrin bool AbstractEditorSupport::usePragmaOnce() { - return Internal::CppToolsPlugin::instance()->usePragmaOnce(); + return Internal::CppToolsPlugin::usePragmaOnce(); } } // namespace CppTools diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp index ce35d95b77c..8a3b8f0adfe 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp +++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp @@ -55,7 +55,7 @@ QList<QTextEdit::ExtraSelection> toTextEditorSelections( const QList<CPlusPlus::Document::DiagnosticMessage> &diagnostics, QTextDocument *textDocument) { - const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings(); + const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::fontSettings(); QTextCharFormat warningFormat = fontSettings.toTextCharFormat(TextEditor::C_WARNING); QTextCharFormat errorFormat = fontSettings.toTextCharFormat(TextEditor::C_ERROR); diff --git a/src/plugins/debugger/qml/qmlengineutils.cpp b/src/plugins/debugger/qml/qmlengineutils.cpp index eb0652fbc6e..f7e22d127a0 100644 --- a/src/plugins/debugger/qml/qmlengineutils.cpp +++ b/src/plugins/debugger/qml/qmlengineutils.cpp @@ -244,7 +244,7 @@ QStringList highlightExceptionCode(int lineNumber, const QString &filePath, cons const QList<IEditor *> editors = DocumentModel::editorsForFilePath( Utils::FilePath::fromString(filePath)); - const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings(); + const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::fontSettings(); QTextCharFormat errorFormat = fontSettings.toTextCharFormat(TextEditor::C_ERROR); for (IEditor *editor : editors) { diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp index 3a2592f7354..6988dd28dd5 100644 --- a/src/plugins/git/logchangedialog.cpp +++ b/src/plugins/git/logchangedialog.cpp @@ -106,10 +106,8 @@ bool LogChangeWidget::init(const QString &repository, const QString &commit, Log return false; if (m_model->rowCount() > 0) return true; - if (!(flags & Silent)) { - VcsOutputWindow::appendError( - GitClient::instance()->msgNoCommits(flags & IncludeRemotes)); - } + if (!(flags & Silent)) + VcsOutputWindow::appendError(GitClient::msgNoCommits(flags & IncludeRemotes)); return false; } diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index e00ce14c7b3..1f76e997eb2 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -277,7 +277,7 @@ void GlslEditorWidget::updateDocumentNow() CreateRanges createRanges(document(), doc); createRanges(ast); - const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings(); + const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::fontSettings(); QTextCharFormat warningFormat = fontSettings.toTextCharFormat(TextEditor::C_WARNING); QTextCharFormat errorFormat = fontSettings.toTextCharFormat(TextEditor::C_ERROR); diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index 532b77e115e..f9167b2d407 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -436,7 +436,7 @@ void SimulatorControlPrivate::startSimulator(QFutureInterface<SimulatorControl:: auto start = chrono::high_resolution_clock::now(); while (simInfo.isShuttingDown() && !checkForTimeout(start, simulatorStartTimeout)) { // Wait till the simulator shuts down, if doing so. - QThread::currentThread()->msleep(100); + QThread::msleep(100); simInfo = deviceInfo(simUdid); } diff --git a/src/plugins/languageclient/diagnosticmanager.cpp b/src/plugins/languageclient/diagnosticmanager.cpp index 562c2e3c753..802ff4a58fd 100644 --- a/src/plugins/languageclient/diagnosticmanager.cpp +++ b/src/plugins/languageclient/diagnosticmanager.cpp @@ -103,7 +103,7 @@ static QTextEdit::ExtraSelection toDiagnosticsSelections(const Diagnostic &diagn cursor.setPosition(diagnostic.range().end().toPositionInDocument(textDocument), QTextCursor::KeepAnchor); - const FontSettings &fontSettings = TextEditorSettings::instance()->fontSettings(); + const FontSettings &fontSettings = TextEditorSettings::fontSettings(); const DiagnosticSeverity severity = diagnostic.severity().value_or(DiagnosticSeverity::Warning); const TextStyle style = severity == DiagnosticSeverity::Error ? C_ERROR : C_WARNING; diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp index 5d9d7cf39a4..3153bbf99ab 100644 --- a/src/plugins/macros/texteditormacrohandler.cpp +++ b/src/plugins/macros/texteditormacrohandler.cpp @@ -97,7 +97,7 @@ bool TextEditorMacroHandler::executeEvent(const MacroEvent ¯oEvent) macroEvent.value(TEXT).toString(), macroEvent.value(AUTOREP).toBool(), macroEvent.value(COUNT).toInt()); - QApplication::instance()->sendEvent(m_currentEditor->widget(), &keyEvent); + QCoreApplication::sendEvent(m_currentEditor->widget(), &keyEvent); return true; } diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index a0c5ab4ec32..3dbd0356390 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -290,7 +290,7 @@ void ExtraCompilerPrivate::updateIssues() cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor); selection.cursor = cursor; - const auto fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings(); + const auto fontSettings = TextEditor::TextEditorSettings::fontSettings(); selection.format = fontSettings.toTextCharFormat(issue.type == Task::Warning ? TextEditor::C_WARNING : TextEditor::C_ERROR); selection.format.setToolTip(issue.description()); diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index f54ea3f7d92..b7d399720c9 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -681,7 +681,7 @@ void FolderNavigationWidget::openProjectsInDirectory(const QModelIndex &index) { const QStringList projectFiles = projectsInDirectory(index); if (!projectFiles.isEmpty()) - Core::ICore::instance()->openFiles(projectFiles); + Core::ICore::openFiles(projectFiles); } void FolderNavigationWidget::createNewFolder(const QModelIndex &parent) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp index b1d690b8a41..3d613b5e63c 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp @@ -452,7 +452,7 @@ void JsonWizard::openFiles(const JsonWizard::GeneratorFiles &files) } if (file.attributes() & Core::GeneratedFile::OpenProjectAttribute) { ProjectExplorerPlugin::OpenProjectResult result - = ProjectExplorerPlugin::instance()->openProject(file.path()); + = ProjectExplorerPlugin::openProject(file.path()); if (!result) { errorMessage = result.errorMessage(); if (errorMessage.isEmpty()) { diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp index 9e873e6b413..a49b01fd48a 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp @@ -114,7 +114,7 @@ bool JsonWizardGenerator::formatFile(const JsonWizard *wizard, GeneratedFile *fi if (TextEditorSettings::storageSettings().m_cleanWhitespace) { QTextBlock block = doc.firstBlock(); while (block.isValid()) { - codeStylePrefs->currentTabSettings().removeTrailingWhitespace(cursor, block); + TabSettings::removeTrailingWhitespace(cursor, block); block = block.next(); } } diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp index 54b011ee81a..730d4585160 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.cpp +++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp @@ -274,7 +274,7 @@ void ProjectFileWizardExtension::applyCodeStyle(GeneratedFile *file) const if (TextEditorSettings::storageSettings().m_cleanWhitespace) { QTextBlock block = doc.firstBlock(); while (block.isValid()) { - codeStylePrefs->currentTabSettings().removeTrailingWhitespace(cursor, block); + TabSettings::removeTrailingWhitespace(cursor, block); block = block.next(); } } diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index afd4af7e492..b3a2dbdef5e 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -693,8 +693,8 @@ void NavigatorTreeModel::handleItemLibraryItemDrop(const QMimeData *mimeData, in // Files are copied into the same directory as the current qml document for (const auto ©File : copyFiles) { QFileInfo fi(copyFile); - const QString targetFile = QmlDesignerPlugin::instance()->documentManager() - .currentFilePath().toFileInfo().dir().absoluteFilePath(fi.fileName()); + const QString targetFile = DocumentManager::currentFilePath().toFileInfo().dir() + .absoluteFilePath(fi.fileName()); // We don't want to overwrite existing default files if (!QFileInfo::exists(targetFile)) { if (!QFile::copy(copyFile, targetFile)) @@ -717,7 +717,7 @@ void NavigatorTreeModel::handleItemLibraryImageDrop(const QMimeData *mimeData, i ModelNode targetNode(modelNodeForIndex(rowModelIndex)); const QString imageSource = QString::fromUtf8(mimeData->data("application/vnd.bauhaus.libraryresource")); // absolute path - const QString imagePath = QmlDesignerPlugin::instance()->documentManager().currentFilePath().toFileInfo().dir().relativeFilePath(imageSource); // relative to .ui.qml file + const QString imagePath = DocumentManager::currentFilePath().toFileInfo().dir().relativeFilePath(imageSource); // relative to .ui.qml file ModelNode newModelNode; diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp index 97ff27dfd5e..e3a870f9801 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp @@ -270,7 +270,7 @@ void TextEditorView::reformatFile() QByteArray editorState = m_widget->textEditor()->saveState(); auto document = - qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(Core::EditorManager::instance()->currentDocument()); + qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(Core::EditorManager::currentDocument()); /* Reformat document if we have a .ui.qml file */ if (document diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 66752e27e3e..0b205327b6a 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -992,7 +992,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH m_rewriterView->model()->clearMetaInfoCache(); try { - Snapshot snapshot = m_rewriterView->textModifier()->qmljsSnapshot(); + Snapshot snapshot = TextModifier::qmljsSnapshot(); QList<DocumentMessage> errors; QList<DocumentMessage> warnings; diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index c591ecfe2c7..05f6353d09c 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -209,7 +209,7 @@ static void appendExtraSelectionsForMessages( sel.cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor, d.loc.length); } - const auto fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings(); + const auto fontSettings = TextEditor::TextEditorSettings::fontSettings(); if (d.isWarning()) sel.format = fontSettings.toTextCharFormat(TextEditor::C_WARNING); diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp index 823e57d7ab4..b7e98ad0b7c 100644 --- a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp +++ b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp @@ -404,7 +404,7 @@ protected: length = end-begin; } - const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings(); + const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::fontSettings(); QTextCharFormat format; if (d.isWarning()) @@ -441,7 +441,7 @@ protected: length = end-begin; } - const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings(); + const TextEditor::FontSettings &fontSettings = TextEditor::TextEditorSettings::fontSettings(); QTextCharFormat format; if (d.severity == Severity::Warning diff --git a/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp b/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp index f97c5991865..97b124e016c 100644 --- a/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp @@ -255,10 +255,10 @@ void PixmapCacheModelTest::testConsistency() break; } - QString filename = details[model.tr("File")].toString(); + QString filename = details[PixmapCacheModel::tr("File")].toString(); QVERIFY(filename == QString("dings.png") || filename == QString("blah.png")); - QVERIFY(details.contains(model.tr("Width"))); - QVERIFY(details.contains(model.tr("Height"))); + QVERIFY(details.contains(PixmapCacheModel::tr("Width"))); + QVERIFY(details.contains(PixmapCacheModel::tr("Height"))); } } diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerattachdialog_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerattachdialog_test.cpp index d0a2856cd8c..628b8803c00 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilerattachdialog_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilerattachdialog_test.cpp @@ -48,13 +48,13 @@ void QmlProfilerAttachDialogTest::testAccessors() ProjectExplorer::KitManager *kitManager = ProjectExplorer::KitManager::instance(); QVERIFY(kitManager); - ProjectExplorer::Kit * const newKit = kitManager->registerKit({}, "dings"); + ProjectExplorer::Kit * const newKit = ProjectExplorer::KitManager::registerKit({}, "dings"); QVERIFY(newKit); dialog.setKitId("dings"); QCOMPARE(dialog.kit(), newKit); - kitManager->deregisterKit(newKit); + ProjectExplorer::KitManager::deregisterKit(newKit); } } // namespace Internal diff --git a/src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp index ab085ea4586..bac99ccdbfe 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp @@ -46,7 +46,7 @@ void QmlProfilerToolTest::testAttachToWaitingApplication() { ProjectExplorer::KitManager *kitManager = ProjectExplorer::KitManager::instance(); QVERIFY(kitManager); - ProjectExplorer::Kit * const newKit = kitManager->registerKit({}, "fookit"); + ProjectExplorer::Kit * const newKit = ProjectExplorer::KitManager::registerKit({}, "fookit"); QVERIFY(newKit); QSettings *settings = Core::ICore::settings(); QVERIFY(settings); diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp index bbab05c0468..65d6336ed82 100644 --- a/src/plugins/qtsupport/qtprojectimporter.cpp +++ b/src/plugins/qtsupport/qtprojectimporter.cpp @@ -221,7 +221,7 @@ Kit *TestQtProjectImporter::createKit(void *directoryData) const const DirectoryData *dd = static_cast<const DirectoryData *>(directoryData); assert(dd->importPath == m_path); - if (KitManager::instance()->kit(dd->kit->id())) // known kit + if (KitManager::kit(dd->kit->id())) // known kit return dd->kit; // New temporary kit: diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index e0642423b4e..d6d83296afd 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -6220,13 +6220,13 @@ void TextEditorWidget::zoomF(float delta) else if (step < 0 && step > -1) step = -1; - const int newZoom = TextEditorSettings::instance()->increaseFontZoom(int(step)); + const int newZoom = TextEditorSettings::increaseFontZoom(int(step)); showZoomIndicator(this, newZoom); } void TextEditorWidget::zoomReset() { - TextEditorSettings::instance()->resetFontZoom(); + TextEditorSettings::resetFontZoom(); showZoomIndicator(this, 100); } diff --git a/tests/auto/diff/differ/tst_differ.cpp b/tests/auto/diff/differ/tst_differ.cpp index 969c811991f..821bcc3dcf7 100644 --- a/tests/auto/diff/differ/tst_differ.cpp +++ b/tests/auto/diff/differ/tst_differ.cpp @@ -415,8 +415,7 @@ void tst_Differ::merge() QFETCH(QList<Diff>, input); QFETCH(QList<Diff>, expected); - Differ differ; - QList<Diff> result = differ.merge(input); + QList<Diff> result = Differ::merge(input); QCOMPARE(result, expected); } @@ -651,8 +650,7 @@ void tst_Differ::cleanupSemantics() QFETCH(QList<Diff>, input); QFETCH(QList<Diff>, expected); - Differ differ; - QList<Diff> result = differ.cleanupSemantics(input); + QList<Diff> result = Differ::cleanupSemantics(input); QCOMPARE(result, expected); } @@ -793,8 +791,7 @@ void tst_Differ::cleanupSemanticsLossless() QFETCH(QList<Diff>, input); QFETCH(QList<Diff>, expected); - Differ differ; - QList<Diff> result = differ.cleanupSemanticsLossless(input); + QList<Diff> result = Differ::cleanupSemanticsLossless(input); QCOMPARE(result, expected); } diff --git a/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp b/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp index a36e8d41fe1..137d5f6327f 100644 --- a/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp +++ b/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp @@ -574,14 +574,15 @@ void tst_LanguageServerProtocol::jsonObject() ErrorHierarchy errorHierarchy; QVERIFY(!obj.check<int>(&errorHierarchy, "doesNotExist")); ErrorHierarchy errorDoesNotExists; - errorDoesNotExists.setError(obj.errorString(QJsonValue::Double, QJsonValue::Undefined)); + errorDoesNotExists.setError( + JsonTestObject::errorString(QJsonValue::Double, QJsonValue::Undefined)); errorDoesNotExists.prependMember("doesNotExist"); QCOMPARE(errorHierarchy, errorDoesNotExists); errorHierarchy.clear(); QVERIFY(!obj.check<int>(&errorHierarchy, "bool")); ErrorHierarchy errorWrongType; - errorWrongType.setError(obj.errorString(QJsonValue::Double, QJsonValue::Bool)); + errorWrongType.setError(JsonTestObject::errorString(QJsonValue::Double, QJsonValue::Bool)); errorWrongType.prependMember("bool"); QCOMPARE(errorHierarchy, errorWrongType); errorHierarchy.clear(); |