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

UiCodeModel: Simplify usage

Browse Source 
Change-Id: Id274db9ed3022364e7b65788f8313ae6cfa73326
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-07-11 16:24:51 +02:00
parent 0ea0c2f876
commit 78d3191363
11 changed files with 270 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/cmakeproject.h
View File

@@ -52,7 +52,6 @@ class QFileSystemWatcher;
QT_END_NAMESPACE
namespace ProjectExplorer { class Target; }
namespace QtSupport { class UiCodeModelSupport; }
namespace CMakeProjectManager {
namespace Internal {
@@ -117,17 +116,12 @@ private slots:
void activeTargetWasChanged(ProjectExplorer::Target *target);
void changeActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*);
void editorChanged(Core::IEditor *editor);
void editorAboutToClose(Core::IEditor *editor);
void uiDocumentContentsChanged();
void buildStateChanged(ProjectExplorer::Project *project);
void updateRunConfigurations();
private:
void buildTree(CMakeProjectNode *rootNode, QList<ProjectExplorer::FileNode *> list);
void gatherFileNodes(ProjectExplorer::FolderNode *parent, QList<ProjectExplorer::FileNode *> &list);
ProjectExplorer::FolderNode *findOrCreateFolder(CMakeProjectNode *rootNode, QString directory);
void updateCodeModelSupportFromEditor(const QString &uiFileName, const QString &contents);
void createUiCodeModelSupport();
QString uiHeaderFile(const QString &uiFile);
void updateRunConfigurations(ProjectExplorer::Target *t);
@@ -145,10 +139,6 @@ private:
QFileSystemWatcher *m_watcher;
QSet<QString> m_watchedFiles;
QFuture<void> m_codeModelFuture;
QMap<QString, QtSupport::UiCodeModelSupport *> m_uiCodeModelSupport;
Core::IEditor *m_lastEditor;
bool m_dirtyUic;
};
class CMakeCbpParser : public QXmlStreamReader