[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-39-g3a1238e

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 5c9c7a31f2acd3745c18542d540405702f12ed98
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Apr 4 20:12:48 2009 +0300

    Change default kaboom stamp to ~/.local/kaboom.
    
    Also improve internals of stamp handling, support --stamp command
    line argument.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/debian/changelog b/debian/changelog
index 89f42b9..0b72e9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kaboom (1.0.3) unstable; urgency=low
+kaboom (1.0.4) unstable; urgency=low
 
   * NOT RELEASED YET (final version will be 1.1.0).
 
@@ -18,8 +18,9 @@ kaboom (1.0.3) unstable; urgency=low
   * Be more verbose in the MigrationPage about selected options.
   * Fix layouting of ChoicePage (more stable).
   * Add myself to debian/copyright as author.
+  * Change default kaboom stamp path to ~/.local/kaboom.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 03 Apr 2009 19:48:45 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Apr 2009 19:58:45 +0300
 
 kaboom (0.9.1) experimental; urgency=low
 
diff --git a/kaboomsettings.cpp b/kaboomsettings.cpp
index cd8fe59..ba2c1c4 100644
--- a/kaboomsettings.cpp
+++ b/kaboomsettings.cpp
@@ -18,12 +18,14 @@
 #include <QtCore/QStringList>
 #include <QtCore/QDebug>
 #include <cstring>
+#include <unistd.h>
 
 #include "kaboomsettings.h"
 
 #define DEFAULT_KDEDIR "/.kde"
 #define DEFAULT_KDE4DIR "/.kde4"
 #define DEFAULT_KDE3BACKUPDIR "/kde3-backup"
+#define KABOOM_STAMP "/.local/kaboom"
 
 KaboomSettings* KaboomSettings::s_instance = 0;
 
@@ -40,6 +42,7 @@ void KaboomSettings::initDefaults()
     setKdehomePath(KdeHome, homedir + DEFAULT_KDEDIR);
     setKdehomePath(Kde4Home, homedir + DEFAULT_KDE4DIR);
     setKdehomePath(Kde3Backup, homedir + DEFAULT_KDE3BACKUPDIR);
+    m_stampFile.setFileName(homedir + KABOOM_STAMP);
 }
 
 KaboomSettings::KaboomSettings()
@@ -58,6 +61,8 @@ KaboomSettings::KaboomSettings(int argc, char** argv)
             setKdehomePath(Kde4Home, QString::fromLocal8Bit(argv[++i]));
         } else if (strcmp(argv[i], "--kde3backup") == 0 && i+1 < argc) {
             setKdehomePath(Kde3Backup, QString::fromLocal8Bit(argv[++i]));
+        } else if (strcmp(argv[i], "--stamp") == 0 && i+1 < argc) {
+            m_stampFile.setFileName(QString::fromLocal8Bit(argv[++i]));
         } else if (strcmp(argv[i], "--help") == 0) {
             // TODO: show help
         }
@@ -73,7 +78,8 @@ void KaboomSettings::dump()
         ((kde4homeDir().exists()) ? "YES" : "NO");
     qDebug() << "kde3backup -" << kde3backupDir().path() << "- exists?:" <<
         ((kde3backupDir().exists()) ? "YES" : "NO");
-    qDebug() << "kaboom stamp -" << "exists?: " << ((stampExists()) ? "YES" : "NO");
+    qDebug() << "kaboom stamp -" << stampFile().fileName() << "- exists?: " <<
+        ((stampExists()) ? "YES" : "NO");
     qDebug() << "---- -------------------- ----";
 }
 
@@ -108,12 +114,19 @@ QString KaboomSettings::kdehomePrettyPath(KdeHomeType type) const
     return m_prettyKdehomes[type];
 }
 
+const QFile& KaboomSettings::stampFile() const
+{
+    return m_stampFile;
+}
+
 bool KaboomSettings::stampExists() const
 {
-    return (QFile::exists(QDir::homePath()+"/.local/kdebian3to4"));
+    return m_stampFile.exists();;
 }
 
 void KaboomSettings::touchStamp()
 {
-    QFile(QDir::homePath()+"/.local/kdebian3to4").open(QIODevice::WriteOnly);
+    m_stampFile.open(QIODevice::WriteOnly);
+    m_stampFile.close();
+    sync();
 }
diff --git a/kaboomsettings.h b/kaboomsettings.h
index c9b3d0d..4aaa30f 100644
--- a/kaboomsettings.h
+++ b/kaboomsettings.h
@@ -46,6 +46,7 @@ class KaboomSettings {
     const QDir& kde3backupDir() const { return kdehomeDir(Kde3Backup); }
 
     /* Stamp handling */
+    const QFile& stampFile() const;
     bool stampExists() const;
     void touchStamp();
 
@@ -57,6 +58,7 @@ class KaboomSettings {
 
     QDir m_kdehomes[KDEHOMES_COUNT];
     QString m_prettyKdehomes[KDEHOMES_COUNT];
+    QFile m_stampFile;
     void initDefaults();
 };
 

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