diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-10-07 13:34:40 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-10-10 15:56:12 +0200 |
| commit | b8dbac0b9c4c45ee0d17d16eeae9086a14e9656a (patch) | |
| tree | 784eb7872148f25bbe34a650b7c152e990ede927 /src/plugins | |
| parent | a48315ee1f5372cacc749a2cf985f55d1e312dbd (diff) | |
| download | qt-creator-b8dbac0b9c4c45ee0d17d16eeae9086a14e9656a.tar.gz | |
Rename "[Mm]ethod(s)" to "[Ff]unction(s)"
Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.
This is a follow-up patch to commit 872bfb7.
Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins')
85 files changed, 159 insertions, 159 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h index f5304358c5..1af14a6bed 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h @@ -120,7 +120,7 @@ private: const QStringList &files); /** - * Helper method for buildFileNodeTree(): Inserts a new folder-node for + * Helper function for buildFileNodeTree(): Inserts a new folder-node for * the directory \p nodeDir and inserts it into \p nodes. If no parent * folder exists, it will be created recursively. */ diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h index 4257e2ad7f..4dd627be0b 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h @@ -75,7 +75,7 @@ private: AutotoolsProject *m_project; Core::IDocument *m_projectFile; - // TODO: AutotoolsProject calls the protected method addFileNodes() from AutotoolsProjectNode. + // TODO: AutotoolsProject calls the protected function addFileNodes() from AutotoolsProjectNode. // Instead of this friend declaration, a public interface might be preferable. friend class AutotoolsProject; }; diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.h b/src/plugins/autotoolsprojectmanager/makefileparser.h index 9638cebba7..894201bef5 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.h +++ b/src/plugins/autotoolsprojectmanager/makefileparser.h @@ -65,7 +65,7 @@ public: /** * Parses the makefile. Must be invoked at least once, otherwise - * the getter methods of MakefileParser will return empty values. + * the getter functions of MakefileParser will return empty values. * @return True, if the parsing was successful. If false is returned, * the makefile could not be opened. */ @@ -116,15 +116,15 @@ public: QStringList cxxflags() const; /** - * Cancels the parsing. Calling this method only makes sense, if the - * parser runs in a different thread than the caller of this method. - * The method is thread-safe. + * Cancels the parsing. Calling this function only makes sense, if the + * parser runs in a different thread than the caller of this function. + * The function is thread-safe. */ void cancel(); /** * @return True, if the parser has been cancelled by MakefileParser::cancel(). - * The method is thread-safe. + * The function is thread-safe. */ bool isCanceled() const; @@ -176,14 +176,14 @@ private: void parseSubDirs(); /** - * Helper method for parseDefaultExtensions(). Returns recursively all sources + * Helper function for parseDefaultExtensions(). Returns recursively all sources * inside the directory \p directory that match with the extension \p extension. */ QStringList directorySources(const QString &directory, const QStringList &extensions); /** - * Helper method for all parse-methods. Returns each value of a target as string in + * Helper function for all parse-functions. Returns each value of a target as string in * the stringlist. The current line m_line is used as starting point and increased * if the current line ends with a \. * @@ -205,7 +205,7 @@ private: /** * Adds recursively all sources of the current folder to m_sources and removes * all duplicates. The Makefile.am is not parsed, only the folders and files are - * handled. This method should only be called, if the sources parsing in the Makefile.am + * handled. This function should only be called, if the sources parsing in the Makefile.am * failed because variables (e.g. $(test)) have been used. */ void addAllSources(); @@ -218,7 +218,7 @@ private: void parseIncludePaths(); /** - * Helper method for MakefileParser::directorySources(). Appends the name of the headerfile + * Helper function for MakefileParser::directorySources(). Appends the name of the headerfile * to \p list, if the header could be found in the directory specified by \p dir. * The headerfile base name is defined by \p fileName. */ diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h index 0baa0157c1..ed93dd221f 100644 --- a/src/plugins/bazaar/bazaarplugin.h +++ b/src/plugins/bazaar/bazaarplugin.h @@ -118,7 +118,7 @@ protected: bool submitEditorAboutToClose(); private: - // Methods + // Functions void createMenu(); void createSubmitEditorActions(); void createFileActions(const Core::Context &context); diff --git a/src/plugins/classview/classviewnavigationwidget.cpp b/src/plugins/classview/classviewnavigationwidget.cpp index 846a210281..7f7418b43a 100644 --- a/src/plugins/classview/classviewnavigationwidget.cpp +++ b/src/plugins/classview/classviewnavigationwidget.cpp @@ -52,7 +52,7 @@ namespace Internal { \class NavigationWidgetPrivate The NavigationWidgetPrivate class provides internal data structures and - methods for NavigationWidget. + functions for NavigationWidget. */ class NavigationWidgetPrivate @@ -256,7 +256,7 @@ void NavigationWidget::onItemActivated(const QModelIndex &index) /*! Receives new data for the tree. \a result is a pointer to the Class View - model root item. The method does nothing if null is passed. + model root item. The function does nothing if null is passed. */ void NavigationWidget::onDataUpdate(QSharedPointer<QStandardItem> result) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index b480c9b5db..fe0c2561d0 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -208,7 +208,7 @@ QString CMakeManager::findCbpFile(const QDir &directory) { // Find the cbp file // the cbp file is named like the project() command in the CMakeList.txt file - // so this method below could find the wrong cbp file, if the user changes the project() + // so this function below could find the wrong cbp file, if the user changes the project() // 2name QDateTime t; QString file; diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index e3567b2fbb..ab45581cdd 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -54,7 +54,7 @@ using namespace Core::Internal; You don't create instances of this class directly, but instead use the \l{ActionManager::createMenu()} - and \l{ActionManager::createMenuBar()} methods. + and \l{ActionManager::createMenuBar()} functions. Retrieve existing action containers for an ID with \l{ActionManager::actionContainer()}. diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index 3bf3d902ca..a4b2080e93 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -59,8 +59,8 @@ using namespace Core::Internal; menu items and keyboard shortcuts. The ActionManager is the central bookkeeper of actions and their shortcuts and layout. - It is a singleton containing mostly static methods. If you need access to the instance, - e.g. for connecting to signals, is its ActionManager::instance() method. + It is a singleton containing mostly static functions. If you need access to the instance, + e.g. for connecting to signals, is its ActionManager::instance() function. The main reasons for the need of this class is to provide a central place where the user can specify all his keyboard shortcuts, and to provide a solution for actions that should @@ -92,7 +92,7 @@ using namespace Core::Internal; \section1 Registering Actions To register a globally active action "My Action" - put the following in your plugin's IPlugin::initialize method: + put the following in your plugin's IPlugin::initialize function: \code QAction *myAction = new QAction(tr("My Action"), this); Core::Command *cmd = Core::ActionManager::registerAction(myAction, @@ -113,7 +113,7 @@ using namespace Core::Internal; Also use the ActionManager to add items to registered action containers like the applications menu bar or menus in that menu bar. To do this, you register your action via the - registerAction methods, get the action container for a specific ID (like specified in + registerAction functions, get the action container for a specific ID (like specified in the Core::Constants namespace) with a call of actionContainer(const Id&) and add your command to this container. @@ -126,7 +126,7 @@ using namespace Core::Internal; \list \li Always register your actions and shortcuts! \li Register your actions and shortcuts during your plugin's \l{ExtensionSystem::IPlugin::initialize()} - or \l{ExtensionSystem::IPlugin::extensionsInitialized()} methods, otherwise the shortcuts won't appear + or \l{ExtensionSystem::IPlugin::extensionsInitialized()} functions, otherwise the shortcuts won't appear in the keyboard settings dialog from the beginning. \li When registering an action with \c{cmd=registerAction(action, id, contexts)} be sure to connect your own action \c{connect(action, SIGNAL...)} but make \c{cmd->action()} visible to the user, i.e. @@ -176,7 +176,7 @@ ActionManager *ActionManager::instance() or to add menu items to the menu. The ActionManager owns the returned ActionContainer. Add your menu to some other menu or a menu bar via the - ActionManager::actionContainer and ActionContainer::addMenu methods. + ActionManager::actionContainer and ActionContainer::addMenu functions. */ ActionContainer *ActionManager::createMenu(Id id) { diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index 4df472472c..bb26839348 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -162,13 +162,13 @@ void WizardEventLoop::rejected() \brief The BaseFileWizard class implements a generic wizard for creating files. - The following abstract methods must be implemented: + The following abstract functions must be implemented: \list \li createWizardDialog(): Called to create the QWizard dialog to be shown. \li generateFiles(): Generates file content. \endlist - The behaviour can be further customized by overwriting the virtual method \c postGenerateFiles(), + The behaviour can be further customized by overwriting the virtual function \c postGenerateFiles(), which is called after generating the files. \sa Core::GeneratedFile, Core::BaseFileWizardParameters, Core::StandardFileWizard diff --git a/src/plugins/coreplugin/dialogs/iwizard.cpp b/src/plugins/coreplugin/dialogs/iwizard.cpp index d6134c8dba..f1b638cd50 100644 --- a/src/plugins/coreplugin/dialogs/iwizard.cpp +++ b/src/plugins/coreplugin/dialogs/iwizard.cpp @@ -51,7 +51,7 @@ instead use one of the predefined wizards and adapt it to your needs. To make your wizard known to the system, add your IWizard instance to the - plugin manager's object pool in your plugin's initialize method: + plugin manager's object pool in your plugin's initialize function: \code bool MyPlugin::initialize(const QStringList &arguments, QString *errorString) { @@ -133,7 +133,7 @@ const QString &platform, const QVariantMap &variables) - This method is executed when the wizard has been selected by the user + This function is executed when the wizard has been selected by the user for execution. Any dialogs the wizard opens should use the given \a parent. The \a path argument is a suggestion for the location where files should be created. The wizard should fill this in its path selection elements as a diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index e7c2573e5a..9e7dbbdba3 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -81,7 +81,7 @@ as expected. On expected file changes all IDocument objects are notified to reload themselves. - The DocumentManager service also provides two convenience methods for saving + The DocumentManager service also provides two convenience functions for saving files: \c saveModifiedFiles() and \c saveModifiedFilesSilently(). Both take a list of FileInterfaces as an argument, and return the list of files which were _not_ saved. @@ -517,7 +517,7 @@ void DocumentManager::expectFileChange(const QString &fileName) d->m_expectedFileNames.insert(fileName); } -/* only called from unblock and unexpect file change methods */ +/* only called from unblock and unexpect file change functions */ static void updateExpectedState(const QString &fileName) { if (fileName.isEmpty()) diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h index 6839b01ff4..70168a2b23 100644 --- a/src/plugins/coreplugin/documentmanager.h +++ b/src/plugins/coreplugin/documentmanager.h @@ -84,7 +84,7 @@ public: static void setCurrentFile(const QString &filePath); static QString currentFile(); - // helper methods + // helper functions static QString fixFileName(const QString &fileName, FixMode fixmode); static bool saveDocument(IDocument *document, const QString &fileName = QString(), bool *isReadOnly = 0); diff --git a/src/plugins/coreplugin/editormanager/documentmodel.h b/src/plugins/coreplugin/editormanager/documentmodel.h index 2ec74ff401..bc494050a9 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.h +++ b/src/plugins/coreplugin/editormanager/documentmodel.h @@ -87,7 +87,7 @@ public: QList<IEditor *> editorsForDocuments(const QList<IDocument *> &documents) const; QList<IEditor *> oneEditorForEachOpenedDocument() const; - // editor manager related methods, nobody else should call it + // editor manager related functions, nobody else should call it void addEditor(IEditor *editor, bool *isNewDocument); void addRestoredDocument(const QString &fileName, const QString &displayName, const Id &id); Entry *firstRestoredDocument() const; diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index 867d00eb6c..b136f8287c 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -57,7 +57,7 @@ using namespace Utils; own overlay icon handling (Mac/Windows). Plugins can register custom overlay icons via registerIconOverlayForSuffix(), and - retrieve icons via the icon() method. + retrieve icons via the icon() function. */ // Cache icons in a list of pairs suffix/icon which should be faster than diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 38bf0a128f..7564a59f02 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -161,7 +161,7 @@ Returns the absolute path in the users directory that is used for resources like project templates. - Use this method for finding the place for resources that the user may + Use this function for finding the place for resources that the user may write to, for example, to allow for custom palettes or templates. */ @@ -263,7 +263,7 @@ Enables plugins to perform some pre-end-of-life actions. The application is guaranteed to shut down after this signal is emitted. - It is there as an addition to the usual plugin lifecycle methods, namely + It is there as an addition to the usual plugin lifecycle functions, namely \c IPlugin::aboutToShutdown(), just for convenience. */ diff --git a/src/plugins/coreplugin/icorelistener.cpp b/src/plugins/coreplugin/icorelistener.cpp index 08ee9895e2..8c620812df 100644 --- a/src/plugins/coreplugin/icorelistener.cpp +++ b/src/plugins/coreplugin/icorelistener.cpp @@ -48,7 +48,7 @@ Guidelines for implementing the class: \list - \li Return \c false from the implemented method if you want to prevent + \li Return \c false from the implemented function if you want to prevent the event. \li Add your implementing object to the plugin managers objects: \c{ExtensionSystem::PluginManager::instance()->addObject(yourImplementingObject)} diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index 361f96a875..444f19296b 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -72,7 +72,7 @@ using namespace Core::Internal; The progress indicator also allows the user to cancel the task. You get the single instance of this class via the - Core::ICore::progressManager() method. + Core::ICore::progressManager() function. \section1 Registering a task The ProgressManager API uses QtConcurrent as the basis for defining @@ -110,7 +110,7 @@ using namespace Core::Internal; \endtable To register a task you create your \c QFuture<void> object, and call - addTask(). This method returns a + addTask(). This function returns a \l{Core::FutureProgress}{FutureProgress} object that you can use to further customize the progress bar's appearance. See the \l{Core::FutureProgress}{FutureProgress} documentation for @@ -122,16 +122,16 @@ using namespace Core::Internal; \section2 Create a threaded task with QtConcurrent The first option is to directly use QtConcurrent to actually start a task concurrently in a different thread. - QtConcurrent has several different methods to run e.g. - a class method in a different thread. Qt Creator itself + QtConcurrent has several different functions to run e.g. + a class function in a different thread. Qt Creator itself adds a few more in \c{src/libs/qtconcurrent/runextensions.h}. - The QtConcurrent methods to run a concurrent task return a + The QtConcurrent functions to run a concurrent task return a \c QFuture object. This is what you want to give the - ProgressManager in the addTask() method. + ProgressManager in the addTask() function. Have a look at e.g Locator::ILocatorFilter. Locator filters implement - a method \c refresh which takes a \c QFutureInterface object - as a parameter. These methods look something like: + a function \c refresh which takes a \c QFutureInterface object + as a parameter. These functions look something like: \code void Filter::refresh(QFutureInterface<void> &future) { future.setProgressRange(0, MAX); @@ -145,7 +145,7 @@ using namespace Core::Internal; } \endcode - The actual refresh, which calls all the filters' refresh methods + The actual refresh, which calls all the filters' refresh functions in a different thread, looks like this: \code QFuture<void> task = QtConcurrent::run(&ILocatorFilter::refresh, filters); @@ -154,7 +154,7 @@ using namespace Core::Internal; Locator::Constants::TASK_INDEX); \endcode First, we tell QtConcurrent to start a thread which calls all the filters' - refresh method. After that we register the returned QFuture object + refresh function. After that we register the returned QFuture object with the ProgressManager. \section2 Manually create QtConcurrent objects for your thread @@ -184,7 +184,7 @@ using namespace Core::Internal; We register the task with the ProgressManager, using the internal QFuture object that has been created for our QFutureInterface object. Next we report that the task has begun and start doing our actual - work, regularly reporting the progress via the methods + work, regularly reporting the progress via the functions in QFutureInterface. After the long taking operation has finished, we report so through the QFutureInterface object, and delete it afterwards. @@ -192,7 +192,7 @@ using namespace Core::Internal; \section1 Customizing progress appearance You can set a custom widget to show below the progress bar itself, - using the FutureProgress object returned by the addTask() method. + using the FutureProgress object returned by the addTask() function. Also use this object to get notified when the user clicks on the progress indicator. */ @@ -231,8 +231,8 @@ using namespace Core::Internal; which can be used to further customize. The FutureProgress object's life is managed by the ProgressManager and is guaranteed to live only until the next event loop cycle, or until the next call of addTask. - If you want to use the returned FutureProgress later than directly after calling this method, - you will need to use protective methods (like wrapping the returned object in QPointer and + If you want to use the returned FutureProgress later than directly after calling this function, + you will need to use protective functions (like wrapping the returned object in QPointer and checking for 0 whenever you use it). */ diff --git a/src/plugins/coreplugin/variablechooser.cpp b/src/plugins/coreplugin/variablechooser.cpp index 71a3199a28..354dac430c 100644 --- a/src/plugins/coreplugin/variablechooser.cpp +++ b/src/plugins/coreplugin/variablechooser.cpp @@ -58,7 +58,7 @@ using namespace Core; * * The variable chooser monitors focus changes of all children of its parent widget. * When a text control gets focus, the variable chooser checks if it has variable support set, - * either through the addVariableSupport() method or by manually setting the + * either through the addVariableSupport() function or by manually setting the * custom kVariableSupportProperty on the control. If the control supports variables, * a tool button which opens the variable chooser is shown in it while it has focus. * diff --git a/src/plugins/coreplugin/variablemanager.cpp b/src/plugins/coreplugin/variablemanager.cpp index 873a6481b5..a4f126d6e8 100644 --- a/src/plugins/coreplugin/variablemanager.cpp +++ b/src/plugins/coreplugin/variablemanager.cpp @@ -122,9 +122,9 @@ public: If there are conditions where your variable is not valid, you should call VariableManager::remove(kMyVariable) in updateVariable(). - For variables that refer to a file, you should use the convenience methods + For variables that refer to a file, you should use the convenience functions VariableManager::registerFileVariables(), VariableManager::fileVariableValue() and - VariableManager::isFileVariable(). The methods take a variable prefix, like \c MyFileVariable, + VariableManager::isFileVariable(). The functions take a variable prefix, like \c MyFileVariable, and automatically handle standardized postfixes like \c{:FilePath}, \c{:Path} and \c{:FileBaseName}, resulting in the combined variables, such as \c{MyFileVariable:FilePath}. @@ -162,12 +162,12 @@ public: \li Using VariableManager::expandedString(). This is the most comfortable way to get a string with variable values expanded, but also the least flexible one. If this is sufficient for you, use it. - \li Using the Utils::expandMacros() methods. These take a string and a macro expander (for which + \li Using the Utils::expandMacros() functions. These take a string and a macro expander (for which you would use the one provided by the variable manager). Mostly the same as VariableManager::expandedString(), but also has a variant that does the replacement inline instead of returning a new string. \li Using Utils::QtcProcess::expandMacros(). This expands the string while conforming to the - quoting rules of the platform it is run on. Use this method with the variable manager's + quoting rules of the platform it is run on. Use this function with the variable manager's macro expander if your string will be passed as a command line parameter string to an external command. \li Writing your own macro expander that nests the variable manager's macro expander. And then @@ -208,7 +208,7 @@ VariableManager::~VariableManager() * Used to set the \a value of a \a variable. Most of the time this is only done when * requested by VariableManager::variableUpdateRequested(). If the value of the variable * does not change, or changes very seldom, you can also keep the value up to date by calling - * this method whenever the value changes. + * this function whenever the value changes. * * As long as insert() was never called for a variable, it will not have a value, not even * an empty string, meaning that the variable will not be expanded when expanding strings. @@ -273,8 +273,8 @@ Utils::AbstractMacroExpander *VariableManager::macroExpander() } /*! - * Returns the variable manager instance, for connecting to signals. All other methods are static - * and should be called as class methods, not through the instance. + * Returns the variable manager instance, for connecting to signals. All other functions are static + * and should be called as class functions, not through the instance. */ QObject *VariableManager::instance() { @@ -294,7 +294,7 @@ void VariableManager::registerVariable(const QByteArray &variable, const QString } /*! - * Convenience method to register several variables with the same \a prefix, that have a file + * Convenience function to register several variables with the same \a prefix, that have a file * as a value. Takes the prefix and registers variables like \c{prefix:FilePath} and * \c{prefix:Path}, with descriptions that start with the given \a heading. * For example \c{registerFileVariables("CurrentDocument", tr("Current Document"))} registers diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index bd848509c6..7b36de8cf0 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -1023,7 +1023,7 @@ void CPPEditorWidget::jumpToOutlineElement(int index) // the view's currentIndex is updated, so we want to use that. // When the scroll wheel was used on the combo box, // the view's currentIndex is not updated, - // but the passed index to this method is correct. + // but the passed index to this function is correct. // So, if the view has a current index, we reset it, to be able // to distinguish wheel events later if (modelIndex.isValid()) diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index 4735be7018..4ffa0d93d6 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -128,7 +128,7 @@ void CppEditorPlugin::initializeEditor(CPPEditorWidget *editor) editor->setLanguageSettingsId(CppTools::Constants::CPP_SETTINGS_ID); TextEditor::TextEditorSettings::initializeEditor(editor); - // method combo box sorting + // function combo box sorting connect(this, SIGNAL(outlineSortingChanged(bool)), editor, SLOT(setSortedOutline(bool))); } @@ -210,7 +210,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err contextMenu->addAction(cmd); cppToolsMenu->addAction(cmd); - QAction *switchDeclarationDefinition = new QAction(tr("Switch Between Method Declaration/Definition"), this); + QAction *switchDeclarationDefinition = new QAction(tr("Switch Between Function Declaration/Definition"), this); cmd = ActionManager::registerAction(switchDeclarationDefinition, Constants::SWITCH_DECLARATION_DEFINITION, context, true); cmd->setDefaultKeySequence(QKeySequence(tr("Shift+F2"))); @@ -223,7 +223,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err cppToolsMenu->addAction(cmd); QAction *openDeclarationDefinitionInNextSplit = - new QAction(tr("Open Method Declaration/Definition in Next Split"), this); + new QAction(tr("Open Function Declaration/Definition in Next Split"), this); cmd = ActionManager::registerAction(openDeclarationDefinitionInNextSplit, Constants::OPEN_DECLARATION_DEFINITION_IN_NEXT_SPLIT, context, true); cmd->setDefaultKeySequence(QKeySequence(Utils::HostOsInfo::isMacHost() diff --git a/src/plugins/cppeditor/cppquickfix.h b/src/plugins/cppeditor/cppquickfix.h index 16466682b7..f9f4ca4963 100644 --- a/src/plugins/cppeditor/cppquickfix.h +++ b/src/plugins/cppeditor/cppquickfix.h @@ -67,7 +67,7 @@ public: TextEditor::QuickFixOperations &result); /*! - Implement this method to match and create the appropriate + Implement this function to match and create the appropriate CppQuickFixOperation objects. */ virtual void match(const CppQuickFixInterface &interface, diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 4802a3a346..dcdd879686 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -1302,14 +1302,14 @@ void TranslateStringLiteral::match(const CppQuickFixInterface &interface, QSharedPointer<Control> control = interface->context().bindings()->control(); const Name *trName = control->identifier("tr"); - // Check whether we are in a method: + // Check whether we are in a function: const QString description = QApplication::translate("CppTools::QuickFix", "Mark as Translatable"); for (int i = path.size() - 1; i >= 0; --i) { if (FunctionDefinitionAST *definition = path.at(i)->asFunctionDefinition()) { Function *function = definition->symbol; ClassOrNamespace *b = interface->context().lookupType(function); if (b) { - // Do we have a tr method? + // Do we have a tr function? foreach (const LookupItem &r, b->find(trName)) { Symbol *s = r.declaration(); if (s->type()->isFunctionType()) { @@ -2180,7 +2180,7 @@ void ReformatPointerDeclaration::match(const CppQuickFixInterface &interface, PointerDeclarationFormatter::RespectCursor); if (cursor.hasSelection()) { - // This will no work always as expected since this method is only called if + // This will no work always as expected since this function is only called if // interface-path() is not empty. If the user selects the whole document via // ctrl-a and there is an empty line in the end, then the cursor is not on // any AST and therefore no quick fix will be triggered. diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index 441af4b440..19f33336ae 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp @@ -43,7 +43,7 @@ /*! - Tests for Follow Symbol Under Cursor and Switch Between Method Declaration/Definition + Tests for Follow Symbol Under Cursor and Switch Between Function Declaration/Definition Section numbers refer to @@ -187,7 +187,7 @@ public: /** * Encapsulates the whole process of setting up several editors, positioning the cursor, - * executing Follow Symbol Under Cursor or Switch Between Method Declaration/Definition + * executing Follow Symbol Under Cursor or Switch Between Function Declaration/Definition * and checking the result. */ class TestCase diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp index 066e71f619..4aaef9c7e6 100644 --- a/src/plugins/cpptools/cppchecksymbols.cpp +++ b/src/plugins/cpptools/cppchecksymbols.cpp @@ -517,10 +517,10 @@ bool CheckSymbols::visit(SimpleDeclarationAST *ast) if ((_usages.back().kind != CppHighlightingSupport::VirtualMethodUse)) { if (funTy->isOverride()) warning(declrIdNameAST, QCoreApplication::translate( - "CPlusplus::CheckSymbols", "Only virtual methods can be marked 'override'")); + "CPlusplus::CheckSymbols", "Only virtual functions can be marked 'override'")); else if (funTy->isFinal()) warning(declrIdNameAST, QCoreApplication::translate( - "CPlusPlus::CheckSymbols", "Only virtual methods can be marked 'final'")); + "CPlusPlus::CheckSymbols", "Only virtual functions can be marked 'final'")); } } } diff --git a/src/plugins/cpptools/cppcodestylesettingspage.ui b/src/plugins/cpptools/cppcodestylesettingspage.ui index fed6d45722..0206b96549 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.ui +++ b/src/plugins/cpptools/cppcodestylesettingspage.ui @@ -17,7 +17,7 @@ <item> <widget class="QTabWidget" name="categoryTab"> <property name="currentIndex"> - <number>5</number> + <number>0</number> </property> <widget class="QWidget" name="generalTab"> <attribute name="title"> @@ -101,7 +101,7 @@ <item> <widget class="QCheckBox" name="indentFunctionBody"> <property name="text"> - <string>Statements within method body</string> + <string>Statements within function body</string> </property> </widget> </item> @@ -192,7 +192,7 @@ <item> <widget class="QCheckBox" name="indentFunctionBraces"> <property name="text"> - <string>Method declarations</string> + <string>Function declarations</string> </property> </widget> </item> diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 4dcbb2b6ea..fd4430320c 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -380,7 +380,7 @@ QByteArray CppModelManager::internalDefinedMacros() const return macros; } -/// This method will aquire the mutex! +/// This function will aquire the mutex! void CppModelManager::dumpModelManagerConfiguration() { // Tons of debug output... diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h index b0c01d9a38..eacfa6f756 100644 --- a/src/plugins/cpptools/cppmodelmanagerinterface.h +++ b/src/plugins/cpptools/cppmodelmanagerinterface.h @@ -273,7 +273,7 @@ signals: void documentUpdated(CPlusPlus::Document::Ptr doc); void sourceFilesRefreshed(const QStringList &files); - /// \brief Emitted after updateProjectInfo method is called on the model-manager. + /// \brief Emitted after updateProjectInfo function is called on the model-manager. /// /// Other classes can use this to get notified when the \c ProjectExplorer has updated the parts. void projectPartsUpdated(ProjectExplorer::Project *project); diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index fb02d392cf..631b1c1a44 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -383,7 +383,7 @@ void CppEditorSupport::startHighlighting() } } -/// \brief This slot puts the new diagnostics into the editorUpdates. This method has to be called +/// \brief This slot puts the new diagnostics into the editorUpdates. This function has to be called /// on the UI thread. void CppEditorSupport::onDiagnosticsChanged() { diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index ad15b7d6bc..f9a8d5f326 100644 --- a/src/plugins/cpptools/symbolsfindfilter.cpp +++ b/src/plugins/cpptools/symbolsfindfilter.cpp @@ -246,7 +246,7 @@ QString SymbolsFindFilter::toolTip(Find::FindFlags findFlags) const if (m_symbolsToSearch & SymbolSearcher::Classes) types.append(tr("Classes")); if (m_symbolsToSearch & SymbolSearcher::Functions) - types.append(tr("Methods")); + types.append(tr("Functions")); if (m_symbolsToSearch & SymbolSearcher::Enums) types.append(tr("Enums")); if (m_symbolsToSearch & SymbolSearcher::Declarations) @@ -274,7 +274,7 @@ SymbolsFindFilterConfigWidget::SymbolsFindFilterConfigWidget(SymbolsFindFilter * m_typeClasses = new QCheckBox(tr("Classes")); layout->addWidget(m_typeClasses, 0, 1); - m_typeMethods = new QCheckBox(tr("Methods")); + m_typeMethods = new QCheckBox(tr("Functions")); layout->addWidget(m_typeMethods, 0, 2); m_typeEnums = new QCheckBox(tr("Enums")); diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index 60854617f0..2080d92d38 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -431,7 +431,7 @@ DebuggerSourcePathMappingWidget::SourcePathMap // We could query the QtVersion for this information directly, but then we // will need to add a dependency on QtSupport to the debugger. // - // The profile could also get a method to extract the required information from + // The profile could also get a function to extract the required information from // its information to avoid this dependency (as we do for the environment). const QString qtInstallPath = findQtInstallPath(qmake); SourcePathMap rc = in; diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index b2cab00f27..52e16732ae 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -2418,7 +2418,7 @@ void GdbEngine::handleExecuteReturn(const GdbResponse &response) /*! Discards the results of all pending watch-updating commands. - This method is called at the beginning of all step, next, finish, and so on, + This function is called at the beginning of all step, next, finish, and so on, debugger functions. If non-watch-updating commands with call-backs are still in the pipe, it will complain. diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index ce5c6da2b9..b9ce323654 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -103,7 +103,7 @@ void FormEditorPlugin::extensionsInitialized() //////////////////////////////////////////////////// // -// PRIVATE methods +// PRIVATE functions // //////////////////////////////////////////////////// diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h index eeabafb47c..7a5f0f25b7 100644 --- a/src/plugins/designer/formeditorw.h +++ b/src/plugins/designer/formeditorw.h @@ -80,7 +80,7 @@ class SettingsPage; class DesignerContext; /** FormEditorW is a singleton that stores the Designer CoreInterface and - * performs centralized operations. The instance() method will return an + * performs centralized operations. The instance() function will return an * instance. However, it must be manually deleted when unloading the * plugin. Since fully initializing Designer at startup is expensive, the * class has an internal partial initialisation stage "RegisterPlugins" diff --git a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h index 89deab50d3..ec290a84a2 100644 --- a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h +++ b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h @@ -51,7 +51,7 @@ namespace qdesigner_internal { class PreviewManager; // -// Convenience methods to manage form previews (ultimately forwarded to PreviewManager). +// Convenience functions to manage form previews (ultimately forwarded to PreviewManager). // class QDESIGNER_SHARED_EXPORT QDesignerFormWindowManager : public QDesignerFormWindowManagerInterface diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 1297a7f4ac..723c6f3191 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -228,8 +228,8 @@ static Function *findDeclaration(const Class *cl, const QString &functionName) { const QString funName = QString::fromUtf8(QMetaObject::normalizedSignature(functionName.toUtf8())); const unsigned mCount = cl->memberCount(); - // we are interested only in declarations (can be decl of method or of a field) - // we are only interested in declarations of methods + // we are interested only in declarations (can be decl of function or of a field) + // we are only interested in declarations of functions const Overview overview; for (unsigned j = 0; j < mCount; ++j) { // go through all members if (Declaration *decl = cl->memberAt(j)->asDeclaration()) @@ -254,7 +254,7 @@ static Function *findDeclaration(const Class *cl, const QString &functionName) return 0; } -// TODO: remove me, this is taken from cppeditor.cpp. Find some common place for this method +// TODO: remove me, this is taken from cppeditor.cpp. Find some common place for this function static Document::Ptr findDefinition(Function *functionDeclaration, int *line) { if (CppTools::CppModelManagerInterface *cppModelManager = CppTools::CppModelManagerInterface::instance()) { diff --git a/src/plugins/find/ifindfilter.cpp b/src/plugins/find/ifindfilter.cpp index 06754f9ca0..7755d7088d 100644 --- a/src/plugins/find/ifindfilter.cpp +++ b/src/plugins/find/ifindfilter.cpp @@ -74,20 +74,20 @@ The common pattern is roughly this: - Implement the actual search within a QtConcurrent based method, that is - a method that takes a \c{QFutureInterface<MySearchResult> &future} + Implement the actual search within a QtConcurrent based function, that is + a function that takes a \c{QFutureInterface<MySearchResult> &future} as the first parameter and the other information needed for the search as additional parameters. It should set useful progress information on the QFutureInterface, regularly check for \c{future.isPaused()} and \c{future.isCanceled()}, and report the search results (possibly in chunks) via \c{future.reportResult}. - In the find filter's find/replaceAll method, get the shared + In the find filter's find/replaceAll function, get the shared \gui{Search Results} window, initiate a new search and connect the signals for handling selection of results and the replace action (see the Find::SearchResultWindow class for details). Start your search implementation via the corresponding QtConcurrent - methods. Add the returned QFuture object to the Core::ProgressManager. + functions. Add the returned QFuture object to the Core::ProgressManager. Use a QFutureWatcher on the returned QFuture object to receive a signal when your search implementation reports search results, and add these to the shared \gui{Search Results} window. @@ -138,13 +138,13 @@ \fn bool IFindFilter::isReplaceSupported() const Returns whether the find filter supports search and replace. - The default value is false, override this method to return \c true, if + The default value is false, override this function to return \c true, if your find filter supports global search and replace. */ /*! \fn void IFindFilter::findAll(const QString &txt, Find::FindFlags findFlags) - This method is called when the user selected this find scope and + This function is called when the user selected this find scope and initiated a search. You should start a thread which actually performs the search for \a txt @@ -161,9 +161,9 @@ /*! \fn void IFindFilter::replaceAll(const QString &txt, Find::FindFlags findFlags) - Override this method if you want to support search and replace. + Override this function if you want to support search and replace. - This method is called when the user selected this find scope and + This function is called when the user selected this find scope and initiated a search and replace. The default implementation does nothing. diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp index 38b2e58224..c6cc1906d5 100644 --- a/src/plugins/find/searchresultwindow.cpp +++ b/src/plugins/find/searchresultwindow.cpp @@ -238,14 +238,14 @@ using namespace Find::Internal; of this class. Except for being an implementation of a output pane, the - SearchResultWindow has a few methods and one enum that allows other + SearchResultWindow has a few functions and one enum that allows other plugins to show their search results and hook into the user actions for selecting an entry and performing a global replace. Whenever you start a search, call startNewSearch(SearchMode) to initialize the \gui {Search Results} output pane. The parameter determines if the GUI for replacing should be shown. - The method returns a SearchResult object that is your + The function returns a SearchResult object that is your hook into the signals from user interaction for this search. When you produce search results, call addResults or addResult to add them to the \gui {Search Results} output pane. diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index ab195cde66..d0fc04bd90 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1352,7 +1352,7 @@ void GitPlugin::stashSnapshot() m_stashDialog->refresh(state.topLevel(), true); } -// Create a non-modal dialog with refresh method or raise if it exists +// Create a non-modal dialog with refresh function or raise if it exists template <class NonModalDialog> inline void showNonModalDialog(const QString &topLevel, QPointer<NonModalDialog> &dialog) diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp index ea781f4026..314d1e9065 100644 --- a/src/plugins/helloworld/helloworldplugin.cpp +++ b/src/plugins/helloworld/helloworldplugin.cpp @@ -68,7 +68,7 @@ public: /*! Constructs the Hello World plugin. Normally plugins don't do anything in their constructor except for initializing their member variables. The actual work is done later, in the initialize() and extensionsInitialized() - methods. + functions. */ HelloWorldPlugin::HelloWorldPlugin() { @@ -131,7 +131,7 @@ bool HelloWorldPlugin::initialize(const QStringList &arguments, QString *errorMe /*! Notification that all extensions that this plugin depends on have been initialized. The dependencies are defined in the plugins .pluginspec file. - Normally this method is used for things that rely on other plugins to have + Normally this function is used for things that rely on other plugins to have added objects to the plugin manager, that implement interfaces that we're interested in. These objects can now be requested through the PluginManagerInterface. diff --git a/src/plugins/macros/imacrohandler.cpp b/src/plugins/macros/imacrohandler.cpp index 25630a24ae..c29be0b74e 100644 --- a/src/plugins/macros/imacrohandler.cpp +++ b/src/plugins/macros/imacrohandler.cpp @@ -60,8 +60,8 @@ using namespace Macros::Internal; When replaying a macro, the manager iterates through all macro events specified in \a macroEvent - in the macro and calls this method to determine which handler to use. - If the method returns \c true, \c executeEvent is called. + in the macro and calls this function to determine which handler to use. + If the function returns \c true, \c executeEvent is called. */ /*! diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 036a0f7320..b24573c6c9 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -77,13 +77,13 @@ using namespace Macros::Internal; The MacroManager manages all macros, loads them on startup, keeps track of the current macro, and creates new macros. - There are two important methods in this class that can be used outside the Macros plugin: + There are two important functions in this class that can be used outside the Macros plugin: \list \li registerEventHandler: add a new event handler \li registerAction: add a macro event when this action is triggered \endlist - This class is a singleton and can be accessed using the instance method. + This class is a singleton and can be accessed using the instance function. */ /*! diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index 768cd9556a..a9933d3ffc 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -74,7 +74,7 @@ using namespace ProjectExplorer; Enables or disables a BuildStep. - Disabled BuildSteps immediately return true from their run method. + Disabled BuildSteps immediately return true from their run function. Should be called from init(). */ diff --git a/src/plugins/projectexplorer/ioutputparser.cpp b/src/plugins/projectexplorer/ioutputparser.cpp index ea073d0824..2c03191ad5 100644 --- a/src/plugins/projectexplorer/ioutputparser.cpp +++ b/src/plugins/projectexplorer/ioutputparser.cpp @@ -102,14 +102,14 @@ /*! \fn void ProjectExplorer::IOutputParser::outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format) - This method can be overwritten to change the string. + This function can be overwritten to change the string. */ /*! \fn void ProjectExplorer::IOutputParser::taskAdded(const ProjectExplorer::Task &task) Subparsers have their addTask signal connected to this slot. - This method can be overwritten to change the task. + This function can be overwritten to change the task. */ /*! @@ -118,7 +118,7 @@ Instructs a parser to flush its state. Parsers may have state (for example, because they need to aggregate several lines into one task). This - method is called when this state needs to be flushed out to be visible. + function is called when this state needs to be flushed out to be visible. doFlush() is called by flush(). flush() is called on child parsers whenever a new task is added. diff --git a/src/plugins/projectexplorer/nodesvisitor.cpp b/src/plugins/projectexplorer/nodesvisitor.cpp index ba64f18752..bdc29fb80d 100644 --- a/src/plugins/projectexplorer/nodesvisitor.cpp +++ b/src/plugins/projectexplorer/nodesvisitor.cpp @@ -38,7 +38,7 @@ using namespace ProjectExplorer; \brief Base class for visitors that can be used to traverse a node hierarchy. The class follows the visitor pattern as described in Gamma et al. Pass - an instance of NodesVisitor to FolderNode::accept(): The visit methods + an instance of NodesVisitor to FolderNode::accept(): The visit functions will be called for each node in the subtree, except for file nodes: Access these through FolderNode::fileNodes() in visitProjectNode() and visitoFolderNode(). diff --git a/src/plugins/projectexplorer/outputparser_test.cpp b/src/plugins/projectexplorer/outputparser_test.cpp index 0b5ab36600..4e42bee6e6 100644 --- a/src/plugins/projectexplorer/outputparser_test.cpp +++ b/src/plugins/projectexplorer/outputparser_test.cpp @@ -40,7 +40,7 @@ OutputParserTester::OutputParserTester() : m_debug(false) { } -// test methods: +// test functions: void OutputParserTester::testParsing(const QString &lines, Channel inputChannel, QList<Task> tasks, diff --git a/src/plugins/projectexplorer/outputparser_test.h b/src/plugins/projectexplorer/outputparser_test.h index d56c5492d2..54e50ab5ad 100644 --- a/src/plugins/projectexplorer/outputparser_test.h +++ b/src/plugins/projectexplorer/outputparser_test.h @@ -54,7 +54,7 @@ public: OutputParserTester(); - // test methods: + // test functions: void testParsing(const QString &lines, Channel inputChannel, QList<Task> tasks, const QString &childStdOutLines, diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index e5b49f2ce9..e6c4b6f67b 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -314,7 +314,7 @@ bool Project::restoreSettings() This map is then saved in the .user file of the project. Just put all your data into the map. - \note Do not forget to call your base class' toMap method. + \note Do not forget to call your base class' toMap function. \note Do not forget to call setActiveBuildConfiguration when creating new build configurations. */ diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index 2bcebb811e..0fcc4dab06 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -57,10 +57,10 @@ public: void setDisplayName(const QString &name); void setDefaultDisplayName(const QString &name); - // Note: Make sure subclasses call the superclasses' fromMap() method! + // Note: Make sure subclasses call the superclasses' fromMap() function! virtual bool fromMap(const QVariantMap &map); - // Note: Make sure subclasses call the superclasses' toMap() method! + // Note: Make sure subclasses call the superclasses' toMap() function! virtual QVariantMap toMap() const; signals: diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index dad6d1720f..58497eb38f 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1519,7 +1519,7 @@ static inline QStringList projectFileGlobs() } /*! - This method is connected to the ICore::coreOpened signal. If + This function is connected to the ICore::coreOpened signal. If there was no session explicitly loaded, it creates an empty new default session and puts the list of recent projects and sessions onto the welcome page. diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index e1f97cf178..06f4e78ee1 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -91,7 +91,7 @@ void Node::emitNodeSortKeyChanged() /*! * The path of the file representing this node. * - * This method does not emit any signals. That has to be done by the calling + * This function does not emit any signals. That has to be done by the calling * class. */ void Node::setPath(const QString &path) @@ -613,7 +613,7 @@ void ProjectNode::removeFolderNodes(const QList<FolderNode*> &subFolders, Adds file nodes specified by \a files to the internal list in the location specified by \a folder and emits the corresponding signals. - This method should be called within an implementation of the public method + This function should be called within an implementation of the public function addFiles. */ @@ -658,7 +658,7 @@ void ProjectNode::addFileNodes(const QList<FileNode*> &files, FolderNode *folder Removes \a files from the internal list and emits the corresponding signals. All objects in the \a files list are deleted. - This method should be called within an implementation of the public method + This function should be called within an implementation of the public function removeFiles. */ diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index b324dff4ec..424a877d80 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -240,7 +240,7 @@ public: void removeFileNodes(const QList<FileNode*> &files, FolderNode *parentFolder); // to be called in implementation of - // the corresponding public methods + // the corresponding public functions void addProjectNodes(const QList<ProjectNode*> &subProjects); void removeProjectNodes(const QList<ProjectNode*> &subProjects); diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 583ed05988..86bd83d6c3 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -201,7 +201,7 @@ protected: RunConfiguration(Target *parent, const Core::Id id); RunConfiguration(Target *parent, RunConfiguration *source); - /// convenience method to get current build configuration. + /// convenience function to get current build configuration. BuildConfiguration *activeBuildConfiguration() const; private: diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index d6b3d2d919..0ca4793033 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -156,7 +156,7 @@ bool ToolChain::operator == (const ToolChain &tc) const /*! Used by the tool chain manager to save user-generated tool chains. - Make sure to call this method when deriving. + Make sure to call this function when deriving. */ QVariantMap ToolChain::toMap() const @@ -185,7 +185,7 @@ void ToolChain::setDetection(ToolChain::Detection de) /*! Used by the tool chain manager to load user-generated tool chains. - Make sure to call this method when deriving. + Make sure to call this function when deriving. */ bool ToolChain::fromMap(const QVariantMap &data) diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index 71b7b1e244..74f1545317 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -150,7 +150,7 @@ public: virtual ToolChain *clone() const = 0; // Used by the toolchainmanager to save user-generated tool chains. - // Make sure to call this method when deriving! + // Make sure to call this function when deriving! virtual QVariantMap toMap() const; virtual QList<Task> validateKit(const Kit *k) const; protected: @@ -159,7 +159,7 @@ protected: void toolChainUpdated(); - // Make sure to call this method when deriving! + // Make sure to call this function when deriving! virtual bool fromMap(const QVariantMap &data); private: diff --git a/src/plugins/pythoneditor/tools/pythonhighlighter.cpp b/src/plugins/pythoneditor/tools/pythonhighlighter.cpp index 32c59ef6b0..2bb2bd9caa 100644 --- a/src/plugins/pythoneditor/tools/pythonhighlighter.cpp +++ b/src/plugins/pythoneditor/tools/pythonhighlighter.cpp @@ -106,9 +106,9 @@ PythonHighlighter::~PythonHighlighter() /** * @brief Highlighter::highlightBlock highlights single line of Python code * @param text is single line without EOLN symbol. Access to all block data - * can be obtained through inherited currentBlock() method. + * can be obtained through inherited currentBlock() function. * - * This method receives state (int number) from previously highlighted block, + * This function receives state (int number) from previously highlighted block, * scans block using received state and sets initial highlighting for current * block. At the end, it saves internal state in current block. */ diff --git a/src/plugins/pythoneditor/tools/pythonindenter.cpp b/src/plugins/pythoneditor/tools/pythonindenter.cpp index befa7f6e02..e65dd295fe 100644 --- a/src/plugins/pythoneditor/tools/pythonindenter.cpp +++ b/src/plugins/pythoneditor/tools/pythonindenter.cpp @@ -70,8 +70,8 @@ bool PythonIndenter::isElectricCharacter(const QChar &ch) const * @param typedChar Unused * @param tabSettings An IDE tabulation settings * - * Usually this method called once when you begin new line of code by pressing - * Enter. If Indenter reimplements indent() method, than indentBlock() may be + * Usually this function called once when you begin new line of code by pressing + * Enter. If Indenter reimplements indent() function, than indentBlock() may be * called in other cases. */ void PythonIndenter::indentBlock(QTextDocument *document, diff --git a/src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.h b/src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.h index 04d5160b7f..b0610cb863 100644 --- a/src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.h +++ b/src/plugins/qmldesigner/components/componentcore/defaultdesigneraction.h @@ -48,7 +48,7 @@ public: signals: void triggered(bool checked, const SelectionContext &selectionContext); -public slots: //virtual method instead of slot +public slots: //virtual function instead of slot virtual void actionTriggered(bool enable); void setSelectionContext(const SelectionContext &selectionContext); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index df00f13b0f..a350b29ff5 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -142,7 +142,7 @@ AbstractFormEditorTool* FormEditorScene::currentTool() const return m_editorView->currentTool(); } -//This method calculates the possible parent for reparent +//This function calculates the possible parent for reparent FormEditorItem* FormEditorScene::calulateNewParent(FormEditorItem *formEditorItem) { if (formEditorItem->qmlItemNode().isValid()) { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index be51e341bc..e1c67f76be 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -111,7 +111,7 @@ void FormEditorView::modelAttached(Model *model) } -//This method does the setup of the initial FormEditorItem tree in the scene +//This function does the setup of the initial FormEditorItem tree in the scene void FormEditorView::setupFormEditorItemTree(const QmlItemNode &qmlItemNode) { m_scene->addFormEditorItem(qmlItemNode); diff --git a/src/plugins/qmldesigner/components/pluginmanager/iplugin.h b/src/plugins/qmldesigner/components/pluginmanager/iplugin.h index 97df850e89..9c0cc217dc 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/iplugin.h +++ b/src/plugins/qmldesigner/components/pluginmanager/iplugin.h @@ -36,7 +36,7 @@ namespace QmlDesigner { -// QmlDesigner "base" plugin with initialization method in which +// QmlDesigner "base" plugin with initialization function in which // it can retriece the core via its static accessor and do magic. class IPlugin diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp index cefc0b9987..b5c04086a4 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp @@ -183,7 +183,7 @@ MetaInfo MetaInfo::global() /*! Clears the global meta information object. - This method should be called once on application shutdown to free static data structures. + This function should be called once on application shutdown to free static data structures. */ void MetaInfo::clearGlobal() { diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 70f6863259..94e9bbc018 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -65,7 +65,7 @@ The object can be invalid - you can check this by calling isValid(). The object is invalid if you ask for meta information for an non-existing qml property. Also the node meta info can become invalid if the enclosing type is deregistered from the meta type system (e.g. -a sub component qml file is deleted). Trying to call any accessor methods on an invalid +a sub component qml file is deleted). Trying to call any accessor functions on an invalid NodeMetaInfo object will result in an InvalidMetaInfoException being thrown. \see QmlDesigner::MetaInfo, QmlDesigner::PropertyMetaInfo, QmlDesigner::EnumeratorMetaInfo diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h index 0ac4c77a4a..eee3b8806a 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h @@ -55,7 +55,7 @@ public: virtual bool isValid() const; - using InternalProperty::remove; // keep the virtual remove(...) method around + using InternalProperty::remove; // keep the virtual remove(...) function around protected: InternalNodeAbstractProperty(const PropertyName &name, const InternalNodePointer &propertyOwner); diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 7925ee468e..7abcc8a4b9 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -612,7 +612,7 @@ void ModelNode::destroy() //\} /*! \name Property Manipulation - * This methodes interact with properties. + * This functions interact with properties. */ diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h index 7d177b353c..a8190eb5cd 100644 --- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h +++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h @@ -55,7 +55,7 @@ public: ModelToTextMerger(RewriterView *reWriterView); /** - * Note: his method might throw exceptions, as the model works this way. So to + * Note: his function might throw exceptions, as the model works this way. So to * handle rewriting failures, you will also need to catch any exception coming * out. */ diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 29cf46d84c..520b07dac7 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -384,7 +384,7 @@ public: /// When something is changed here, also change Check::checkScopeObjectMember in /// qmljscheck.cpp - /// ### Maybe put this into the context as a helper method. + /// ### Maybe put this into the context as a helper function. bool lookupProperty(const QString &prefix, const UiQualifiedId *id, const Value **property = 0, const ObjectValue **parentObject = 0, QString *name = 0) { QList<const ObjectValue *> scopeObjects = m_scopeChain.qmlScopeObjects(); diff --git a/src/plugins/qmljseditor/qmljsquickfix.h b/src/plugins/qmljseditor/qmljsquickfix.h index ba01ecb4cd..3a22b3f8cc 100644 --- a/src/plugins/qmljseditor/qmljsquickfix.h +++ b/src/plugins/qmljseditor/qmljsquickfix.h @@ -91,7 +91,7 @@ protected: void matchingOperations(const QuickFixInterface &interface, QuickFixOperations &result); /*! - Implement this method to match and create the appropriate + Implement this function to match and create the appropriate QmlJSQuickFixOperation objects. */ virtual void match(const QmlJSQuickFixInterface &interface, TextEditor::QuickFixOperations &result) = 0; diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp index 775668f7c8..d0fd1c7738 100644 --- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp @@ -256,7 +256,7 @@ bool QmlProfilerClientManager::isConnected() const void QmlProfilerClientManager::disconnectClient() { // this might be actually be called indirectly by QDDConnectionPrivate::readyRead(), therefore allow - // method to complete before deleting object + // function to complete before deleting object if (d->connection) { d->connection->deleteLater(); d->connection = 0; diff --git a/src/plugins/qt4projectmanager/externaleditors.h b/src/plugins/qt4projectmanager/externaleditors.h index e333d6e5df..e3f85b13d3 100644 --- a/src/plugins/qt4projectmanager/externaleditors.h +++ b/src/plugins/qt4projectmanager/externaleditors.h @@ -50,7 +50,7 @@ namespace Qt4ProjectManager { namespace Internal { /* Convenience parametrizable base class for Qt editors/binaries - * Provides convenience methods that + * Provides convenience functions that * try to retrieve the binary of the editor from the Qt version * of the project the file belongs to, falling back to path search * if none is found. On Mac, the "open" mechanism can be optionally be used. */ @@ -65,7 +65,7 @@ public: virtual QString displayName() const; protected: - // Method pointer for a QtVersion method return a string (command) + // Member function pointer for a QtVersion function return a string (command) typedef QString (QtSupport::BaseQtVersion::*QtVersionCommandAccessor)() const; // Data required to launch the editor diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index ee27f181c5..8be72bff5b 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -297,7 +297,7 @@ struct InternalNode // * file2 // * path2 // * file1 - // The method first creates a tree that looks like the directory structure, i.e. + // The function first creates a tree that looks like the directory structure, i.e. // * / // * absolute // * path diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h index 8b80ff80fe..e043f05247 100644 --- a/src/plugins/qtsupport/qtversionmanager.h +++ b/src/plugins/qtsupport/qtversionmanager.h @@ -77,7 +77,7 @@ public: // Note: DO NOT STORE THIS POINTER! // The QtVersionManager will delete it at random times and you will - // need to get a new pointer by calling this method again! + // need to get a new pointer by calling this function again! static BaseQtVersion *version(int id); static BaseQtVersion *qtVersionForQMakeBinary(const Utils::FileName &qmakePath); diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 06d6e6401e..beb49cb46d 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -6520,11 +6520,11 @@ int BaseTextEditorWidget::rowCount() const } /** - Helper method to transform a selected text. If nothing is selected at the moment + Helper function to transform a selected text. If nothing is selected at the moment the word under the cursor is used. - The type of the transformation is determined by the method pointer given. + The type of the transformation is determined by the function pointer given. - @param method pointer to the QString method to use for the transformation + @param method pointer to the QString function to use for the transformation @see uppercaseSelection, lowercaseSelection */ diff --git a/src/plugins/texteditor/basetextmark.cpp b/src/plugins/texteditor/basetextmark.cpp index dbef43c04c..dd5832a7bb 100644 --- a/src/plugins/texteditor/basetextmark.cpp +++ b/src/plugins/texteditor/basetextmark.cpp @@ -136,7 +136,7 @@ BaseTextMark::BaseTextMark(const QString &fileName, int lineNumber) { } -// we need two phase initilization, since we are calling virtual methods +// we need two phase initilization, since we are calling virtual functions // of BaseTextMark in add() and also accessing widthFactor // which might be set in the derived constructor void BaseTextMark::init() diff --git a/src/plugins/texteditor/codeassist/iassistinterface.cpp b/src/plugins/texteditor/codeassist/iassistinterface.cpp index 51fe2a615a..2f3ec8d923 100644 --- a/src/plugins/texteditor/codeassist/iassistinterface.cpp +++ b/src/plugins/texteditor/codeassist/iassistinterface.cpp @@ -90,7 +90,7 @@ IAssistInterface::~IAssistInterface() Detaches the interface. If it is necessary to take any special care in order to allow this interface to be run in a separate thread \a destination this needs to be done - in this method. + in this function. */ /*! diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp index 06106e9703..787b1fc1b8 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.cpp +++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp @@ -416,7 +416,7 @@ void Highlighter::applyFormat(int offset, QTextCharFormat format = formatForCategory(formatId); if (itemData->isCustomized()) { // Please notice that the following are applied every time for item data which have - // customizations. The configureFormats method could be used to provide a "one time" + // customizations. The configureFormats function could be used to provide a "one time" // configuration, but it would probably require to traverse all item data from all // definitions available/loaded (either to set the values or for some "notifying" // strategy). This is because the highlighter does not really know on which diff --git a/src/plugins/texteditor/highlighterutils.h b/src/plugins/texteditor/highlighterutils.h index dd6bc5343d..8e9fba0f44 100644 --- a/src/plugins/texteditor/highlighterutils.h +++ b/src/plugins/texteditor/highlighterutils.h @@ -33,9 +33,9 @@ #include <QString> #include "texteditor_global.h" -/* These methods were originally a part of TextEditor::Highlighter, +/* These functions were originally a part of TextEditor::Highlighter, * but due to a very hackish test of that generic highlighter, - * there methods must be outside. */ + * there functions must be outside. */ namespace Core { class MimeType; diff --git a/src/plugins/texteditor/quickfix.h b/src/plugins/texteditor/quickfix.h index d4317aab6c..349c003f2e 100644 --- a/src/plugins/texteditor/quickfix.h +++ b/src/plugins/texteditor/quickfix.h @@ -81,7 +81,7 @@ public: /*! Perform this quick-fix's operation. - Subclasses should implement this method to do the actual changes. + Subclasses should implement this function to do the actual changes. */ virtual void perform() = 0; diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp index 1cf9359c37..8066f8d7f7 100644 --- a/src/plugins/texteditor/syntaxhighlighter.cpp +++ b/src/plugins/texteditor/syntaxhighlighter.cpp @@ -693,7 +693,7 @@ static bool byStartOfRange(const QTextLayout::FormatRange &range, const QTextLay } // The formats is passed in by reference in order to prevent unnecessary copying of its items. -// After this method returns, the list is modified, and should be considered invalidated! +// After this function returns, the list is modified, and should be considered invalidated! void SyntaxHighlighter::setExtraAdditionalFormats(const QTextBlock& block, QList<QTextLayout::FormatRange> &formats) { diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index e795b3ab3b..3a98d51e60 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -150,8 +150,8 @@ TextEditorSettings::TextEditorSettings(QObject *parent) formatDescr.append(FormatDescription(C_FUNCTION, tr("Function"), tr("Name of a function."), functionFormat)); functionFormat.setItalic(true); - formatDescr.append(FormatDescription(C_VIRTUAL_METHOD, tr("Virtual Method"), - tr("Name of method declared as virtual."), + formatDescr.append(FormatDescription(C_VIRTUAL_METHOD, tr("Virtual Function"), + tr("Name of function declared as virtual."), functionFormat)); formatDescr.append(FormatDescription(C_BINDING, tr("QML Binding"), diff --git a/src/plugins/valgrind/callgrind/callgrindparser.h b/src/plugins/valgrind/callgrind/callgrindparser.h index acf4524312..275eaa2481 100644 --- a/src/plugins/valgrind/callgrind/callgrindparser.h +++ b/src/plugins/valgrind/callgrind/callgrindparser.h @@ -58,7 +58,7 @@ public: explicit Parser(QObject *parent = 0); ~Parser(); - // get and take ownership of the parsing results. If this method is not called the repository + // get and take ownership of the parsing results. If this function is not called the repository // will be destroyed when the parser is destroyed. Subsequent calls return null. ParseData *takeData(); diff --git a/src/plugins/valgrind/callgrind/callgrindrunner.cpp b/src/plugins/valgrind/callgrind/callgrindrunner.cpp index e0e37e0810..b5e4822868 100644 --- a/src/plugins/valgrind/callgrind/callgrindrunner.cpp +++ b/src/plugins/valgrind/callgrind/callgrindrunner.cpp @@ -79,7 +79,7 @@ void CallgrindRunner::processFinished(int ret, QProcess::ExitStatus status) triggerParse(); m_controller->setValgrindProcess(0); - ValgrindRunner::processFinished(ret, status); // call base class method + ValgrindRunner::processFinished(ret, status); // call base class function } bool CallgrindRunner::isPaused() const diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index 09c08b0b40..fdd8791bda 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -93,7 +93,7 @@ private slots: void openLinkInEditor(const QString &link); private: - // the constness of this method is a necessary lie because it is called from paint() const. + // the constness of this function is a necessary lie because it is called from paint() const. QWidget *createDetailsWidget(const QModelIndex &errorIndex, QWidget *parent) const; static const int s_itemMargin = 2; diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h index 5799f8bf99..ce379754f6 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.h +++ b/src/plugins/vcsbase/vcsbaseplugin.h @@ -200,7 +200,7 @@ protected: // Sets the current submit editor for this specific version control plugin. // The plugin automatically checks if the submit editor is closed and calls // submitEditorAboutToClose(). - // The method raiseSubmitEditor can be used to check for a running submit editor and raise it. + // The function raiseSubmitEditor can be used to check for a running submit editor and raise it. void setSubmitEditor(VcsBaseSubmitEditor *submitEditor); // Current submit editor set through setSubmitEditor, if it wasn't closed inbetween VcsBaseSubmitEditor *submitEditor() const; diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 6b0b3bce48..202645a5d4 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -353,7 +353,7 @@ bool WelcomePlugin::initialize(const QStringList & /* arguments */, QString * /* /*! Notification that all extensions that this plugin depends on have been initialized. The dependencies are defined in the plugins .qwp file. - Normally this method is used for things that rely on other plugins to have + Normally this function is used for things that rely on other plugins to have added objects to the plugin manager, that implement interfaces that we're interested in. These objects can now be requested through the PluginManagerInterface. |