diff options
author | Michael Neves | 2012-01-25 18:22:31 +0100 |
---|---|---|
committer | Michael Neves | 2012-01-25 18:22:31 +0100 |
commit | 6b1eebad28870e6eef578782bac394f83c279c24 (patch) | |
tree | c2f14f3f4f5449a24bb93871310ea07f70aecf9b /src/fbgui/fbgui.h | |
parent | testApp custom (diff) | |
parent | debug console fixed, now basicly tail on logfile (diff) | |
download | fbgui-6b1eebad28870e6eef578782bac394f83c279c24.tar.gz fbgui-6b1eebad28870e6eef578782bac394f83c279c24.tar.xz fbgui-6b1eebad28870e6eef578782bac394f83c279c24.zip |
Merge branch 'master' of git.openslx.org:openslx-ng/fbgui
Conflicts:
testApp.sh
Diffstat (limited to 'src/fbgui/fbgui.h')
-rw-r--r-- | src/fbgui/fbgui.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/fbgui/fbgui.h b/src/fbgui/fbgui.h index c6d5a01..4891194 100644 --- a/src/fbgui/fbgui.h +++ b/src/fbgui/fbgui.h @@ -101,14 +101,17 @@ private: // watcher to detect changes in the observed directory. QFileSystemWatcher* _watcher; + QFile* _logFile; + QTextStream* _logFileIn; private slots: // toggles debug console when action _toggleDebugConsole happens. void toggleDebugConsole(); + void refreshDebugConsole(const QString&); // This function is triggered by fileChanged Signal of _watcher. // It deletes _watcher, since we don't need it anymore and tries to load URL. - void prepareURLLoad(); + void prepareURLLoad(const QString&); void loadURLDone(bool success); // shut off the system |