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

[Sune Vuorela]

The following commit has been merged in the master branch:
commit 7ce7369265c1f10dd23162045cb38c53602efa25
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Feb 17 23:11:57 2009 +0100

    do some dummy operations

diff --git a/migrationpage.cpp b/migrationpage.cpp
index f5ffe2e..77430e0 100644
--- a/migrationpage.cpp
+++ b/migrationpage.cpp
@@ -47,10 +47,13 @@ void MigrationPagePrivate::doMagic()
       qDebug() << "do nothing, let kconf_update do magic";
       break;
     case MigrationTool::Merge:
+	DirOperations::mergeDirs(QDir::homePath()+"tmp/dirstructure/kde4",
+			         QDir::homePath()+"tmp/dirstructure/kde");
       qDebug() << "do magic experimental merge";
       break;
     case MigrationTool::Clean:
       qDebug() << "do recursive rm of .kde dir";
+      DirOperations::recursiveRmDir(QDir::homePath()+"tmp/dirstructure/kde");
       break;
     case MigrationTool::Move:
       qDebug() << "move .kde4 over .kde";

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