[ #7887 ] Fix warning

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?

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;
    }
 }
 

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"