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

QmakeProject: Remove some debugging code

Browse Source 
Change-Id: Ia4266d568074023edfe40177e1e6a35186d935dd
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-10 11:07:11 +01:00
parent 5094cfe019
commit e98f5ae226
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -990,11 +990,6 @@ void QmakeProject::unwatchFolders(const QStringList &l, QmakePriFileNode *node)
//////////// ////////////
// All the folder have a trailing slash! // All the folder have a trailing slash!
namespace {
bool debugCFW = false;
}
CentralizedFolderWatcher::CentralizedFolderWatcher(QmakeProject *parent) CentralizedFolderWatcher::CentralizedFolderWatcher(QmakeProject *parent)
: QObject(parent), m_project(parent) : QObject(parent), m_project(parent)
{ {
@@ -1020,8 +1015,6 @@ QSet<QString> CentralizedFolderWatcher::recursiveDirs(const QString &folder)
void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, QmakePriFileNode *node) void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, QmakePriFileNode *node)
{ {
if (debugCFW)
qDebug()<<"CFW::watchFolders()"<<folders<<"for node"<<node->filePath();
m_watcher.addPaths(folders); m_watcher.addPaths(folders);
const QChar slash = QLatin1Char('/'); const QChar slash = QLatin1Char('/');
@@ -1037,16 +1030,11 @@ void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qmake
if (!tmp.isEmpty()) if (!tmp.isEmpty())
m_watcher.addPaths(tmp.toList()); m_watcher.addPaths(tmp.toList());
m_recursiveWatchedFolders += tmp; m_recursiveWatchedFolders += tmp;
if (debugCFW)
qDebug()<<"adding recursive dirs for"<< folder<<":"<<tmp;
} }
} }
void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, QmakePriFileNode *node) void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, QmakePriFileNode *node)
{ {
if (debugCFW)
qDebug()<<"CFW::unwatchFolders()"<<folders<<"for node"<<node->filePath();
const QChar slash = QLatin1Char('/'); const QChar slash = QLatin1Char('/');
foreach (const QString &f, folders) { foreach (const QString &f, folders) {
QString folder = f; QString folder = f;
@@ -1082,13 +1070,9 @@ void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, Qma
} }
} }
if (debugCFW) foreach (const QString &tr, toRemove)
qDebug()<<"removing recursive dirs for"<<folder<<":"<<toRemove;
foreach (const QString &tr, toRemove) {
m_recursiveWatchedFolders.remove(tr); m_recursiveWatchedFolders.remove(tr);
} }
}
} }
void CentralizedFolderWatcher::folderChanged(const QString &folder) void CentralizedFolderWatcher::folderChanged(const QString &folder)
@@ -1106,10 +1090,7 @@ void CentralizedFolderWatcher::onTimer()
void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder) void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
{ {
if (debugCFW)
qDebug()<<"CFW::folderChanged"<<folder;
// Figure out whom to inform // Figure out whom to inform
QString dir = folder; QString dir = folder;
const QChar slash = QLatin1Char('/'); const QChar slash = QLatin1Char('/');
bool newOrRemovedFiles = false; bool newOrRemovedFiles = false;
@@ -1146,9 +1127,6 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
// If a subdirectory was added, watch it too // If a subdirectory was added, watch it too
QSet<QString> tmp = recursiveDirs(folderWithSlash); QSet<QString> tmp = recursiveDirs(folderWithSlash);
if (!tmp.isEmpty()) { if (!tmp.isEmpty()) {
if (debugCFW)
qDebug()<<"found new recursive dirs"<<tmp;
QSet<QString> alreadyAdded = m_watcher.directories().toSet(); QSet<QString> alreadyAdded = m_watcher.directories().toSet();
tmp.subtract(alreadyAdded); tmp.subtract(alreadyAdded);
if (!tmp.isEmpty()) if (!tmp.isEmpty())