[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=382a01e

The following commit has been merged in the master branch:
commit 382a01e4527294f0c99ef8e264697f445ebdc77a
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Dec 9 18:21:34 2011 +0100

    Fix a few "-Wparentheses" warnings
---
 src/salut-enabler.cpp        | 4 ++--
 src/salut-message-widget.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/salut-enabler.cpp b/src/salut-enabler.cpp
index 34bfbdf..847a666 100644
--- a/src/salut-enabler.cpp
+++ b/src/salut-enabler.cpp
@@ -191,7 +191,7 @@ void SalutEnabler::onUserAccepted()
     QString nick = d->values["nickname"].toString();
 
     //either one of the names is filled and nick is filled
-    if ((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty())
+    if (((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty()))
             && !nick.isEmpty()) {
 
         displayName = QString("%1 (%2)").arg(d->values["first-name"].toString().isEmpty() ?
@@ -199,7 +199,7 @@ void SalutEnabler::onUserAccepted()
                                              d->values["nickname"].toString());
 
     //either one of the names is filled and nick is empty
-    } else if ((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty())
+    } else if (((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty()))
             && nick.isEmpty()) {
 
         displayName = d->values["first-name"].toString().isEmpty() ?
diff --git a/src/salut-message-widget.cpp b/src/salut-message-widget.cpp
index af9be19..0ab5c1a 100644
--- a/src/salut-message-widget.cpp
+++ b/src/salut-message-widget.cpp
@@ -76,13 +76,13 @@ void SalutMessageWidget::setParams(const QString& firstname, const QString& last
     QString displayName;
 
     //either one of the names is filled and nick is filled
-    if ((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty())
+    if (((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty()))
             && !nick.isEmpty()) {
 
         displayName = QString("%1 (%2)").arg(lastname.isEmpty() ? firstname : lastname, nick);
 
     //either one of the names is filled and nick is empty
-    } else if ((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty())
+    } else if (((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty()))
             && nick.isEmpty()) {
 
         displayName = QString("%1").arg(lastname.isEmpty() ? firstname : lastname);

-- 
ktp-accounts-kcm packaging