feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

s/error_message/errorMessage/g

Browse Source 
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-09-21 13:05:15 +02:00
committed by hjk
parent 56a05bf287
commit 7bfde77d7c
39 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/glsleditor/glsleditorplugin.cpp
View File

@@ -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();