diff --git a/kdevplatform/interfaces/ibuddydocumentfinder.h b/kdevplatform/interfaces/ibuddydocumentfinder.h --- a/kdevplatform/interfaces/ibuddydocumentfinder.h +++ b/kdevplatform/interfaces/ibuddydocumentfinder.h @@ -106,7 +106,7 @@ * @returns list of potential buddy documents or an empty list * if non are available. */ - virtual QVector getPotentialBuddies(const QUrl& url) const = 0; + virtual QVector potentialBuddies(const QUrl& url) const = 0; /** * @brief Registers a IBuddyDocumentFinder object for a mimetype. diff --git a/kdevplatform/language/assistant/renameassistant.cpp b/kdevplatform/language/assistant/renameassistant.cpp --- a/kdevplatform/language/assistant/renameassistant.cpp +++ b/kdevplatform/language/assistant/renameassistant.cpp @@ -47,7 +47,7 @@ return !firstRange.intersect(secondRange + KTextEditor::Range(0, -1, 0, +1)).isEmpty(); } -Declaration* getDeclarationForChangedRange(KTextEditor::Document* doc, const KTextEditor::Range& changed) +Declaration* declarationForChangedRange(KTextEditor::Document* doc, const KTextEditor::Range& changed) { const KTextEditor::Cursor cursor(changed.start()); Declaration* declaration = DUChainUtils::itemUnderCursor(doc->url(), cursor).declaration; @@ -154,7 +154,7 @@ || d->m_newDeclarationRange->document() != indexedUrl) { d->reset(); - Declaration* declAtCursor = getDeclarationForChangedRange(doc, invocationRange); + Declaration* declAtCursor = declarationForChangedRange(doc, invocationRange); if (!declAtCursor) { // not editing a declaration return; diff --git a/kdevplatform/language/duchain/duchain.cpp b/kdevplatform/language/duchain/duchain.cpp --- a/kdevplatform/language/duchain/duchain.cpp +++ b/kdevplatform/language/duchain/duchain.cpp @@ -1637,7 +1637,7 @@ return ret; } } - static QAtomicInt& currentId( globalItemRepositoryRegistry().getCustomCounter(QStringLiteral("Top-Context Counter"), 1) ); + static QAtomicInt& currentId( globalItemRepositoryRegistry().customCounter(QStringLiteral("Top-Context Counter"), 1) ); return currentId.fetchAndAddRelaxed(1); } diff --git a/kdevplatform/language/highlighting/codehighlighting.cpp b/kdevplatform/language/highlighting/codehighlighting.cpp --- a/kdevplatform/language/highlighting/codehighlighting.cpp +++ b/kdevplatform/language/highlighting/codehighlighting.cpp @@ -107,7 +107,7 @@ if ( !a || color.isValid() ) { - a = KTextEditor::Attribute::Ptr(new KTextEditor::Attribute(*ColorCache::self()->defaultColors()->getAttribute(type))); + a = KTextEditor::Attribute::Ptr(new KTextEditor::Attribute(*ColorCache::self()->defaultColors()->attribute(type))); if ( context == DefinitionContext || context == DeclarationContext ) { if (ICore::self()->languageController()->completionSettings()->boldDeclarations()) { diff --git a/kdevplatform/language/highlighting/configurablecolors.h b/kdevplatform/language/highlighting/configurablecolors.h --- a/kdevplatform/language/highlighting/configurablecolors.h +++ b/kdevplatform/language/highlighting/configurablecolors.h @@ -37,7 +37,7 @@ void addAttribute(int number, KTextEditor::Attribute::Ptr attribute); - KTextEditor::Attribute::Ptr getAttribute(int number) const; + KTextEditor::Attribute::Ptr attribute(int number) const; void setDefaultAttribute(KTextEditor::Attribute::Ptr defaultAttrib); diff --git a/kdevplatform/language/highlighting/configurablecolors.cpp b/kdevplatform/language/highlighting/configurablecolors.cpp --- a/kdevplatform/language/highlighting/configurablecolors.cpp +++ b/kdevplatform/language/highlighting/configurablecolors.cpp @@ -43,7 +43,7 @@ m_defaultAttribute = defaultAttrib; } -KTextEditor::Attribute::Ptr ConfigurableHighlightingColors::getAttribute(int number) const +KTextEditor::Attribute::Ptr ConfigurableHighlightingColors::attribute(int number) const { return m_attributes[number]; } diff --git a/kdevplatform/outputview/outputexecutejob.cpp b/kdevplatform/outputview/outputexecutejob.cpp --- a/kdevplatform/outputview/outputexecutejob.cpp +++ b/kdevplatform/outputview/outputexecutejob.cpp @@ -46,7 +46,7 @@ void emitProgress(const IFilterStrategy::Progress& progress); QString joinCommandLine() const; - QString getJobName(); + QString jobDisplayName() const; template< typename T > static void mergeEnvironment( QProcessEnvironment& dest, const T& src ); @@ -149,9 +149,10 @@ void OutputExecuteJob::setJobName( const QString& name ) { d->m_jobName = name; - QString jobName = d->getJobName(); - setObjectName( jobName ); - setTitle( jobName ); + + const QString jobDisplayName = d->jobDisplayName(); + setObjectName(jobDisplayName); + setTitle(jobDisplayName); } QUrl OutputExecuteJob::workingDirectory() const @@ -530,7 +531,7 @@ } } -QString OutputExecuteJobPrivate::getJobName() +QString OutputExecuteJobPrivate::jobDisplayName() const { const QString joinedCommandLine = joinCommandLine(); if( m_properties.testFlag( OutputExecuteJob::AppendProcessString ) ) { diff --git a/kdevplatform/outputview/outputfilteringstrategies.h b/kdevplatform/outputview/outputfilteringstrategies.h --- a/kdevplatform/outputview/outputfilteringstrategies.h +++ b/kdevplatform/outputview/outputfilteringstrategies.h @@ -68,7 +68,7 @@ FilteredItem actionInLine(const QString& line) override; - QVector getCurrentDirs(); + QVector currentDirs() const; private: const QScopedPointer d; diff --git a/kdevplatform/outputview/outputfilteringstrategies.cpp b/kdevplatform/outputview/outputfilteringstrategies.cpp --- a/kdevplatform/outputview/outputfilteringstrategies.cpp +++ b/kdevplatform/outputview/outputfilteringstrategies.cpp @@ -148,7 +148,7 @@ CompilerFilterStrategy::~CompilerFilterStrategy() = default; -QVector CompilerFilterStrategy::getCurrentDirs() +QVector CompilerFilterStrategy::currentDirs() const { QVector ret; ret.reserve(d->m_currentDirs.size()); diff --git a/kdevplatform/outputview/tests/test_filteringstrategy.cpp b/kdevplatform/outputview/tests/test_filteringstrategy.cpp --- a/kdevplatform/outputview/tests/test_filteringstrategy.cpp +++ b/kdevplatform/outputview/tests/test_filteringstrategy.cpp @@ -427,8 +427,8 @@ QUrl projecturl = QUrl::fromLocalFile( projectPath(pathType) ); CompilerFilterStrategy testee(projecturl); FilteredItem item1 = testee.actionInLine(line); - int last = testee.getCurrentDirs().size() - 1; - QCOMPARE(testee.getCurrentDirs().at(last), expectedLastDir); + int last = testee.currentDirs().size() - 1; + QCOMPARE(testee.currentDirs().at(last), expectedLastDir); } void TestFilteringStrategy::benchMarkCompilerFilterAction() diff --git a/kdevplatform/project/abstractfilemanagerplugin.cpp b/kdevplatform/project/abstractfilemanagerplugin.cpp --- a/kdevplatform/project/abstractfilemanagerplugin.cpp +++ b/kdevplatform/project/abstractfilemanagerplugin.cpp @@ -54,7 +54,7 @@ /** * Returns the parent folder item for a given item or the project root item if there is no parent. */ -ProjectFolderItem* getParentFolder(ProjectBaseItem* item) +ProjectFolderItem* parentFolder(ProjectBaseItem* item) { if ( item->parent() ) { return static_cast(item->parent()); @@ -568,7 +568,7 @@ { Q_ASSERT(item->folder() || item->file()); - ProjectFolderItem* parent = getParentFolder(item); + ProjectFolderItem* parent = parentFolder(item); d->stopWatcher(parent); success &= removeUrl(parent->project(), item->path().toUrl(), true); @@ -596,7 +596,7 @@ { Q_ASSERT(item->folder() || item->file()); - ProjectFolderItem* oldParent = getParentFolder(item); + ProjectFolderItem* oldParent = parentFolder(item); d->stopWatcher(oldParent); d->stopWatcher(newParent); diff --git a/kdevplatform/serialization/itemrepositoryregistry.h b/kdevplatform/serialization/itemrepositoryregistry.h --- a/kdevplatform/serialization/itemrepositoryregistry.h +++ b/kdevplatform/serialization/itemrepositoryregistry.h @@ -90,7 +90,7 @@ /// same directory, possibly creating it. /// @param identity The string used to identify a counter. /// @param initialValue Value to initialize a previously inexistent counter with. - QAtomicInt& getCustomCounter(const QString& identity, int initialValue); + QAtomicInt& customCounter(const QString& identity, int initialValue); /// @returns The global item-repository mutex. /// @note Can be used to protect the initialization. diff --git a/kdevplatform/serialization/itemrepositoryregistry.cpp b/kdevplatform/serialization/itemrepositoryregistry.cpp --- a/kdevplatform/serialization/itemrepositoryregistry.cpp +++ b/kdevplatform/serialization/itemrepositoryregistry.cpp @@ -184,7 +184,7 @@ return d->m_mutex; } -QAtomicInt& ItemRepositoryRegistry::getCustomCounter(const QString& identity, int initialValue) +QAtomicInt& ItemRepositoryRegistry::customCounter(const QString& identity, int initialValue) { if(!d->m_customCounters.contains(identity)) d->m_customCounters.insert(identity, new QAtomicInt(initialValue)); @@ -302,7 +302,7 @@ stream >> counterName; int counterValue; stream >> counterValue; - m_owner->getCustomCounter(counterName, 0) = counterValue; + m_owner->customCounter(counterName, 0) = counterValue; } } diff --git a/kdevplatform/shell/documentcontroller.cpp b/kdevplatform/shell/documentcontroller.cpp --- a/kdevplatform/shell/documentcontroller.cpp +++ b/kdevplatform/shell/documentcontroller.cpp @@ -1054,7 +1054,7 @@ Sublime::Area* area = Core::self()->uiControllerInternal()->activeArea(); Sublime::AreaIndex* areaIndex = area->rootIndex(); - QList topViews = static_cast(Core::self()->uiControllerInternal()->activeMainWindow())->getTopViews(); + QList topViews = static_cast(Core::self()->uiControllerInternal()->activeMainWindow())->topViews(); if(Sublime::View* activeView = Core::self()->uiControllerInternal()->activeSublimeWindow()->activeView()) areaIndex = area->indexOf(activeView); diff --git a/kdevplatform/shell/mainwindow_actions.cpp b/kdevplatform/shell/mainwindow_actions.cpp --- a/kdevplatform/shell/mainwindow_actions.cpp +++ b/kdevplatform/shell/mainwindow_actions.cpp @@ -152,7 +152,7 @@ if (!area) return; - QList topViews = ui->activeSublimeWindow()->getTopViews(); + QList topViews = ui->activeSublimeWindow()->topViews(); Sublime::View *activeView = ui->activeSublimeWindow()->activeView(); if (!activeView) diff --git a/kdevplatform/shell/openprojectdialog.cpp b/kdevplatform/shell/openprojectdialog.cpp --- a/kdevplatform/shell/openprojectdialog.cpp +++ b/kdevplatform/shell/openprojectdialog.cpp @@ -40,7 +40,7 @@ QString extension; }; -URLInfo getUrlInfo(const QUrl& url) +URLInfo urlInfo(const QUrl& url) { URLInfo ret; ret.isValid = false; @@ -167,7 +167,7 @@ { if (nativeDialog->exec()) { QUrl selectedUrl = nativeDialog->selectedUrls().at(0); - if (getUrlInfo(selectedUrl).isValid) { + if (urlInfo(selectedUrl).isValid) { // validate directory first to populate m_projectName and m_projectManager validateOpenUrl(selectedUrl.adjusted(QUrl::RemoveFilename)); validateOpenUrl(selectedUrl); @@ -199,7 +199,7 @@ void OpenProjectDialog::validateOpenUrl( const QUrl& url_ ) { - URLInfo urlInfo = getUrlInfo(url_); + URLInfo urlInfo = ::urlInfo(url_); const QUrl url = url_.adjusted(QUrl::StripTrailingSlash); diff --git a/kdevplatform/shell/openprojectpage.h b/kdevplatform/shell/openprojectpage.h --- a/kdevplatform/shell/openprojectpage.h +++ b/kdevplatform/shell/openprojectpage.h @@ -42,7 +42,9 @@ void dirChanged(const QUrl& url); private: - QUrl getAbsoluteUrl(const QString&) const; + QUrl absoluteUrl(const QString& file) const; + +private: KFileWidget* fileWidget; }; diff --git a/kdevplatform/shell/openprojectpage.cpp b/kdevplatform/shell/openprojectpage.cpp --- a/kdevplatform/shell/openprojectpage.cpp +++ b/kdevplatform/shell/openprojectpage.cpp @@ -55,7 +55,7 @@ connect( fileWidget, &KFileWidget::accepted, this, &OpenProjectPage::accepted); } -QUrl OpenProjectPage::getAbsoluteUrl( const QString& file ) const +QUrl OpenProjectPage::absoluteUrl(const QString& file) const { QUrl u(file); if( u.isRelative() ) @@ -104,7 +104,7 @@ void OpenProjectPage::comboTextChanged( const QString& file ) { - emit urlSelected( getAbsoluteUrl( file ) ); + emit urlSelected(absoluteUrl(file)); } } diff --git a/kdevplatform/shell/progresswidget/progressmanager.h b/kdevplatform/shell/progresswidget/progressmanager.h --- a/kdevplatform/shell/progresswidget/progressmanager.h +++ b/kdevplatform/shell/progresswidget/progressmanager.h @@ -289,7 +289,7 @@ * an operation from all others going on at the same time. Use that * number as the id string for your progressItem to ensure it is unique. */ - static QString getUniqueID() + static QString createUniqueID() { return QString::number( ++uID ); } @@ -301,7 +301,7 @@ */ static ProgressItem *createProgressItem( const QString &label ) { - return instance()->createProgressItemImpl( nullptr, getUniqueID(), label, + return instance()->createProgressItemImpl( nullptr, createUniqueID(), label, QString(), true, false ); } diff --git a/kdevplatform/shell/statusbar.cpp b/kdevplatform/shell/statusbar.cpp --- a/kdevplatform/shell/statusbar.cpp +++ b/kdevplatform/shell/statusbar.cpp @@ -238,7 +238,7 @@ if (!m_progressItems.contains(status)) { bool canBeCanceled = false; m_progressItems[status] = m_progressController->createProgressItem( - ProgressManager::getUniqueID(), status->statusName(), QString(), canBeCanceled);; + ProgressManager::createUniqueID(), status->statusName(), QString(), canBeCanceled); } ProgressItem* i = m_progressItems[status]; diff --git a/kdevplatform/shell/tests/test_shellbuddy.cpp b/kdevplatform/shell/tests/test_shellbuddy.cpp --- a/kdevplatform/shell/tests/test_shellbuddy.cpp +++ b/kdevplatform/shell/tests/test_shellbuddy.cpp @@ -73,7 +73,7 @@ return name1.at(1) == QLatin1String("l"); } - QVector getPotentialBuddies(const QUrl& url) const override + QVector potentialBuddies(const QUrl& url) const override { Q_UNUSED(url); return QVector(); diff --git a/kdevplatform/sublime/mainwindow.h b/kdevplatform/sublime/mainwindow.h --- a/kdevplatform/sublime/mainwindow.h +++ b/kdevplatform/sublime/mainwindow.h @@ -87,7 +87,7 @@ void reconstructViews(const QList& topViews = QList()); /**Returns a list of all views which are on top of their corresponding view stacks*/ - QList getTopViews() const; + QList topViews() const; QList containers() const; diff --git a/kdevplatform/sublime/mainwindow.cpp b/kdevplatform/sublime/mainwindow.cpp --- a/kdevplatform/sublime/mainwindow.cpp +++ b/kdevplatform/sublime/mainwindow.cpp @@ -78,7 +78,7 @@ d->reconstructViews(topViews); } -QList MainWindow::getTopViews() const +QList MainWindow::topViews() const { QList topViews; foreach(View* view, d->area->views()) diff --git a/kdevplatform/template/filters/kdevfilters.cpp b/kdevplatform/template/filters/kdevfilters.cpp --- a/kdevplatform/template/filters/kdevfilters.cpp +++ b/kdevplatform/template/filters/kdevfilters.cpp @@ -27,7 +27,8 @@ using namespace KDevelop; -QString getSafeString(const QVariant& variant) +static +QString safeString(const QVariant& variant) { if (variant.canConvert()) { @@ -41,7 +42,7 @@ QStringList words(const QVariant& input) { - QString string = getSafeString(input); + QString string = safeString(input); if (string == string.toLower() && !string.contains(QLatin1Char('_'))) { return QStringList(string); } @@ -105,7 +106,7 @@ QVariant UpperFirstFilter::doFilter(const QVariant& input, const QVariant& /*argument*/, bool /*autoescape*/) const { - QString in = getSafeString(input); + QString in = safeString(input); if (!in.isEmpty()) { in[0] = in[0].toUpper(); @@ -118,8 +119,8 @@ bool /*autoescape*/) const { QStringList retLines; - QString start = getSafeString(argument); - foreach (const QString& line, getSafeString(input).split(QLatin1Char('\n'), QString::KeepEmptyParts)) + QString start = safeString(argument); + foreach (const QString& line, safeString(input).split(QLatin1Char('\n'), QString::KeepEmptyParts)) { retLines << start + line; } @@ -129,7 +130,7 @@ QVariant ArgumentTypeFilter::doFilter (const QVariant& input, const QVariant& /*argument*/, bool /*autoescape*/) const { - QString type = getSafeString(input); + QString type = safeString(input); DUChainReadLocker locker(DUChain::lock()); PersistentSymbolTable::Declarations decl = PersistentSymbolTable::self().getDeclarations(IndexedQualifiedIdentifier(QualifiedIdentifier(type))); diff --git a/kdevplatform/util/texteditorhelpers.cpp b/kdevplatform/util/texteditorhelpers.cpp --- a/kdevplatform/util/texteditorhelpers.cpp +++ b/kdevplatform/util/texteditorhelpers.cpp @@ -30,7 +30,7 @@ namespace { // TODO: this is a hack, but Kate does not provide interface for this -int getLineHeight(const KTextEditor::View* view, int curLine) +int lineHeight(const KTextEditor::View* view, int curLine) { KTextEditor::Cursor c(curLine, 0); int currentHeight = view->cursorToCoordinate(c).y(); @@ -47,7 +47,7 @@ { QPoint startPoint = view->mapToGlobal(view->cursorToCoordinate(itemRange.start())); QPoint endPoint = view->mapToGlobal(view->cursorToCoordinate(itemRange.end())); - endPoint.ry() += getLineHeight(view, itemRange.start().line()); + endPoint.ry() += lineHeight(view, itemRange.start().line()); return QRect(startPoint, endPoint); } diff --git a/kdevplatform/vcs/dvcs/dvcsplugin.h b/kdevplatform/vcs/dvcs/dvcsplugin.h --- a/kdevplatform/vcs/dvcs/dvcsplugin.h +++ b/kdevplatform/vcs/dvcs/dvcsplugin.h @@ -77,7 +77,7 @@ /** Returns the list of all commits (in all branches). * @see CommitView and CommitViewDelegate to see how this list is used. */ - virtual QVector getAllCommits(const QString& repo) = 0; + virtual QVector allCommits(const QString& repo) = 0; /** * When a plugin wants to add elements to the vcs menu, this method can be diff --git a/kdevplatform/vcs/vcsrevision.h b/kdevplatform/vcs/vcsrevision.h --- a/kdevplatform/vcs/vcsrevision.h +++ b/kdevplatform/vcs/vcsrevision.h @@ -144,7 +144,7 @@ * get the value for a given key, this retrieves internal data and is * meant to be used by subclasses */ - QVariant getValue( const QString& key ) const; + QVariant value(const QString& key) const; /** * change the value of the given internal data */ diff --git a/kdevplatform/vcs/vcsrevision.cpp b/kdevplatform/vcs/vcsrevision.cpp --- a/kdevplatform/vcs/vcsrevision.cpp +++ b/kdevplatform/vcs/vcsrevision.cpp @@ -90,7 +90,7 @@ return d->internalValues.keys(); } -QVariant VcsRevision::getValue( const QString& key ) const +QVariant VcsRevision::value(const QString& key) const { if( d->internalValues.contains(key) ) { diff --git a/plugins/appwizard/projectselectionpage.h b/plugins/appwizard/projectselectionpage.h --- a/plugins/appwizard/projectselectionpage.h +++ b/plugins/appwizard/projectselectionpage.h @@ -51,7 +51,7 @@ private: inline QByteArray encodedProjectName(); - inline QStandardItem* getCurrentItem() const; + inline QStandardItem* currentItem() const; void setCurrentTemplate(const QString& fileName); Ui::ProjectSelectionPage *ui; diff --git a/plugins/appwizard/projectselectionpage.cpp b/plugins/appwizard/projectselectionpage.cpp --- a/plugins/appwizard/projectselectionpage.cpp +++ b/plugins/appwizard/projectselectionpage.cpp @@ -138,7 +138,7 @@ QString ProjectSelectionPage::selectedTemplate() { - QStandardItem *item = getCurrentItem(); + QStandardItem *item = currentItem(); if (item) return item->data().toString(); else @@ -222,7 +222,7 @@ } } - QStandardItem* item = getCurrentItem(); + QStandardItem* item = currentItem(); if( item && !item->hasChildren() ) { ui->locationValidWidget->animatedHide(); @@ -267,7 +267,7 @@ return tEncodedName; } -QStandardItem* ProjectSelectionPage::getCurrentItem() const +QStandardItem* ProjectSelectionPage::currentItem() const { QStandardItem* item = m_templatesModel->itemFromIndex( ui->listView->currentIndex() ); if ( item && item->hasChildren() ) diff --git a/plugins/clang/clangsupport.h b/plugins/clang/clangsupport.h --- a/plugins/clang/clangsupport.h +++ b/plugins/clang/clangsupport.h @@ -85,7 +85,7 @@ bool areBuddies(const QUrl &url1, const QUrl& url2) override; bool buddyOrder(const QUrl &url1, const QUrl& url2) override; - QVector< QUrl > getPotentialBuddies(const QUrl &url) const override; + QVector potentialBuddies(const QUrl& url) const override; //END IBuddyDocumentFinder diff --git a/plugins/clang/clangsupport.cpp b/plugins/clang/clangsupport.cpp --- a/plugins/clang/clangsupport.cpp +++ b/plugins/clang/clangsupport.cpp @@ -276,9 +276,9 @@ return DocumentFinderHelpers::buddyOrder(url1, url2); } -QVector< QUrl > ClangSupport::getPotentialBuddies(const QUrl &url) const +QVector ClangSupport::potentialBuddies(const QUrl& url) const { - return DocumentFinderHelpers::getPotentialBuddies(url); + return DocumentFinderHelpers::potentialBuddies(url); } void ClangSupport::createActionsForMainWindow (Sublime::MainWindow* /*window*/, QString& _xmlFile, KActionCollection& actions) diff --git a/plugins/clang/codecompletion/completionhelper.cpp b/plugins/clang/codecompletion/completionhelper.cpp --- a/plugins/clang/codecompletion/completionhelper.cpp +++ b/plugins/clang/codecompletion/completionhelper.cpp @@ -393,7 +393,7 @@ QVector fileFilter; fileFilter << file; const auto url = QUrl::fromLocalFile(ClangString(clang_getFileName(file)).toString()).adjusted(QUrl::NormalizePathSegments); - const auto& buddies = DocumentFinderHelpers::getPotentialBuddies(url); + const auto& buddies = DocumentFinderHelpers::potentialBuddies(url); foreach(const auto& buddy, buddies) { auto buddyFile = clang_getFile(unit, qPrintable(buddy.toLocalFile())); if (buddyFile) { diff --git a/plugins/clang/duchain/clangindex.cpp b/plugins/clang/duchain/clangindex.cpp --- a/plugins/clang/duchain/clangindex.cpp +++ b/plugins/clang/duchain/clangindex.cpp @@ -126,7 +126,7 @@ // otherwise, fallback to a simple buddy search for headers if (ClangHelpers::isHeader(url.str())) { - foreach(const QUrl& buddy, DocumentFinderHelpers::getPotentialBuddies(url.toUrl(), false)) { + foreach(const QUrl& buddy, DocumentFinderHelpers::potentialBuddies(url.toUrl(), false)) { const QString buddyPath = buddy.toLocalFile(); if (QFile::exists(buddyPath)) { return IndexedString(buddyPath); diff --git a/plugins/clang/duchain/documentfinderhelpers.h b/plugins/clang/duchain/documentfinderhelpers.h --- a/plugins/clang/duchain/documentfinderhelpers.h +++ b/plugins/clang/duchain/documentfinderhelpers.h @@ -48,7 +48,7 @@ KDEVCLANGPRIVATE_EXPORT bool buddyOrder(const QUrl &url1, const QUrl& url2); /// @see KDevelop::IBuddyDocumentFinder -KDEVCLANGPRIVATE_EXPORT QVector< QUrl > getPotentialBuddies(const QUrl &url, bool checkDUChain = true); +KDEVCLANGPRIVATE_EXPORT QVector potentialBuddies(const QUrl& url, bool checkDUChain = true); /** * Returns path to the source file for given @p headerPath diff --git a/plugins/clang/duchain/documentfinderhelpers.cpp b/plugins/clang/duchain/documentfinderhelpers.cpp --- a/plugins/clang/duchain/documentfinderhelpers.cpp +++ b/plugins/clang/duchain/documentfinderhelpers.cpp @@ -228,7 +228,7 @@ return(type1.second == Header && type2.second == Source); } -QVector< QUrl > getPotentialBuddies(const QUrl &url, bool checkDUChain) +QVector potentialBuddies(const QUrl& url, bool checkDUChain) { auto type = basePathAndTypeForUrl(url); // Don't do anything for types we don't know @@ -266,7 +266,7 @@ } QString targetUrl; - auto buddies = DocumentFinderHelpers::getPotentialBuddies(QUrl::fromLocalFile(headerPath)); + auto buddies = DocumentFinderHelpers::potentialBuddies(QUrl::fromLocalFile(headerPath)); for (const auto& buddy : buddies) { const auto local = buddy.toLocalFile(); if (QFileInfo::exists(local)) { diff --git a/plugins/clang/tests/test_buddies.cpp b/plugins/clang/tests/test_buddies.cpp --- a/plugins/clang/tests/test_buddies.cpp +++ b/plugins/clang/tests/test_buddies.cpp @@ -433,19 +433,19 @@ other.parseAndWait(); source.parseAndWait(); - // Test IBuddyDocumentFinder::getPotentialBuddies() + // Test IBuddyDocumentFinder::potentialBuddies() QMimeDatabase db; IBuddyDocumentFinder* sourceBuddyFinder = IBuddyDocumentFinder::finderForMimeType(db.mimeTypeForUrl(source.url().toUrl()).name()); - QVector< QUrl > sourceBuddies = sourceBuddyFinder->getPotentialBuddies(source.url().toUrl()); + QVector< QUrl > sourceBuddies = sourceBuddyFinder->potentialBuddies(source.url().toUrl()); if (!sourceBuddies.contains(header.url().toUrl())) { qDebug() << "got source buddies: " << sourceBuddies; qDebug() << "expected: " << header.url().toUrl(); QFAIL("Failed to find buddy for source file"); } QVERIFY2(!sourceBuddies.contains(other.url().toUrl()), "source buddy list contains unrelated file"); IBuddyDocumentFinder* headerBuddyFinder = IBuddyDocumentFinder::finderForMimeType(db.mimeTypeForUrl(header.url().toUrl()).name()); - QVector< QUrl > headerBuddies = headerBuddyFinder->getPotentialBuddies(header.url().toUrl()); + QVector< QUrl > headerBuddies = headerBuddyFinder->potentialBuddies(header.url().toUrl()); if (!headerBuddies.contains(source.url().toUrl())) { qDebug() << "got header buddies: " << headerBuddies; qDebug() << "expected: " << source.url().toUrl(); @@ -485,26 +485,26 @@ source1.parseAndWait(); source2.parseAndWait(); - // Test IBuddyDocumentFinder::getPotentialBuddies() + // Test IBuddyDocumentFinder::potentialBuddies() QMimeDatabase db; IBuddyDocumentFinder* sourceBuddyFinder = IBuddyDocumentFinder::finderForMimeType(db.mimeTypeForUrl(source1.url().toUrl()).name()); - QVector< QUrl > sourceBuddies = sourceBuddyFinder->getPotentialBuddies(source1.url().toUrl()); + QVector< QUrl > sourceBuddies = sourceBuddyFinder->potentialBuddies(source1.url().toUrl()); if (!sourceBuddies.contains(header.url().toUrl())) { qDebug() << "got source buddies: " << sourceBuddies; qDebug() << "expected: " << header.url().toUrl(); QFAIL("Failed to find buddy for source file"); } IBuddyDocumentFinder* source2BuddyFinder = IBuddyDocumentFinder::finderForMimeType(db.mimeTypeForUrl(source2.url().toUrl()).name()); - QVector< QUrl > source2Buddies = source2BuddyFinder->getPotentialBuddies(source2.url().toUrl()); + QVector< QUrl > source2Buddies = source2BuddyFinder->potentialBuddies(source2.url().toUrl()); if (!source2Buddies.contains(header.url().toUrl())) { qDebug() << "got source2 buddies: " << source2Buddies; qDebug() << "expected: " << header.url().toUrl(); QFAIL("Failed to find buddy for source2 file"); } IBuddyDocumentFinder* headerBuddyFinder = IBuddyDocumentFinder::finderForMimeType(db.mimeTypeForUrl(header.url().toUrl()).name()); - QVector< QUrl > headerBuddies = headerBuddyFinder->getPotentialBuddies(header.url().toUrl()); + QVector< QUrl > headerBuddies = headerBuddyFinder->potentialBuddies(header.url().toUrl()); if (!headerBuddies.contains(source2.url().toUrl())) { qDebug() << "got header buddies: " << headerBuddies; qDebug() << "expected: " << source2.url().toUrl(); diff --git a/plugins/contextbrowser/contextbrowser.cpp b/plugins/contextbrowser/contextbrowser.cpp --- a/plugins/contextbrowser/contextbrowser.cpp +++ b/plugins/contextbrowser/contextbrowser.cpp @@ -111,7 +111,7 @@ } ///Duchain must be locked -DUContext* getContextAt(const QUrl& url, KTextEditor::Cursor cursor) +DUContext* contextAt(const QUrl& url, KTextEditor::Cursor cursor) { TopDUContext* topContext = DUChainUtils::standardContextForUrl(url); if (!topContext) return nullptr; @@ -1179,7 +1179,7 @@ if(previousDocument && previousCursor.isValid()) { qCDebug(PLUGIN_CONTEXTBROWSER) << "updating jump source"; - DUContext* context = getContextAt(previousDocument->url(), previousCursor); + DUContext* context = contextAt(previousDocument->url(), previousCursor); if(context) { updateHistory(context, KTextEditor::Cursor(previousCursor), true); }else{ @@ -1192,7 +1192,7 @@ qCDebug(PLUGIN_CONTEXTBROWSER) << "new doc: " << newDocument << " new cursor: " << newCursor; if(newDocument && newCursor.isValid()) { qCDebug(PLUGIN_CONTEXTBROWSER) << "updating jump target"; - DUContext* context = getContextAt(newDocument->url(), newCursor); + DUContext* context = contextAt(newDocument->url(), newCursor); if(context) { updateHistory(context, KTextEditor::Cursor(newCursor), true); }else{ diff --git a/plugins/custommake/makefileresolver/makefileresolver.cpp b/plugins/custommake/makefileresolver/makefileresolver.cpp --- a/plugins/custommake/makefileresolver/makefileresolver.cpp +++ b/plugins/custommake/makefileresolver/makefileresolver.cpp @@ -92,7 +92,7 @@ { } - QString getCommand(const QString& absoluteFile, const QString& workingDirectory, const QString& makeParameters) const + QString createCommand(const QString& absoluteFile, const QString& workingDirectory, const QString& makeParameters) const { QString relativeFile = Path(workingDirectory).relativePath(Path(absoluteFile)); return "make -k --no-print-directory -W \'" + absoluteFile + "\' -W \'" + relativeFile + "\' -n " + makeParameters; @@ -426,7 +426,7 @@ return PathResolutionResult(false); QString fullOutput; - executeCommand(source.getCommand(file, workingDirectory, makeParameters), workingDirectory, fullOutput); + executeCommand(source.createCommand(file, workingDirectory, makeParameters), workingDirectory, fullOutput); { QRegExp newLineRx("\\\\\\n"); @@ -517,7 +517,7 @@ if (ret.paths.isEmpty() && ret.frameworkDirectories.isEmpty()) return PathResolutionResult(false, i18n("Could not extract include paths from make output"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"", workingDirectory, - source.getCommand(file, workingDirectory, makeParameters), fullOutput)); + source.createCommand(file, workingDirectory, makeParameters), fullOutput)); return ret; } diff --git a/plugins/git/gitplugin.h b/plugins/git/gitplugin.h --- a/plugins/git/gitplugin.h +++ b/plugins/git/gitplugin.h @@ -125,7 +125,7 @@ KDevelop::VcsJob* mergeBranch(const QUrl& repository, const QString& branchName) override; //graph helpers - QVector getAllCommits(const QString &repo) override; + QVector allCommits(const QString& repo) override; //used in log void parseLogOutput(const KDevelop::DVcsJob* job, diff --git a/plugins/git/gitplugin.cpp b/plugins/git/gitplugin.cpp --- a/plugins/git/gitplugin.cpp +++ b/plugins/git/gitplugin.cpp @@ -834,7 +834,7 @@ 3. Commits that have additional commit-data (not only history merging, but changes to fix conflicts) are shown incorrectly */ -QVector GitPlugin::getAllCommits(const QString &repo) +QVector GitPlugin::allCommits(const QString& repo) { initBranchHash(repo); diff --git a/plugins/git/tests/test_git.cpp b/plugins/git/tests/test_git.cpp --- a/plugins/git/tests/test_git.cpp +++ b/plugins/git/tests/test_git.cpp @@ -438,7 +438,7 @@ addFiles(); commitFiles(); - QVector commits = m_plugin->getAllCommits(gitTest_BaseDir()); + QVector commits = m_plugin->allCommits(gitTest_BaseDir()); QVERIFY(!commits.isEmpty()); QStringList logMessages; diff --git a/plugins/switchtobuddy/switchtobuddyplugin.cpp b/plugins/switchtobuddy/switchtobuddyplugin.cpp --- a/plugins/switchtobuddy/switchtobuddyplugin.cpp +++ b/plugins/switchtobuddy/switchtobuddyplugin.cpp @@ -75,7 +75,7 @@ IBuddyDocumentFinder* finder = IBuddyDocumentFinder::finderForMimeType(db.mimeTypeForUrl(docUrl).name()); if (finder) { // get the first entry that exists, use that as candidate - foreach(const QUrl& buddyUrl, finder->getPotentialBuddies(docUrl)) { + foreach(const QUrl& buddyUrl, finder->potentialBuddies(docUrl)) { if (!QFile::exists(buddyUrl.toLocalFile())) { continue; } @@ -115,7 +115,7 @@ // Get all potential buddies for the current document and add a switch-to action // for each buddy who really exists in the file system. Note: if no buddies could be calculated // no extension actions are generated. - const QVector& potentialBuddies = buddyFinder->getPotentialBuddies(currentUrl); + const QVector& potentialBuddies = buddyFinder->potentialBuddies(currentUrl); ContextMenuExtension extension;