From kde-commits  Fri Oct 30 14:23:31 2009
From: =?utf-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <agateau () kde ! org>
Date: Fri, 30 Oct 2009 14:23:31 +0000
To: kde-commits
Subject: KDE/kdemultimedia
Message-Id: <1256912611.995951.14041.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=125691262614052

SVN commit 1042712 by gateau:

notification -> statusnotifier

 M  +3 -3      juk/systemtray.cpp  
 M  +2 -2      juk/systemtray.h  
 M  +1 -1      kmix/kmixdockwidget.cpp  
 M  +2 -2      kmix/kmixdockwidget.h  


--- trunk/KDE/kdemultimedia/juk/systemtray.cpp #1042711:1042712
@@ -136,7 +136,7 @@
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-SystemTray::SystemTray(QWidget *parent) : KNotificationItem(parent),
+SystemTray::SystemTray(QWidget *parent) : KStatusNotifierItem(parent),
                                           m_popup(0),
                                           m_fadeTimer(0),
                                           m_fade(true),
@@ -474,7 +474,7 @@
 void SystemTray::setToolTip(const QString &tip, const QPixmap &cover)
 {
     if(tip.isEmpty())
-        KNotificationItem::setToolTip("juk", i18n("JuK"), QString());
+        KStatusNotifierItem::setToolTip("juk", i18n("JuK"), QString());
     else {
         QPixmap myCover = cover;
         if(cover.isNull())
@@ -482,7 +482,7 @@
 
         QString html = QString("%1").arg(tip);
         html.replace(" ", "&nbsp;");
-        KNotificationItem::setToolTip(QIcon(myCover), i18n("JuK"), html);
+        KStatusNotifierItem::setToolTip(QIcon(myCover), i18n("JuK"), html);
     }
 }
 
--- trunk/KDE/kdemultimedia/juk/systemtray.h #1042711:1042712
@@ -21,7 +21,7 @@
 #ifndef JUK_SYSTEMTRAY_H
 #define JUK_SYSTEMTRAY_H
 
-#include <knotificationitem.h>
+#include <kstatusnotifieritem.h>
 
 #include <QVector>
 #include <QColor>
@@ -85,7 +85,7 @@
     bool m_justDie;
 };
 
-class SystemTray : public KNotificationItem
+class SystemTray : public KStatusNotifierItem
 {
     Q_OBJECT
 
--- trunk/KDE/kdemultimedia/kmix/kmixdockwidget.cpp #1042711:1042712
@@ -53,7 +53,7 @@
 #include "viewdockareapopup.h"
 
 KMixDockWidget::KMixDockWidget(KMixWindow* parent, QWidget *referenceWidget, bool volumePopup)
-    : KNotificationItem(parent)
+    : KStatusNotifierItem(parent)
     , _referenceWidget(referenceWidget)
     , _audioPlayer(0L)
     , _playBeepOnVolumeChange(false) // disabled due to triggering a "Bug"
--- trunk/KDE/kdemultimedia/kmix/kmixdockwidget.h #1042711:1042712
@@ -26,7 +26,7 @@
 class QString;
 #include <QWidget>
 
-#include <knotificationitem.h>
+#include <kstatusnotifieritem.h>
 
 class KMixWindow;
 class Mixer;
@@ -38,7 +38,7 @@
     class MediaObject;
 }
 
-class KMixDockWidget : public KNotificationItem
+class KMixDockWidget : public KStatusNotifierItem
 {
    Q_OBJECT