From 7bfde77d7c6beeb833e09fa061b16be43f515a62 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 21 Sep 2011 13:05:15 +0200
Subject: [PATCH] s/error_message/errorMessage/g
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/bineditor/bineditorplugin.h | 2 +-
src/plugins/bookmarks/bookmarksplugin.h | 2 +-
src/plugins/classview/classviewplugin.h | 2 +-
src/plugins/cmakeprojectmanager/cmakeprojectplugin.h | 2 +-
src/plugins/cpaster/cpasterplugin.cpp | 4 ++--
src/plugins/cpaster/cpasterplugin.h | 2 +-
src/plugins/cppeditor/cppplugin.h | 2 +-
src/plugins/cpptools/cpptoolsplugin.h | 2 +-
src/plugins/cvs/cvsplugin.h | 2 +-
src/plugins/designer/formeditorplugin.h | 2 +-
src/plugins/fakevim/fakevimplugin.h | 2 +-
src/plugins/find/findplugin.h | 2 +-
src/plugins/git/gitplugin.h | 2 +-
src/plugins/glsleditor/glsleditorplugin.cpp | 6 +++---
src/plugins/helloworld/helloworldplugin.cpp | 6 +++---
src/plugins/helloworld/helloworldplugin.h | 2 +-
src/plugins/help/helpplugin.h | 2 +-
src/plugins/imageviewer/imageviewerplugin.h | 2 +-
src/plugins/locator/locatorplugin.h | 2 +-
src/plugins/macros/macrosplugin.cpp | 4 ++--
src/plugins/macros/macrosplugin.h | 2 +-
src/plugins/mercurial/mercurialplugin.cpp | 2 +-
src/plugins/mercurial/mercurialplugin.h | 2 +-
src/plugins/perforce/perforceplugin.h | 2 +-
src/plugins/projectexplorer/projectexplorer.h | 2 +-
src/plugins/qmldesigner/qmldesignerplugin.cpp | 4 ++--
src/plugins/qmldesigner/qmldesignerplugin.h | 2 +-
src/plugins/qmljseditor/qmljseditorplugin.cpp | 6 +++---
src/plugins/qmljstools/qmljstoolsplugin.h | 2 +-
src/plugins/qt4projectmanager/qt4projectmanagerplugin.h | 2 +-
src/plugins/qtestlib/qtestlibplugin.h | 2 +-
src/plugins/qtsupport/qtsupportplugin.h | 2 +-
src/plugins/remotelinux/remotelinuxplugin.cpp | 4 ++--
src/plugins/remotelinux/remotelinuxplugin.h | 2 +-
src/plugins/subversion/subversionplugin.h | 2 +-
src/plugins/updateinfo/updateinfoplugin.cpp | 2 +-
src/plugins/vcsbase/vcsplugin.h | 2 +-
src/plugins/welcome/welcomeplugin.cpp | 4 ++--
src/plugins/welcome/welcomeplugin.h | 2 +-
39 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h
index 15450bdb603..75624a530ab 100644
--- a/src/plugins/bineditor/bineditorplugin.h
+++ b/src/plugins/bineditor/bineditorplugin.h
@@ -65,7 +65,7 @@ public:
BinEditorPlugin();
~BinEditorPlugin();
- bool initialize(const QStringList &arguments, QString *error_message = 0);
+ bool initialize(const QStringList &arguments, QString *errorMessage = 0);
void extensionsInitialized();
// Connect editor to settings changed signals.
diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h
index 063056c9dec..1e2baeb9a79 100644
--- a/src/plugins/bookmarks/bookmarksplugin.h
+++ b/src/plugins/bookmarks/bookmarksplugin.h
@@ -66,7 +66,7 @@ public:
static BookmarksPlugin *instance() { return m_instance; }
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
public slots:
diff --git a/src/plugins/classview/classviewplugin.h b/src/plugins/classview/classviewplugin.h
index 351f91ca52a..d4400732b7a 100644
--- a/src/plugins/classview/classviewplugin.h
+++ b/src/plugins/classview/classviewplugin.h
@@ -52,7 +52,7 @@ public:
Plugin() {}
//! \implements ExtensionSystem::IPlugin::initialize
- bool initialize(const QStringList &arguments, QString *error_message = 0);
+ bool initialize(const QStringList &arguments, QString *errorMessage = 0);
//! \implements ExtensionSystem::IPlugin::extensionsInitialized
void extensionsInitialized() {}
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
index 98403f7d386..7c0e877a5ec 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
@@ -49,7 +49,7 @@ public:
CMakeProjectPlugin();
~CMakeProjectPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
};
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 205bf462415..8d7a9d44189 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -119,10 +119,10 @@ CodepasterPlugin::~CodepasterPlugin()
CodepasterPlugin::m_instance = 0;
}
-bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_message)
+bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments)
- Q_UNUSED(error_message)
+ Q_UNUSED(errorMessage)
// Create the globalcontext list to register actions accordingly
Core::Context globalcontext(Core::Constants::C_GLOBAL);
diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h
index e684a92365f..197af6c9467 100644
--- a/src/plugins/cpaster/cpasterplugin.h
+++ b/src/plugins/cpaster/cpasterplugin.h
@@ -68,7 +68,7 @@ public:
CodepasterPlugin();
~CodepasterPlugin();
- virtual bool initialize(const QStringList &arguments, QString *error_message);
+ virtual bool initialize(const QStringList &arguments, QString *errorMessage);
virtual void extensionsInitialized();
virtual ShutdownFlag aboutToShutdown();
diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h
index 3539b49eee2..0045d4dec7b 100644
--- a/src/plugins/cppeditor/cppplugin.h
+++ b/src/plugins/cppeditor/cppplugin.h
@@ -62,7 +62,7 @@ public:
static CppPlugin *instance();
- bool initialize(const QStringList &arguments, QString *error_message = 0);
+ bool initialize(const QStringList &arguments, QString *errorMessage = 0);
void extensionsInitialized();
ShutdownFlag aboutToShutdown();
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 3b75daa3fc9..232d878bdc0 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -67,7 +67,7 @@ public:
CppToolsPlugin();
~CppToolsPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
ShutdownFlag aboutToShutdown();
CppModelManager *cppModelManager() { return m_modelManager; }
diff --git a/src/plugins/cvs/cvsplugin.h b/src/plugins/cvs/cvsplugin.h
index d553de32c6e..125e7ce6506 100644
--- a/src/plugins/cvs/cvsplugin.h
+++ b/src/plugins/cvs/cvsplugin.h
@@ -86,7 +86,7 @@ public:
CVSPlugin();
~CVSPlugin();
- virtual bool initialize(const QStringList &arguments, QString *error_message);
+ virtual bool initialize(const QStringList &arguments, QString *errorMessage);
void cvsDiff(const QString &workingDir, const QStringList &files);
diff --git a/src/plugins/designer/formeditorplugin.h b/src/plugins/designer/formeditorplugin.h
index f21040b907c..cb366f8462d 100644
--- a/src/plugins/designer/formeditorplugin.h
+++ b/src/plugins/designer/formeditorplugin.h
@@ -47,7 +47,7 @@ public:
~FormEditorPlugin();
//Plugin
- bool initialize(const QStringList &arguments, QString *error_message = 0);
+ bool initialize(const QStringList &arguments, QString *errorMessage = 0);
void extensionsInitialized();
private:
diff --git a/src/plugins/fakevim/fakevimplugin.h b/src/plugins/fakevim/fakevimplugin.h
index 3603f1b6321..9f0cad8db64 100644
--- a/src/plugins/fakevim/fakevimplugin.h
+++ b/src/plugins/fakevim/fakevimplugin.h
@@ -51,7 +51,7 @@ public:
private:
// implementation of ExtensionSystem::IPlugin
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
ShutdownFlag aboutToShutdown();
void extensionsInitialized();
diff --git a/src/plugins/find/findplugin.h b/src/plugins/find/findplugin.h
index 6feed7f94ab..54062f04d9f 100644
--- a/src/plugins/find/findplugin.h
+++ b/src/plugins/find/findplugin.h
@@ -66,7 +66,7 @@ public:
};
// IPlugin
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
ShutdownFlag aboutToShutdown();
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 796642fcf3b..8aea43897df 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -95,7 +95,7 @@ public:
static GitPlugin *instance();
- virtual bool initialize(const QStringList &arguments, QString *error_message);
+ virtual bool initialize(const QStringList &arguments, QString *errorMessage);
GitVersionControl *gitVersionControl() const;
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index 3907e5a0ec3..117ed4f5f14 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -107,10 +107,10 @@ Core::Command *createSeparator(Core::ActionManager *am,
return am->registerAction(separator, Core::Id(id), context);
}
-bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *error_message)
+bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
{
Core::ICore *core = Core::ICore::instance();
- if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/glsleditor/GLSLEditor.mimetypes.xml"), error_message))
+ if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/glsleditor/GLSLEditor.mimetypes.xml"), errorMessage))
return false;
parseGlslFile(QLatin1String("glsl_120.frag"), &m_glsl_120_frag);
@@ -162,7 +162,7 @@ bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
cmd = am->command(TextEditor::Constants::UN_COMMENT_SELECTION);
contextMenu->addAction(cmd);
- error_message->clear();
+ errorMessage->clear();
Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
Core::MimeDatabase *mimeDatabase = Core::ICore::instance()->mimeDatabase();
diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp
index 905df9d0c75..6f7812f2de9 100644
--- a/src/plugins/helloworld/helloworldplugin.cpp
+++ b/src/plugins/helloworld/helloworldplugin.cpp
@@ -88,13 +88,13 @@ HelloWorldPlugin::~HelloWorldPlugin()
/*! Initializes the plugin. Returns true on success.
Plugins want to register objects with the plugin manager here.
- \a error_message can be used to pass an error message to the plugin system,
+ \a errorMessage can be used to pass an error message to the plugin system,
if there was any.
*/
-bool HelloWorldPlugin::initialize(const QStringList &arguments, QString *error_message)
+bool HelloWorldPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments)
- Q_UNUSED(error_message)
+ Q_UNUSED(errorMessage)
// Get the primary access point to the workbench.
Core::ICore *core = Core::ICore::instance();
diff --git a/src/plugins/helloworld/helloworldplugin.h b/src/plugins/helloworld/helloworldplugin.h
index 0ebc4e37e0f..24e1b053908 100644
--- a/src/plugins/helloworld/helloworldplugin.h
+++ b/src/plugins/helloworld/helloworldplugin.h
@@ -47,7 +47,7 @@ public:
HelloWorldPlugin();
~HelloWorldPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 97443d5927c..340e4926927 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -76,7 +76,7 @@ public:
HelpPlugin();
virtual ~HelpPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
ShutdownFlag aboutToShutdown();
diff --git a/src/plugins/imageviewer/imageviewerplugin.h b/src/plugins/imageviewer/imageviewerplugin.h
index fd937062aef..feabaaff3d6 100644
--- a/src/plugins/imageviewer/imageviewerplugin.h
+++ b/src/plugins/imageviewer/imageviewerplugin.h
@@ -51,7 +51,7 @@ public:
ImageViewerPlugin();
~ImageViewerPlugin();
- bool initialize(const QStringList &arguments, QString *error_message = 0);
+ bool initialize(const QStringList &arguments, QString *errorMessage = 0);
void extensionsInitialized();
private:
diff --git a/src/plugins/locator/locatorplugin.h b/src/plugins/locator/locatorplugin.h
index 0d2ec895c0e..71dd334d1dd 100644
--- a/src/plugins/locator/locatorplugin.h
+++ b/src/plugins/locator/locatorplugin.h
@@ -60,7 +60,7 @@ public:
LocatorPlugin();
~LocatorPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
QList<ILocatorFilter*> filters();
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index 65efbc47163..a7ac16da68d 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -64,10 +64,10 @@ MacrosPlugin::~MacrosPlugin()
{
}
-bool MacrosPlugin::initialize(const QStringList &arguments, QString *error_message)
+bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments);
- Q_UNUSED(error_message);
+ Q_UNUSED(errorMessage);
addAutoReleasedObject(new MacroOptionsPage);
addAutoReleasedObject(new MacroLocatorFilter);
diff --git a/src/plugins/macros/macrosplugin.h b/src/plugins/macros/macrosplugin.h
index 92b27523263..f64bbe1fa63 100644
--- a/src/plugins/macros/macrosplugin.h
+++ b/src/plugins/macros/macrosplugin.h
@@ -49,7 +49,7 @@ public:
MacrosPlugin();
~MacrosPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
private:
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 8d4cf91f65e..90e7271cd6c 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -152,7 +152,7 @@ MercurialPlugin::~MercurialPlugin()
m_instance = 0;
}
-bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * /*error_message */)
+bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * /*errorMessage */)
{
typedef VCSBase::VCSEditorFactory<MercurialEditor> MercurialEditorFactory;
diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h
index 2e86c6daf15..caf1d523b8a 100644
--- a/src/plugins/mercurial/mercurialplugin.h
+++ b/src/plugins/mercurial/mercurialplugin.h
@@ -86,7 +86,7 @@ class MercurialPlugin : public VCSBase::VCSBasePlugin
public:
MercurialPlugin();
virtual ~MercurialPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
static MercurialPlugin *instance() { return m_instance; }
MercurialClient *client() const { return m_client; }
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 25fd97f56ed..4b246c50a29 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -85,7 +85,7 @@ public:
PerforcePlugin();
~PerforcePlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
bool managesDirectory(const QString &directory, QString *topLevel = 0);
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 480807a4859..48979495fdd 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -100,7 +100,7 @@ public:
static void openEditorFromAction(QAction *action, const QString &fileName);
//PluginInterface
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
ShutdownFlag aboutToShutdown();
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 296118256da..004779c121e 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -117,7 +117,7 @@ BauhausPlugin::~BauhausPlugin()
// INHERITED FROM ExtensionSystem::Plugin
//
////////////////////////////////////////////////////
-bool BauhausPlugin::initialize(const QStringList & /*arguments*/, QString *error_message/* = 0*/) // =0;
+bool BauhausPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage/* = 0*/) // =0;
{
Core::ICore *core = Core::ICore::instance();
@@ -150,7 +150,7 @@ bool BauhausPlugin::initialize(const QStringList & /*arguments*/, QString *error
m_settings.fromSettings(core->settings());
- error_message->clear();
+ errorMessage->clear();
return true;
}
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h
index 3a93e478d79..1fe6bc41576 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.h
+++ b/src/plugins/qmldesigner/qmldesignerplugin.h
@@ -71,7 +71,7 @@ public:
virtual ~BauhausPlugin();
//Plugin
- virtual bool initialize(const QStringList &arguments, QString *error_message = 0);
+ virtual bool initialize(const QStringList &arguments, QString *errorMessage = 0);
virtual void extensionsInitialized();
static BauhausPlugin *pluginInstance();
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 02e1af34d93..ce89eaada2f 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -122,10 +122,10 @@ Core::Command *createSeparator(Core::ActionManager *am,
return am->registerAction(separator, Core::Id(id), context);
}
-bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *error_message)
+bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
{
Core::ICore *core = Core::ICore::instance();
- if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/qmljseditor/QmlJSEditor.mimetypes.xml"), error_message))
+ if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/qmljseditor/QmlJSEditor.mimetypes.xml"), errorMessage))
return false;
m_modelManager = QmlJS::ModelManagerInterface::instance();
@@ -238,7 +238,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
addAutoReleasedObject(new HoverHandler);
- error_message->clear();
+ errorMessage->clear();
Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(":/qmljseditor/images/qmlfile.png")), "qml");
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.h b/src/plugins/qmljstools/qmljstoolsplugin.h
index b383fb38e88..c5937a95fa4 100644
--- a/src/plugins/qmljstools/qmljstoolsplugin.h
+++ b/src/plugins/qmljstools/qmljstoolsplugin.h
@@ -63,7 +63,7 @@ public:
QmlJSToolsPlugin();
~QmlJSToolsPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
ShutdownFlag aboutToShutdown();
ModelManager *modelManager() { return m_modelManager; }
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index c1d67e012ad..9610cd9c011 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -60,7 +60,7 @@ class Qt4ProjectManagerPlugin : public ExtensionSystem::IPlugin
public:
~Qt4ProjectManagerPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
private slots:
diff --git a/src/plugins/qtestlib/qtestlibplugin.h b/src/plugins/qtestlib/qtestlibplugin.h
index 612b99e8aa2..60c85cb6813 100644
--- a/src/plugins/qtestlib/qtestlibplugin.h
+++ b/src/plugins/qtestlib/qtestlibplugin.h
@@ -178,7 +178,7 @@ public:
QTestLibPlugin();
virtual ~QTestLibPlugin();
- bool init(const QStringList &args, QString *error_message);
+ bool init(const QStringList &args, QString *errorMessage);
void extensionsInitialized();
// IApplicationOutput
diff --git a/src/plugins/qtsupport/qtsupportplugin.h b/src/plugins/qtsupport/qtsupportplugin.h
index a5d68c31665..871b1c4f104 100644
--- a/src/plugins/qtsupport/qtsupportplugin.h
+++ b/src/plugins/qtsupport/qtsupportplugin.h
@@ -48,7 +48,7 @@ class QtSupportPlugin : public ExtensionSystem::IPlugin
public:
~QtSupportPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
private slots:
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index a1fb3ca57cc..a2e31498f3e 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -68,10 +68,10 @@ RemoteLinuxPlugin::~RemoteLinuxPlugin()
}
bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
- QString *error_message)
+ QString *errorMessage)
{
Q_UNUSED(arguments)
- Q_UNUSED(error_message)
+ Q_UNUSED(errorMessage)
MaemoQemuManager::instance(this);
LinuxDeviceConfigurations::instance(this);
diff --git a/src/plugins/remotelinux/remotelinuxplugin.h b/src/plugins/remotelinux/remotelinuxplugin.h
index 6acd2e52fa2..d3620f145a6 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.h
+++ b/src/plugins/remotelinux/remotelinuxplugin.h
@@ -45,7 +45,7 @@ public:
RemoteLinuxPlugin();
~RemoteLinuxPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
};
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index ef8461fd085..ddadc78597d 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -84,7 +84,7 @@ public:
SubversionPlugin();
~SubversionPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void svnDiff(const QString &workingDir, const QStringList &files, QString diffname = QString());
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index b233dc9f6a7..efdb15846f4 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -116,7 +116,7 @@ void UpdateInfoPlugin::stopCurrentCheckTimer()
/*! Initializes the plugin. Returns true on success.
Plugins want to register objects with the plugin manager here.
- \a error_message can be used to pass an error message to the plugin system,
+ \a errorMessage can be used to pass an error message to the plugin system,
if there was any.
*/
bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString * /* errorMessage */)
diff --git a/src/plugins/vcsbase/vcsplugin.h b/src/plugins/vcsbase/vcsplugin.h
index 12297888cf8..e3202bd0523 100644
--- a/src/plugins/vcsbase/vcsplugin.h
+++ b/src/plugins/vcsbase/vcsplugin.h
@@ -56,7 +56,7 @@ public:
VCSPlugin();
~VCSPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index be99fc7717c..73177aa44e8 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -319,10 +319,10 @@ WelcomePlugin::WelcomePlugin()
/*! Initializes the plugin. Returns true on success.
Plugins want to register objects with the plugin manager here.
- \a error_message can be used to pass an error message to the plugin system,
+ \a errorMessage can be used to pass an error message to the plugin system,
if there was any.
*/
-bool WelcomePlugin::initialize(const QStringList & /* arguments */, QString * /* error_message */)
+bool WelcomePlugin::initialize(const QStringList & /* arguments */, QString * /* errorMessage */)
{
m_welcomeMode = new WelcomeMode;
addAutoReleasedObject(m_welcomeMode);
diff --git a/src/plugins/welcome/welcomeplugin.h b/src/plugins/welcome/welcomeplugin.h
index c6a498984d2..9468773f7c1 100644
--- a/src/plugins/welcome/welcomeplugin.h
+++ b/src/plugins/welcome/welcomeplugin.h
@@ -50,7 +50,7 @@ class WelcomePlugin : public ExtensionSystem::IPlugin
public:
WelcomePlugin();
- virtual bool initialize(const QStringList &arguments, QString *error_message);
+ virtual bool initialize(const QStringList &arguments, QString *errorMessage);
virtual void extensionsInitialized();
private:
--
GitLab