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

Id: Add QByteArray constructor

Browse Source 
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Orgad Shaneh
2012-11-20 07:18:01 +02:00
committed by Orgad Shaneh
parent f31da9ac55
commit 7c4e2b6c60
55 changed files with 97 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -580,7 +580,7 @@ Core::IEditor *QmlJSEditorEditable::duplicate(QWidget *parent)
Core::Id QmlJSEditorEditable::id() const
{
return QmlJSEditor::Constants::C_QMLJSEDITOR_ID;
return Core::Id(QmlJSEditor::Constants::C_QMLJSEDITOR_ID);
}
bool QmlJSEditorEditable::open(QString *errorString, const QString &fileName, const QString &realFileName)

2
src/plugins/qmljseditor/qmljseditoreditable.cpp
View File

@@ -85,7 +85,7 @@ Core::Id QmlJSEditorEditable::preferredModeType() const
// have the user also access to this failsafe setting.
if (editorWidget()->mimeType() == QLatin1String(QmlJSTools::Constants::QML_MIMETYPE)
&& openInDesignMode())
return Core::Constants::MODE_DESIGN_TYPE;
return Core::Id(Core::Constants::MODE_DESIGN_TYPE);
return Core::Id();
}

2
src/plugins/qmljseditor/qmljseditorfactory.cpp
View File

@@ -66,7 +66,7 @@ QmlJSEditorFactory::QmlJSEditorFactory(QObject *parent)
Core::Id QmlJSEditorFactory::id() const
{
return C_QMLJSEDITOR_ID;
return Core::Id(C_QMLJSEDITOR_ID);
}
QString QmlJSEditorFactory::displayName() const