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

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 2f06c9571b6232604d8c7831c1d725f1a508bf4e
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date:   Sat Mar 7 12:44:58 2009 +0200

    Use correct context for DirOperations::Exception messages.

diff --git a/diroperations/diroperations.cpp b/diroperations/diroperations.cpp
index 306f98e..82572e1 100644
--- a/diroperations/diroperations.cpp
+++ b/diroperations/diroperations.cpp
@@ -20,7 +20,6 @@
 #include <QtCore/QFile>
 #include <QtCore/QEventLoop>
 #include <QtCore/QVariant>
-#include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
 #include <climits> //for PATH_MAX
 #define _FILE_OFFSET_BITS 64
@@ -31,14 +30,14 @@ namespace DirOperations {
 QString Exception::what() const
 {
     switch (m_type) {
-        case OperationCanceled: return QObject::tr("User canceled the operation");
-        case AccessDenied: return QObject::tr("Access was denied to the file or directory %1").arg(m_info);
-        case NoSuchFileOrDirectory: return QObject::tr("%1: No such file or directory").arg(m_info);
-        case FileOrDirectoryExists: return QObject::tr("%1 already exists").arg(m_info);
-        case CopyFail: return QObject::tr("Could not copy %1").arg(m_info);
-        case MkdirFail: return QObject::tr("Could not create directory %1").arg(m_info);
-        case RmFail: return QObject::tr("Could not remove %1").arg(m_info);
-        default: return QObject::tr("Unknown error");
+        case OperationCanceled: return tr("User canceled the operation");
+        case AccessDenied: return tr("Access was denied to the file or directory \"%1\"").arg(m_info);
+        case NoSuchFileOrDirectory: return tr("\"%1\": No such file or directory").arg(m_info);
+        case FileOrDirectoryExists: return tr("\"%1\" already exists").arg(m_info);
+        case CopyFail: return tr("Could not copy \"%1\"").arg(m_info);
+        case MkdirFail: return tr("Could not create directory \"%1\"").arg(m_info);
+        case RmFail: return tr("Could not remove \"%1\"").arg(m_info);
+        default: return tr("Unknown error");
     }
 }
 
diff --git a/diroperations/diroperations.h b/diroperations/diroperations.h
index 6526970..28abdcc 100644
--- a/diroperations/diroperations.h
+++ b/diroperations/diroperations.h
@@ -20,6 +20,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QMetaType>
+#include <QtCore/QCoreApplication>
 
 namespace DirOperations {
 
@@ -35,6 +36,7 @@ namespace DirOperations {
 
     class Exception
     {
+        Q_DECLARE_TR_FUNCTIONS(Exception)
     public:
         enum Type { OperationCanceled, AccessDenied, NoSuchFileOrDirectory,
                     FileOrDirectoryExists, CopyFail, MkdirFail, RmFail, NoError };

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