diff --git src/plugins/projectexplorer/projectnodes.cpp src/plugins/projectexplorer/projectnodes.cpp index 89e48fe..d37ba05 100644 --- src/plugins/projectexplorer/projectnodes.cpp +++ src/plugins/projectexplorer/projectnodes.cpp @@ -739,7 +739,7 @@ void SessionNode::watcherDestroyed(QObject *watcher) by calling ProjectNode::unregisterWatcher and SessionNode::unregisterWatcher(). - The NodesWatcher is similar to the Observer in the + The NodesWatcher is similar to the Observer in the well-known Observer pattern (Booch et al). \sa ProjectExplorer::Node @@ -763,7 +763,7 @@ FileType typeForFileName(const Core::MimeDatabase *db, const QFileInfo &file) return SourceType; if (typeName == QLatin1String(Constants::CPP_HEADER_MIMETYPE) || typeName == QLatin1String(Constants::C_HEADER_MIMETYPE)) - return HeaderType; + return SourceType; if (typeName == QLatin1String(Constants::RESOURCE_MIMETYPE)) return ResourceType; if (typeName == QLatin1String(Constants::FORM_MIMETYPE)) diff --git src/plugins/qt4projectmanager/qt4nodes.cpp src/plugins/qt4projectmanager/qt4nodes.cpp index 313ac58..4948ce5 100644 --- src/plugins/qt4projectmanager/qt4nodes.cpp +++ src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1222,10 +1222,10 @@ QStringList Qt4PriFileNode::varNames(ProjectExplorer::FileType type) QStringList vars; switch (type) { case ProjectExplorer::HeaderType: - vars << QLatin1String("HEADERS"); - vars << QLatin1String("OBJECTIVE_HEADERS"); break; case ProjectExplorer::SourceType: + vars << QLatin1String("HEADERS"); + vars << QLatin1String("OBJECTIVE_HEADERS"); vars << QLatin1String("SOURCES"); vars << QLatin1String("OBJECTIVE_SOURCES"); vars << QLatin1String("LEXSOURCES"); @@ -2060,7 +2060,7 @@ QStringList Qt4ProFileNode::updateUiFiles() toRemove << *existingNodeIter; ++existingNodeIter; } else if ((*existingNodeIter)->path() > *newPathIter) { - toAdd << new ProjectExplorer::FileNode(*newPathIter, ProjectExplorer::HeaderType, true); + toAdd << new ProjectExplorer::FileNode(*newPathIter, ProjectExplorer::SourceType, true); ++newPathIter; } else { // *existingNodeIter->path() == *newPathIter QString fileName = (*existingNodeIter)->path(); @@ -2079,7 +2079,7 @@ QStringList Qt4ProFileNode::updateUiFiles() ++existingNodeIter; } while (newPathIter != newFilePaths.constEnd()) { - toAdd << new ProjectExplorer::FileNode(*newPathIter, ProjectExplorer::HeaderType, true); + toAdd << new ProjectExplorer::FileNode(*newPathIter, ProjectExplorer::SourceType, true); ++newPathIter; }