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
src/plugins/analyzerbase/ianalyzertool.cpp
+5 -5
View File
@@ -42,8 +42,8 @@ IAnalyzerTool::IAnalyzerTool(QObject *parent)
Id IAnalyzerTool::defaultMenuGroup(StartMode mode)
{
if (mode == StartRemote)
return Constants::G_ANALYZER_REMOTE_TOOLS;
return Constants::G_ANALYZER_TOOLS;
return Id(Constants::G_ANALYZER_REMOTE_TOOLS);
return Id(Constants::G_ANALYZER_TOOLS);
}
Id IAnalyzerTool::defaultActionId(const IAnalyzerTool *tool, StartMode mode)
@@ -51,11 +51,11 @@ Id IAnalyzerTool::defaultActionId(const IAnalyzerTool *tool, StartMode mode)
Id id = tool->id();
switch (mode) {
case StartLocal:
return Id(QByteArray("Analyzer." + id.name() + ".Local").data());
return Id(QByteArray("Analyzer." + id.name() + ".Local"));
case StartRemote:
return Id(QByteArray("Analyzer." + id.name() + ".Remote").data());
return Id(QByteArray("Analyzer." + id.name() + ".Remote"));
case StartQml:
return Id(QByteArray("Analyzer." + id.name() + ".Qml").data());
return Id(QByteArray("Analyzer." + id.name() + ".Qml"));
}
return Id();
}
src/plugins/bazaar/bazaarcontrol.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ QString BazaarControl::displayName() const
Core::Id BazaarControl::id() const
{
return VcsBase::Constants::VCS_ID_BAZAAR;
return Core::Id(VcsBase::Constants::VCS_ID_BAZAAR);
}
bool BazaarControl::managesDirectory(const QString &directory, QString *topLevel) const
src/plugins/bineditor/bineditorplugin.cpp
+2 -2
View File
@@ -373,7 +373,7 @@ public:
return m_file->open(errorString, fileName);
}
Core::IDocument *document() { return m_file; }
Core::Id id() const { return Core::Constants::K_DEFAULT_BINARY_EDITOR_ID; }
Core::Id id() const { return Core::Id(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID); }
QString displayName() const { return m_displayName; }
void setDisplayName(const QString &title) { m_displayName = title; emit changed(); }
@@ -417,7 +417,7 @@ BinEditorFactory::BinEditorFactory(BinEditorPlugin *owner) :
Core::Id BinEditorFactory::id() const
{
return Core::Constants::K_DEFAULT_BINARY_EDITOR_ID;
return Core::Id(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID);
}
QString BinEditorFactory::displayName() const
src/plugins/clearcase/clearcasecontrol.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ QString ClearCaseControl::displayName() const
Core::Id ClearCaseControl::id() const
{
return ClearCase::Constants::VCS_ID_CLEARCASE;
return Core::Id(ClearCase::Constants::VCS_ID_CLEARCASE);
}
bool ClearCaseControl::isConfigured() const
src/plugins/clearcase/clearcaseplugin.cpp
+1 -1
View File
@@ -1261,7 +1261,7 @@ Core::IEditor *ClearCasePlugin::showOutputInEditor(const QString& title, const Q
{
const VcsBase::VcsBaseEditorParameters *params = findType(editorType);
QTC_ASSERT(params, return 0);
const Core::Id id = params->id;
const Core::Id id = Core::Id(QByteArray(params->id));
if (ClearCase::Constants::debug)
qDebug() << "ClearCasePlugin::showOutputInEditor" << title << id.name()
<< "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ Core::IEditor *CMakeEditor::duplicate(QWidget *parent)
Core::Id CMakeEditor::id() const
{
return CMakeProjectManager::Constants::CMAKE_EDITOR_ID;
return Core::Id(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
}
void CMakeEditor::markAsChanged()
src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ CMakeEditorFactory::CMakeEditorFactory(CMakeManager *manager)
Core::Id CMakeEditorFactory::id() const
{
return CMakeProjectManager::Constants::CMAKE_EDITOR_ID;
return Core::Id(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
}
QString CMakeEditorFactory::displayName() const
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+1 -1
View File
@@ -565,5 +565,5 @@ QString CMakeRunConfigurationFactory::buildTargetFromId(Core::Id id)
Core::Id CMakeRunConfigurationFactory::idFromBuildTarget(const QString &target)
{
QString id = QString::fromLatin1(CMAKE_RC_PREFIX) + target;
return Core::Id(id.toUtf8().constData());
return Core::Id(id.toUtf8());
}
src/plugins/coreplugin/featureprovider.h
+1 -1
View File
@@ -63,7 +63,7 @@ class CORE_EXPORT Feature : public Id
{
friend class FeatureSet;
public:
Feature(const char *name) : Id(name) {}
Feature(const char *name) : Id(QByteArray(name)) {}
explicit Feature(const QString &name) : Id(name) {}
};
src/plugins/coreplugin/icontext.cpp
+2 -2
View File
@@ -42,12 +42,12 @@ Context::Context(const char *id, int offset)
void Context::add(const char *id)
{
d.append(Id(id).uniqueIdentifier());
d.append(Id(QByteArray(id)).uniqueIdentifier());
}
bool Context::contains(const char *id) const
{
return d.contains(Id(id).uniqueIdentifier());
return d.contains(Id(QByteArray(id)).uniqueIdentifier());
}
} // namespace Core
src/plugins/coreplugin/id.cpp
+16 -7
View File
@@ -52,13 +52,13 @@ namespace Core {
class StringHolder
{
public:
explicit StringHolder(const char *s)
: str(s)
StringHolder(const char *s, int length)
: n(length), str(s)
{
n = strlen(s);
int m = n;
if (!n)
length = n = strlen(s);
h = 0;
while (m--) {
while (length--) {
h = (h << 4) + *s++;
h ^= (h & 0xf0000000) >> 23;
h &= 0x0fffffff;
@@ -97,10 +97,10 @@ static int lastUid = 0;
static QVector<QByteArray> stringFromId;
static IdCache idFromString;
static int theId(const char *str)
static int theId(const char *str, int n = 0)
{
QTC_ASSERT(str && *str, return 0);
StringHolder sh(str);
StringHolder sh(str, n);
int res = idFromString.value(sh, 0);
if (res == 0) {
if (lastUid == 0)
@@ -113,7 +113,16 @@ static int theId(const char *str)
return res;
}
static int theId(const QByteArray &ba)
{
return theId(ba.constData(), ba.size());
}
Id::Id(const char *name)
: m_id(theId(name, 0))
{}
Id::Id(const QByteArray &name)
: m_id(theId(name))
{}
src/plugins/coreplugin/id.h
+2 -1
View File
@@ -43,7 +43,8 @@ class CORE_EXPORT Id
public:
Id() : m_id(0) {}
Id(const char *name);
// FIXME: Replace with QByteArray
explicit Id(const QByteArray &name);
// FIXME: Remove
explicit Id(const QString &name);
QByteArray name() const;
QString toString() const;
src/plugins/cppeditor/cppeditor.cpp
+1 -1
View File
@@ -1743,7 +1743,7 @@ Core::IEditor *CPPEditor::duplicate(QWidget *parent)
Core::Id CPPEditor::id() const
{
return CppEditor::Constants::CPPEDITOR_ID;
return Core::Id(CppEditor::Constants::CPPEDITOR_ID);
}
bool CPPEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
src/plugins/cppeditor/cppplugin.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ CppEditorFactory::CppEditorFactory(CppPlugin *owner) :
Core::Id CppEditorFactory::id() const
{
return CppEditor::Constants::CPPEDITOR_ID;
return Core::Id(CppEditor::Constants::CPPEDITOR_ID);
}
QString CppEditorFactory::displayName() const
src/plugins/cvs/cvscontrol.cpp
+1 -1
View File
@@ -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
src/plugins/cvs/cvsplugin.cpp
+1 -1
View File
@@ -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);
src/plugins/debugger/debuggerplugin.cpp
+7 -7
View File
@@ -463,12 +463,12 @@ static QToolButton *toolButton(QAction *action)
return button;
}
static void setProxyAction(ProxyAction *proxy, const char *id)
static void setProxyAction(ProxyAction *proxy, Core::Id id)
{
proxy->setAction(ActionManager::command(id)->action());
}
static QToolButton *toolButton(const char *id)
static QToolButton *toolButton(Core::Id id)
{
return toolButton(ActionManager::command(id)->action());
}
@@ -1562,7 +1562,7 @@ void DebuggerPluginPrivate::onCurrentProjectChanged(Project *project)
m_exitAction->setEnabled(false);
m_startAction->setEnabled(true);
m_debugWithoutDeployAction->setEnabled(true);
setProxyAction(m_visibleStartAction, Constants::DEBUG);
setProxyAction(m_visibleStartAction, Core::Id(Constants::DEBUG));
}
void DebuggerPluginPrivate::languagesChanged()
@@ -2233,7 +2233,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
m_exitAction->setEnabled(false);
m_startAction->setEnabled(true);
m_debugWithoutDeployAction->setEnabled(true);
setProxyAction(m_visibleStartAction, Constants::DEBUG);
setProxyAction(m_visibleStartAction, Core::Id(Constants::DEBUG));
m_hiddenStopAction->setAction(m_undisturbableAction);
} else if (state == InferiorStopOk) {
// F5 continues, Shift-F5 kills. It is "continuable".
@@ -2242,7 +2242,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
m_exitAction->setEnabled(true);
m_startAction->setEnabled(false);
m_debugWithoutDeployAction->setEnabled(false);
setProxyAction(m_visibleStartAction, Constants::CONTINUE);
setProxyAction(m_visibleStartAction, Core::Id(Constants::CONTINUE));
m_hiddenStopAction->setAction(m_exitAction);
m_localsAndExpressionsWindow->setShowLocals(true);
} else if (state == InferiorRunOk) {
@@ -2252,7 +2252,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
m_exitAction->setEnabled(true);
m_startAction->setEnabled(false);
m_debugWithoutDeployAction->setEnabled(false);
setProxyAction(m_visibleStartAction, Constants::INTERRUPT);
setProxyAction(m_visibleStartAction, Core::Id(Constants::INTERRUPT));
m_hiddenStopAction->setAction(m_interruptAction);
m_localsAndExpressionsWindow->setShowLocals(false);
} else if (state == DebuggerFinished) {
@@ -2262,7 +2262,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
m_exitAction->setEnabled(false);
m_startAction->setEnabled(true);
m_debugWithoutDeployAction->setEnabled(true);
setProxyAction(m_visibleStartAction, Constants::DEBUG);
setProxyAction(m_visibleStartAction, Core::Id(Constants::DEBUG));
m_hiddenStopAction->setAction(m_undisturbableAction);
m_codeModelSnapshot = CPlusPlus::Snapshot();
setBusyCursor(false);
src/plugins/designer/formeditorfactory.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ FormEditorFactory::FormEditorFactory()
Core::Id FormEditorFactory::id() const
{
return K_DESIGNER_XML_EDITOR_ID;
return Core::Id(K_DESIGNER_XML_EDITOR_ID);
}
QString FormEditorFactory::displayName() const
src/plugins/designer/formwindoweditor.cpp
+2 -2
View File
@@ -208,7 +208,7 @@ Core::IDocument *FormWindowEditor::document()
Core::Id FormWindowEditor::id() const
{
return Designer::Constants::K_DESIGNER_XML_EDITOR_ID;
return Core::Id(Designer::Constants::K_DESIGNER_XML_EDITOR_ID);
}
QString FormWindowEditor::displayName() const
@@ -278,7 +278,7 @@ TextEditor::PlainTextEditor *FormWindowEditor::textEditor()
Core::Id FormWindowEditor::preferredModeType() const
{
return Core::Constants::MODE_DESIGN_TYPE;
return Core::Id(Core::Constants::MODE_DESIGN_TYPE);
}
} // namespace Designer
src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+2 -2
View File
@@ -72,7 +72,7 @@ QStringList ProjectFilesFactory::mimeTypes() const
Core::Id ProjectFilesFactory::id() const
{
return Constants::FILES_EDITOR_ID;
return Core::Id(Constants::FILES_EDITOR_ID);
}
QString ProjectFilesFactory::displayName() const
@@ -94,7 +94,7 @@ ProjectFilesEditor::ProjectFilesEditor(ProjectFilesEditorWidget *editor)
Core::Id ProjectFilesEditor::id() const
{
return Constants::FILES_EDITOR_ID;
return Core::Id(Constants::FILES_EDITOR_ID);
}
bool ProjectFilesEditor::duplicateSupported() const
src/plugins/git/gitversioncontrol.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ QString GitVersionControl::displayName() const
Core::Id GitVersionControl::id() const
{
return VcsBase::Constants::VCS_ID_GIT;
return Core::Id(VcsBase::Constants::VCS_ID_GIT);
}
bool GitVersionControl::isConfigured() const
src/plugins/glsleditor/glsleditor.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ Core::IEditor *GLSLEditorEditable::duplicate(QWidget *parent)
Core::Id GLSLEditorEditable::id() const
{
return GLSLEditor::Constants::C_GLSLEDITOR_ID;
return Core::Id(GLSLEditor::Constants::C_GLSLEDITOR_ID);
}
bool GLSLEditorEditable::open(QString *errorString, const QString &fileName, const QString &realFileName)
src/plugins/glsleditor/glsleditorfactory.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ GLSLEditorFactory::GLSLEditorFactory(QObject *parent)
Core::Id GLSLEditorFactory::id() const
{
return C_GLSLEDITOR_ID;
return Core::Id(C_GLSLEDITOR_ID);
}
QString GLSLEditorFactory::displayName() const
src/plugins/imageviewer/imageviewerfactory.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ QStringList ImageViewerFactory::mimeTypes() const
Core::Id ImageViewerFactory::id() const
{
return Constants::IMAGEVIEWER_ID;
return Core::Id(Constants::IMAGEVIEWER_ID);
}
QString ImageViewerFactory::displayName() const
src/plugins/mercurial/mercurialcontrol.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ QString MercurialControl::displayName() const
Core::Id MercurialControl::id() const
{
return VcsBase::Constants::VCS_ID_MERCURIAL;
return Core::Id(VcsBase::Constants::VCS_ID_MERCURIAL);
}
bool MercurialControl::managesDirectory(const QString &directory, QString *topLevel) const
src/plugins/perforce/perforceplugin.cpp
+1 -1
View File
@@ -1172,7 +1172,7 @@ Core::IEditor *PerforcePlugin::showOutputInEditor(const QString &title, const QS
{
const VcsBase::VcsBaseEditorParameters *params = findType(editorType);
QTC_ASSERT(params, return 0);
const Core::Id id(params->id);
const Core::Id id = Core::Id(QByteArray(params->id));
if (Perforce::Constants::debug)
qDebug() << "PerforcePlugin::showOutputInEditor" << title << id.name()
<< "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
src/plugins/perforce/perforceversioncontrol.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ QString PerforceVersionControl::displayName() const
Core::Id PerforceVersionControl::id() const
{
return VcsBase::Constants::VCS_ID_PERFORCE;
return Core::Id(VcsBase::Constants::VCS_ID_PERFORCE);
}
bool PerforceVersionControl::isConfigured() const
src/plugins/projectexplorer/devicesupport/idevice.cpp
+1 -1
View File
@@ -300,7 +300,7 @@ void IDevice::fromMap(const QVariantMap &map)
{
d->type = typeFromMap(map);
d->displayName = map.value(QLatin1String(DisplayNameKey)).toString();
d->id = Core::Id(map.value(QLatin1String(IdKey), newId().name()).toByteArray().constData());
d->id = Core::Id(map.value(QLatin1String(IdKey), newId().name()).toByteArray());
d->origin = static_cast<Origin>(map.value(QLatin1String(OriginKey), ManuallyAdded).toInt());
d->sshParameters.host = map.value(HostKey).toString();
src/plugins/projectexplorer/foldernavigationwidget.cpp
+1 -1
View File
@@ -401,7 +401,7 @@ int FolderNavigationWidgetFactory::priority() const
Core::Id FolderNavigationWidgetFactory::id() const
{
return "File System";
return Core::Id("File System");
}
QKeySequence FolderNavigationWidgetFactory::activationSequence() const
src/plugins/projectexplorer/kit.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ public:
m_mustNotify(false)
{
if (!id.isValid())
m_id = Core::Id(QUuid::createUuid().toString().toLatin1().constData());
m_id = Core::Id(QUuid::createUuid().toString().toLatin1());
}
QString m_displayName;
src/plugins/projectexplorer/kitinformation.cpp
+1 -1
View File
@@ -312,7 +312,7 @@ const Core::Id DeviceTypeKitInformation::deviceTypeId(const Kit *k)
{
if (!k)
return Core::Id();
return Core::Id(k->value(Core::Id(DEVICETYPE_INFORMATION)).toByteArray().constData());
return Core::Id(k->value(Core::Id(DEVICETYPE_INFORMATION)).toByteArray());
}
void DeviceTypeKitInformation::setDeviceTypeId(Kit *k, Core::Id type)
src/plugins/projectexplorer/pluginfilefactory.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ QStringList ProjectFileFactory::mimeTypes() const
Core::Id ProjectFileFactory::id() const
{
return Constants::FILE_FACTORY_ID;
return Core::Id(Constants::FILE_FACTORY_ID);
}
QString ProjectFileFactory::displayName() const
src/plugins/projectexplorer/projectconfiguration.cpp
+1 -1
View File
@@ -102,7 +102,7 @@ QVariantMap ProjectConfiguration::toMap() const
bool ProjectConfiguration::fromMap(const QVariantMap &map)
{
m_id = Core::Id(map.value(QLatin1String(CONFIGURATION_ID_KEY), QByteArray()).toByteArray().constData());
m_id = Core::Id(map.value(QLatin1String(CONFIGURATION_ID_KEY), QByteArray()).toByteArray());
m_displayName = map.value(QLatin1String(DISPLAY_NAME_KEY), QString()).toString();
m_defaultDisplayName = map.value(QLatin1String(DEFAULT_DISPLAY_NAME_KEY),
m_defaultDisplayName.isEmpty() ?
src/plugins/projectexplorer/taskwindow.cpp
+2 -2
View File
@@ -558,14 +558,14 @@ void TaskWindow::updateCategoriesMenu()
action->setCheckable(true);
action->setText(displayName);
action->setData(categoryId);
action->setChecked(!filteredCategories.contains(Core::Id(categoryId.constData())));
action->setChecked(!filteredCategories.contains(Core::Id(categoryId)));
d->m_categoriesMenu->addAction(action);
}
}
void TaskWindow::filterCategoryTriggered(QAction *action)
{
Core::Id categoryId(action->data().toByteArray().constData());
Core::Id categoryId(action->data().toByteArray());
QTC_CHECK(categoryId.uniqueIdentifier() != 0);
setCategoryVisibility(categoryId, action->isChecked());
src/plugins/qmljseditor/qmljseditor.cpp
+1 -1
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)
src/plugins/qmljseditor/qmljseditoreditable.cpp
+1 -1
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();
}
src/plugins/qmljseditor/qmljseditorfactory.cpp
+1 -1
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
src/plugins/qmlprofiler/qmlprofilertool.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ QmlProfilerTool::~QmlProfilerTool()
Core::Id QmlProfilerTool::id() const
{
return "QmlProfiler";
return Core::Id("QmlProfiler");
}
RunMode QmlProfilerTool::runMode() const
src/plugins/qt4projectmanager/profileeditor.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ Core::IEditor *ProFileEditor::duplicate(QWidget *parent)
Core::Id ProFileEditor::id() const
{
return Qt4ProjectManager::Constants::PROFILE_EDITOR_ID;
return Core::Id(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
}
//
src/plugins/qt4projectmanager/profileeditorfactory.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ ProFileEditorFactory::~ProFileEditorFactory()
Core::Id ProFileEditorFactory::id() const
{
return Qt4ProjectManager::Constants::PROFILE_EDITOR_ID;
return Core::Id(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
}
QString ProFileEditorFactory::displayName() const
src/plugins/qt4projectmanager/qmakestep.cpp
+5 -5
View File
@@ -69,12 +69,12 @@ using namespace ProjectExplorer;
using namespace Utils;
namespace {
const char * const QMAKE_BS_ID("QtProjectManager.QMakeBuildStep");
const char QMAKE_BS_ID[] = "QtProjectManager.QMakeBuildStep";
const char * const QMAKE_ARGUMENTS_KEY("QtProjectManager.QMakeBuildStep.QMakeArguments");
const char * const QMAKE_FORCED_KEY("QtProjectManager.QMakeBuildStep.QMakeForced");
const char * const QMAKE_QMLDEBUGLIBAUTO_KEY("QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto");
const char * const QMAKE_QMLDEBUGLIB_KEY("QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary");
const char QMAKE_ARGUMENTS_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeArguments";
const char QMAKE_FORCED_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeForced";
const char QMAKE_QMLDEBUGLIBAUTO_KEY[] = "QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto";
const char QMAKE_QMLDEBUGLIB_KEY[] = "QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary";
}
QMakeStep::QMakeStep(BuildStepList *bsl) :
src/plugins/qtsupport/customexecutablerunconfiguration.cpp
+7 -7
View File
@@ -54,14 +54,14 @@ using namespace QtSupport;
using namespace QtSupport::Internal;
namespace {
const char * const CUSTOM_EXECUTABLE_ID("ProjectExplorer.CustomExecutableRunConfiguration");
const char CUSTOM_EXECUTABLE_ID[] = "ProjectExplorer.CustomExecutableRunConfiguration";
const char * const EXECUTABLE_KEY("ProjectExplorer.CustomExecutableRunConfiguration.Executable");
const char * const ARGUMENTS_KEY("ProjectExplorer.CustomExecutableRunConfiguration.Arguments");
const char * const WORKING_DIRECTORY_KEY("ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory");
const char * const USE_TERMINAL_KEY("ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal");
const char * const USER_ENVIRONMENT_CHANGES_KEY("ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges");
const char * const BASE_ENVIRONMENT_BASE_KEY("ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase");
const char EXECUTABLE_KEY[] = "ProjectExplorer.CustomExecutableRunConfiguration.Executable";
const char ARGUMENTS_KEY[] = "ProjectExplorer.CustomExecutableRunConfiguration.Arguments";
const char WORKING_DIRECTORY_KEY[] = "ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory";
const char USE_TERMINAL_KEY[] = "ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal";
const char USER_ENVIRONMENT_CHANGES_KEY[] = "ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges";
const char BASE_ENVIRONMENT_BASE_KEY[] = "ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase";
}
void CustomExecutableRunConfiguration::ctor()
src/plugins/resourceeditor/resourceeditorfactory.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) :
Core::Id ResourceEditorFactory::id() const
{
return RESOURCEEDITOR_ID;
return Core::Id(RESOURCEEDITOR_ID);
}
QString ResourceEditorFactory::displayName() const
src/plugins/subversion/subversioncontrol.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ QString SubversionControl::displayName() const
Core::Id SubversionControl::id() const
{
return VcsBase::Constants::VCS_ID_SUBVERSION;
return Core::Id(VcsBase::Constants::VCS_ID_SUBVERSION);
}
bool SubversionControl::isConfigured() const
src/plugins/subversion/subversionplugin.cpp
+1 -1
View File
@@ -1145,7 +1145,7 @@ Core::IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const
{
const VcsBase::VcsBaseEditorParameters *params = findType(editorType);
QTC_ASSERT(params, return 0);
const Core::Id id = params->id;
const Core::Id id = Core::Id(QByteArray(params->id));
if (Subversion::Constants::debug)
qDebug() << "SubversionPlugin::showOutputInEditor" << title << id.name()
<< "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
src/plugins/tasklist/taskfilefactory.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ QStringList TaskFileFactory::mimeTypes() const
Core::Id TaskFileFactory::id() const
{
return "ProjectExplorer.TaskFileFactory";
return Core::Id("ProjectExplorer.TaskFileFactory");
}
QString TaskFileFactory::displayName() const
src/plugins/texteditor/plaintexteditor.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ Core::IEditor *PlainTextEditor::duplicate(QWidget *parent)
Core::Id PlainTextEditor::id() const
{
return Core::Constants::K_DEFAULT_TEXT_EDITOR_ID;
return Core::Id(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID);
}
void PlainTextEditorWidget::unCommentSelection()
src/plugins/texteditor/plaintexteditorfactory.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ PlainTextEditorFactory::~PlainTextEditorFactory()
Core::Id PlainTextEditorFactory::id() const
{
return Core::Constants::K_DEFAULT_TEXT_EDITOR_ID;
return Core::Id(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID);
}
QString PlainTextEditorFactory::displayName() const
src/plugins/texteditor/snippets/snippeteditor.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ SnippetEditor::SnippetEditor(SnippetEditorWidget *editor)
Core::Id SnippetEditor::id() const
{
return Constants::SNIPPET_EDITOR_ID;
return Core::Id(Constants::SNIPPET_EDITOR_ID);
}
SnippetEditorWidget::SnippetEditorWidget(QWidget *parent) : BaseTextEditorWidget(parent)
src/plugins/valgrind/callgrindtool.cpp
+1 -1
View File
@@ -516,7 +516,7 @@ CallgrindTool::~CallgrindTool()
Core::Id CallgrindTool::id() const
{
return "Callgrind";
return Core::Id("Callgrind");
}
ProjectExplorer::RunMode CallgrindTool::runMode() const
src/plugins/valgrind/memchecktool.cpp
+1 -1
View File
@@ -283,7 +283,7 @@ void MemcheckTool::maybeActiveRunConfigurationChanged()
Core::Id MemcheckTool::id() const
{
return "Memcheck";
return Core::Id("Memcheck");
}
ProjectExplorer::RunMode MemcheckTool::runMode() const
src/plugins/vcsbase/basevcseditorfactory.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ public:
BaseVcsEditorFactoryPrivate::BaseVcsEditorFactoryPrivate(const VcsBaseEditorParameters *t) :
m_type(t),
m_id(t->id),
m_id(QByteArray(t->id)),
m_mimeTypes(QStringList(QLatin1String(t->mimeType))),
m_editorHandler(new TextEditor::TextEditorActionHandler(t->context))
{
src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ public:
BaseVcsSubmitEditorFactoryPrivate::BaseVcsSubmitEditorFactoryPrivate(const VcsBaseSubmitEditorParameters *parameters) :
m_parameters(parameters),
m_id(parameters->id),
m_id(QByteArray(parameters->id)),
m_displayName(QLatin1String(parameters->displayName)),
m_mimeTypes(QLatin1String(parameters->mimeType))
{
src/plugins/vcsbase/vcsbaseeditor.cpp
+1 -1
View File
@@ -178,7 +178,7 @@ private:
VcsBaseEditor::VcsBaseEditor(VcsBaseEditorWidget *widget,
const VcsBaseEditorParameters *type) :
BaseTextEditor(widget),
m_id(type->id),
m_id(QByteArray(type->id)),
m_temporary(false)
{
setContext(Core::Context(type->context, TextEditor::Constants::C_TEXTEDITOR));
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+1 -1
View File
@@ -426,7 +426,7 @@ Core::IEditor *VcsBaseSubmitEditor::duplicate(QWidget * /*parent*/)
Core::Id VcsBaseSubmitEditor::id() const
{
return d->m_parameters->id;
return Core::Id(QByteArray(d->m_parameters->id));
}
static QToolBar *createToolBar(const QWidget *someWidget, QAction *submitAction, QAction *diffAction)