Commit 7edefec4 authored by Jarek Kobus's avatar Jarek Kobus

Compile fix for Mac 10.5.8 gcc 4.0.1

Change-Id: I77a9ac922ead256c3c58be39ad0383aef67f3133
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent d3f84361
...@@ -165,7 +165,7 @@ enum { debug = 0 }; ...@@ -165,7 +165,7 @@ enum { debug = 0 };
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;
Qt4PriFile::Qt4PriFile(Qt4PriFileNode *qt4PriFile) Qt4PriFile::Qt4PriFile(Qt4ProjectManager::Qt4PriFileNode *qt4PriFile)
: IFile(qt4PriFile), m_priFile(qt4PriFile) : IFile(qt4PriFile), m_priFile(qt4PriFile)
{ {
...@@ -243,6 +243,8 @@ bool Qt4PriFile::reload(QString *errorString, ReloadFlag flag, ChangeType type) ...@@ -243,6 +243,8 @@ bool Qt4PriFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
Implements abstract ProjectNode class Implements abstract ProjectNode class
*/ */
namespace Qt4ProjectManager {
Qt4PriFileNode::Qt4PriFileNode(Qt4Project *project, Qt4ProFileNode* qt4ProFileNode, const QString &filePath) Qt4PriFileNode::Qt4PriFileNode(Qt4Project *project, Qt4ProFileNode* qt4ProFileNode, const QString &filePath)
: ProjectNode(filePath), : ProjectNode(filePath),
m_project(project), m_project(project),
...@@ -266,7 +268,6 @@ void Qt4PriFileNode::scheduleUpdate() ...@@ -266,7 +268,6 @@ void Qt4PriFileNode::scheduleUpdate()
m_qt4ProFileNode->scheduleUpdate(); m_qt4ProFileNode->scheduleUpdate();
} }
namespace Qt4ProjectManager {
namespace Internal { namespace Internal {
struct InternalNode struct InternalNode
{ {
...@@ -375,7 +376,7 @@ struct InternalNode ...@@ -375,7 +376,7 @@ struct InternalNode
} }
// Makes the projectNode's subtree below the given folder match this internal node's subtree // 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); updateFiles(projectNode, folder, type);
...@@ -440,7 +441,7 @@ struct InternalNode ...@@ -440,7 +441,7 @@ struct InternalNode
} }
// Makes the folder's files match this internal node's file list // 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; QList<FileNode*> existingFileNodes;
foreach (FileNode *fileNode, folder->fileNodes()) { foreach (FileNode *fileNode, folder->fileNodes()) {
...@@ -485,7 +486,6 @@ struct InternalNode ...@@ -485,7 +486,6 @@ struct InternalNode
} }
}; };
} }
}
QStringList Qt4PriFileNode::baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir) QStringList Qt4PriFileNode::baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir)
{ {
...@@ -1289,6 +1289,8 @@ QSet<QString> Qt4PriFileNode::filterFilesRecursiveEnumerata(ProjectExplorer::Fil ...@@ -1289,6 +1289,8 @@ QSet<QString> Qt4PriFileNode::filterFilesRecursiveEnumerata(ProjectExplorer::Fil
return result; return result;
} }
} // namespace Qt4ProjectManager
static Qt4ProjectType proFileTemplateTypeToProjectType(ProFileEvaluator::TemplateType type) static Qt4ProjectType proFileTemplateTypeToProjectType(ProFileEvaluator::TemplateType type)
{ {
switch (type) { switch (type) {
......
...@@ -118,8 +118,8 @@ class CentralizedFolderWatcher : public QObject ...@@ -118,8 +118,8 @@ class CentralizedFolderWatcher : public QObject
public: public:
CentralizedFolderWatcher(QObject *parent); CentralizedFolderWatcher(QObject *parent);
~CentralizedFolderWatcher(); ~CentralizedFolderWatcher();
void watchFolders(const QList<QString> &folders, Qt4PriFileNode *node); void watchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node);
void unwatchFolders(const QList<QString> &folders, Qt4PriFileNode *node); void unwatchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node);
private slots: private slots:
void folderChanged(const QString &folder); void folderChanged(const QString &folder);
...@@ -129,7 +129,7 @@ private slots: ...@@ -129,7 +129,7 @@ private slots:
private: private:
QSet<QString> recursiveDirs(const QString &folder); QSet<QString> recursiveDirs(const QString &folder);
QFileSystemWatcher m_watcher; QFileSystemWatcher m_watcher;
QMultiMap<QString, Qt4PriFileNode *> m_map; QMultiMap<QString, Qt4ProjectManager::Qt4PriFileNode *> m_map;
QSet<QString> m_recursiveWatchedFolders; QSet<QString> m_recursiveWatchedFolders;
QTimer m_compressTimer; QTimer m_compressTimer;
...@@ -1206,7 +1206,7 @@ QSet<QString> CentralizedFolderWatcher::recursiveDirs(const QString &folder) ...@@ -1206,7 +1206,7 @@ QSet<QString> CentralizedFolderWatcher::recursiveDirs(const QString &folder)
return result; return result;
} }
void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qt4PriFileNode *node) void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node)
{ {
if (debugCFW) if (debugCFW)
qDebug()<<"CFW::watchFolders()"<<folders<<"for node"<<node->path(); qDebug()<<"CFW::watchFolders()"<<folders<<"for node"<<node->path();
...@@ -1230,7 +1230,7 @@ void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qt4Pr ...@@ -1230,7 +1230,7 @@ void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qt4Pr
} }
} }
void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, Qt4PriFileNode *node) void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node)
{ {
if (debugCFW) if (debugCFW)
qDebug()<<"CFW::unwatchFolders()"<<folders<<"for node"<<node->path(); qDebug()<<"CFW::unwatchFolders()"<<folders<<"for node"<<node->path();
...@@ -1254,7 +1254,7 @@ void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, Qt4 ...@@ -1254,7 +1254,7 @@ void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, Qt4
// So the rwf is a subdirectory of a folder we aren't watching // So the rwf is a subdirectory of a folder we aren't watching
// but maybe someone else wants us to watch // but maybe someone else wants us to watch
bool needToWatch = false; bool needToWatch = false;
QMultiMap<QString, Qt4PriFileNode *>::const_iterator it, end; QMultiMap<QString, Qt4ProjectManager::Qt4PriFileNode *>::const_iterator it, end;
end = m_map.constEnd(); end = m_map.constEnd();
for (it = m_map.constEnd(); it != end; ++it) { for (it = m_map.constEnd(); it != end; ++it) {
if (rwf.startsWith(it.key())) { if (rwf.startsWith(it.key())) {
...@@ -1301,8 +1301,8 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder) ...@@ -1301,8 +1301,8 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
while (true) { while (true) {
if (!dir.endsWith('/')) if (!dir.endsWith('/'))
dir.append('/'); dir.append('/');
QList<Qt4PriFileNode *> nodes = m_map.values(dir); QList<Qt4ProjectManager::Qt4PriFileNode *> nodes = m_map.values(dir);
foreach (Qt4PriFileNode *node, nodes) { foreach (Qt4ProjectManager::Qt4PriFileNode *node, nodes) {
node->folderChanged(folder); node->folderChanged(folder);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment