From 8b4de96f9ecb3a9a5ead2ffac863123a506a8f34 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
Date: Tue, 13 Dec 2011 16:58:25 -0500
Subject: [PATCH] [ #7887 ] Fix warning
---
kde/src/AccountView.cpp | 9 ++++++---
kde/src/lib/Account.cpp | 6 +++---
kde/src/lib/sflphone_const.h | 3 +++
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/kde/src/AccountView.cpp b/kde/src/AccountView.cpp
index d45f10b3aa..692a40d1ad 100644
--- a/kde/src/AccountView.cpp
+++ b/kde/src/AccountView.cpp
@@ -99,11 +99,14 @@ QColor AccountView::getStateColor()
///Get the color name
const QString& AccountView::getStateColorName()
{
+ static const QString black("black");
+ static const QString darkGreen("darkGreen");
+ static const QString red("red");
if(getAccountDetail(ACCOUNT_STATUS) == ACCOUNT_STATE_UNREGISTERED)
- return "black";
+ return black;
if(getAccountDetail(ACCOUNT_STATUS) == ACCOUNT_STATE_REGISTERED || getAccountDetail(ACCOUNT_STATUS) == ACCOUNT_STATE_READY)
- return "darkGreen";
- return "red";
+ return darkGreen;
+ return red;
}
///Is this item checked?
diff --git a/kde/src/lib/Account.cpp b/kde/src/lib/Account.cpp
index 2b7acc8951..0f82149ed8 100644
--- a/kde/src/lib/Account.cpp
+++ b/kde/src/lib/Account.cpp
@@ -125,7 +125,7 @@ const QString& Account::getAccountId() const
qDebug() << "Error : getting AccountId of a new account.";
if (!m_pAccountId) {
qDebug() << "Account not configured";
- return ""; //WARNING May explode
+ return EMPTY_STRING; //WARNING May explode
}
return *m_pAccountId;
@@ -148,13 +148,13 @@ const QString& Account::getAccountDetail(const QString& param) const
{
if (!m_pAccountDetails) {
qDebug() << "The account list is not set";
- return NULL; //May crash, but better than crashing now
+ return EMPTY_STRING; //May crash, but better than crashing now
}
if (m_pAccountDetails->find(param) != m_pAccountDetails->end())
return (*m_pAccountDetails)[param];
else {
qDebug() << "Account details not found, there is " << m_pAccountDetails->count() << " details available";
- return NULL;
+ return EMPTY_STRING;
}
}
diff --git a/kde/src/lib/sflphone_const.h b/kde/src/lib/sflphone_const.h
index 4475f5a67c..10009f279c 100644
--- a/kde/src/lib/sflphone_const.h
+++ b/kde/src/lib/sflphone_const.h
@@ -305,6 +305,9 @@ typedef enum
CALL_STATE_ERROR = 10
} call_state;
+static const QString empty("");
+#define EMPTY_STRING empty
+
/** MIME API */
#define MIME_CALLID "text/sflphone.call.id"
#define MIME_CONTACT "text/sflphone.contact"
--
GitLab