[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=74ff872

The following commit has been merged in the master branch:
commit 74ff8720970ab8b7baf7279675e47720a441da18
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Dec 21 19:18:24 2011 +0100

    Fix curly brackets style
---
 src/handle-incoming-file-transfer-channel-job.cpp | 21 +++++++--------------
 src/handle-outgoing-file-transfer-channel-job.cpp | 15 +++++----------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 7c92a9e..8b6a3f3 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -121,8 +121,7 @@ void HandleIncomingFileTransferChannelJobPrivate::init()
     kDebug();
     Q_Q(HandleIncomingFileTransferChannelJob);
 
-    if (channel.isNull())
-    {
+    if (channel.isNull()) {
         kError() << "Channel cannot be NULL";
         q->setError(KTp::NullChannel);
         q->setErrorText(i18n("Invalid channel"));
@@ -131,8 +130,7 @@ void HandleIncomingFileTransferChannelJobPrivate::init()
     }
 
     Tp::Features features = Tp::Features() << Tp::FileTransferChannel::FeatureCore;
-    if (!channel->isReady(Tp::Features() << Tp::FileTransferChannel::FeatureCore))
-    {
+    if (!channel->isReady(Tp::Features() << Tp::FileTransferChannel::FeatureCore)) {
         kError() << "Channel must be ready with Tp::FileTransferChannel::FeatureCore";
         q->setError(KTp::FeatureNotReady);
         q->setErrorText(i18n("Channel is not ready"));
@@ -211,8 +209,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onRenameDialogFinished(in
     kDebug();
     Q_Q(HandleIncomingFileTransferChannelJob);
 
-    if (!renameDialog)
-    {
+    if (!renameDialog) {
         kWarning() << "Rename dialog was deleted during event loop.";
         QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
         return;
@@ -220,8 +217,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onRenameDialogFinished(in
 
     Q_ASSERT(renameDialog.data()->result() == result);
 
-    switch (result)
-    {
+    switch (result) {
         case KIO::R_CANCEL:
             // TODO Cancel file transfer and close channel
             channel->cancel();
@@ -284,8 +280,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onResumeDialogFinished(in
     kDebug();
     Q_Q(HandleIncomingFileTransferChannelJob);
 
-    if (!renameDialog)
-    {
+    if (!renameDialog) {
         kWarning() << "Rename dialog was deleted during event loop.";
         QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
         return;
@@ -293,8 +288,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onResumeDialogFinished(in
 
     Q_ASSERT(renameDialog.data()->result() == result);
 
-    switch (result)
-    {
+    switch (result) {
         case KIO::R_RESUME:
         {
             QFileInfo fileInfo(partUrl.toLocalFile());
@@ -411,8 +405,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
 
     kDebug() << "Incoming file transfer channel state changed to" << state << "with reason" << stateReason;
 
-    switch (state)
-    {
+    switch (state) {
         case Tp::FileTransferStateNone:
             // This is bad
             kWarning() << "An unknown error occurred.";
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index f02d2cf..07afc04 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -109,8 +109,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::init()
     kDebug();
     Q_Q(HandleOutgoingFileTransferChannelJob);
 
-    if (channel.isNull())
-    {
+    if (channel.isNull()) {
         kError() << "Channel cannot be NULL";
         q->setError(KTp::NullChannel);
         q->setErrorText(i18n("Invalid channel"));
@@ -119,8 +118,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::init()
     }
 
     Tp::Features features = Tp::Features() << Tp::FileTransferChannel::FeatureCore;
-    if (!channel->isReady(Tp::Features() << Tp::FileTransferChannel::FeatureCore))
-    {
+    if (!channel->isReady(Tp::Features() << Tp::FileTransferChannel::FeatureCore)) {
         kError() << "Channel must be ready with Tp::FileTransferChannel::FeatureCore";
         q->setError(KTp::FeatureNotReady);
         q->setErrorText(i18n("Channel is not ready"));
@@ -129,16 +127,14 @@ void HandleOutgoingFileTransferChannelJobPrivate::init()
     }
 
     uri = KUrl(channel->uri());
-    if (uri.isEmpty())
-    {
+    if (uri.isEmpty()) {
         qWarning() << "URI property missing";
         q->setError(KTp::UriPropertyMissing);
         q->setErrorText(i18n("URI property is missing"));
         QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
         return;
     }
-    if (!uri.isLocalFile())
-    {
+    if (!uri.isLocalFile()) {
         // TODO handle this!
         qWarning() << "Not a local file";
         q->setError(KTp::NotALocalFile);
@@ -220,8 +216,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
 
     kDebug() << "Outgoing file transfer channel state changed to" << state << "with reason" << stateReason;
 
-    switch (state)
-    {
+    switch (state) {
         case Tp::FileTransferStateNone:
             // This is bad
             kWarning() << "An unknown error occurred.";

-- 
ktp-filetransfer-handler packaging