[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/1.1.0-7-g0ff2464

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 0ff246429fc56916bd232841d691b0dabac6114b
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date:   Sun Apr 12 13:37:58 2009 +0300

    Use ~/.kaboom.log as a default log file and dump it with the rest of the settings.

diff --git a/debian/changelog b/debian/changelog
index 57808fd..31456ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ kaboom (1.1.1~pre1) UNRELEASED; urgency=low
   * Force showing kaboom at the upper left corner of the screen,
     so that it doesn't get outside of the screen when it grows bigger.
   * Fix integer overflow bug in 32-bit architectures. (Closes: #522834)
-  * Add support for logging output to a file.
+  * Add support for logging output to a file (default is ~/.kaboom.log).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Apr 2009 00:57:13 +0300
 
diff --git a/kaboomsettings.cpp b/kaboomsettings.cpp
index ab33f4c..c1fb621 100644
--- a/kaboomsettings.cpp
+++ b/kaboomsettings.cpp
@@ -27,6 +27,7 @@
 #define DEFAULT_KDE4DIR "/.kde4"
 #define DEFAULT_KDE3BACKUPDIR "/kde3-backup"
 #define KABOOM_STAMP "/.local/kaboom"
+#define KABOOM_LOG "/.kaboom.log"
 
 KaboomSettings* KaboomSettings::s_instance = 0;
 
@@ -44,11 +45,13 @@ void KaboomSettings::initDefaults()
     setKdehomePath(Kde4Home, homedir + DEFAULT_KDE4DIR);
     setKdehomePath(Kde3Backup, homedir + DEFAULT_KDE3BACKUPDIR);
     m_stampFile.setFileName(homedir + KABOOM_STAMP);
+    m_logFile = homedir + KABOOM_LOG;
 }
 
 KaboomSettings::KaboomSettings()
 {
     initDefaults();
+    KaboomLog::init(m_logFile);
 }
 
 KaboomSettings::KaboomSettings(int argc, char** argv)
@@ -65,11 +68,18 @@ KaboomSettings::KaboomSettings(int argc, char** argv)
         } else if (strcmp(argv[i], "--stamp") == 0 && i+1 < argc) {
             m_stampFile.setFileName(QFile::decodeName(argv[++i]));
         } else if (qstrcmp(argv[i], "--log") == 0) {
-            KaboomLog::init(argv[++i]);
+            m_logFile = QFile::decodeName(argv[++i]);
         } else if (strcmp(argv[i], "--help") == 0) {
             // TODO: show help
         }
     }
+
+    KaboomLog::init(m_logFile);
+}
+
+KaboomSettings::~KaboomSettings()
+{
+    KaboomLog::cleanup();
 }
 
 void KaboomSettings::dump()
@@ -83,6 +93,7 @@ void KaboomSettings::dump()
         ((kde3backupDir().exists()) ? "YES" : "NO");
     qDebug() << "kaboom stamp -" << stampFile().fileName() << "- exists?: " <<
         ((stampExists()) ? "YES" : "NO");
+    qDebug() << "kaboom log -" << m_logFile;
     qDebug() << "---- -------------------- ----";
 }
 
diff --git a/kaboomsettings.h b/kaboomsettings.h
index 4aaa30f..a615843 100644
--- a/kaboomsettings.h
+++ b/kaboomsettings.h
@@ -33,6 +33,7 @@ class KaboomSettings {
 
     explicit KaboomSettings(int argc, char** argv);
     explicit KaboomSettings();
+    ~KaboomSettings();
 
     static KaboomSettings& instance();
 
@@ -59,6 +60,7 @@ class KaboomSettings {
     QDir m_kdehomes[KDEHOMES_COUNT];
     QString m_prettyKdehomes[KDEHOMES_COUNT];
     QFile m_stampFile;
+    QString m_logFile;
     void initDefaults();
 };
 
diff --git a/main.cpp b/main.cpp
index e582f56..b19e0dc 100644
--- a/main.cpp
+++ b/main.cpp
@@ -16,7 +16,6 @@
 */
 #include "migrationtool.h"
 #include "kaboomsettings.h"
-#include "kaboomlog.h"
 #include <QApplication>
 #include <QFile>
 #include <QTranslator>
@@ -65,6 +64,5 @@ int main(int argc, char* argv[])
       }
   }
 
-  KaboomLog::cleanup();
   return exitvalue;
 }

-- 
Kaboom - Debian KDE 3->4 migration tool