s/error_message/errorMessage/g

Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>

39 files changed, 50 insertions, 50 deletions

diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h
index 15450bdb60..75624a530a 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 063056c9de..1e2baeb9a7 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 351f91ca52..d4400732b7 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 98403f7d38..7c0e877a5e 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 205bf46241..8d7a9d4418 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 e684a92365..197af6c946 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 3539b49eee..0045d4dec7 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 3b75daa3fc..232d878bdc 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 d553de32c6..125e7ce650 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 f21040b907..cb366f8462 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 3603f1b632..9f0cad8db6 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 6feed7f94a..54062f04d9 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 796642fcf3..8aea43897d 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 3907e5a0ec..117ed4f5f1 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 905df9d0c7..6f7812f2de 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 0ebc4e37e0..24e1b05390 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 97443d5927..340e492692 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 fd937062ae..feabaaff3d 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 0d2ec895c0..71dd334d1d 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 65efbc4716..a7ac16da68 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 92b2752326..f64bbe1fa6 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 8d4cf91f65..90e7271cd6 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 2e86c6daf1..caf1d523b8 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 25fd97f56e..4b246c50a2 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 480807a485..48979495fd 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 296118256d..004779c121 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 3a93e478d7..1fe6bc4157 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 02e1af34d9..ce89eaada2 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 b383fb38e8..c5937a95fa 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 c1d67e012a..9610cd9c01 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 612b99e8aa..60c85cb681 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 a5d68c3166..871b1c4f10 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 a1fb3ca57c..a2e31498f3 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 6acd2e52fa..d3620f145a 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 ef8461fd08..ddadc78597 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 b233dc9f6a..efdb15846f 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 12297888cf..e3202bd052 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 be99fc7717..73177aa44e 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 c6a498984d..9468773f7c 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: