[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=51bd1a6

The following commit has been merged in the master branch:
commit 51bd1a6a9fe7eaa62c27c1f96f4ff386f4eb7e34
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Jun 7 10:42:11 2011 +0200

    Remove i18n for kDebug() and kWarning()
---
 src/handle-incoming-file-transfer-channel-job.cpp | 18 +++++++++---------
 src/handle-outgoing-file-transfer-channel-job.cpp | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 7ba6878..3838ba2 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -115,7 +115,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__start()
     kDebug() << "File name:" << url;
 
     file = new QFile(url.toLocalFile(), q->parent());
-    kDebug() << i18n("Saving file as") << file->fileName();
+    kDebug() << "Saving file as" << file->fileName();
 
     //TODO check if file already exists and if file should be overwritten, resumed or renamed
     //     (also set offset accordingly)
@@ -132,7 +132,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onSetUrlOperationFinished
     Q_Q(HandleIncomingFileTransferChannelJob);
 
     if (op->isError()) {
-        kWarning() << i18n("Unable to set the URI") << "-" <<
+        kWarning() << "Unable to set the URI -" <<
             op->errorName() << ":" << op->errorMessage();
         __k__onInvalidated();
         return;
@@ -149,10 +149,10 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
     kDebug();
     Q_Q(HandleIncomingFileTransferChannelJob);
 
-    kDebug() << i18n("File transfer channel state changed to") << state << i18n("with reason") << stateReason;
+    kDebug() << "File transfer channel state changed to" << state << "with reason" << stateReason;
     transferCompleted = (state == Tp::FileTransferStateCompleted);
     if (transferCompleted) {
-        kDebug() << i18n("Transfer completed, saved at") << file->fileName();
+        kDebug() << "Transfer completed, saved at" << file->fileName();
         Q_EMIT q->infoMessage(q, i18n("Transfer completed!"));
 
         QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
@@ -164,9 +164,9 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelTran
     kDebug();
     Q_Q(HandleIncomingFileTransferChannelJob);
 
-    kDebug().nospace() << i18n("Receiving") << channel->fileName() << "-"
-                       << i18n("transferred bytes") << "=" << count << " ("
-                       << ((int) (((double) count / channel->size()) * 100)) << "%" << i18n("done") << ")";
+    kDebug().nospace() << "Receiving" << channel->fileName() << " - "
+                       << "transferred bytes" << " = " << count << " ("
+                       << ((int) (((double) count / channel->size()) * 100)) << "% done)";
     Q_EMIT q->infoMessage(q, i18n("Transferred bytes"));
 }
 
@@ -174,7 +174,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onAcceptFileFinished(Tp::
 {
     kDebug();
     if (op->isError()) {
-        kWarning() << i18n("Unable to accept file") << "-" <<
+        kWarning() << "Unable to accept file -" <<
             op->errorName() << ":" << op->errorMessage();
         __k__onInvalidated();
         return;
@@ -185,7 +185,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onInvalidated()
 {
     Q_Q(HandleIncomingFileTransferChannelJob);
 
-    kWarning() << i18n("File transfer invalidated!");
+    kWarning() << "File transfer invalidated!";
     Q_EMIT q->infoMessage(q, i18n("File transfer invalidated!"));
 
     QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index a256de3..921da81 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -122,22 +122,22 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
     kDebug();
     Q_Q(HandleOutgoingFileTransferChannelJob);
 
-    kDebug() << i18n("File transfer channel state changed to") << state << i18n("with reason") << stateReason;
+    kDebug() << "File transfer channel state changed to" << state << "with reason" << stateReason;
 
     switch (state)
     {
         case Tp::FileTransferStateNone:
             // This is bad
-            kWarning() << i18n("An error occurred.");
+            kWarning() << "An error occurred.";
             q->setError(KTelepathy::InvalidOperationError);
             QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
         case Tp::FileTransferStateCompleted:
-            kDebug() << i18n("Transfer completed");
+            kDebug() << "Transfer completed";
             Q_EMIT q->infoMessage(q, i18n("Transfer completed"));
             QTimer::singleShot(0, q, SLOT(__k__doEmitResult())); //TODO here?
             break;
         case Tp::FileTransferStateCancelled:
-            kWarning() << i18n("Transfer was canceled.");
+            kWarning() << "Transfer was canceled.";
             q->setError(KTelepathy::InvalidOperationError); //TODO
             q->setErrorText(i18n("Transfer was canceled."));
             QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
@@ -172,7 +172,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__provideFile()
     }
 
     file = new QFile(uri.toLocalFile(), q->parent());
-    kDebug() << i18n("Providing file") << file->fileName();
+    kDebug() << "Providing file" << file->fileName();
 
     Tp::PendingOperation* provideFileOperation = channel->provideFile(file);
     q->connect(provideFileOperation, SIGNAL(finished(Tp::PendingOperation*)),
@@ -184,9 +184,9 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelTran
     kDebug();
     Q_Q(HandleOutgoingFileTransferChannelJob);
 
-    kDebug().nospace() << i18n("Receiving") << channel->fileName() << "-"
-                       << i18n("Transferred bytes") << "=" << count << " ("
-                       << ((int) (((double) count / channel->size()) * 100)) << "%" << i18n("done") << ")";
+    kDebug().nospace() << "Receiving" << channel->fileName() << " - "
+                       << "Transferred bytes = " << count << " ("
+                       << ((int) (((double) count / channel->size()) * 100)) << "% done)";
     Q_EMIT q->infoMessage(q, i18n("Transferred bytes"));
 }
 
@@ -194,7 +194,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onProvideFileFinished(Tp:
 {
     kDebug();
     if (op->isError()) {
-        kWarning() << i18n("Unable to provide file") << "-" <<
+        kWarning() << "Unable to provide file - " <<
             op->errorName() << ":" << op->errorMessage();
         __k__onInvalidated();
         return;
@@ -205,7 +205,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onInvalidated()
 {
     Q_Q(HandleOutgoingFileTransferChannelJob);
 
-    kWarning() << i18n("File transfer invalidated!");
+    kWarning() << "File transfer invalidated!";
     Q_EMIT q->infoMessage(q, i18n("File transfer invalidated!"));
 
     QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));

-- 
ktp-filetransfer-handler packaging