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

Prevent symbol clashes for qml classes

Browse Source 
Fix namespace usage such that all classes in shared/qml live in the
Qml namespace, and classes in QmlDesigner plugin in the QmlDesigner
namespace.

This should prevent any symbol clashes until we can finally get rid
of the file dublicates (e.g. QmlDocument).
This commit is contained in:
Kai Koehne
2010-01-14 16:22:43 +01:00
parent f808377344
commit 33ec15b9ab
64 changed files with 150 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

@@ -100,8 +100,8 @@ void QmlProjectPlugin::extensionsInitialized()
QmlEditor::QmlModelManagerInterface *modelManager = pluginManager->getObject<QmlEditor::QmlModelManagerInterface>();
Q_ASSERT(modelManager);
connect(modelManager, SIGNAL(documentUpdated(QmlEditor::QmlDocument::Ptr)),
m_qmlTaskManager, SLOT(documentUpdated(QmlEditor::QmlDocument::Ptr)));
connect(modelManager, SIGNAL(documentUpdated(Qml::QmlDocument::Ptr)),
m_qmlTaskManager, SLOT(documentUpdated(Qml::QmlDocument::Ptr)));
}
Q_EXPORT_PLUGIN(QmlProjectPlugin)

2
src/plugins/qmlprojectmanager/qmltaskmanager.cpp
View File

@@ -48,7 +48,7 @@ void QmlTaskManager::setTaskWindow(ProjectExplorer::TaskWindow *taskWindow)
m_taskWindow->addCategory(Constants::TASK_CATEGORY_QML, "Qml");
}
void QmlTaskManager::documentUpdated(QmlEditor::QmlDocument::Ptr doc)
void QmlTaskManager::documentUpdated(Qml::QmlDocument::Ptr doc)
{
#if 0 // This will give way too many flickering errors in the build-results pane *when you're typing*
m_taskWindow->clearTasks(Constants::TASK_CATEGORY_QML);

2
src/plugins/qmlprojectmanager/qmltaskmanager.h
View File

@@ -46,7 +46,7 @@ public:
void setTaskWindow(ProjectExplorer::TaskWindow *taskWindow);
public slots:
void documentUpdated(QmlEditor::QmlDocument::Ptr doc);
void documentUpdated(Qml::QmlDocument::Ptr doc);
private:
ProjectExplorer::TaskWindow *m_taskWindow;