Commit 7bfde77d authored by hjk's avatar hjk Committed by hjk

s/error_message/errorMessage/g

Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 56a05bf2
......@@ -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.
......
......@@ -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:
......
......@@ -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() {}
......
......@@ -49,7 +49,7 @@ public:
CMakeProjectPlugin();
~CMakeProjectPlugin();
bool initialize(const QStringList &arguments, QString *error_message);
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
};
......
......@@ -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);
......
......@@ -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();
......
......@@ -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();
......
......@@ -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; }
......
......@@ -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);
......
......@@ -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:
......
......@@ -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();
......
......@@ -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();
......
......@@ -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;
......
......@@ -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();
......
......@@ -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();
......
......@@ -47,7 +47,7 @@ public:
HelloWorldPlugin();
~HelloWorldPlugin();
bool initialize(const QStringList &arguments, QString *error_message);
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
......
......@@ -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();
......
......@@ -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:
......
......@@ -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();
......
......@@ -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);
......
......@@ -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:
......
......@@ -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;
......
......@@ -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; }
......
......@@ -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);
......
......@@ -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();
......
......@@ -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;
}
......
......@@ -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();
......
......@@ -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");
......
......@@ -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; }
......
......@@ -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:
......
......@@ -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
......
......@@ -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:
......
......@@ -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);
......
......@@ -45,7 +45,7 @@ public:
RemoteLinuxPlugin();
~RemoteLinuxPlugin();
bool initialize(const QStringList &arguments, QString *error_message);
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
};
......
......@@ -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());
......
......@@ -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 */)
......
......@@ -56,7 +56,7 @@ public:
VCSPlugin();
~VCSPlugin();
bool initialize(const QStringList &arguments, QString *error_message);
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
......
......@@ -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);
......
......@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment