Skip to content
Snippets Groups Projects
Commit 9ef11006 authored by dt's avatar dt
Browse files

Add some (disabled) debug output

parent 551114de
No related branches found
No related tags found
No related merge requests found
...@@ -50,13 +50,15 @@ Qt4UiCodeModelSupport::Qt4UiCodeModelSupport(CppTools::CppModelManagerInterface ...@@ -50,13 +50,15 @@ Qt4UiCodeModelSupport::Qt4UiCodeModelSupport(CppTools::CppModelManagerInterface
m_fileName(uiHeaderFile), m_fileName(uiHeaderFile),
m_updateIncludingFiles(false) m_updateIncludingFiles(false)
{ {
// qDebug()<<"ctor Qt4UiCodeModelSupport for"<<m_sourceName; if (debug)
qDebug()<<"ctor Qt4UiCodeModelSupport for"<<m_sourceName<<uiHeaderFile;
init(); init();
} }
Qt4UiCodeModelSupport::~Qt4UiCodeModelSupport() Qt4UiCodeModelSupport::~Qt4UiCodeModelSupport()
{ {
// qDebug()<<"dtor ~Qt4UiCodeModelSupport for"<<m_sourceName; if (debug)
qDebug()<<"dtor ~Qt4UiCodeModelSupport for"<<m_sourceName;
} }
void Qt4UiCodeModelSupport::init() void Qt4UiCodeModelSupport::init()
...@@ -67,7 +69,8 @@ void Qt4UiCodeModelSupport::init() ...@@ -67,7 +69,8 @@ void Qt4UiCodeModelSupport::init()
if (uiHeaderTime.isValid() && (uiHeaderTime > sourceTime)) { if (uiHeaderTime.isValid() && (uiHeaderTime > sourceTime)) {
QFile file(m_fileName); QFile file(m_fileName);
if (file.open(QFile::ReadOnly)) { if (file.open(QFile::ReadOnly)) {
// qDebug()<<"ui*h file is more recent then source file, using information from ui*h file"<<m_fileName; if (debug)
qDebug()<<"ui*h file is more recent then source file, using information from ui*h file"<<m_fileName;
QTextStream stream(&file); QTextStream stream(&file);
m_contents = stream.readAll().toUtf8(); m_contents = stream.readAll().toUtf8();
m_cacheTime = uiHeaderTime; m_cacheTime = uiHeaderTime;
...@@ -75,17 +78,20 @@ void Qt4UiCodeModelSupport::init() ...@@ -75,17 +78,20 @@ void Qt4UiCodeModelSupport::init()
} }
} }
// qDebug()<<"ui*h file not found, or not recent enough, trying to create it on the fly"; if (debug)
qDebug()<<"ui*h file not found, or not recent enough, trying to create it on the fly";
QFile file(m_sourceName); QFile file(m_sourceName);
if (file.open(QFile::ReadOnly)) { if (file.open(QFile::ReadOnly)) {
QTextStream stream(&file); QTextStream stream(&file);
const QString contents = stream.readAll(); const QString contents = stream.readAll();
if (runUic(contents)) { if (runUic(contents)) {
// qDebug()<<"created on the fly"; if (debug)
qDebug()<<"created on the fly";
return; return;
} else { } else {
// uic run was unsuccesfull // uic run was unsuccesfull
// qDebug()<<"uic run wasn't succesfull"; if (debug)
qDebug()<<"uic run wasn't succesfull";
m_cacheTime = QDateTime(); m_cacheTime = QDateTime();
m_contents = QByteArray(); m_contents = QByteArray();
// and if the header file wasn't there, next time we need to update // and if the header file wasn't there, next time we need to update
...@@ -95,7 +101,8 @@ void Qt4UiCodeModelSupport::init() ...@@ -95,7 +101,8 @@ void Qt4UiCodeModelSupport::init()
return; return;
} }
} else { } else {
// qDebug()<<"Could open "<<m_sourceName<<"needed for the cpp model"; if (debug)
qDebug()<<"Could open "<<m_sourceName<<"needed for the cpp model";
m_contents = QByteArray(); m_contents = QByteArray();
} }
} }
...@@ -114,6 +121,10 @@ void Qt4UiCodeModelSupport::setFileName(const QString &name) ...@@ -114,6 +121,10 @@ void Qt4UiCodeModelSupport::setFileName(const QString &name)
{ {
if (m_fileName == name && m_cacheTime.isValid()) if (m_fileName == name && m_cacheTime.isValid())
return; return;
if (debug)
qDebug() << "Qt4UiCodeModelSupport::setFileName"<<name;
m_fileName = name; m_fileName = name;
m_contents.clear(); m_contents.clear();
m_cacheTime = QDateTime(); m_cacheTime = QDateTime();
...@@ -156,12 +167,14 @@ void Qt4UiCodeModelSupport::updateFromEditor(const QString &formEditorContents) ...@@ -156,12 +167,14 @@ void Qt4UiCodeModelSupport::updateFromEditor(const QString &formEditorContents)
void Qt4UiCodeModelSupport::updateFromBuild() void Qt4UiCodeModelSupport::updateFromBuild()
{ {
// qDebug()<<"Qt4UiCodeModelSupport::updateFromBuild() for file"<<m_sourceName; if (debug)
qDebug()<<"Qt4UiCodeModelSupport::updateFromBuild() for file"<<m_sourceName;
// This is mostly a fall back for the cases when uic couldn't be run // This is mostly a fall back for the cases when uic couldn't be run
// it pays special attention to the case where a ui_*h was newly created // it pays special attention to the case where a ui_*h was newly created
QDateTime sourceTime = QFileInfo(m_sourceName).lastModified(); QDateTime sourceTime = QFileInfo(m_sourceName).lastModified();
if (m_cacheTime.isValid() && m_cacheTime >= sourceTime) { if (m_cacheTime.isValid() && m_cacheTime >= sourceTime) {
// qDebug()<<"Cache is still more recent then source"; if (debug)
qDebug()<<"Cache is still more recent then source";
return; return;
} else { } else {
QFileInfo fi(m_fileName); QFileInfo fi(m_fileName);
...@@ -169,7 +182,8 @@ void Qt4UiCodeModelSupport::updateFromBuild() ...@@ -169,7 +182,8 @@ void Qt4UiCodeModelSupport::updateFromBuild()
if (uiHeaderTime.isValid() && (uiHeaderTime > sourceTime)) { if (uiHeaderTime.isValid() && (uiHeaderTime > sourceTime)) {
if (m_cacheTime >= uiHeaderTime) if (m_cacheTime >= uiHeaderTime)
return; return;
// qDebug()<<"found ui*h updating from it"; if (debug)
qDebug()<<"found ui*h updating from it";
QFile file(m_fileName); QFile file(m_fileName);
if (file.open(QFile::ReadOnly)) { if (file.open(QFile::ReadOnly)) {
...@@ -180,8 +194,8 @@ void Qt4UiCodeModelSupport::updateFromBuild() ...@@ -180,8 +194,8 @@ void Qt4UiCodeModelSupport::updateFromBuild()
return; return;
} }
} }
if (debug)
// qDebug()<<"ui*h not found or not more recent then source not changing anything"; qDebug()<<"ui*h not found or not more recent then source not changing anything";
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment