forked from qt-creator/qt-creator
s/error_message/errorMessage/g
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710 Reviewed-on: http://codereview.qt-project.org/5312 Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user