diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-20 07:18:01 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2012-11-20 08:57:35 +0100 |
| commit | 7c4e2b6c60eb311ab5ce2bf1cc05fd10caf06350 (patch) | |
| tree | 50ebe5aa9ff3552ef07c73986945c889fef3e452 /src/plugins/cvs | |
| parent | f31da9ac552bdad551babfebfeadd7d99250ac9d (diff) | |
| download | qt-creator-7c4e2b6c60eb311ab5ce2bf1cc05fd10caf06350.tar.gz | |
Id: Add QByteArray constructor
Distinguish from const char * one.
QString ctor is yet to be removed
Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/cvs')
| -rw-r--r-- | src/plugins/cvs/cvscontrol.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp index 0604ecd0ee..5feb30ab52 100644 --- a/src/plugins/cvs/cvscontrol.cpp +++ b/src/plugins/cvs/cvscontrol.cpp @@ -50,7 +50,7 @@ QString CvsControl::displayName() const Core::Id CvsControl::id() const { - return VcsBase::Constants::VCS_ID_CVS; + return Core::Id(VcsBase::Constants::VCS_ID_CVS); } bool CvsControl::isConfigured() const diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 059f51e3a6..1185aa2ce0 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -1269,7 +1269,7 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp { const VcsBaseEditorParameters *params = findType(editorType); QTC_ASSERT(params, return 0); - const Id id = params->id; + const Id id = Core::Id(QByteArray(params->id)); if (Cvs::Constants::debug) qDebug() << "CVSPlugin::showOutputInEditor" << title << id.name() << "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); |