diff options
author | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2011-11-22 13:10:10 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2011-11-22 15:44:53 +0100 |
commit | 7edefec435c730ac4fac6531be252d78753134a7 (patch) | |
tree | 3030f8ad52dcb8a60fa4ecb8c0137fdd8db5316a /src/plugins/qt4projectmanager/qt4nodes.cpp | |
parent | d3f8436165f69e1aa41d0e312b6c47ec3765430a (diff) | |
download | qt-creator-7edefec435c730ac4fac6531be252d78753134a7.tar.gz |
Compile fix for Mac 10.5.8 gcc 4.0.1
Change-Id: I77a9ac922ead256c3c58be39ad0383aef67f3133
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4nodes.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/qt4nodes.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index a4ea29aad1..410b8c7122 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -165,7 +165,7 @@ enum { debug = 0 }; using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; -Qt4PriFile::Qt4PriFile(Qt4PriFileNode *qt4PriFile) +Qt4PriFile::Qt4PriFile(Qt4ProjectManager::Qt4PriFileNode *qt4PriFile) : IFile(qt4PriFile), m_priFile(qt4PriFile) { @@ -243,6 +243,8 @@ bool Qt4PriFile::reload(QString *errorString, ReloadFlag flag, ChangeType type) Implements abstract ProjectNode class */ +namespace Qt4ProjectManager { + Qt4PriFileNode::Qt4PriFileNode(Qt4Project *project, Qt4ProFileNode* qt4ProFileNode, const QString &filePath) : ProjectNode(filePath), m_project(project), @@ -266,7 +268,6 @@ void Qt4PriFileNode::scheduleUpdate() m_qt4ProFileNode->scheduleUpdate(); } -namespace Qt4ProjectManager { namespace Internal { struct InternalNode { @@ -375,7 +376,7 @@ struct InternalNode } // Makes the projectNode's subtree below the given folder match this internal node's subtree - void updateSubFolders(Qt4PriFileNode *projectNode, ProjectExplorer::FolderNode *folder) + void updateSubFolders(Qt4ProjectManager::Qt4PriFileNode *projectNode, ProjectExplorer::FolderNode *folder) { updateFiles(projectNode, folder, type); @@ -440,7 +441,7 @@ struct InternalNode } // Makes the folder's files match this internal node's file list - void updateFiles(Qt4PriFileNode *projectNode, FolderNode *folder, FileType type) + void updateFiles(Qt4ProjectManager::Qt4PriFileNode *projectNode, FolderNode *folder, FileType type) { QList<FileNode*> existingFileNodes; foreach (FileNode *fileNode, folder->fileNodes()) { @@ -485,7 +486,6 @@ struct InternalNode } }; } -} QStringList Qt4PriFileNode::baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir) { @@ -1289,6 +1289,8 @@ QSet<QString> Qt4PriFileNode::filterFilesRecursiveEnumerata(ProjectExplorer::Fil return result; } +} // namespace Qt4ProjectManager + static Qt4ProjectType proFileTemplateTypeToProjectType(ProFileEvaluator::TemplateType type) { switch (type) { |