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

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 1ab9457b6eb63822a58d86279aeaaab2dbe60c37
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date:   Wed Feb 18 14:42:30 2009 +0200

    Modify the unit test to do merging.

diff --git a/diroperations/unit_test/test.cpp b/diroperations/unit_test/test.cpp
index d9f68ac..8949d7c 100644
--- a/diroperations/unit_test/test.cpp
+++ b/diroperations/unit_test/test.cpp
@@ -43,7 +43,7 @@ Test::Test()
 void Test::docopy()
 {
     try {
-        DirOperations::recursiveCpDir(m_source->text(), m_dest->text(), true, m_progressWidget);
+        DirOperations::mergeDirs(m_source->text(), m_dest->text(), m_progressWidget);
     } catch (const DirOperations::Exception & e) {
         qDebug() << e.what();
         std::exit(1);
@@ -57,5 +57,3 @@ int main(int argc, char **argv)
     t.show();
     return a.exec();
 }
-
-#include "test.moc"

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