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

List:       kde-commits
Subject:    playground/base/plasma/libknotificationareaitem
From:       Marco Martin <notmart () gmail ! com>
Date:       2009-04-04 18:54:02
Message-ID: 1238871242.173805.9679.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 949257 by mart:

unbreak some return values


 M  +3 -15     knotificationareaitem.cpp  
 M  +11 -18    knotificationareaitemdbus_p.cpp  


--- trunk/playground/base/plasma/libknotificationareaitem/knotificationareaitem.cpp \
#949256:949257 @@ -342,11 +342,7 @@
 
 QString KNotificationAreaItem::icon() const
 {
-    if (d->icon.data.length() == 0) {
-        return d->iconName;
-    } else {
-        return QString();
-    }
+    return d->iconName;
 }
 
 QPixmap KNotificationAreaItem::image() const
@@ -359,11 +355,7 @@
 
 QString KNotificationAreaItem::attentionIcon() const
 {
-    if (d->attentionIcon.data.length() == 0) {
-        return d->attentionIconName;
-    } else {
-        return QString();
-    }
+    return d->attentionIconName;
 }
 
 QPixmap KNotificationAreaItem::attentionImage() const
@@ -381,11 +373,7 @@
 
 QString KNotificationAreaItem::tooltipIcon() const
 {
-    if (d->tooltipIcon.data.length() == 0) {
-        return d->tooltipIconName;
-    } else {
-        return QString();
-    }
+    return d->tooltipIconName;
 }
 
 QPixmap KNotificationAreaItem::tooltipImage() const
--- trunk/playground/base/plasma/libknotificationareaitem/knotificationareaitemdbus_p.cpp \
#949256:949257 @@ -137,7 +137,7 @@
 
 QString KNotificationAreaItemDBus::Icon() const
 {
-    if (notificationareaItem->icon().length() == 0) {
+    if (notificationareaItem->d->icon.data.length() == 0) {
         return notificationareaItem->icon();
     } else {
         return QString();
@@ -154,7 +154,7 @@
 
 QString KNotificationAreaItemDBus::AttentionIcon() const
 {
-    if (notificationareaItem->attentionIcon().length() == 0) {
+    if (notificationareaItem->d->attentionIcon.data.length() == 0) {
         return notificationareaItem->attentionIcon();
     } else {
         return QString();
@@ -176,7 +176,7 @@
 
 QString KNotificationAreaItemDBus::TooltipIcon() const
 {
-    if (notificationareaItem->tooltipIcon().length() == 0) {
+    if (notificationareaItem->d->tooltipIcon.data.length() == 0) {
         return notificationareaItem->tooltipIcon();
     } else {
         return QString();
@@ -203,39 +203,32 @@
 
 void KNotificationAreaItemDBus::ContextMenu(int x, int y)
 {
-    if ( !notificationareaItem->d->hasQuit )
-    {
+    if (!notificationareaItem->d->hasQuit) {
         // we need to add the actions to the menu afterwards so that these items
         // appear at the _END_ of the menu
         notificationareaItem->d->menu->addSeparator();
         QAction* action = notificationareaItem->d->actionCollection->action( \
"minimizeRestore" );  
-        if ( action )
-        {
+        if (action) {
             notificationareaItem->d->menu->addAction( action );
         }
 
         action = notificationareaItem->d->actionCollection->action( \
KStandardAction::name( KStandardAction::Quit ) );  
-        if ( action )
-        {
+        if (action) {
             notificationareaItem->d->menu->addAction( action );
         }
 
         notificationareaItem->d->hasQuit = true;
     }
 
-    if ( notificationareaItem->d->parentWidget )
-    {
+    if (notificationareaItem->d->parentWidget) {
         QAction* action = \
                notificationareaItem->d->actionCollection->action("minimizeRestore");
-        if ( notificationareaItem->d->parentWidget->isVisible() )
-        {
-            action->setText( i18n("&Minimize") );
+        if (notificationareaItem->d->parentWidget->isVisible())  {
+            action->setText(i18n("&Minimize"));
+        } else {
+            action->setText(i18n("&Restore"));
         }
-        else
-        {
-            action->setText( i18n("&Restore") );
-        }
     }
 
     //TODO: nicer placement, possible?


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