[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/libkopete
From:       Grzegorz Jaskiewicz <gj () pointblue ! com ! pl>
Date:       2004-03-01 9:47:46
Message-ID: 20040301094746.6E3B1995B () office ! kde ! org
[Download RAW message or body]

CVS commit by gj: 

Don't display empty properties in tooltip.


  M +7 -7      kopetecontact.cpp   1.182


--- kdenetwork/kopete/libkopete/kopetecontact.cpp  #1.181:1.182
@@ -702,5 +702,5 @@ QString KopeteContact::toolTip() const
                 {
                         QString name = formattedName();
-                        if(!name.isNull())
+                        if(!name.isEmpty())
                                 tip += i18n("<br><b>Full Name:</b>&nbsp;FORMATTED NAME",
                                         "<br><b>Full Name:</b>&nbsp;<nobr>%1</nobr>").arg(name);
@@ -709,5 +709,5 @@ QString KopeteContact::toolTip() const
                 {
                         QString time = formattedIdleTime();
-                        if(!time.isNull())
+                        if(!time.isEmpty())
                                 tip += i18n("<br><b>Idle:</b>&nbsp;FORMATTED IDLE TIME",
                                         "<br><b>Idle:</b>&nbsp;<nobr>%1</nobr>").arg(time);
@@ -716,5 +716,5 @@ QString KopeteContact::toolTip() const
                 {
                         QString url = property(*it).value().toString();
-                        if(!url.isNull())
+                        if(!url.isEmpty())
                                 url += i18n("<br><b>Home Page:</b>&nbsp;FORMATTED URL",
                                         "<br><b>Home Page:</b>&nbsp;<nobr><a href=\"%1\">%1</a></nobr>").arg(url).arg(url);
@@ -723,5 +723,5 @@ QString KopeteContact::toolTip() const
                 {
                         p = property(*it);
-                        if(!p.isNull())
+                        if(!p.isEmpty())
                         {
                                 QVariant val = p.value();
@@ -759,7 +759,7 @@ QString KopeteContact::formattedName() c
         first = property(QString::fromLatin1("firstName"));
         last = property(QString::fromLatin1("lastName"));
-        if(!first.isNull())
+        if(!first.isEmpty())
         {
-                if(!last.isNull()) // contact has both first and last name
+                if(!last.isEmpty()) // contact has both first and last name
                 {
                         ret = i18n("firstName lastName", "%2 %1")
@@ -772,5 +772,5 @@ QString KopeteContact::formattedName() c
                 }
         }
-        else if(!last.isNull()) // only last name set
+        else if(!last.isEmpty()) // only last name set
         {
                 ret = last.value().toString();


[prev in list] [next in list] [prev in thread] [next in thread]