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

more Id type fixes

Browse Source 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-10 11:36:51 +01:00
committed by hjk
parent cfc9b71ecb
commit 82f5573626
102 changed files with 322 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/analyzerbase/analyzermanager.cpp
+3 -3
View File
@@ -436,7 +436,7 @@ void AnalyzerManagerPrivate::activateDock(Qt::DockWidgetArea area, QDockWidget *
QAction *toggleViewAction = dockWidget->toggleViewAction();
toggleViewAction->setText(dockWidget->windowTitle());
Command *cmd = am->registerAction(toggleViewAction,
QString("Analyzer." + dockWidget->objectName()), globalContext);
Core::Id("Analyzer." + dockWidget->objectName()), globalContext);
cmd->setAttribute(Command::CA_Hide);
ActionContainer *viewsMenu =
@@ -448,7 +448,7 @@ void AnalyzerManagerPrivate::deactivateDock(QDockWidget *dockWidget)
{
ActionManager *am = ICore::instance()->actionManager();
QAction *toggleViewAction = dockWidget->toggleViewAction();
am->unregisterAction(toggleViewAction, QString("Analyzer." + dockWidget->objectName()));
am->unregisterAction(toggleViewAction, Core::Id("Analyzer." + dockWidget->objectName()));
m_mainWindow->removeDockWidget(dockWidget);
dockWidget->hide();
// Prevent saveState storing the data of the wrong children.
@@ -701,7 +701,7 @@ void AnalyzerManagerPrivate::addTool(IAnalyzerTool *tool, const StartModes &mode
foreach (StartMode mode, modes) {
QString actionName = tool->actionName(mode);
QString menuGroup = tool->menuGroup(mode);
QString actionId = tool->actionId(mode);
Core::Id actionId(QString::fromLatin1(tool->actionId(mode)));
QAction *action = new QAction(actionName, 0);
Core::Command *command = am->registerAction(action, actionId,
Core::Context(Core::Constants::C_GLOBAL));
src/plugins/bineditor/bineditorplugin.cpp
+2 -2
View File
@@ -374,7 +374,7 @@ public:
return m_file->open(errorString, fileName);
}
Core::IFile *file() { return m_file; }
QString id() const { return QLatin1String(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID); }
Core::Id id() const { return Core::Constants::K_DEFAULT_BINARY_EDITOR_ID; }
QString displayName() const { return m_displayName; }
void setDisplayName(const QString &title) { m_displayName = title; emit changed(); }
@@ -477,7 +477,7 @@ BinEditorPlugin::~BinEditorPlugin()
QAction *BinEditorPlugin::registerNewAction(const QString &id, const QString &title)
{
QAction *result = new QAction(title, this);
Core::ICore::instance()->actionManager()->registerAction(result, id, m_context);
Core::ICore::instance()->actionManager()->registerAction(result, Core::Id(id), m_context);
return result;
}
src/plugins/classview/classviewmanager.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ void Manager::onDocumentUpdated(CPlusPlus::Document::Ptr doc)
void Manager::gotoLocation(const QString &fileName, int line, int column)
{
bool newEditor = false;
TextEditor::BaseTextEditorWidget::openEditorAt(fileName, line, column, QString(),
TextEditor::BaseTextEditorWidget::openEditorAt(fileName, line, column, Core::Id(),
Core::EditorManager::IgnoreNavigationHistory,
&newEditor);
}
src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+2 -2
View File
@@ -72,9 +72,9 @@ Core::IEditor *CMakeEditor::duplicate(QWidget *parent)
return ret->editor();
}
QString CMakeEditor::id() const
Core::Id CMakeEditor::id() const
{
return QLatin1String(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
return CMakeProjectManager::Constants::CMAKE_EDITOR_ID;
}
void CMakeEditor::markAsChanged()
src/plugins/cmakeprojectmanager/cmakeeditor.h
+1 -1
View File
@@ -59,7 +59,7 @@ public:
bool duplicateSupported() const { return true; }
Core::IEditor *duplicate(QWidget *parent);
QString id() const;
Core::Id id() const;
bool isTemporary() const { return false; }
private slots:
src/plugins/coreplugin/editormanager/editormanager.cpp
+16 -17
View File
@@ -278,12 +278,11 @@ static EditorManager *m_instance = 0;
EditorManager *EditorManager::instance() { return m_instance; }
static Command *createSeparator(ActionManager *am, QObject *parent,
const QString &name,
const Context &context)
const Id &id, const Context &context)
{
QAction *tmpaction = new QAction(parent);
tmpaction->setSeparator(true);
Command *cmd = am->registerAction(tmpaction, name, context);
Command *cmd = am->registerAction(tmpaction, id, context);
return cmd;
}
@@ -458,13 +457,13 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
advancedMenu->appendGroup(Constants::G_EDIT_EDITOR);
// Advanced menu separators
cmd = createSeparator(am, this, QLatin1String("QtCreator.Edit.Sep.Collapsing"), editManagerContext);
cmd = createSeparator(am, this, Id("QtCreator.Edit.Sep.Collapsing"), editManagerContext);
advancedMenu->addAction(cmd, Constants::G_EDIT_COLLAPSING);
cmd = createSeparator(am, this, QLatin1String("QtCreator.Edit.Sep.Blocks"), editManagerContext);
cmd = createSeparator(am, this, Id("QtCreator.Edit.Sep.Blocks"), editManagerContext);
advancedMenu->addAction(cmd, Constants::G_EDIT_BLOCKS);
cmd = createSeparator(am, this, QLatin1String("QtCreator.Edit.Sep.Font"), editManagerContext);
cmd = createSeparator(am, this, Id("QtCreator.Edit.Sep.Font"), editManagerContext);
advancedMenu->addAction(cmd, Constants::G_EDIT_FONT);
cmd = createSeparator(am, this, QLatin1String("QtCreator.Edit.Sep.Editor"), editManagerContext);
cmd = createSeparator(am, this, Id("QtCreator.Edit.Sep.Editor"), editManagerContext);
advancedMenu->addAction(cmd, Constants::G_EDIT_EDITOR);
// other setup
@@ -1221,9 +1220,9 @@ Core::Id EditorManager::getOpenWithEditorId(const QString &fileName,
// Collect editors that can open the file
const MimeType mt = d->m_core->mimeDatabase()->findByFile(fileName);
if (!mt)
return QString();
return Id();
QStringList allEditorIds;
QStringList externalEditorIds;
QList<Id> externalEditorIds;
// Built-in
const EditorFactoryList editors = editorFactories(mt, false);
const int size = editors.size();
@@ -1234,18 +1233,18 @@ Core::Id EditorManager::getOpenWithEditorId(const QString &fileName,
const ExternalEditorList exEditors = externalEditors(mt, false);
const int esize = exEditors.size();
for (int i = 0; i < esize; i++) {
externalEditorIds.push_back(exEditors.at(i)->id().toString());
externalEditorIds.push_back(exEditors.at(i)->id());
allEditorIds.push_back(exEditors.at(i)->id().toString());
}
if (allEditorIds.empty())
return QString();
return Id();
// Run dialog.
OpenWithDialog dialog(fileName, d->m_core->mainWindow());
dialog.setEditors(allEditorIds);
dialog.setCurrentEditor(0);
if (dialog.exec() != QDialog::Accepted)
return QString();
const QString selectedId = dialog.editor();
return Id();
const Id selectedId = Id(dialog.editor());
if (isExternalEditor)
*isExternalEditor = externalEditorIds.contains(selectedId);
return selectedId;
@@ -1318,7 +1317,7 @@ IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QStri
// If we could not open the file in the requested editor, fall
// back to the default editor:
if (!editor)
editor = createEditor(QString(), fn);
editor = createEditor(Id(), fn);
if (!editor) // Internal error
return 0;
@@ -1604,7 +1603,7 @@ bool EditorManager::saveFileAs(IFile *fileParam)
void EditorManager::addFileToRecentFiles(IFile *file)
{
bool isTemporary = true;
QString editorId;
Id editorId;
QList<IEditor *> editors = editorsForFile(file);
foreach (IEditor *editor, editors) {
if (!editor->isTemporary()) {
@@ -1943,9 +1942,9 @@ bool EditorManager::restoreState(const QByteArray &state)
continue;
QFileInfo rfi(autoSaveName(fileName));
if (rfi.exists() && fi.lastModified() < rfi.lastModified()) {
openEditor(fileName, QString::fromUtf8(id));
openEditor(fileName, Id(QString::fromUtf8(id)));
} else {
d->m_editorModel->addRestoredEditor(fileName, displayName, QString::fromUtf8(id));
d->m_editorModel->addRestoredEditor(fileName, displayName, Id(QString::fromUtf8(id)));
}
}
}
src/plugins/coreplugin/editormanager/editorview.cpp
+2 -2
View File
@@ -756,10 +756,10 @@ QByteArray SplitterOrView::saveState() const
stream << QByteArray("empty");
} else if (e == em->currentEditor()) {
stream << QByteArray("currenteditor")
<< e->file()->fileName() << e->id() << e->saveState();
<< e->file()->fileName() << e->id().toString() << e->saveState();
} else {
stream << QByteArray("editor")
<< e->file()->fileName() << e->id() << e->saveState();
<< e->file()->fileName() << e->id().toString() << e->saveState();
}
}
return bytes;
src/plugins/coreplugin/editormanager/editorview.h
+3 -1
View File
@@ -33,6 +33,8 @@
#ifndef EDITORVIEW_H
#define EDITORVIEW_H
#include "coreplugin/id.h"
#include <QtCore/QMap>
#include <QtCore/QList>
#include <QtCore/QString>
@@ -64,7 +66,7 @@ namespace Internal {
struct EditLocation {
QPointer<IFile> file;
QString fileName;
QString id;
Id id;
QVariant state;
};
src/plugins/coreplugin/editormanager/ieditor.h
+3 -1
View File
@@ -35,6 +35,8 @@
#include <coreplugin/core_global.h>
#include <coreplugin/icontext.h>
#include <coreplugin/id.h>
#include <QtCore/QMetaType>
namespace Core {
@@ -52,7 +54,7 @@ public:
virtual bool createNew(const QString &contents = QString()) = 0;
virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName) = 0;
virtual IFile *file() = 0;
virtual QString id() const = 0;
virtual Core::Id id() const = 0;
virtual QString displayName() const = 0;
virtual void setDisplayName(const QString &title) = 0;
src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ void OpenEditorsModel::addEditor(IEditor *editor, bool isDuplicate)
addEntry(entry);
}
void OpenEditorsModel::addRestoredEditor(const QString &fileName, const QString &displayName, const QString &id)
void OpenEditorsModel::addRestoredEditor(const QString &fileName, const QString &displayName, const Id &id)
{
Entry entry;
entry.m_fileName = fileName;
src/plugins/coreplugin/editormanager/openeditorsmodel.h
+1 -1
View File
@@ -64,7 +64,7 @@ public:
QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
void addEditor(IEditor *editor, bool isDuplicate = false);
void addRestoredEditor(const QString &fileName, const QString &displayName, const QString &id);
void addRestoredEditor(const QString &fileName, const QString &displayName, const Id &id);
QModelIndex firstRestoredEditor() const;
struct CORE_EXPORT Entry {
src/plugins/coreplugin/filemanager.cpp
+3 -3
View File
@@ -1059,7 +1059,7 @@ void FileManager::syncWithEditor(Core::IContext *context)
\a editorId defaults to the empty id, which means to let the system figure out
the best editor itself.
*/
void FileManager::addToRecentFiles(const QString &fileName, const QString &editorId)
void FileManager::addToRecentFiles(const QString &fileName, const Id &editorId)
{
if (fileName.isEmpty())
return;
@@ -1103,7 +1103,7 @@ void FileManager::saveSettings()
QStringList recentEditorIds;
foreach (const RecentFile &file, d->m_recentFiles) {
recentFiles.append(file.first);
recentEditorIds.append(file.second);
recentEditorIds.append(file.second.toString());
}
QSettings *s = Core::ICore::instance()->settings();
@@ -1133,7 +1133,7 @@ void FileManager::readSettings()
editorId = ids.next();
if (QFileInfo(fileName).isFile())
d->m_recentFiles.append(RecentFile(QDir::fromNativeSeparators(fileName), // from native to guard against old settings
editorId));
Id(editorId)));
}
s->beginGroup(QLatin1String(directoryGroupC));
src/plugins/coreplugin/filemanager.h
+3 -3
View File
@@ -33,7 +33,7 @@
#ifndef FILEMANAGER_H
#define FILEMANAGER_H
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
#include <QtCore/QObject>
#include <QtCore/QStringList>
@@ -64,7 +64,7 @@ public:
KeepLinks
};
typedef QPair<QString, QString> RecentFile;
typedef QPair<QString, Id> RecentFile;
explicit FileManager(QMainWindow *ew);
virtual ~FileManager();
@@ -83,7 +83,7 @@ public:
void unexpectFileChange(const QString &fileName);
// recent files
void addToRecentFiles(const QString &fileName, const QString &editorId = QString());
void addToRecentFiles(const QString &fileName, const Id &editorId = Id());
Q_SLOT void clearRecentFiles();
QList<RecentFile> recentFiles() const;
src/plugins/coreplugin/generatedfile.cpp
+4 -4
View File
@@ -61,7 +61,7 @@ public:
explicit GeneratedFilePrivate(const QString &p);
QString path;
QByteArray contents;
QString editorId;
Id editorId;
bool binary;
GeneratedFile::Attributes attributes;
};
@@ -139,14 +139,14 @@ void GeneratedFile::setBinary(bool b)
m_d->binary = b;
}
QString GeneratedFile::editorId() const
Id GeneratedFile::editorId() const
{
return m_d->editorId;
}
void GeneratedFile::setEditorId(const QString &k)
void GeneratedFile::setEditorId(const Id &id)
{
m_d->editorId = k;
m_d->editorId = id;
}
bool GeneratedFile::write(QString *errorMessage) const
src/plugins/coreplugin/generatedfile.h
+3 -3
View File
@@ -34,7 +34,7 @@
#ifndef CORE_GENERATEDFILE_H
#define CORE_GENERATEDFILE_H
#include "core_global.h"
#include "coreplugin/id.h"
#include <QtCore/QSharedDataPointer>
#include <QtCore/QList>
@@ -79,8 +79,8 @@ public:
void setBinary(bool b);
// Id of editor to open the file with
QString editorId() const;
void setEditorId(const QString &k);
Id editorId() const;
void setEditorId(const Id &id);
bool write(QString *errorMessage) const;
src/plugins/coreplugin/id.cpp
-1
View File
@@ -37,7 +37,6 @@
#include <utils/qtcassert.h>
#include <QtCore/QHash>
#include <QtCore/QDebug>
namespace Core {
src/plugins/coreplugin/id.h
+2 -2
View File
@@ -47,7 +47,7 @@ public:
Id() : m_id(0) {}
Id(const char *name);
// FIXME: Replace with QByteArray
Id(const QString &name);
explicit Id(const QString &name);
QByteArray name() const;
QString toString() const;
bool isValid() const { return m_id; }
@@ -67,6 +67,6 @@ CORE_EXPORT inline uint qHash(const Id &id) { return id.uniqueIdentifier(); }
} // namespace Core
Q_DECLARE_METATYPE(Core::Id);
Q_DECLARE_METATYPE(Core::Id)
#endif // CORE_ID_H
src/plugins/coreplugin/mainwindow.cpp
+13 -14
View File
@@ -537,12 +537,11 @@ void MainWindow::registerDefaultContainers()
}
static Command *createSeparator(ActionManager *am, QObject *parent,
const QString &name,
const Context &context)
const Id &id, const Context &context)
{
QAction *tmpaction = new QAction(parent);
tmpaction->setSeparator(true);
Command *cmd = am->registerAction(tmpaction, name, context);
Command *cmd = am->registerAction(tmpaction, id, context);
return cmd;
}
@@ -558,30 +557,30 @@ void MainWindow::registerDefaultActions()
Context globalContext(Constants::C_GLOBAL);
// File menu separators
Command *cmd = createSeparator(am, this, QLatin1String("QtCreator.File.Sep.Save"), globalContext);
Command *cmd = createSeparator(am, this, Id("QtCreator.File.Sep.Save"), globalContext);
mfile->addAction(cmd, Constants::G_FILE_SAVE);
cmd = createSeparator(am, this, QLatin1String("QtCreator.File.Sep.Print"), globalContext);
cmd = createSeparator(am, this, Id("QtCreator.File.Sep.Print"), globalContext);
QIcon icon = QIcon::fromTheme(QLatin1String("edit-cut"), QIcon(Constants::ICON_CUT));
mfile->addAction(cmd, Constants::G_FILE_PRINT);
cmd = createSeparator(am, this, QLatin1String("QtCreator.File.Sep.Close"), globalContext);
cmd = createSeparator(am, this, Id("QtCreator.File.Sep.Close"), globalContext);
mfile->addAction(cmd, Constants::G_FILE_CLOSE);
cmd = createSeparator(am, this, QLatin1String("QtCreator.File.Sep.Other"), globalContext);
cmd = createSeparator(am, this, Id("QtCreator.File.Sep.Other"), globalContext);
mfile->addAction(cmd, Constants::G_FILE_OTHER);
// Edit menu separators
cmd = createSeparator(am, this, QLatin1String("QtCreator.Edit.Sep.CopyPaste"), globalContext);
cmd = createSeparator(am, this, Id("QtCreator.Edit.Sep.CopyPaste"), globalContext);
medit->addAction(cmd, Constants::G_EDIT_COPYPASTE);
cmd = createSeparator(am, this, QLatin1String("QtCreator.Edit.Sep.SelectAll"), globalContext);
cmd = createSeparator(am, this, Id("QtCreator.Edit.Sep.SelectAll"), globalContext);
medit->addAction(cmd, Constants::G_EDIT_SELECTALL);
cmd = createSeparator(am, this, QLatin1String("QtCreator.Edit.Sep.Find"), globalContext);
cmd = createSeparator(am, this, Id("QtCreator.Edit.Sep.Find"), globalContext);
medit->addAction(cmd, Constants::G_EDIT_FIND);
cmd = createSeparator(am, this, QLatin1String("QtCreator.Edit.Sep.Advanced"), globalContext);
cmd = createSeparator(am, this, Id("QtCreator.Edit.Sep.Advanced"), globalContext);
medit->addAction(cmd, Constants::G_EDIT_ADVANCED);
// Return to editor shortcut: Note this requires Qt to fix up
@@ -728,7 +727,7 @@ void MainWindow::registerDefaultActions()
// Options Action
mtools->appendGroup(Constants::G_TOOLS_OPTIONS);
cmd = createSeparator(am, this, QLatin1String("QtCreator.Tools.Sep.Options"), globalContext);
cmd = createSeparator(am, this, Id("QtCreator.Tools.Sep.Options"), globalContext);
mtools->addAction(cmd, Constants::G_TOOLS_OPTIONS);
m_optionsAction = new QAction(tr("&Options..."), this);
cmd = am->registerAction(m_optionsAction, Constants::OPTIONS, globalContext);
@@ -754,7 +753,7 @@ void MainWindow::registerDefaultActions()
connect(m_zoomAction, SIGNAL(triggered()), this, SLOT(showMaximized()));
// Window separator
cmd = createSeparator(am, this, QLatin1String("QtCreator.Window.Sep.Size"), globalContext);
cmd = createSeparator(am, this, Id("QtCreator.Window.Sep.Size"), globalContext);
mwindow->addAction(cmd, Constants::G_WINDOW_SIZE);
#endif
@@ -884,7 +883,7 @@ void MainWindow::openFiles(const QStringList &fileNames, ICore::OpenFilesFlags f
emFlags = EditorManager::ModeSwitch;
if (flags & ICore::CanContainLineNumbers)
emFlags |= EditorManager::CanContainLineNumber;
Core::IEditor *editor = editorManager()->openEditor(absoluteFilePath, QString(), emFlags);
Core::IEditor *editor = editorManager()->openEditor(absoluteFilePath, Id(), emFlags);
if (!editor && (flags & ICore::StopOnLoadFail))
return;
}
src/plugins/coreplugin/modemanager.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ void ModeManager::objectAdded(QObject *obj)
// Register mode shortcut
ActionManager *am = d->m_mainWindow->actionManager();
const QString shortcutId = QLatin1String("QtCreator.Mode.") + mode->id();
const Id shortcutId(QLatin1String("QtCreator.Mode.") + mode->id());
QShortcut *shortcut = new QShortcut(d->m_mainWindow);
shortcut->setWhatsThis(tr("Switch to <b>%1</b> mode").arg(mode->displayName()));
Command *cmd = am->registerShortcut(shortcut, shortcutId, Context(Constants::C_GLOBAL));
src/plugins/coreplugin/outputpanemanager.cpp
+1 -1
View File
@@ -274,7 +274,7 @@ void OutputPaneManager::init()
actionId.remove(QLatin1Char(' '));
QAction *action = new QAction(outPane->displayName(), this);
Command *cmd = am->registerAction(action, actionId, Context(Constants::C_GLOBAL));
Command *cmd = am->registerAction(action, Id(actionId), Context(Constants::C_GLOBAL));
mpanes->addAction(cmd, "Coreplugin.OutputPane.PanesGroup");
m_actions.insert(cmd->action(), idx);
src/plugins/cpaster/cpasterplugin.cpp
+1 -1
View File
@@ -366,7 +366,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription,
const QString fileName = saver.fileName();
m_fetchedSnippets.push_back(fileName);
// Open editor with title.
Core::IEditor* editor = EditorManager::instance()->openEditor(fileName, QString(), EditorManager::ModeSwitch);
Core::IEditor* editor = EditorManager::instance()->openEditor(fileName, Core::Id(), EditorManager::ModeSwitch);
QTC_ASSERT(editor, return)
editor->setDisplayName(titleDescription);
}
src/plugins/cppeditor/cppeditor.cpp
+2 -2
View File
@@ -1639,9 +1639,9 @@ Core::IEditor *CPPEditor::duplicate(QWidget *parent)
return newEditor->editor();
}
QString CPPEditor::id() const
Core::Id CPPEditor::id() const
{
return QLatin1String(CppEditor::Constants::CPPEDITOR_ID);
return CppEditor::Constants::CPPEDITOR_ID;
}
bool CPPEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
src/plugins/cppeditor/cppeditor.h
+2 -2
View File
@@ -152,10 +152,10 @@ public:
bool duplicateSupported() const { return true; }
Core::IEditor *duplicate(QWidget *parent);
QString id() const;
Core::Id id() const;
bool isTemporary() const { return false; }
virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName);
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
};
class CPPEditorWidget : public TextEditor::BaseTextEditorWidget
src/plugins/cppeditor/cppquickfixassistant.cpp
+2 -2
View File
@@ -65,9 +65,9 @@ using namespace CPlusPlus;
// -------------------------
// CppQuickFixAssistProvider
// -------------------------
bool CppQuickFixAssistProvider::supportsEditor(const QString &editorId) const
bool CppQuickFixAssistProvider::supportsEditor(const Core::Id &editorId) const
{
return editorId == QLatin1String(CppEditor::Constants::CPPEDITOR_ID);
return editorId == CppEditor::Constants::CPPEDITOR_ID;
}
IAssistProcessor *CppQuickFixAssistProvider::createProcessor() const
src/plugins/cppeditor/cppquickfixassistant.h
+1 -1
View File
@@ -91,7 +91,7 @@ private:
class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
{
public:
virtual bool supportsEditor(const QString &editorId) const;
virtual bool supportsEditor(const Core::Id &editorId) const;
virtual TextEditor::IAssistProcessor *createProcessor() const;
virtual QList<TextEditor::QuickFixFactory *> quickFixFactories() const;
src/plugins/cpptools/cppcompletionassist.cpp
+2 -2
View File
@@ -495,9 +495,9 @@ int CppFunctionHintModel::activeArgument(const QString &prefix) const
// ---------------------------
// CppCompletionAssistProvider
// ---------------------------
bool CppCompletionAssistProvider::supportsEditor(const QString &editorId) const
bool CppCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
{
return editorId == QLatin1String(CppEditor::Constants::CPPEDITOR_ID);
return editorId == Core::Id(CppEditor::Constants::CPPEDITOR_ID);
}
int CppCompletionAssistProvider::activationCharSequenceLength() const
src/plugins/cpptools/cppcompletionassist.h
+1 -1
View File
@@ -66,7 +66,7 @@ class CppAssistProposalModel;
class CppCompletionAssistProvider : public TextEditor::CompletionAssistProvider
{
public:
virtual bool supportsEditor(const QString &editorId) const;
virtual bool supportsEditor(const Core::Id &editorId) const;
virtual int activationCharSequenceLength() const;
virtual bool isActivationCharSequence(const QString &sequence) const;
virtual TextEditor::IAssistProcessor *createProcessor() const;
src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ void CppCurrentDocumentFilter::accept(Locator::FilterEntry selection) const
{
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName, info.line, info.column,
QString(), Core::EditorManager::ModeSwitch);
Core::Id(), Core::EditorManager::ModeSwitch);
}
void CppCurrentDocumentFilter::refresh(QFutureInterface<void> &future)
src/plugins/cpptools/cppfindreferences.cpp
+2 -2
View File
@@ -327,10 +327,10 @@ void CppFindReferences::openEditor(const Find::SearchResultItem &item)
{
if (item.path.size() > 0) {
TextEditor::BaseTextEditorWidget::openEditorAt(item.path.first(), item.lineNumber, item.textMarkPos,
QString(),
Core::Id(),
Core::EditorManager::ModeSwitch);
} else {
Core::EditorManager::instance()->openEditor(item.text, QString(), Core::EditorManager::ModeSwitch);
Core::EditorManager::instance()->openEditor(item.text, Core::Id(), Core::EditorManager::ModeSwitch);
}
}
src/plugins/cpptools/cpplocatorfilter.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ void CppLocatorFilter::accept(Locator::FilterEntry selection) const
{
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName, info.line, info.column,
QString(), Core::EditorManager::ModeSwitch);
Core::Id(), Core::EditorManager::ModeSwitch);
}
void CppLocatorFilter::reset()
src/plugins/cvs/cvsplugin.cpp
+3 -2
View File
@@ -1284,9 +1284,10 @@ Core::IEditor * CVSPlugin::showOutputInEditor(const QString& title, const QStrin
{
const VCSBase::VCSBaseEditorParameters *params = findType(editorType);
QTC_ASSERT(params, return 0);
const QString id = params->id;
const Core::Id id = params->id;
if (CVS::Constants::debug)
qDebug() << "CVSPlugin::showOutputInEditor" << title << id << "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
qDebug() << "CVSPlugin::showOutputInEditor" << title << id.name()
<< "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(id, &s, output.toLocal8Bit());
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
src/plugins/debugger/debuggerengine.cpp
+1 -1
View File
@@ -567,7 +567,7 @@ void DebuggerEngine::gotoLocation(const Location &loc)
QList<IEditor *> editors = editorManager->editorsForFileName(file);
IEditor *editor = 0;
if (editors.isEmpty()) {
editor = editorManager->openEditor(file, QString(),
editor = editorManager->openEditor(file, Core::Id(),
EditorManager::IgnoreNavigationHistory);
if (editor) {
editors.append(editor);
src/plugins/debugger/debuggermainwindow.cpp
+1 -1
View File
@@ -427,7 +427,7 @@ QDockWidget *DebuggerMainWindow::createDockWidget(const DebuggerLanguage &langua
ActionManager *am = ICore::instance()->actionManager();
QAction *toggleViewAction = dockWidget->toggleViewAction();
Command *cmd = am->registerAction(toggleViewAction,
QString("Debugger." + widget->objectName()), globalContext);
Core::Id("Debugger." + widget->objectName()), globalContext);
cmd->setAttribute(Command::CA_Hide);
d->m_viewsMenu->addAction(cmd);
src/plugins/designer/formeditorw.cpp
+47 -47
View File
@@ -136,12 +136,12 @@ static inline QAction *createSeparator(QObject *parent,
Core::ActionManager *am,
const Core::Context &context,
Core::ActionContainer *container,
const QString &name = QString(),
const Core::Id &id,
const QString &group = QString())
{
QAction *actSeparator = new QAction(parent);
actSeparator->setSeparator(true);
Core::Command *command = am->registerAction(actSeparator, name, context);
Core::Command *command = am->registerAction(actSeparator, id, context);
container->addAction(command, group);
return actSeparator;
}
@@ -238,7 +238,7 @@ FormEditorW::~FormEditorW()
void FormEditorW::addDockViewAction(Core::ActionManager *am,
Core::ActionContainer *viewMenu,
int index, const Core::Context &context,
const QString &title, const QString &id)
const QString &title, const Core::Id &id)
{
if (const QDockWidget *dw = m_editorWidget->designerDockWidgets()[index]) {
QAction *action = dw->toggleViewAction();
@@ -256,30 +256,30 @@ void FormEditorW::setupViewActions()
QTC_ASSERT(viewMenu, return)
addDockViewAction(am, viewMenu, WidgetBoxSubWindow, m_contexts,
tr("Widget box"), QLatin1String("FormEditor.WidgetBox"));
tr("Widget box"), Core::Id("FormEditor.WidgetBox"));
addDockViewAction(am, viewMenu, ObjectInspectorSubWindow, m_contexts,
tr("Object Inspector"), QLatin1String("FormEditor.ObjectInspector"));
tr("Object Inspector"), Core::Id("FormEditor.ObjectInspector"));
addDockViewAction(am, viewMenu, PropertyEditorSubWindow, m_contexts,
tr("Property Editor"), QLatin1String("FormEditor.PropertyEditor"));
tr("Property Editor"), Core::Id("FormEditor.PropertyEditor"));
addDockViewAction(am, viewMenu, SignalSlotEditorSubWindow, m_contexts,
tr("Signals && Slots Editor"), QLatin1String("FormEditor.SignalsAndSlotsEditor"));
tr("Signals && Slots Editor"), Core::Id("FormEditor.SignalsAndSlotsEditor"));
addDockViewAction(am, viewMenu, ActionEditorSubWindow, m_contexts,
tr("Action Editor"), QLatin1String("FormEditor.ActionEditor"));
tr("Action Editor"), Core::Id("FormEditor.ActionEditor"));
// Lock/Reset
Core::Command *cmd = addToolAction(m_editorWidget->menuSeparator1(), am, m_contexts, QLatin1String("FormEditor.SeparatorLock"), viewMenu, QString());
Core::Command *cmd = addToolAction(m_editorWidget->menuSeparator1(), am, m_contexts, Core::Id("FormEditor.SeparatorLock"), viewMenu, QString());
cmd->setAttribute(Core::Command::CA_Hide);
cmd = addToolAction(m_editorWidget->toggleLockedAction(), am, m_contexts, QLatin1String("FormEditor.Locked"), viewMenu, QString());
cmd = addToolAction(m_editorWidget->toggleLockedAction(), am, m_contexts, Core::Id("FormEditor.Locked"), viewMenu, QString());
cmd->setAttribute(Core::Command::CA_Hide);
cmd = addToolAction(m_editorWidget->menuSeparator2(), am, m_contexts, QLatin1String("FormEditor.SeparatorReset"), viewMenu, QString());
cmd = addToolAction(m_editorWidget->menuSeparator2(), am, m_contexts, Core::Id("FormEditor.SeparatorReset"), viewMenu, QString());
cmd->setAttribute(Core::Command::CA_Hide);
cmd = addToolAction(m_editorWidget->resetLayoutAction(), am, m_contexts, QLatin1String("FormEditor.ResetToDefaultLayout"), viewMenu, QString());
cmd = addToolAction(m_editorWidget->resetLayoutAction(), am, m_contexts, Core::Id("FormEditor.ResetToDefaultLayout"), viewMenu, QString());
connect(m_editorWidget, SIGNAL(resetLayout()), m_editorWidget, SLOT(resetToDefaultLayout()));
cmd->setAttribute(Core::Command::CA_Hide);
}
@@ -479,77 +479,77 @@ void FormEditorW::setupActions()
command = am->registerAction(m_modeActionSeparator, Core::Id("FormEditor.Sep.ModeActions"), m_contexts);
medit->addAction(command, Core::Constants::G_EDIT_OTHER);
m_toolActionIds.push_back(QLatin1String("FormEditor.WidgetEditor"));
m_toolActionIds.push_back(Core::Id("FormEditor.WidgetEditor"));
createEditModeAction(m_actionGroupEditMode, m_contexts, am, medit,
tr("Edit Widgets"), m_toolActionIds.back(),
EditModeWidgetEditor, QLatin1String("widgettool.png"), tr("F3"));
m_toolActionIds.push_back(QLatin1String("FormEditor.SignalsSlotsEditor"));
m_toolActionIds.push_back(Core::Id("FormEditor.SignalsSlotsEditor"));
createEditModeAction(m_actionGroupEditMode, m_contexts, am, medit,
tr("Edit Signals/Slots"), m_toolActionIds.back(),
EditModeSignalsSlotEditor, QLatin1String("signalslottool.png"), tr("F4"));
m_toolActionIds.push_back(QLatin1String("FormEditor.BuddyEditor"));
m_toolActionIds.push_back(Core::Id("FormEditor.BuddyEditor"));
createEditModeAction(m_actionGroupEditMode, m_contexts, am, medit,
tr("Edit Buddies"), m_toolActionIds.back(),
EditModeBuddyEditor, QLatin1String("buddytool.png"));
m_toolActionIds.push_back(QLatin1String("FormEditor.TabOrderEditor"));
m_toolActionIds.push_back(Core::Id("FormEditor.TabOrderEditor"));
createEditModeAction(m_actionGroupEditMode, m_contexts, am, medit,
tr("Edit Tab Order"), m_toolActionIds.back(),
EditModeTabOrderEditor, QLatin1String("tabordertool.png"));
//tool actions
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutHorizontally"));
m_toolActionIds.push_back(Core::Id("FormEditor.LayoutHorizontally"));
const QString horizLayoutShortcut = osMac ? tr("Meta+H") : tr("Ctrl+H");
addToolAction(m_fwm->actionHorizontalLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools, horizLayoutShortcut);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutVertically"));
m_toolActionIds.push_back(Core::Id("FormEditor.LayoutVertically"));
const QString vertLayoutShortcut = osMac ? tr("Meta+L") : tr("Ctrl+L");
addToolAction(m_fwm->actionVerticalLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools, vertLayoutShortcut);
m_toolActionIds.push_back(QLatin1String("FormEditor.SplitHorizontal"));
m_toolActionIds.push_back(Core::Id("FormEditor.SplitHorizontal"));
addToolAction(m_fwm->actionSplitHorizontal(), am, m_contexts,
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.SplitVertical"));
m_toolActionIds.push_back(Core::Id("FormEditor.SplitVertical"));
addToolAction(m_fwm->actionSplitVertical(), am, m_contexts,
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutForm"));
m_toolActionIds.push_back(Core::Id("FormEditor.LayoutForm"));
addToolAction(m_fwm->actionFormLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutGrid"));
m_toolActionIds.push_back(Core::Id("FormEditor.LayoutGrid"));
const QString gridShortcut = osMac ? tr("Meta+G") : tr("Ctrl+G");
addToolAction(m_fwm->actionGridLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools, gridShortcut);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutBreak"));
m_toolActionIds.push_back(Core::Id("FormEditor.LayoutBreak"));
addToolAction(m_fwm->actionBreakLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutAdjustSize"));
m_toolActionIds.push_back(Core::Id("FormEditor.LayoutAdjustSize"));
const QString adjustShortcut = osMac ? tr("Meta+J") : tr("Ctrl+J");
addToolAction(m_fwm->actionAdjustSize(), am, m_contexts,
m_toolActionIds.back(), mformtools, adjustShortcut);
m_toolActionIds.push_back(QLatin1String("FormEditor.SimplifyLayout"));
m_toolActionIds.push_back(Core::Id("FormEditor.SimplifyLayout"));
addToolAction(m_fwm->actionSimplifyLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools);
createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator1"));
createSeparator(this, am, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator1"));
addToolAction(m_fwm->actionLower(), am, m_contexts,
QLatin1String("FormEditor.Lower"), mformtools);
Core::Id("FormEditor.Lower"), mformtools);
addToolAction(m_fwm->actionRaise(), am, m_contexts,
QLatin1String("FormEditor.Raise"), mformtools);
Core::Id("FormEditor.Raise"), mformtools);
// Commands that do not go into the editor toolbar
createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator2"));
createSeparator(this, am, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator2"));
#if QT_VERSION >= 0x050000
m_actionPreview = m_fwm->action(QDesignerFormWindowManagerInterface::DefaultPreviewAction);
@@ -558,7 +558,7 @@ void FormEditorW::setupActions()
#endif
QTC_ASSERT(m_actionPreview, return);
addToolAction(m_actionPreview, am, m_contexts,
QLatin1String("FormEditor.Preview"), mformtools, tr("Alt+Shift+R"));
Core::Id("FormEditor.Preview"), mformtools, tr("Alt+Shift+R"));
// Preview in style...
#if QT_VERSION >= 0x050000
@@ -573,9 +573,9 @@ void FormEditorW::setupActions()
setPreviewMenuEnabled(false);
// Form settings
createSeparator(this, am, m_contexts, medit, QLatin1String("FormEditor.Edit.Separator2"), Core::Constants::G_EDIT_OTHER);
createSeparator(this, am, m_contexts, medit, Core::Id("FormEditor.Edit.Separator2"), Core::Constants::G_EDIT_OTHER);
createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator3"));
createSeparator(this, am, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator3"));
m_actionSwitchSource = new QAction(tr("Switch Source/Form"), this);
connect(m_actionSwitchSource, SIGNAL(triggered()), this, SLOT(switchSourceForm()));
@@ -583,21 +583,21 @@ void FormEditorW::setupActions()
// Switch form/source in editor/design contexts.
Core::Context switchContexts = m_contexts;
switchContexts.add(Core::Constants::C_EDITORMANAGER);
addToolAction(m_actionSwitchSource, am, switchContexts, QLatin1String("FormEditor.FormSwitchSource"), mformtools,
addToolAction(m_actionSwitchSource, am, switchContexts, Core::Id("FormEditor.FormSwitchSource"), mformtools,
tr("Shift+F4"));
createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator4"));
createSeparator(this, am, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator4"));
#if QT_VERSION >= 0x050000
QAction *actionFormSettings = m_fwm->action(QDesignerFormWindowManagerInterface::FormWindowSettingsDialogAction);
#else
QAction *actionFormSettings = m_fwm->actionShowFormWindowSettingsDialog();
#endif
addToolAction(actionFormSettings, am, m_contexts, QLatin1String("FormEditor.FormSettings"), mformtools);
addToolAction(actionFormSettings, am, m_contexts, Core::Id("FormEditor.FormSettings"), mformtools);
createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator5"));
createSeparator(this, am, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator5"));
m_actionAboutPlugins = new QAction(tr("About Qt Designer plugins...."), this);
addToolAction(m_actionAboutPlugins, am, m_contexts,
QLatin1String("FormEditor.AboutPlugins"), mformtools);
Core::Id("FormEditor.AboutPlugins"), mformtools);
connect(m_actionAboutPlugins, SIGNAL(triggered()), m_fwm,
#if QT_VERSION >= 0x050000
SLOT(showPluginDialog())
@@ -615,8 +615,8 @@ QToolBar *FormEditorW::createEditorToolBar() const
{
QToolBar *editorToolBar = new QToolBar;
Core::ActionManager *am = m_core->actionManager();
const QStringList::const_iterator cend = m_toolActionIds.constEnd();
for (QStringList::const_iterator it = m_toolActionIds.constBegin(); it != cend; ++it) {
const QList<Core::Id>::const_iterator cend = m_toolActionIds.constEnd();
for (QList<Core::Id>::const_iterator it = m_toolActionIds.constBegin(); it != cend; ++it) {
Core::Command *cmd = am->command(*it);
QTC_ASSERT(cmd, continue);
QAction *action = cmd->action();
@@ -633,7 +633,7 @@ Core::ActionContainer *FormEditorW::createPreviewStyleMenu(Core::ActionManager *
QActionGroup *actionGroup)
{
const QString menuId = QLatin1String(M_FORMEDITOR_PREVIEW);
Core::ActionContainer *menuPreviewStyle = am->createMenu(menuId);
Core::ActionContainer *menuPreviewStyle = am->createMenu(M_FORMEDITOR_PREVIEW);
menuPreviewStyle->menu()->setTitle(tr("Preview in"));
// The preview menu is a list of invisible actions for the embedded design
@@ -655,7 +655,7 @@ Core::ActionContainer *FormEditorW::createPreviewStyleMenu(Core::ActionManager *
name += dot;
}
name += data.toString();
Core::Command *command = am->registerAction(a, name, m_contexts);
Core::Command *command = am->registerAction(a, Core::Id(name), m_contexts);
bindShortcut(command, a);
if (isDeviceProfile) {
command->setAttribute(Core::Command::CA_UpdateText);
@@ -700,7 +700,7 @@ QAction *FormEditorW::createEditModeAction(QActionGroup *ag,
Core::ActionManager *am,
Core::ActionContainer *medit,
const QString &actionName,
const QString &name,
const Core::Id &id,
int toolNumber,
const QString &iconName,
const QString &keySequence)
@@ -709,7 +709,7 @@ QAction *FormEditorW::createEditModeAction(QActionGroup *ag,
rc->setCheckable(true);
if (!iconName.isEmpty())
rc->setIcon(designerIcon(iconName));
Core::Command *command = am->registerAction(rc, name, context);
Core::Command *command = am->registerAction(rc, id, context);
command->setAttribute(Core::Command::CA_Hide);
if (!keySequence.isEmpty())
command->setDefaultKeySequence(QKeySequence(keySequence));
@@ -722,10 +722,10 @@ QAction *FormEditorW::createEditModeAction(QActionGroup *ag,
// Create a tool action
Core::Command *FormEditorW::addToolAction(QAction *a, Core::ActionManager *am,
const Core::Context &context, const QString &name,
const Core::Context &context, const Core::Id &id,
Core::ActionContainer *c1, const QString &keySequence)
{
Core::Command *command = am->registerAction(a, name, context);
Core::Command *command = am->registerAction(a, id, context);
if (!keySequence.isEmpty())
command->setDefaultKeySequence(QKeySequence(keySequence));
if (!a->isSeparator())
@@ -784,7 +784,7 @@ void FormEditorW::currentEditorChanged(Core::IEditor *editor)
if (Designer::Constants::Internal::debug)
qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount();
if (editor && editor->id() == QLatin1String(Constants::K_DESIGNER_XML_EDITOR_ID)) {
if (editor && editor->id() == Core::Id(Constants::K_DESIGNER_XML_EDITOR_ID)) {
FormWindowEditor *xmlEditor = qobject_cast<FormWindowEditor *>(editor);
QTC_ASSERT(xmlEditor, return);
ensureInitStage(FullyInitialized);
@@ -955,7 +955,7 @@ void FormEditorW::switchSourceForm()
Core::EditorManager *em = Core::EditorManager::instance();
const QString fileToOpen = otherFile(em);
if (!fileToOpen.isEmpty())
em->openEditor(fileToOpen, QString(), Core::EditorManager::ModeSwitch);
em->openEditor(fileToOpen, Core::Id(), Core::EditorManager::ModeSwitch);
}
} // namespace Internal
src/plugins/designer/formeditorw.h
+6 -5
View File
@@ -68,9 +68,10 @@ QT_END_NAMESPACE
namespace Core {
class ActionManager;
class ActionContainer;
class Command;
class ICore;
class IEditor;
class Command;
class Id;
class DesignMode;
class EditorToolBar;
}
@@ -151,7 +152,7 @@ private:
Core::ActionContainer *viewMenu,
int index,
const Core::Context &context,
const QString &title, const QString &id);
const QString &title, const Core::Id &id);
Core::ActionContainer *createPreviewStyleMenu(Core::ActionManager *am,
QActionGroup *actionGroup);
@@ -163,12 +164,12 @@ private:
Core::ActionManager *am,
Core::ActionContainer *medit,
const QString &actionName,
const QString &name,
const Core::Id &id,
int toolNumber,
const QString &iconName = QString(),
const QString &keySequence = QString());
Core::Command *addToolAction(QAction *a, Core::ActionManager *am,
const Core::Context &context, const QString &name,
const Core::Context &context, const Core::Id &id,
Core::ActionContainer *c1, const QString &keySequence = QString());
QToolBar *createEditorToolBar() const;
@@ -204,7 +205,7 @@ private:
DesignerContext *m_context;
Core::Context m_contexts;
QStringList m_toolActionIds;
QList<Core::Id> m_toolActionIds;
QWidget *m_modeWidget;
EditorWidget *m_editorWidget;
Core::DesignMode *m_designMode;
src/plugins/designer/formwindoweditor.cpp
+2 -2
View File
@@ -209,9 +209,9 @@ Core::IFile *FormWindowEditor::file()
return &d->m_file;
}
QString FormWindowEditor::id() const
Core::Id FormWindowEditor::id() const
{
return QLatin1String(Designer::Constants::K_DESIGNER_XML_EDITOR_ID);
return Designer::Constants::K_DESIGNER_XML_EDITOR_ID;
}
QString FormWindowEditor::displayName() const
src/plugins/designer/formwindoweditor.h
+1 -1
View File
@@ -73,7 +73,7 @@ public:
virtual bool createNew(const QString &contents = QString());
virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName);
virtual Core::IFile *file();
virtual QString id() const;
virtual Core::Id id() const;
virtual QString displayName() const;
virtual void setDisplayName(const QString &title);
src/plugins/fakevim/fakevimplugin.cpp
+11 -11
View File
@@ -630,12 +630,12 @@ void FakeVimUserCommandsPage::apply()
class FakeVimCompletionAssistProvider : public TextEditor::CompletionAssistProvider
{
public:
virtual bool supportsEditor(const QString &) const
bool supportsEditor(const Core::Id &) const
{
return false;
}
virtual TextEditor::IAssistProcessor *createProcessor() const;
TextEditor::IAssistProcessor *createProcessor() const;
void setActive(const QString &needle, bool forward, FakeVimHandler *handler)
{
@@ -844,8 +844,8 @@ private:
FakeVimUserCommandsPage *m_fakeVimUserCommandsPage;
QHash<Core::IEditor *, FakeVimHandler *> m_editorToHandler;
void triggerAction(const QString &code);
void setActionChecked(const QString &code, bool check);
void triggerAction(const Core::Id &id);
void setActionChecked(const Core::Id &id, bool check);
typedef int (*DistFunction)(const QRect &cursor, const QRect &other);
void moveSomewhere(DistFunction f);
@@ -995,7 +995,7 @@ bool FakeVimPluginPrivate::initialize()
act->setData(i);
QString id = QString("FakeVim.UserAction%1").arg(i);
QString keys = QString("Alt+V,%1").arg(i);
cmd = actionManager->registerAction(act, id, globalcontext);
cmd = actionManager->registerAction(act, Core::Id(id), globalcontext);
cmd->setDefaultKeySequence(QKeySequence(keys));
connect(act, SIGNAL(triggered()), SLOT(userActionTriggered()));
}
@@ -1148,22 +1148,22 @@ void FakeVimPluginPrivate::showSettingsDialog()
_(Constants::SETTINGS_ID));
}
void FakeVimPluginPrivate::triggerAction(const QString &code)
void FakeVimPluginPrivate::triggerAction(const Id &id)
{
Core::ActionManager *am = ICore::instance()->actionManager();
QTC_ASSERT(am, return);
Core::Command *cmd = am->command(code);
QTC_ASSERT(cmd, qDebug() << "UNKNOWN CODE: " << code; return);
Core::Command *cmd = am->command(id);
QTC_ASSERT(cmd, qDebug() << "UNKNOWN CODE: " << id.name(); return);
QAction *action = cmd->action();
QTC_ASSERT(action, return);
action->trigger();
}
void FakeVimPluginPrivate::setActionChecked(const QString &code, bool check)
void FakeVimPluginPrivate::setActionChecked(const Id &id, bool check)
{
Core::ActionManager *am = ICore::instance()->actionManager();
QTC_ASSERT(am, return);
Core::Command *cmd = am->command(code);
Core::Command *cmd = am->command(id);
QTC_ASSERT(cmd, return);
QAction *action = cmd->action();
QTC_ASSERT(action, return);
@@ -1583,7 +1583,7 @@ void FakeVimPluginPrivate::handleExCommand(bool *handled, const ExCommand &cmd)
const QString &id = it.key();
const QRegExp &re = it.value();
if (!re.pattern().isEmpty() && re.indexIn(cmd.cmd) != -1) {
triggerAction(id);
triggerAction(Core::Id(id));
return;
}
}
src/plugins/find/findplugin.cpp
+1 -1
View File
@@ -244,7 +244,7 @@ void FindPlugin::setupFilterMenuItems()
haveEnabledFilters = true;
action->setEnabled(isEnabled);
action->setData(qVariantFromValue(filter));
cmd = am->registerAction(action, QString(QLatin1String("FindFilter.")+filter->id()), globalcontext);
cmd = am->registerAction(action, Core::Id(QLatin1String("FindFilter.")+filter->id()), globalcontext);
cmd->setDefaultKeySequence(filter->defaultShortcut());
mfindadvanced->addAction(cmd);
d->m_filterActions.insert(filter, action);
src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+2 -2
View File
@@ -105,9 +105,9 @@ ProjectFilesEditor::ProjectFilesEditor(ProjectFilesEditorWidget *editor)
setContext(Core::Context(Constants::C_FILESEDITOR));
}
QString ProjectFilesEditor::id() const
Core::Id ProjectFilesEditor::id() const
{
return QLatin1String(Constants::FILES_EDITOR_ID);
return Constants::FILES_EDITOR_ID;
}
bool ProjectFilesEditor::duplicateSupported() const
src/plugins/genericprojectmanager/genericprojectfileseditor.h
+1 -1
View File
@@ -80,7 +80,7 @@ class ProjectFilesEditor : public TextEditor::BaseTextEditor
public:
ProjectFilesEditor(ProjectFilesEditorWidget *editorWidget);
virtual QString id() const;
virtual Core::Id id() const;
virtual bool duplicateSupported() const;
virtual Core::IEditor *duplicate(QWidget *parent);
virtual bool isTemporary() const { return false; }
src/plugins/git/gitclient.cpp
+9 -9
View File
@@ -348,7 +348,7 @@ VCSBase::VCSBaseEditorWidget *GitClient::findExistingVCSEditor(const char *regis
* (using the file's codec). Makes use of a dynamic property to find an
* existing instance and to reuse it (in case, say, 'git diff foo' is
* already open). */
VCSBase::VCSBaseEditorWidget *GitClient::createVCSEditor(const QString &id,
VCSBase::VCSBaseEditorWidget *GitClient::createVCSEditor(const Core::Id &id,
QString title,
// Source file or directory
const QString &source,
@@ -393,7 +393,7 @@ void GitClient::diff(const QString &workingDirectory,
const QStringList &stagedFileNames)
{
const QString binary = settings()->stringValue(GitSettings::binaryPathKey);
const QString editorId = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_ID);
const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID;
const QString title = tr("Git Diff");
VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("originalFileName", workingDirectory);
@@ -452,7 +452,7 @@ void GitClient::diff(const QString &workingDirectory,
const QStringList &diffArgs,
const QString &fileName)
{
const QString editorId = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_ID);
const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID;
const QString title = tr("Git Diff \"%1\"").arg(fileName);
const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, fileName);
@@ -482,7 +482,7 @@ void GitClient::diffBranch(const QString &workingDirectory,
const QStringList &diffArgs,
const QString &branchName)
{
const QString editorId = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_ID);
const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID;
const QString title = tr("Git Diff Branch \"%1\"").arg(branchName);
const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, QStringList());
@@ -535,7 +535,7 @@ void GitClient::graphLog(const QString &workingDirectory, const QString & branch
title = tr("Git Log \"%1\"").arg(branch);
arguments << branch;
}
const QString editorId = QLatin1String(Git::Constants::GIT_LOG_EDITOR_ID);
const Core::Id editorId = Git::Constants::GIT_LOG_EDITOR_ID;
const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, QStringList());
VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("logFileName", sourceFile);
if (!editor)
@@ -560,7 +560,7 @@ void GitClient::log(const QString &workingDirectory, const QStringList &fileName
const QString msgArg = fileNames.empty() ? workingDirectory :
fileNames.join(QString(", "));
const QString title = tr("Git Log \"%1\"").arg(msgArg);
const QString editorId = QLatin1String(Git::Constants::GIT_LOG_EDITOR_ID);
const Core::Id editorId = Git::Constants::GIT_LOG_EDITOR_ID;
const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, fileNames);
VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("logFileName", sourceFile);
if (!editor)
@@ -592,7 +592,7 @@ void GitClient::show(const QString &source, const QString &id, const QStringList
}
const QString title = tr("Git Show \"%1\"").arg(id);
const QString editorId = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_ID);
const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID;
VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("show", id);
if (!editor)
editor = createVCSEditor(editorId, title, source, CodecLogOutput, "show", id,
@@ -634,7 +634,7 @@ void GitClient::blame(const QString &workingDirectory,
const QString &revision,
int lineNumber)
{
const QString editorId = QLatin1String(Git::Constants::GIT_BLAME_EDITOR_ID);
const Core::Id editorId = Git::Constants::GIT_BLAME_EDITOR_ID;
const QString id = VCSBase::VCSBaseEditorWidget::getTitleId(workingDirectory, QStringList(fileName), revision);
const QString title = tr("Git Blame \"%1\"").arg(id);
const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, fileName);
@@ -1956,7 +1956,7 @@ void GitClient::subversionLog(const QString &workingDirectory)
// Create a command editor, no highlighting or interaction.
const QString title = tr("Git SVN Log");
const QString editorId = QLatin1String(Git::Constants::C_GIT_COMMAND_LOG_EDITOR);
const Core::Id editorId = Git::Constants::C_GIT_COMMAND_LOG_EDITOR;
const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, QStringList());
VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("svnLog", sourceFile);
if (!editor)
src/plugins/git/gitclient.h
+1 -1
View File
@@ -236,7 +236,7 @@ private:
VCSBase::VCSBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const;
enum CodecType { CodecSource, CodecLogOutput, CodecNone };
VCSBase::VCSBaseEditorWidget *createVCSEditor(const QString &kind,
VCSBase::VCSBaseEditorWidget *createVCSEditor(const Core::Id &kind,
QString title,
const QString &source,
CodecType codecType,
src/plugins/git/gitplugin.cpp
+39 -40
View File
@@ -194,7 +194,7 @@ static Core::Command *createSeparator(Core::ActionManager *am,
ParameterActionCommandPair
GitPlugin::createParameterAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const QString &id, const Core::Context &context,
const Core::Id &id, const Core::Context &context,
bool addToLocator)
{
Utils::ParameterAction *action = new Utils::ParameterAction(defaultText, parameterText,
@@ -212,7 +212,7 @@ ParameterActionCommandPair
ParameterActionCommandPair
GitPlugin::createFileAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const QString &id, const Core::Context &context, bool addToLocator,
const Core::Id &id, const Core::Context &context, bool addToLocator,
const char *pluginSlot)
{
const ParameterActionCommandPair rc = createParameterAction(am, ac, defaultText, parameterText, id, context, addToLocator);
@@ -225,7 +225,7 @@ ParameterActionCommandPair
ParameterActionCommandPair
GitPlugin::createProjectAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const QString &id, const Core::Context &context, bool addToLocator,
const Core::Id &id, const Core::Context &context, bool addToLocator,
const char *pluginSlot)
{
const ParameterActionCommandPair rc = createParameterAction(am, ac, defaultText, parameterText, id, context, addToLocator);
@@ -237,7 +237,7 @@ ParameterActionCommandPair
// Create an action to act on the repository
ActionCommandPair
GitPlugin::createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &text, const QString &id,
const QString &text, const Core::Id &id,
const Core::Context &context, bool addToLocator)
{
QAction *action = new QAction(text, this);
@@ -252,7 +252,7 @@ ActionCommandPair
// Create an action to act on the repository with slot
ActionCommandPair
GitPlugin::createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &text, const QString &id,
const QString &text, const Core::Id &id,
const Core::Context &context, bool addToLocator,
const char *pluginSlot)
{
@@ -265,7 +265,7 @@ ActionCommandPair
// taking the directory. Store the member function as data on the action.
ActionCommandPair
GitPlugin::createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &text, const QString &id,
const QString &text, const Core::Id &id,
const Core::Context &context, bool addToLocator,
GitClientMemberFunc func)
{
@@ -317,8 +317,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
Core::ActionContainer *toolsContainer =
actionManager->actionContainer(Core::Constants::M_TOOLS);
Core::ActionContainer *gitContainer =
actionManager->createMenu(description);
Core::ActionContainer *gitContainer = actionManager->createMenu("Git");
gitContainer->menu()->setTitle(tr("&Git"));
toolsContainer->addMenu(gitContainer);
m_menuAction = gitContainer->menu()->menuAction();
@@ -326,21 +325,21 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
ParameterActionCommandPair parameterActionCommand
= createFileAction(actionManager, gitContainer,
tr("Blame Current File"), tr("Blame for \"%1\""),
QLatin1String("Git.Blame"),
Core::Id("Git.Blame"),
globalcontext, true, SLOT(blameFile()));
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+B")));
parameterActionCommand
= createFileAction(actionManager, gitContainer,
tr("Diff Current File"), tr("Diff of \"%1\""),
QLatin1String("Git.Diff"), globalcontext, true,
Core::Id("Git.Diff"), globalcontext, true,
SLOT(diffCurrentFile()));
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+D")));
parameterActionCommand
= createFileAction(actionManager, gitContainer,
tr("Log Current File"), tr("Log of \"%1\""),
QLatin1String("Git.Log"), globalcontext, true, SLOT(logFile()));
Core::Id("Git.Log"), globalcontext, true, SLOT(logFile()));
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+L")));
@@ -350,24 +349,24 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
parameterActionCommand
= createFileAction(actionManager, gitContainer,
tr("Stage File for Commit"), tr("Stage \"%1\" for Commit"),
QLatin1String("Git.Stage"), globalcontext, true, SLOT(stageFile()));
Core::Id("Git.Stage"), globalcontext, true, SLOT(stageFile()));
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+A")));
parameterActionCommand
= createFileAction(actionManager, gitContainer,
tr("Unstage File from Commit"), tr("Unstage \"%1\" from Commit"),
QLatin1String("Git.Unstage"), globalcontext, true, SLOT(unstageFile()));
Core::Id("Git.Unstage"), globalcontext, true, SLOT(unstageFile()));
parameterActionCommand
= createFileAction(actionManager, gitContainer,
tr("Undo Unstaged Changes"), tr("Undo Unstaged Changes for \"%1\""),
QLatin1String("Git.UndoUnstaged"), globalcontext,
Core::Id("Git.UndoUnstaged"), globalcontext,
true, SLOT(undoUnstagedFileChanges()));
parameterActionCommand
= createFileAction(actionManager, gitContainer,
tr("Undo Uncommitted Changes"), tr("Undo Uncommitted Changes for \"%1\""),
QLatin1String("Git.Undo"), globalcontext,
Core::Id("Git.Undo"), globalcontext,
true, SLOT(undoFileChanges()));
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
@@ -378,7 +377,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
parameterActionCommand
= createProjectAction(actionManager, gitContainer,
tr("Diff Current Project"), tr("Diff Project \"%1\""),
QLatin1String("Git.DiffProject"),
Core::Id("Git.DiffProject"),
globalcontext, true,
SLOT(diffCurrentProject()));
parameterActionCommand.second->setDefaultKeySequence(QKeySequence("Alt+G,Alt+Shift+D"));
@@ -386,14 +385,14 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
parameterActionCommand
= createProjectAction(actionManager, gitContainer,
tr("Log Project"), tr("Log Project \"%1\""),
QLatin1String("Git.LogProject"), globalcontext, true,
Core::Id("Git.LogProject"), globalcontext, true,
SLOT(logProject()));
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+K")));
parameterActionCommand
= createProjectAction(actionManager, gitContainer,
tr("Clean Project..."), tr("Clean Project \"%1\"..."),
QLatin1String("Git.CleanProject"), globalcontext,
Core::Id("Git.CleanProject"), globalcontext,
true, SLOT(cleanProject()));
@@ -401,24 +400,24 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Repository"), this));
createRepositoryAction(actionManager, gitContainer,
tr("Diff"), QLatin1String("Git.DiffRepository"),
tr("Diff"), Core::Id("Git.DiffRepository"),
globalcontext, true, SLOT(diffRepository()));
createRepositoryAction(actionManager, gitContainer,
tr("Log"), QLatin1String("Git.LogRepository"),
tr("Log"), Core::Id("Git.LogRepository"),
globalcontext, true, &GitClient::graphLog);
createRepositoryAction(actionManager, gitContainer,
tr("Status"), QLatin1String("Git.StatusRepository"),
tr("Status"), Core::Id("Git.StatusRepository"),
globalcontext, true, &GitClient::status);
createRepositoryAction(actionManager, gitContainer,
tr("Undo Uncommited Changes..."), QLatin1String("Git.UndoRepository"),
tr("Undo Uncommited Changes..."), Core::Id("Git.UndoRepository"),
globalcontext, false, SLOT(undoRepositoryChanges()));
createRepositoryAction(actionManager, gitContainer,
tr("Clean..."), QLatin1String("Git.CleanRepository"),
tr("Clean..."), Core::Id("Git.CleanRepository"),
globalcontext, true, SLOT(cleanRepository()));
m_createRepositoryAction = new QAction(tr("Create Repository..."), this);
@@ -430,15 +429,15 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Info"), this));
createRepositoryAction(actionManager, gitContainer,
tr("Launch gitk"), QLatin1String("Git.LaunchGitK"),
tr("Launch gitk"), Core::Id("Git.LaunchGitK"),
globalcontext, true, &GitClient::launchGitK);
createRepositoryAction(actionManager, gitContainer,
tr("Branches..."), QLatin1String("Git.BranchList"),
tr("Branches..."), Core::Id("Git.BranchList"),
globalcontext, true, SLOT(branchList()));
createRepositoryAction(actionManager, gitContainer,
tr("Remotes..."), QLatin1String("Git.RemoteList"),
tr("Remotes..."), Core::Id("Git.RemoteList"),
globalcontext, false, SLOT(remoteList()));
m_showAction = new QAction(tr("Show Commit..."), this);
@@ -458,14 +457,14 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
parameterActionCommand =
createParameterAction(actionManager, patchMenu,
tr("Apply from Editor"), tr("Apply \"%1\""),
QLatin1String("Git.ApplyCurrentFilePatch"),
Core::Id("Git.ApplyCurrentFilePatch"),
globalcontext, true);
m_applyCurrentFilePatchAction = parameterActionCommand.first;
connect(m_applyCurrentFilePatchAction, SIGNAL(triggered()), this,
SLOT(applyCurrentFilePatch()));
createRepositoryAction(actionManager, patchMenu,
tr("Apply from File..."), QLatin1String("Git.ApplyPatch"),
tr("Apply from File..."), Core::Id("Git.ApplyPatch"),
globalcontext, true, SLOT(promptApplyPatch()));
Core::ActionContainer *stashMenu = actionManager->createMenu(Core::Id("Git.StashMenu"));
@@ -473,26 +472,26 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->addMenu(stashMenu);
createRepositoryAction(actionManager, stashMenu,
tr("Stashes..."), QLatin1String("Git.StashList"),
tr("Stashes..."), Core::Id("Git.StashList"),
globalcontext, false, SLOT(stashList()));
stashMenu->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.StashMenuPush"), this));
ActionCommandPair actionCommand =
createRepositoryAction(actionManager, stashMenu,
tr("Stash"), QLatin1String("Git.Stash"),
tr("Stash"), Core::Id("Git.Stash"),
globalcontext, true, SLOT(stash()));
actionCommand.first->setToolTip(tr("Saves the current state of your work and resets the repository."));
actionCommand = createRepositoryAction(actionManager, stashMenu,
tr("Take Snapshot..."), QLatin1String("Git.StashSnapshot"),
tr("Take Snapshot..."), Core::Id("Git.StashSnapshot"),
globalcontext, true, SLOT(stashSnapshot()));
actionCommand.first->setToolTip(tr("Saves the current state of your work."));
stashMenu->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.StashMenuPop"), this));
actionCommand = createRepositoryAction(actionManager, stashMenu,
tr("Stash Pop"), QLatin1String("Git.StashPop"),
tr("Stash Pop"), Core::Id("Git.StashPop"),
globalcontext, true, &GitClient::stashPop);
actionCommand.first->setToolTip(tr("Restores changes saved to the stash list using \"Stash\"."));
@@ -501,11 +500,11 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->addMenu(subversionMenu);
createRepositoryAction(actionManager, subversionMenu,
tr("Log"), QLatin1String("Git.Subversion.Log"),
tr("Log"), Core::Id("Git.Subversion.Log"),
globalcontext, false, &GitClient::subversionLog);
createRepositoryAction(actionManager, subversionMenu,
tr("Fetch"), QLatin1String("Git.Subversion.Fetch"),
tr("Fetch"), Core::Id("Git.Subversion.Fetch"),
globalcontext, false, &GitClient::synchronousSubversionFetch);
gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.PushPull"), this));
@@ -513,24 +512,24 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Global"), this));
createRepositoryAction(actionManager, gitContainer,
tr("Fetch"), QLatin1String("Git.Fetch"),
tr("Fetch"), Core::Id("Git.Fetch"),
globalcontext, true, SLOT(fetch()));
createRepositoryAction(actionManager, gitContainer,
tr("Pull"), QLatin1String("Git.Pull"),
tr("Pull"), Core::Id("Git.Pull"),
globalcontext, true, SLOT(pull()));
actionCommand = createRepositoryAction(actionManager, gitContainer,
tr("Push"), QLatin1String("Git.Push"),
tr("Push"), Core::Id("Git.Push"),
globalcontext, true, SLOT(push()));
actionCommand = createRepositoryAction(actionManager, gitContainer,
tr("Commit..."), QLatin1String("Git.Commit"),
tr("Commit..."), Core::Id("Git.Commit"),
globalcontext, true, SLOT(startCommit()));
actionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+C")));
createRepositoryAction(actionManager, gitContainer,
tr("Amend Last Commit..."), QLatin1String("Git.AmendCommit"),
tr("Amend Last Commit..."), Core::Id("Git.AmendCommit"),
globalcontext, true, SLOT(startAmendCommit()));
// Subversion in a submenu.
@@ -542,7 +541,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
for (int i = 0; i < count; i++) {
Core::Command *tCommand
= actionManager->registerAction(snapShotActions.at(i),
QString(QLatin1String("Git.Snapshot.") + QString::number(i)),
Core::Id(QLatin1String("Git.Snapshot.") + QString::number(i)),
globalcontext);
gitContainer->addAction(tCommand);
}
src/plugins/git/gitplugin.h
+7 -7
View File
@@ -143,35 +143,35 @@ private:
inline ParameterActionCommandPair
createParameterAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const QString &id, const Core::Context &context, bool addToLocator);
const Core::Id &id, const Core::Context &context, bool addToLocator);
inline ParameterActionCommandPair
createFileAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const QString &id, const Core::Context &context, bool addToLocator,
const Core::Id &id, const Core::Context &context, bool addToLocator,
const char *pluginSlot);
inline ParameterActionCommandPair
createProjectAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const QString &id, const Core::Context &context, bool addToLocator);
const Core::Id &id, const Core::Context &context, bool addToLocator);
inline ParameterActionCommandPair
createProjectAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const QString &id, const Core::Context &context, bool addToLocator,
const Core::Id &id, const Core::Context &context, bool addToLocator,
const char *pluginSlot);
inline ActionCommandPair createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &text, const QString &id,
const QString &text, const Core::Id &id,
const Core::Context &context, bool addToLocator);
inline ActionCommandPair createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &text, const QString &id,
const QString &text, const Core::Id &id,
const Core::Context &context,
bool addToLocator, const char *pluginSlot);
inline ActionCommandPair createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
const QString &text, const QString &id,
const QString &text, const Core::Id &id,
const Core::Context &context,
bool addToLocator, GitClientMemberFunc);
src/plugins/glsleditor/glslcompletionassist.cpp
+2 -2
View File
@@ -122,9 +122,9 @@ bool checkStartOfIdentifier(const QString &word)
// ----------------------------
// GLSLCompletionAssistProvider
// ----------------------------
bool GLSLCompletionAssistProvider::supportsEditor(const QString &editorId) const
bool GLSLCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
{
return editorId == QLatin1String(Constants::C_GLSLEDITOR_ID);
return editorId == Core::Id(Constants::C_GLSLEDITOR_ID);
}
IAssistProcessor *GLSLCompletionAssistProvider::createProcessor() const
src/plugins/glsleditor/glslcompletionassist.h
+1 -1
View File
@@ -59,7 +59,7 @@ class GLSLCompletionAssistInterface;
class GLSLCompletionAssistProvider : public TextEditor::CompletionAssistProvider
{
public:
virtual bool supportsEditor(const QString &editorId) const;
virtual bool supportsEditor(const Core::Id &editorId) const;
virtual TextEditor::IAssistProcessor *createProcessor() const;
virtual int activationCharSequenceLength() const;
src/plugins/glsleditor/glsleditor.cpp
+2 -2
View File
@@ -201,9 +201,9 @@ Core::IEditor *GLSLEditorEditable::duplicate(QWidget *parent)
return newEditor->editor();
}
QString GLSLEditorEditable::id() const
Core::Id GLSLEditorEditable::id() const
{
return QLatin1String(GLSLEditor::Constants::C_GLSLEDITOR_ID);
return GLSLEditor::Constants::C_GLSLEDITOR_ID;
}
bool GLSLEditorEditable::open(QString *errorString, const QString &fileName, const QString &realFileName)
src/plugins/glsleditor/glsleditoreditable.h
+3 -3
View File
@@ -49,10 +49,10 @@ public:
bool duplicateSupported() const { return true; }
Core::IEditor *duplicate(QWidget *parent);
QString id() const;
Core::Id id() const;
bool isTemporary() const { return false; }
virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName);
virtual QString preferredModeType() const;
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
QString preferredModeType() const;
};
} // namespace Internal
src/plugins/glsleditor/glsleditorplugin.cpp
+2 -3
View File
@@ -240,12 +240,11 @@ void GLSLEditorPlugin::initializeEditor(GLSLEditor::GLSLTextEditorWidget *editor
TextEditor::TextEditorSettings::instance()->initializeEditor(editor);
}
Core::Command *GLSLEditorPlugin::addToolAction(QAction *a, Core::ActionManager *am,
Core::Context &context, const QString &name,
Core::Context &context, const Core::Id &id,
Core::ActionContainer *c1, const QString &keySequence)
{
Core::Command *command = am->registerAction(a, name, context);
Core::Command *command = am->registerAction(a, id, context);
if (!keySequence.isEmpty())
command->setDefaultKeySequence(QKeySequence(keySequence));
c1->addAction(command);
src/plugins/glsleditor/glsleditorplugin.h
+3 -1
View File
@@ -35,6 +35,7 @@
#include <extensionsystem/iplugin.h>
#include <coreplugin/icontext.h>
#include <coreplugin/id.h>
#include <QtCore/QPointer>
#include <glsl/glsl.h>
@@ -105,7 +106,8 @@ private:
QByteArray glslFile(const QString &fileName);
void parseGlslFile(const QString &fileName, InitFile *initFile);
Core::Command *addToolAction(QAction *a, Core::ActionManager *am, Core::Context &context, const QString &name,
// FIXME: Unused?
Core::Command *addToolAction(QAction *a, Core::ActionManager *am, Core::Context &context, const Core::Id &name,
Core::ActionContainer *c1, const QString &keySequence);
static GLSLEditorPlugin *m_instance;
src/plugins/imageviewer/imageviewer.cpp
+2 -2
View File
@@ -136,9 +136,9 @@ Core::IFile *ImageViewer::file()
return d->file;
}
QString ImageViewer::id() const
Core::Id ImageViewer::id() const
{
return QLatin1String(Constants::IMAGEVIEWER_ID);
return Core::Id(Constants::IMAGEVIEWER_ID);
}
QString ImageViewer::displayName() const
src/plugins/imageviewer/imageviewer.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
bool createNew(const QString &contents = QString());
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
Core::IFile *file();
QString id() const;
Core::Id id() const;
QString displayName() const;
void setDisplayName(const QString &title);
src/plugins/locator/basefilefilter.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ QList<FilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Locator::FilterEn
void BaseFileFilter::accept(Locator::FilterEntry selection) const
{
Core::EditorManager *em = Core::EditorManager::instance();
em->openEditor(selection.internalData.toString(), QString(), Core::EditorManager::ModeSwitch);
em->openEditor(selection.internalData.toString(), Id(), Core::EditorManager::ModeSwitch);
}
void BaseFileFilter::generateFileNames()
src/plugins/locator/filesystemfilter.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ void FileSystemFilter::accept(FilterEntry selection) const
m_locatorWidget->show(value, value.length());
return;
}
m_editorManager->openEditor(selection.internalData.toString(), QString(),
m_editorManager->openEditor(selection.internalData.toString(), Id(),
Core::EditorManager::ModeSwitch);
}
src/plugins/locator/locatorwidget.cpp
+2 -2
View File
@@ -362,7 +362,7 @@ void LocatorWidget::updateFilterList()
foreach (ILocatorFilter *filter, m_locatorPlugin->filters()) {
if (filter->shortcutString().isEmpty() || filter->isHidden())
continue;
QString locatorId = QLatin1String("Locator.") + filter->id();
Core::Id locatorId = Core::Id(QLatin1String("Locator.") + filter->id());
QAction *action = 0;
Core::Command *cmd = 0;
if (!actionCopy.contains(filter->id())) {
@@ -384,7 +384,7 @@ void LocatorWidget::updateFilterList()
// unregister actions that are deleted now
foreach (const QString &id, actionCopy.keys()) {
am->unregisterAction(actionCopy.value(id), QString(QLatin1String("Locator.") + id));
am->unregisterAction(actionCopy.value(id), Core::Id(QLatin1String("Locator.") + id));
}
qDeleteAll(actionCopy);
src/plugins/macros/actionmacrohandler.cpp
+5 -5
View File
@@ -89,7 +89,7 @@ bool ActionMacroHandler::executeEvent(const MacroEvent &macroEvent)
const Core::ICore *core = Core::ICore::instance();
const Core::ActionManager *am = core->actionManager();
QAction *action = am->command(macroEvent.value(ACTIONNAME).toString())->action();
QAction *action = am->command(Core::Id(macroEvent.value(ACTIONNAME).toString()))->action();
if (!action)
return false;
@@ -104,7 +104,7 @@ void ActionMacroHandler::addActionEvent(const QString &id)
const Core::ICore *core = Core::ICore::instance();
const Core::ActionManager *am = core->actionManager();
const Core::Command *cmd = am->command(id);
const Core::Command *cmd = am->command(Core::Id(id));
if (cmd->isScriptable(cmd->context())) {
MacroEvent e;
e.setId(EVENTNAME);
@@ -119,13 +119,13 @@ void ActionMacroHandler::registerCommand(const QString &id)
m_commandIds.insert(id);
const Core::ICore *core = Core::ICore::instance();
const Core::ActionManager *am = core->actionManager();
QAction* action = am->command(id)->action();
QAction* action = am->command(Core::Id(id))->action();
if (action) {
connect(action, SIGNAL(triggered()), m_mapper, SLOT(map()));
m_mapper->setMapping(action, id);
return;
}
QShortcut* shortcut = am->command(id)->shortcut();
QShortcut* shortcut = am->command(Core::Id(id))->shortcut();
if (shortcut) {
connect(shortcut, SIGNAL(activated()), m_mapper, SLOT(map()));
m_mapper->setMapping(shortcut, id);
@@ -137,6 +137,6 @@ void ActionMacroHandler::addCommand(const QString &id)
{
const Core::ICore *core = Core::ICore::instance();
const Core::ActionManager *am = core->actionManager();
if (am->command(id)->isScriptable())
if (am->command(Core::Id(id))->isScriptable())
registerCommand(id);
}
src/plugins/macros/macromanager.cpp
+1 -1
View File
@@ -167,7 +167,7 @@ void MacroManager::MacroManagerPrivate::addMacro(Macro *macro)
Core::ActionManager *am = core->actionManager();
QShortcut *shortcut = new QShortcut(core->mainWindow());
shortcut->setWhatsThis(macro->description());
const QString macroId = QLatin1String(Constants::PREFIX_MACRO) + macro->displayName();
const Core::Id macroId(QLatin1String(Constants::PREFIX_MACRO) + macro->displayName());
am->registerShortcut(shortcut, macroId, context);
connect(shortcut, SIGNAL(activated()), mapper, SLOT(map()));
mapper->setMapping(shortcut, macro->displayName());
src/plugins/madde/maemopackagecreationwidget.cpp
+1 -1
View File
@@ -275,7 +275,7 @@ void MaemoPackageCreationWidget::editSpecFile()
void MaemoPackageCreationWidget::editFile(const QString &filePath)
{
Core::EditorManager::instance()->openEditor(filePath, QString(),
Core::EditorManager::instance()->openEditor(filePath, Core::Id(),
Core::EditorManager::ModeSwitch);
}
src/plugins/perforce/perforceplugin.cpp
+3 -2
View File
@@ -1193,9 +1193,10 @@ Core::IEditor * PerforcePlugin::showOutputInEditor(const QString& title, const Q
{
const VCSBase::VCSBaseEditorParameters *params = findType(editorType);
QTC_ASSERT(params, return 0);
const QString id = params->id;
const Core::Id id(params->id);
if (Perforce::Constants::debug)
qDebug() << "PerforcePlugin::showOutputInEditor" << title << id << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
qDebug() << "PerforcePlugin::showOutputInEditor" << title << id.name()
<< "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(id, &s, output);
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
src/plugins/projectexplorer/foldernavigationwidget.cpp
+1 -1
View File
@@ -272,7 +272,7 @@ void FolderNavigationWidget::openItem(const QModelIndex &srcIndex)
}
// Open file.
Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->openEditor(m_fileSystemModel->filePath(srcIndex), QString(), Core::EditorManager::ModeSwitch);
editorManager->openEditor(m_fileSystemModel->filePath(srcIndex), Core::Id(), Core::EditorManager::ModeSwitch);
}
void FolderNavigationWidget::setCurrentTitle(QString dirName, const QString &fullPath)
src/plugins/projectexplorer/projectexplorer.cpp
+1 -1
View File
@@ -2612,7 +2612,7 @@ void ProjectExplorerPlugin::openFile()
{
QTC_ASSERT(d->m_currentNode, return)
Core::EditorManager *em = Core::EditorManager::instance();
em->openEditor(d->m_currentNode->path(), QString(), Core::EditorManager::ModeSwitch);
em->openEditor(d->m_currentNode->path(), Core::Id(), Core::EditorManager::ModeSwitch);
}
void ProjectExplorerPlugin::searchOnFileSystem()
src/plugins/qmljseditor/qmljscompletionassist.cpp
+2 -2
View File
@@ -429,9 +429,9 @@ int FunctionHintProposalModel::activeArgument(const QString &prefix) const
// -----------------------------
// QmlJSCompletionAssistProvider
// -----------------------------
bool QmlJSCompletionAssistProvider::supportsEditor(const QString &editorId) const
bool QmlJSCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
{
return editorId == QLatin1String(Constants::C_QMLJSEDITOR_ID);
return editorId == Core::Id(Constants::C_QMLJSEDITOR_ID);
}
int QmlJSCompletionAssistProvider::activationCharSequenceLength() const
src/plugins/qmljseditor/qmljscompletionassist.h
+1 -1
View File
@@ -80,7 +80,7 @@ public:
class QmlJSCompletionAssistProvider : public TextEditor::CompletionAssistProvider
{
public:
virtual bool supportsEditor(const QString &editorId) const;
virtual bool supportsEditor(const Core::Id &editorId) const;
virtual TextEditor::IAssistProcessor *createProcessor() const;
virtual int activationCharSequenceLength() const;
src/plugins/qmljseditor/qmljseditor.cpp
+2 -2
View File
@@ -787,9 +787,9 @@ Core::IEditor *QmlJSEditorEditable::duplicate(QWidget *parent)
return newEditor->editor();
}
QString QmlJSEditorEditable::id() const
Core::Id QmlJSEditorEditable::id() const
{
return QLatin1String(QmlJSEditor::Constants::C_QMLJSEDITOR_ID);
return QmlJSEditor::Constants::C_QMLJSEDITOR_ID;
}
bool QmlJSEditorEditable::open(QString *errorString, const QString &fileName, const QString &realFileName)
src/plugins/qmljseditor/qmljseditoreditable.h
+3 -3
View File
@@ -48,10 +48,10 @@ public:
bool duplicateSupported() const { return true; }
Core::IEditor *duplicate(QWidget *parent);
QString id() const;
Core::Id id() const;
bool isTemporary() const { return false; }
virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName);
virtual QString preferredModeType() const;
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
QString preferredModeType() const;
void setTextCodec(QTextCodec *codec, TextCodecReason = TextCodecOtherReason);
};
src/plugins/qmljseditor/qmljseditorplugin.cpp
+2 -2
View File
@@ -310,10 +310,10 @@ void QmlJSEditorPlugin::showContextPane()
}
Core::Command *QmlJSEditorPlugin::addToolAction(QAction *a, Core::ActionManager *am,
Core::Context &context, const QString &name,
Core::Context &context, const Core::Id &id,
Core::ActionContainer *c1, const QString &keySequence)
{
Core::Command *command = am->registerAction(a, name, context);
Core::Command *command = am->registerAction(a, id, context);
if (!keySequence.isEmpty())
command->setDefaultKeySequence(QKeySequence(keySequence));
c1->addAction(command);
src/plugins/qmljseditor/qmljseditorplugin.h
+2 -2
View File
@@ -35,10 +35,10 @@
#include <extensionsystem/iplugin.h>
#include <coreplugin/icontext.h>
#include <coreplugin/id.h>
#include <QtCore/QPointer>
QT_FORWARD_DECLARE_CLASS(QAction)
QT_FORWARD_DECLARE_CLASS(QTimer)
namespace TextEditor {
class TextEditorActionHandler;
@@ -102,7 +102,7 @@ private Q_SLOTS:
void runSemanticScan();
private:
Core::Command *addToolAction(QAction *a, Core::ActionManager *am, Core::Context &context, const QString &name,
Core::Command *addToolAction(QAction *a, Core::ActionManager *am, Core::Context &context, const Core::Id &id,
Core::ActionContainer *c1, const QString &keySequence);
static QmlJSEditorPlugin *m_instance;
src/plugins/qmljseditor/qmljsfindreferences.cpp
+2 -2
View File
@@ -971,10 +971,10 @@ void FindReferences::openEditor(const Find::SearchResultItem &item)
{
if (item.path.size() > 0) {
TextEditor::BaseTextEditorWidget::openEditorAt(item.path.first(), item.lineNumber, item.textMarkPos,
QString(),
Core::Id(),
Core::EditorManager::ModeSwitch);
} else {
Core::EditorManager::instance()->openEditor(item.text, QString(), Core::EditorManager::ModeSwitch);
Core::EditorManager::instance()->openEditor(item.text, Core::Id(), Core::EditorManager::ModeSwitch);
}
}
src/plugins/qmljseditor/qmljsquickfixassist.cpp
+2 -2
View File
@@ -96,9 +96,9 @@ QmlJSQuickFixAssistProvider::QmlJSQuickFixAssistProvider()
QmlJSQuickFixAssistProvider::~QmlJSQuickFixAssistProvider()
{}
bool QmlJSQuickFixAssistProvider::supportsEditor(const QString &editorId) const
bool QmlJSQuickFixAssistProvider::supportsEditor(const Core::Id &editorId) const
{
return editorId == QLatin1String(Constants::C_QMLJSEDITOR_ID);
return editorId == Core::Id(Constants::C_QMLJSEDITOR_ID);
}
IAssistProcessor *QmlJSQuickFixAssistProvider::createProcessor() const
src/plugins/qmljseditor/qmljsquickfixassist.h
+1 -1
View File
@@ -80,7 +80,7 @@ public:
QmlJSQuickFixAssistProvider();
virtual ~QmlJSQuickFixAssistProvider();
virtual bool supportsEditor(const QString &editorId) const;
virtual bool supportsEditor(const Core::Id &editorId) const;
virtual TextEditor::IAssistProcessor *createProcessor() const;
virtual QList<TextEditor::QuickFixFactory *> quickFixFactories() const;
src/plugins/qmljstools/qmljsfunctionfilter.cpp
+1 -1
View File
@@ -114,5 +114,5 @@ void FunctionFilter::accept(Locator::FilterEntry selection) const
{
const LocatorData::Entry entry = qvariant_cast<LocatorData::Entry>(selection.internalData);
TextEditor::BaseTextEditorWidget::openEditorAt(entry.fileName, entry.line, entry.column,
QString(), Core::EditorManager::ModeSwitch);
Core::Id(), Core::EditorManager::ModeSwitch);
}
src/plugins/qt4projectmanager/profilecompletionassist.cpp
+2 -2
View File
@@ -109,9 +109,9 @@ ProFileCompletionAssistProvider::ProFileCompletionAssistProvider()
ProFileCompletionAssistProvider::~ProFileCompletionAssistProvider()
{}
bool ProFileCompletionAssistProvider::supportsEditor(const QString &editorId) const
bool ProFileCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
{
return editorId == QLatin1String(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
return editorId == Core::Id(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
}
bool ProFileCompletionAssistProvider::isAsynchronous() const
src/plugins/qt4projectmanager/profilecompletionassist.h
+1 -1
View File
@@ -61,7 +61,7 @@ public:
ProFileCompletionAssistProvider();
virtual ~ProFileCompletionAssistProvider();
virtual bool supportsEditor(const QString &editorId) const;
virtual bool supportsEditor(const Core::Id &editorId) const;
virtual TextEditor::IAssistProcessor *createProcessor() const;
virtual bool isAsynchronous() const;
src/plugins/qt4projectmanager/profileeditor.cpp
+2 -2
View File
@@ -74,9 +74,9 @@ Core::IEditor *ProFileEditor::duplicate(QWidget *parent)
return ret->editor();
}
QString ProFileEditor::id() const
Core::Id ProFileEditor::id() const
{
return QLatin1String(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
return Qt4ProjectManager::Constants::PROFILE_EDITOR_ID;
}
//
src/plugins/qt4projectmanager/profileeditor.h
+1 -1
View File
@@ -63,7 +63,7 @@ public:
bool duplicateSupported() const { return true; }
Core::IEditor *duplicate(QWidget *parent);
QString id() const;
Core::Id id() const;
bool isTemporary() const { return false; }
};
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+1 -1
View File
@@ -281,7 +281,7 @@ bool AbstractMobileAppWizard::postGenerateFiles(const QWizard *w,
if (success) {
const QString fileToOpen = fileToOpenPostGeneration();
if (!fileToOpen.isEmpty()) {
Core::EditorManager::instance()->openEditor(fileToOpen, QString(), Core::EditorManager::ModeSwitch);
Core::EditorManager::instance()->openEditor(fileToOpen, Core::Id(), Core::EditorManager::ModeSwitch);
ProjectExplorer::ProjectExplorerPlugin::instance()->setCurrentFile(0, fileToOpen);
}
}
src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
+1 -1
View File
@@ -205,7 +205,7 @@ void RemoteLinuxDeployConfigurationWidget::openProjectFile()
return;
const DeployableFilesPerProFile * const proFileInfo =
d->deployConfiguration->deploymentInfo()->modelAt(row);
Core::EditorManager::instance()->openEditor(proFileInfo->proFilePath(), QString(),
Core::EditorManager::instance()->openEditor(proFileInfo->proFilePath(), Core::Id(),
Core::EditorManager::ModeSwitch);
}
src/plugins/resourceeditor/resourceeditorw.cpp
+3 -2
View File
@@ -184,8 +184,9 @@ void ResourceEditorFile::rename(const QString &newName)
emit changed();
}
QString ResourceEditorW::id() const {
return QLatin1String(ResourceEditor::Constants::RESOURCEEDITOR_ID);
Core::Id ResourceEditorW::id() const
{
return Core::Id(ResourceEditor::Constants::RESOURCEEDITOR_ID);
}
QString ResourceEditorFile::fileName() const
src/plugins/resourceeditor/resourceeditorw.h
+1 -1
View File
@@ -90,7 +90,7 @@ public:
bool duplicateSupported() const { return false; }
Core::IEditor *duplicate(QWidget *) { return 0; }
Core::IFile *file() { return m_resourceFile; }
QString id() const;
Core::Id id() const;
QString displayName() const { return m_displayName; }
void setDisplayName(const QString &title) { m_displayName = title; emit changed(); }
QWidget *toolBar() { return 0; }
src/plugins/subversion/subversionplugin.cpp
+3 -2
View File
@@ -1168,9 +1168,10 @@ Core::IEditor * SubversionPlugin::showOutputInEditor(const QString& title, const
{
const VCSBase::VCSBaseEditorParameters *params = findType(editorType);
QTC_ASSERT(params, return 0);
const QString id = params->id;
const Core::Id id = params->id;
if (Subversion::Constants::debug)
qDebug() << "SubversionPlugin::showOutputInEditor" << title << id << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
qDebug() << "SubversionPlugin::showOutputInEditor" << title << id.name()
<< "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(id, &s, output);
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
src/plugins/texteditor/basefilefind.cpp
+2 -2
View File
@@ -288,10 +288,10 @@ void BaseFileFind::openEditor(const Find::SearchResultItem &item)
openedEditor = TextEditor::BaseTextEditorWidget::openEditorAt(QDir::fromNativeSeparators(item.path.first()),
item.lineNumber,
item.textMarkPos,
QString(),
Core::Id(),
Core::EditorManager::ModeSwitch);
} else {
openedEditor = Core::EditorManager::instance()->openEditor(item.text, QString(),
openedEditor = Core::EditorManager::instance()->openEditor(item.text, Core::Id(),
Core::EditorManager::ModeSwitch);
}
if (m_currentFindSupport)
src/plugins/texteditor/basetexteditor.cpp
+2 -2
View File
@@ -161,7 +161,7 @@ protected:
} // namespace TextEditor
Core::IEditor *BaseTextEditorWidget::openEditorAt(const QString &fileName, int line, int column,
const QString &editorKind,
const Core::Id &editorKind,
Core::EditorManager::OpenEditorFlags flags,
bool *newEditor)
{
@@ -4700,7 +4700,7 @@ bool BaseTextEditorWidget::openLink(const Link &link)
return true;
}
return openEditorAt(link.fileName, link.line, link.column, QString(),
return openEditorAt(link.fileName, link.line, link.column, Core::Id(),
Core::EditorManager::IgnoreNavigationHistory
| Core::EditorManager::ModeSwitch);
}
src/plugins/texteditor/basetexteditor.h
+1 -1
View File
@@ -132,7 +132,7 @@ public:
~BaseTextEditorWidget();
static Core::IEditor *openEditorAt(const QString &fileName, int line, int column = 0,
const QString &editorId = QString(),
const Core::Id &editorId = Core::Id(),
Core::EditorManager::OpenEditorFlags flags = Core::EditorManager::IgnoreNavigationHistory,
bool *newEditor = 0);
src/plugins/texteditor/codeassist/codeassistant.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ using namespace Internal;
namespace {
template <class T>
void filterEditorSpecificProviders(QList<T *> *providers, const QString &editorId)
void filterEditorSpecificProviders(QList<T *> *providers, const Core::Id &editorId)
{
typename QList<T *>::iterator it = providers->begin();
while (it != providers->end()) {
src/plugins/texteditor/codeassist/iassistprovider.cpp
-6
View File
@@ -52,12 +52,6 @@ using namespace TextEditor;
\sa IAssistProposal, IAssistProcessor
*/
IAssistProvider::IAssistProvider()
{}
IAssistProvider::~IAssistProvider()
{}
/*!
\fn bool TextEditor::IAssistProvider::supportsEditor(const QString &editorId) const
src/plugins/texteditor/codeassist/iassistprovider.h
+3 -3
View File
@@ -34,6 +34,7 @@
#define IASSISTPROVIDER_H
#include <texteditor/texteditor_global.h>
#include <coreplugin/id.h>
#include <QtCore/QObject>
@@ -46,10 +47,9 @@ class TEXTEDITOR_EXPORT IAssistProvider : public QObject
Q_OBJECT
public:
IAssistProvider();
virtual ~IAssistProvider();
IAssistProvider() {}
virtual bool supportsEditor(const QString &editorId) const = 0;
virtual bool supportsEditor(const Core::Id &editorId) const = 0;
virtual IAssistProcessor *createProcessor() const = 0;
};
src/plugins/texteditor/plaintexteditor.cpp
+2 -2
View File
@@ -92,9 +92,9 @@ Core::IEditor *PlainTextEditor::duplicate(QWidget *parent)
return newWidget->editor();
}
QString PlainTextEditor::id() const
Core::Id PlainTextEditor::id() const
{
return QLatin1String(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID);
return Core::Constants::K_DEFAULT_TEXT_EDITOR_ID;
}
void PlainTextEditorWidget::unCommentSelection()
src/plugins/texteditor/plaintexteditor.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
bool duplicateSupported() const { return true; }
Core::IEditor *duplicate(QWidget *parent);
bool isTemporary() const { return false; }
virtual QString id() const;
Core::Id id() const;
};
class TEXTEDITOR_EXPORT PlainTextEditorWidget : public BaseTextEditorWidget
src/plugins/texteditor/refactoringchanges.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ BaseTextEditorWidget *RefactoringChanges::openEditor(const QString &fileName, bo
column -= 1;
}
Core::IEditor *editor = BaseTextEditorWidget::openEditorAt(
fileName, line, column, QString(), flags);
fileName, line, column, Core::Id(), flags);
return qobject_cast<BaseTextEditorWidget *>(editor->widget());
}
src/plugins/texteditor/snippets/snippeteditor.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ SnippetEditor::SnippetEditor(SnippetEditorWidget *editor)
setContext(Core::Context(Constants::SNIPPET_EDITOR_ID, Constants::C_TEXTEDITOR));
}
QString SnippetEditor::id() const
Core::Id SnippetEditor::id() const
{
return Constants::SNIPPET_EDITOR_ID;
}
src/plugins/texteditor/snippets/snippeteditor.h
+1 -1
View File
@@ -54,7 +54,7 @@ public:
bool duplicateSupported() const { return false; }
Core::IEditor *duplicate(QWidget * /* parent */ ) { return 0; }
bool isTemporary() const { return false; }
virtual QString id() const;
Core::Id id() const;
};
class TEXTEDITOR_EXPORT SnippetEditorWidget : public BaseTextEditorWidget
src/plugins/texteditor/texteditoractionhandler.cpp
+11 -11
View File
@@ -134,17 +134,17 @@ void TextEditorActionHandler::initializeActions()
void TextEditorActionHandler::createActions()
{
m_undoAction = registerNewAction(QLatin1String(Core::Constants::UNDO), this, SLOT(undoAction()),
m_undoAction = registerNewAction(Core::Constants::UNDO, this, SLOT(undoAction()),
true, tr("&Undo"));
m_redoAction = registerNewAction(QLatin1String(Core::Constants::REDO), this, SLOT(redoAction()),
m_redoAction = registerNewAction(Core::Constants::REDO, this, SLOT(redoAction()),
true, tr("&Redo"));
m_copyAction = registerNewAction(QLatin1String(Core::Constants::COPY), this, SLOT(copyAction()), true);
m_cutAction = registerNewAction(QLatin1String(Core::Constants::CUT), this, SLOT(cutAction()), true);
m_pasteAction = registerNewAction(QLatin1String(Core::Constants::PASTE), this, SLOT(pasteAction()), true);
m_copyAction = registerNewAction(Core::Constants::COPY, this, SLOT(copyAction()), true);
m_cutAction = registerNewAction(Core::Constants::CUT, this, SLOT(cutAction()), true);
m_pasteAction = registerNewAction(Core::Constants::PASTE, this, SLOT(pasteAction()), true);
m_modifyingActions << m_pasteAction;
m_selectAllAction = registerNewAction(QLatin1String(Core::Constants::SELECTALL), this, SLOT(selectAllAction()), true);
m_gotoAction = registerNewAction(QLatin1String(Core::Constants::GOTO), this, SLOT(gotoAction()));
m_printAction = registerNewAction(QLatin1String(Core::Constants::PRINT), this, SLOT(printAction()));
m_selectAllAction = registerNewAction(Core::Constants::SELECTALL, this, SLOT(selectAllAction()), true);
m_gotoAction = registerNewAction(Core::Constants::GOTO, this, SLOT(gotoAction()));
m_printAction = registerNewAction(Core::Constants::PRINT, this, SLOT(printAction()));
Core::ActionManager *am = Core::ICore::instance()->actionManager();
@@ -434,12 +434,12 @@ void TextEditorActionHandler::createActions()
}
bool TextEditorActionHandler::supportsAction(const QString & /*id */) const
bool TextEditorActionHandler::supportsAction(const Core::Id & /*id */) const
{
return true;
}
QAction *TextEditorActionHandler::registerNewAction(const QString &id, bool scriptable, const QString &title)
QAction *TextEditorActionHandler::registerNewAction(const Core::Id &id, bool scriptable, const QString &title)
{
if (!supportsAction(id))
return 0;
@@ -449,7 +449,7 @@ QAction *TextEditorActionHandler::registerNewAction(const QString &id, bool scri
return result;
}
QAction *TextEditorActionHandler::registerNewAction(const QString &id,
QAction *TextEditorActionHandler::registerNewAction(const Core::Id &id,
QObject *receiver,
const char *slot,
bool scriptable,
src/plugins/texteditor/texteditoractionhandler.h
+4 -3
View File
@@ -36,6 +36,7 @@
#include "texteditor_global.h"
#include <coreplugin/icontext.h>
#include <coreplugin/id.h>
#include <QtCore/QObject>
#include <QtCore/QPointer>
@@ -80,15 +81,15 @@ public slots:
protected:
const QPointer<BaseTextEditorWidget> &currentEditor() const;
QAction *registerNewAction(const QString &id, bool scriptable=false, const QString &title = QString());
QAction *registerNewAction(const QString &id, QObject *receiver, const char *slot, bool scriptable = false,
QAction *registerNewAction(const Core::Id &id, bool scriptable = false, const QString &title = QString());
QAction *registerNewAction(const Core::Id &id, QObject *receiver, const char *slot, bool scriptable = false,
const QString &title = QString());
enum UpdateMode { ReadOnlyMode, WriteMode };
UpdateMode updateMode() const;
virtual void createActions();
virtual bool supportsAction(const QString &id) const;
virtual bool supportsAction(const Core::Id &id) const;
virtual void updateActions(UpdateMode um);
private slots:
src/plugins/vcsbase/basevcseditorfactory.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ struct BaseVCSEditorFactoryPrivate
BaseVCSEditorFactoryPrivate(const VCSBaseEditorParameters *t);
const VCSBaseEditorParameters *m_type;
const QString m_id;
const Core::Id m_id;
QString m_displayName;
const QStringList m_mimeTypes;
TextEditor::TextEditorActionHandler *m_editorHandler;
src/plugins/vcsbase/cleandialog.cpp
+1 -1
View File
@@ -266,7 +266,7 @@ void CleanDialog::slotDoubleClicked(const QModelIndex &index)
if (const QStandardItem *item = d->m_filesModel->itemFromIndex(index))
if (!item->data(isDirectoryRole).toBool()) {
const QString fname = item->data(fileNameRole).toString();
Core::EditorManager::instance()->openEditor(fname, QString(), Core::EditorManager::ModeSwitch);
Core::EditorManager::instance()->openEditor(fname, Core::Id(), Core::EditorManager::ModeSwitch);
}
}
src/plugins/vcsbase/vcsbaseclient.cpp
+1 -1
View File
@@ -574,7 +574,7 @@ VCSBase::VCSBaseEditorWidget *VCSBaseClient::createVCSEditor(const QString &kind
baseEditor = VCSBase::VCSBaseEditorWidget::getVcsBaseEditor(outputEditor);
QTC_ASSERT(baseEditor, return 0);
} else {
outputEditor = d->m_core->editorManager()->openEditorWithContents(kind, &title, progressMsg);
outputEditor = d->m_core->editorManager()->openEditorWithContents(Core::Id(kind), &title, progressMsg);
outputEditor->file()->setProperty(registerDynamicProperty, dynamicPropertyValue);
baseEditor = VCSBase::VCSBaseEditorWidget::getVcsBaseEditor(outputEditor);
connect(baseEditor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
src/plugins/vcsbase/vcsbaseeditor.cpp
+3 -3
View File
@@ -160,7 +160,7 @@ public:
bool duplicateSupported() const { return false; }
Core::IEditor *duplicate(QWidget * /*parent*/) { return 0; }
QString id() const { return m_id; }
Core::Id id() const { return m_id; }
bool isTemporary() const { return m_temporary; }
void setTemporary(bool t) { m_temporary = t; }
@@ -170,7 +170,7 @@ signals:
void annotateRevisionRequested(const QString &source, const QString &change, int line);
private:
QString m_id;
Core::Id m_id;
bool m_temporary;
};
@@ -773,7 +773,7 @@ void VCSBaseEditorWidget::jumpToChangeFromDiff(QTextCursor cursor)
return;
Core::EditorManager *em = Core::EditorManager::instance();
Core::IEditor *ed = em->openEditor(fileName, QString(), Core::EditorManager::ModeSwitch);
Core::IEditor *ed = em->openEditor(fileName, Core::Id(), Core::EditorManager::ModeSwitch);
if (TextEditor::ITextEditor *editor = qobject_cast<TextEditor::ITextEditor *>(ed))
editor->gotoLine(chunkStart + lineCount);
}
src/plugins/vcsbase/vcsbaseoutputwindow.cpp
+1 -1
View File
@@ -192,7 +192,7 @@ void OutputWindowPlainTextEdit::contextMenuEvent(QContextMenuEvent *event)
}
if (action == openAction) {
const QString fileName = action->data().toString();
Core::EditorManager::instance()->openEditor(fileName, QString(), Core::EditorManager::ModeSwitch);
Core::EditorManager::instance()->openEditor(fileName, Core::Id(), Core::EditorManager::ModeSwitch);
}
}
delete menu;
src/plugins/vcsbase/vcsbaseplugin.cpp
+4 -3
View File
@@ -485,12 +485,13 @@ VCSBASE_EXPORT QDebug operator<<(QDebug in, const VCSBasePluginState &state)
the virtual submitEditorAboutToClose() to trigger the submit process.
*/
struct VCSBasePluginPrivate {
struct VCSBasePluginPrivate
{
explicit VCSBasePluginPrivate(const QString &submitEditorId);
inline bool supportsRepositoryCreation() const;
const QString m_submitEditorId;
const Core::Id m_submitEditorId;
Core::IVersionControl *m_versionControl;
VCSBasePluginState m_state;
int m_actionState;
@@ -557,7 +558,7 @@ void VCSBasePlugin::extensionsInitialized()
void VCSBasePlugin::slotSubmitEditorAboutToClose(VCSBaseSubmitEditor *submitEditor, bool *result)
{
if (debug)
qDebug() << this << d->m_submitEditorId << "Closing submit editor" << submitEditor << submitEditor->id();
qDebug() << this << d->m_submitEditorId.name() << "Closing submit editor" << submitEditor << submitEditor->id().name();
if (submitEditor->id() == d->m_submitEditorId)
*result = submitEditorAboutToClose(submitEditor);
}

Some files were not shown because too many files have changed in this diff Show More