From 2a63387085ab23fc30a23996e4e5eb63b57f33a7 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 15 Feb 2010 13:49:00 +0100
Subject: [PATCH] Renamed qmlmodelmanager.
---
.../qmljseditor/qmljscodecompletion.cpp | 4 +--
src/plugins/qmljseditor/qmljscodecompletion.h | 6 ++---
src/plugins/qmljseditor/qmljseditor.cpp | 4 +--
src/plugins/qmljseditor/qmljseditor.h | 4 +--
src/plugins/qmljseditor/qmljseditor.pro | 8 +++---
src/plugins/qmljseditor/qmljseditorplugin.cpp | 4 +--
src/plugins/qmljseditor/qmljseditorplugin.h | 4 +--
src/plugins/qmljseditor/qmljshoverhandler.cpp | 2 +-
src/plugins/qmljseditor/qmljshoverhandler.h | 4 +--
...modelmanager.cpp => qmljsmodelmanager.cpp} | 26 +++++++++----------
...{qmlmodelmanager.h => qmljsmodelmanager.h} | 14 +++++-----
...ace.cpp => qmljsmodelmanagerinterface.cpp} | 6 ++---
...terface.h => qmljsmodelmanagerinterface.h} | 12 ++++-----
src/plugins/qmlprojectmanager/qmlproject.cpp | 4 +--
src/plugins/qmlprojectmanager/qmlproject.h | 4 +--
.../qmlprojectmanager/qmlprojectplugin.cpp | 4 +--
16 files changed, 55 insertions(+), 55 deletions(-)
rename src/plugins/qmljseditor/{qmlmodelmanager.cpp => qmljsmodelmanager.cpp} (87%)
rename src/plugins/qmljseditor/{qmlmodelmanager.h => qmljsmodelmanager.h} (90%)
rename src/plugins/qmljseditor/{qmlmodelmanagerinterface.cpp => qmljsmodelmanagerinterface.cpp} (88%)
rename src/plugins/qmljseditor/{qmlmodelmanagerinterface.h => qmljsmodelmanagerinterface.h} (86%)
diff --git a/src/plugins/qmljseditor/qmljscodecompletion.cpp b/src/plugins/qmljseditor/qmljscodecompletion.cpp
index b7fcd8797bb..aa00b7a8c00 100644
--- a/src/plugins/qmljseditor/qmljscodecompletion.cpp
+++ b/src/plugins/qmljseditor/qmljscodecompletion.cpp
@@ -30,7 +30,7 @@
#include "qmljscodecompletion.h"
#include "qmlexpressionundercursor.h"
#include "qmljseditor.h"
-#include "qmlmodelmanagerinterface.h"
+#include "qmljsmodelmanagerinterface.h"
#include <qmljs/parser/qmljsast_p.h>
#include <qmljs/qmljsbind.h>
@@ -508,7 +508,7 @@ void FunctionArgumentWidget::updateHintText()
} } // end of namespace QmlJSEditor::Internal
-CodeCompletion::CodeCompletion(QmlModelManagerInterface *modelManager, QObject *parent)
+CodeCompletion::CodeCompletion(ModelManagerInterface *modelManager, QObject *parent)
: TextEditor::ICompletionCollector(parent),
m_modelManager(modelManager),
m_editor(0),
diff --git a/src/plugins/qmljseditor/qmljscodecompletion.h b/src/plugins/qmljseditor/qmljscodecompletion.h
index 34f5a0ee3fc..ea502988998 100644
--- a/src/plugins/qmljseditor/qmljscodecompletion.h
+++ b/src/plugins/qmljseditor/qmljscodecompletion.h
@@ -41,7 +41,7 @@ class ITextEditable;
namespace QmlJSEditor {
-class QmlModelManagerInterface;
+class ModelManagerInterface;
namespace Internal {
@@ -52,7 +52,7 @@ class CodeCompletion: public TextEditor::ICompletionCollector
Q_OBJECT
public:
- CodeCompletion(QmlModelManagerInterface *modelManager, QObject *parent = 0);
+ CodeCompletion(ModelManagerInterface *modelManager, QObject *parent = 0);
virtual ~CodeCompletion();
Qt::CaseSensitivity caseSensitivity() const;
@@ -77,7 +77,7 @@ private:
bool maybeTriggersCompletion(TextEditor::ITextEditable *editor);
bool isDelimiter(const QChar &ch) const;
- QmlModelManagerInterface *m_modelManager;
+ ModelManagerInterface *m_modelManager;
TextEditor::ITextEditable *m_editor;
int m_startPosition;
QList<TextEditor::CompletionItem> m_completions;
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index f4348012975..7a170075ba1 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -31,7 +31,7 @@
#include "qmljseditorconstants.h"
#include "qmljshighlighter.h"
#include "qmljseditorplugin.h"
-#include "qmlmodelmanager.h"
+#include "qmljsmodelmanager.h"
#include <qmljs/qmljsindenter.h>
#include <qmljs/qmljsinterpreter.h>
@@ -583,7 +583,7 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
baseTextDocument()->setSyntaxHighlighter(new Highlighter(document()));
- m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<QmlModelManagerInterface>();
+ m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<ModelManagerInterface>();
if (m_modelManager) {
connect(m_modelManager, SIGNAL(documentUpdated(QmlJS::Document::Ptr)),
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 82465f9839f..a204585a56a 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -45,7 +45,7 @@ class ICore;
namespace QmlJSEditor {
-class QmlModelManagerInterface;
+class ModelManagerInterface;
namespace Internal {
@@ -178,7 +178,7 @@ private:
QTimer *m_updateDocumentTimer;
QTimer *m_updateUsesTimer;
QComboBox *m_methodCombo;
- QmlModelManagerInterface *m_modelManager;
+ ModelManagerInterface *m_modelManager;
QTextCharFormat m_occurrencesFormat;
QTextCharFormat m_occurrencesUnusedFormat;
QTextCharFormat m_occurrenceRenameFormat;
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro
index cda648c3bed..fd3fca3966d 100644
--- a/src/plugins/qmljseditor/qmljseditor.pro
+++ b/src/plugins/qmljseditor/qmljseditor.pro
@@ -20,8 +20,8 @@ HEADERS += \
qmlfilewizard.h \
qmljshighlighter.h \
qmljshoverhandler.h \
- qmlmodelmanager.h \
- qmlmodelmanagerinterface.h
+ qmljsmodelmanager.h \
+ qmljsmodelmanagerinterface.h
SOURCES += \
qmljscodecompletion.cpp \
@@ -33,8 +33,8 @@ SOURCES += \
qmlfilewizard.cpp \
qmljshighlighter.cpp \
qmljshoverhandler.cpp \
- qmlmodelmanager.cpp \
- qmlmodelmanagerinterface.cpp
+ qmljsmodelmanager.cpp \
+ qmljsmodelmanagerinterface.cpp
RESOURCES += qmljseditor.qrc
OTHER_FILES += QmlJSEditor.pluginspec QmlJSEditor.mimetypes.xml
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index c36fa3675b3..34684c95ade 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -34,7 +34,7 @@
#include "qmljseditorfactory.h"
#include "qmljscodecompletion.h"
#include "qmljshoverhandler.h"
-#include "qmlmodelmanager.h"
+#include "qmljsmodelmanager.h"
#include "qmlfilewizard.h"
#include <coreplugin/icore.h>
@@ -90,7 +90,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/qmljseditor/QmlJSEditor.mimetypes.xml"), error_message))
return false;
- m_modelManager = new QmlModelManager(this);
+ m_modelManager = new ModelManager(this);
addAutoReleasedObject(m_modelManager);
QList<int> context;
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h
index dbdcfce77fe..df81b05030e 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.h
+++ b/src/plugins/qmljseditor/qmljseditorplugin.h
@@ -38,7 +38,7 @@ class TextEditorActionHandler;
namespace QmlJSEditor {
-class QmlModelManagerInterface;
+class ModelManagerInterface;
class QmlFileWizard;
namespace Internal {
@@ -70,7 +70,7 @@ public Q_SLOTS:
private:
static QmlJSEditorPlugin *m_instance;
- QmlModelManagerInterface *m_modelManager;
+ ModelManagerInterface *m_modelManager;
QmlFileWizard *m_wizard;
QmlJSEditorFactory *m_editor;
TextEditor::TextEditorActionHandler *m_actionHandler;
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index b40f42d6945..e1103325dcb 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -61,7 +61,7 @@ HoverHandler::HoverHandler(QObject *parent)
: QObject(parent)
, m_helpEngineNeedsSetup(false)
{
- m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<QmlModelManagerInterface>();
+ m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<ModelManagerInterface>();
ICore *core = ICore::instance();
QFileInfo fi(core->settings()->fileName());
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h
index f988652075c..7a187f28773 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.h
+++ b/src/plugins/qmljseditor/qmljshoverhandler.h
@@ -30,7 +30,7 @@
#ifndef QMLJSHOVERHANDLER_H
#define QMLJSHOVERHANDLER_H
-#include "qmlmodelmanagerinterface.h"
+#include "qmljsmodelmanagerinterface.h"
#include <QtCore/QObject>
@@ -79,7 +79,7 @@ private:
QStringList *baseClasses) const;
private:
- QmlModelManagerInterface *m_modelManager;
+ ModelManagerInterface *m_modelManager;
QHelpEngineCore *m_helpEngine;
QString m_helpId;
QString m_toolTip;
diff --git a/src/plugins/qmljseditor/qmlmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
similarity index 87%
rename from src/plugins/qmljseditor/qmlmodelmanager.cpp
rename to src/plugins/qmljseditor/qmljsmodelmanager.cpp
index a885181eec3..2deaef8fba2 100644
--- a/src/plugins/qmljseditor/qmlmodelmanager.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
@@ -28,7 +28,7 @@
**************************************************************************/
#include "qmljseditorconstants.h"
-#include "qmlmodelmanager.h"
+#include "qmljsmodelmanager.h"
#include "qmljseditor.h"
#include <coreplugin/icore.h>
@@ -47,8 +47,8 @@ using namespace QmlJS;
using namespace QmlJSEditor;
using namespace QmlJSEditor::Internal;
-QmlModelManager::QmlModelManager(QObject *parent):
- QmlModelManagerInterface(parent),
+ModelManager::ModelManager(QObject *parent):
+ ModelManagerInterface(parent),
m_core(Core::ICore::instance())
{
m_synchronizer.setCancelOnWait(true);
@@ -59,19 +59,19 @@ QmlModelManager::QmlModelManager(QObject *parent):
this, SLOT(onDocumentUpdated(QmlJS::Document::Ptr)));
}
-Snapshot QmlModelManager::snapshot() const
+Snapshot ModelManager::snapshot() const
{
QMutexLocker locker(&m_mutex);
return _snapshot;
}
-void QmlModelManager::updateSourceFiles(const QStringList &files)
+void ModelManager::updateSourceFiles(const QStringList &files)
{
refreshSourceFiles(files);
}
-QFuture<void> QmlModelManager::refreshSourceFiles(const QStringList &sourceFiles)
+QFuture<void> ModelManager::refreshSourceFiles(const QStringList &sourceFiles)
{
if (sourceFiles.isEmpty()) {
return QFuture<void>();
@@ -79,7 +79,7 @@ QFuture<void> QmlModelManager::refreshSourceFiles(const QStringList &sourceFiles
const QMap<QString, WorkingCopy> workingCopy = buildWorkingCopyList();
- QFuture<void> result = QtConcurrent::run(&QmlModelManager::parse,
+ QFuture<void> result = QtConcurrent::run(&ModelManager::parse,
workingCopy, sourceFiles,
this);
@@ -104,7 +104,7 @@ QFuture<void> QmlModelManager::refreshSourceFiles(const QStringList &sourceFiles
return result;
}
-QMap<QString, QmlModelManager::WorkingCopy> QmlModelManager::buildWorkingCopyList()
+QMap<QString, ModelManager::WorkingCopy> ModelManager::buildWorkingCopyList()
{
QMap<QString, WorkingCopy> workingCopy;
Core::EditorManager *editorManager = m_core->editorManager();
@@ -123,20 +123,20 @@ QMap<QString, QmlModelManager::WorkingCopy> QmlModelManager::buildWorkingCopyLis
return workingCopy;
}
-void QmlModelManager::emitDocumentUpdated(Document::Ptr doc)
+void ModelManager::emitDocumentUpdated(Document::Ptr doc)
{ emit documentUpdated(doc); }
-void QmlModelManager::onDocumentUpdated(Document::Ptr doc)
+void ModelManager::onDocumentUpdated(Document::Ptr doc)
{
QMutexLocker locker(&m_mutex);
_snapshot.insert(doc);
}
-void QmlModelManager::parse(QFutureInterface<void> &future,
+void ModelManager::parse(QFutureInterface<void> &future,
QMap<QString, WorkingCopy> workingCopy,
QStringList files,
- QmlModelManager *modelManager)
+ ModelManager *modelManager)
{
Core::MimeDatabase *db = Core::ICore::instance()->mimeDatabase();
Core::MimeType jsSourceTy = db->findByType(QLatin1String("application/javascript"));
@@ -186,7 +186,7 @@ void QmlModelManager::parse(QFutureInterface<void> &future,
}
// Check whether fileMimeType is the same or extends knownMimeType
-bool QmlModelManager::matchesMimeType(const Core::MimeType &fileMimeType, const Core::MimeType &knownMimeType)
+bool ModelManager::matchesMimeType(const Core::MimeType &fileMimeType, const Core::MimeType &knownMimeType)
{
Core::MimeDatabase *db = Core::ICore::instance()->mimeDatabase();
diff --git a/src/plugins/qmljseditor/qmlmodelmanager.h b/src/plugins/qmljseditor/qmljsmodelmanager.h
similarity index 90%
rename from src/plugins/qmljseditor/qmlmodelmanager.h
rename to src/plugins/qmljseditor/qmljsmodelmanager.h
index 9ac884abd46..47192044da9 100644
--- a/src/plugins/qmljseditor/qmlmodelmanager.h
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.h
@@ -27,10 +27,10 @@
**
**************************************************************************/
-#ifndef QMLMODELMANAGER_H
-#define QMLMODELMANAGER_H
+#ifndef QMLJSMODELMANAGER_H
+#define QMLJSMODELMANAGER_H
-#include "qmlmodelmanagerinterface.h"
+#include "qmljsmodelmanagerinterface.h"
#include <qmljs/qmljsdocument.h>
@@ -46,12 +46,12 @@ class MimeType;
namespace QmlJSEditor {
namespace Internal {
-class QmlModelManager: public QmlModelManagerInterface
+class ModelManager: public ModelManagerInterface
{
Q_OBJECT
public:
- QmlModelManager(QObject *parent = 0);
+ ModelManager(QObject *parent = 0);
virtual QmlJS::Snapshot snapshot() const;
virtual void updateSourceFiles(const QStringList &files);
@@ -80,7 +80,7 @@ protected:
static void parse(QFutureInterface<void> &future,
QMap<QString, WorkingCopy> workingCopy,
QStringList files,
- QmlModelManager *modelManager);
+ ModelManager *modelManager);
private:
static bool matchesMimeType(const Core::MimeType &fileMimeType, const Core::MimeType &knownMimeType);
@@ -95,4 +95,4 @@ private:
} // namespace Internal
} // namespace QmlJSEditor
-#endif // QMLMODELMANAGER_H
+#endif // QMLJSMODELMANAGER_H
diff --git a/src/plugins/qmljseditor/qmlmodelmanagerinterface.cpp b/src/plugins/qmljseditor/qmljsmodelmanagerinterface.cpp
similarity index 88%
rename from src/plugins/qmljseditor/qmlmodelmanagerinterface.cpp
rename to src/plugins/qmljseditor/qmljsmodelmanagerinterface.cpp
index c899703cc52..8fd31e64c77 100644
--- a/src/plugins/qmljseditor/qmlmodelmanagerinterface.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanagerinterface.cpp
@@ -27,15 +27,15 @@
**
**************************************************************************/
-#include "qmlmodelmanagerinterface.h"
+#include "qmljsmodelmanagerinterface.h"
using namespace QmlJSEditor;
-QmlModelManagerInterface::QmlModelManagerInterface(QObject *parent):
+ModelManagerInterface::ModelManagerInterface(QObject *parent):
QObject(parent)
{
}
-QmlModelManagerInterface::~QmlModelManagerInterface()
+ModelManagerInterface::~ModelManagerInterface()
{
}
diff --git a/src/plugins/qmljseditor/qmlmodelmanagerinterface.h b/src/plugins/qmljseditor/qmljsmodelmanagerinterface.h
similarity index 86%
rename from src/plugins/qmljseditor/qmlmodelmanagerinterface.h
rename to src/plugins/qmljseditor/qmljsmodelmanagerinterface.h
index 4ac4bb9fee6..498e1512a04 100644
--- a/src/plugins/qmljseditor/qmlmodelmanagerinterface.h
+++ b/src/plugins/qmljseditor/qmljsmodelmanagerinterface.h
@@ -27,8 +27,8 @@
**
**************************************************************************/
-#ifndef QMLMODELMANAGERINTERFACE_H
-#define QMLMODELMANAGERINTERFACE_H
+#ifndef QMLJSMODELMANAGERINTERFACE_H
+#define QMLJSMODELMANAGERINTERFACE_H
#include "qmljseditor_global.h"
@@ -44,13 +44,13 @@ class Snapshot;
namespace QmlJSEditor {
-class QMLJSEDITOR_EXPORT QmlModelManagerInterface: public QObject
+class QMLJSEDITOR_EXPORT ModelManagerInterface: public QObject
{
Q_OBJECT
public:
- QmlModelManagerInterface(QObject *parent = 0);
- virtual ~QmlModelManagerInterface();
+ ModelManagerInterface(QObject *parent = 0);
+ virtual ~ModelManagerInterface();
virtual QmlJS::Snapshot snapshot() const = 0;
virtual void updateSourceFiles(const QStringList &files) = 0;
@@ -61,4 +61,4 @@ signals:
} // namespace QmlJSEditor
-#endif // QMLMODELMANAGERINTERFACE_H
+#endif // QMLJSMODELMANAGERINTERFACE_H
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 8ff1071ee53..6646e9caf06 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -42,7 +42,7 @@
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/modemanager.h>
-#include <qmljseditor/qmlmodelmanagerinterface.h>
+#include <qmljseditor/qmljsmodelmanagerinterface.h>
#include <utils/synchronousprocess.h>
@@ -85,7 +85,7 @@ const int DEFAULT_DEBUG_SERVER_PORT(3768);
QmlProject::QmlProject(Manager *manager, const QString &fileName)
: m_manager(manager),
m_fileName(fileName),
- m_modelManager(ExtensionSystem::PluginManager::instance()->getObject<QmlJSEditor::QmlModelManagerInterface>()),
+ m_modelManager(ExtensionSystem::PluginManager::instance()->getObject<QmlJSEditor::ModelManagerInterface>()),
m_fileWatcher(new ProjectExplorer::FileWatcher(this)),
m_targetFactory(new QmlTargetFactory(this))
{
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index cd9edd84f92..b5a9d3238be 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -47,7 +47,7 @@
#include <QtDeclarative/QmlEngine>
namespace QmlJSEditor {
-class QmlModelManagerInterface;
+class ModelManagerInterface;
}
namespace QmlProjectManager {
@@ -198,7 +198,7 @@ private:
QString m_fileName;
Internal::QmlProjectFile *m_file;
QString m_projectName;
- QmlJSEditor::QmlModelManagerInterface *m_modelManager;
+ QmlJSEditor::ModelManagerInterface *m_modelManager;
// plain format
QStringList m_files;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index aaa84b111d5..7340bdc4f44 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -43,7 +43,7 @@
#include <texteditor/texteditoractionhandler.h>
#include <projectexplorer/taskwindow.h>
-#include <qmljseditor/qmlmodelmanagerinterface.h>
+#include <qmljseditor/qmljsmodelmanagerinterface.h>
#include <QtCore/QtPlugin>
@@ -88,7 +88,7 @@ void QmlProjectPlugin::extensionsInitialized()
ProjectExplorer::TaskWindow *taskWindow = pluginManager->getObject<ProjectExplorer::TaskWindow>();
m_qmlTaskManager->setTaskWindow(taskWindow);
- QmlJSEditor::QmlModelManagerInterface *modelManager = pluginManager->getObject<QmlJSEditor::QmlModelManagerInterface>();
+ QmlJSEditor::ModelManagerInterface *modelManager = pluginManager->getObject<QmlJSEditor::ModelManagerInterface>();
Q_ASSERT(modelManager);
connect(modelManager, SIGNAL(documentUpdated(QmlJS::Document::Ptr)),
m_qmlTaskManager, SLOT(documentUpdated(QmlJS::Document::Ptr)));
--
GitLab