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

4
src/plugins/qmljseditor/qmljscompletionassist.cpp
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

2
src/plugins/qmljseditor/qmljscompletionassist.h
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;

4
src/plugins/qmljseditor/qmljseditor.cpp
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)

6
src/plugins/qmljseditor/qmljseditoreditable.h
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);
};

4
src/plugins/qmljseditor/qmljseditorplugin.cpp
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);

4
src/plugins/qmljseditor/qmljseditorplugin.h
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;

4
src/plugins/qmljseditor/qmljsfindreferences.cpp
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);
}
}

4
src/plugins/qmljseditor/qmljsquickfixassist.cpp
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

2
src/plugins/qmljseditor/qmljsquickfixassist.h
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;