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

qmake: Use logging category instead of debug enum

Browse Source 
Change-Id: I4f8718656453a3a369780fb555f33235d652a0e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-09 15:41:05 +01:00
parent eaaf9522c6
commit 13d71a9f6b
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -73,10 +73,11 @@
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QLoggingCategory>
#include <QMessageBox>
#include <QTextCodec> #include <QTextCodec>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QMessageBox>
#include <utils/QtConcurrentTools> #include <utils/QtConcurrentTools>
using namespace Core; using namespace Core;
@@ -171,13 +172,13 @@ static void clearQmakeParserNodeStaticData()
qmakeParserNodeStaticData()->projectIcon = QIcon(); qmakeParserNodeStaticData()->projectIcon = QIcon();
} }
enum { debug = 0 };
using namespace QmakeProjectManager; using namespace QmakeProjectManager;
using namespace QmakeProjectManager::Internal; using namespace QmakeProjectManager::Internal;
namespace QmakeProjectManager { namespace QmakeProjectManager {
Q_LOGGING_CATEGORY(qmakeParse, "qtc.qmake.parsing");
uint qHash(Variable key, uint seed) { return ::qHash(static_cast<int>(key), seed); } uint qHash(Variable key, uint seed) { return ::qHash(static_cast<int>(key), seed); }
namespace Internal { namespace Internal {
@@ -658,8 +659,7 @@ void QmakeParserPriFileNode::watchFolders(const QSet<QString> &folders)
bool QmakeParserPriFileNode::folderChanged(const QString &changedFolder, const QSet<FileName> &newFiles) bool QmakeParserPriFileNode::folderChanged(const QString &changedFolder, const QSet<FileName> &newFiles)
{ {
//qDebug()<<"########## QmakeParserPriFileNode::folderChanged"; qCDebug(qmakeParse()) << "QmakeParserPriFileNode::folderChanged";
// So, we need to figure out which files changed.
QSet<FileName> addedFiles = newFiles; QSet<FileName> addedFiles = newFiles;
addedFiles.subtract(m_recursiveEnumerateFiles); addedFiles.subtract(m_recursiveEnumerateFiles);
@@ -677,8 +677,7 @@ bool QmakeParserPriFileNode::folderChanged(const QString &changedFolder, const Q
m_recursiveEnumerateFiles = newFiles; m_recursiveEnumerateFiles = newFiles;
// Apply the differences // Apply the differences per file type
// per file type
const QVector<QmakeParserNodeStaticData::FileTypeData> &fileTypes = qmakeParserNodeStaticData()->fileTypeData; const QVector<QmakeParserNodeStaticData::FileTypeData> &fileTypes = qmakeParserNodeStaticData()->fileTypeData;
for (int i = 0; i < fileTypes.size(); ++i) { for (int i = 0; i < fileTypes.size(); ++i) {
FileType type = fileTypes.at(i).type; FileType type = fileTypes.at(i).type;
@@ -686,10 +685,9 @@ bool QmakeParserPriFileNode::folderChanged(const QString &changedFolder, const Q
QSet<FileName> remove = filterFilesRecursiveEnumerata(type, removedFiles); QSet<FileName> remove = filterFilesRecursiveEnumerata(type, removedFiles);
if (!add.isEmpty() || !remove.isEmpty()) { if (!add.isEmpty() || !remove.isEmpty()) {
// Scream :) qCDebug(qmakeParse()) << "For type" << fileTypes.at(i).typeName <<"\n"
// qDebug()<<"For type"<<fileTypes.at(i).typeName<<"\n" << "added files" << add << "\n"
// <<"added files"<<add<<"\n" << "removed files" << remove;
// <<"removed files"<<remove;
m_files[type].unite(add); m_files[type].unite(add);
m_files[type].subtract(remove); m_files[type].subtract(remove);
@@ -1940,8 +1938,7 @@ void QmakeParserProFileNode::applyEvaluate(QmakeEvalResult *evalResult)
return; return;
} }
if (debug) qCDebug(qmakeParse()) << "QmakeParserProFileNode - updating files for file " << filePath();
qDebug() << "QmakeParserProFileNode - updating files for file " << filePath();
if (result->projectType != m_projectType) { if (result->projectType != m_projectType) {
// probably all subfiles/projects have changed anyway // probably all subfiles/projects have changed anyway