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

List:       kde-commits
Subject:    KDE/kdetoys/kweather
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-08-30 10:18:44
Message-ID: 1188469124.833519.11037.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 706409 by mueller:

KPanelApplet->K3PanelApplet


 M  +1 -1      CMakeLists.txt  
 M  +5 -5      kweather.cpp  
 M  +3 -3      kweather.h  


--- trunk/KDE/kdetoys/kweather/CMakeLists.txt #706408:706409
@@ -54,7 +54,7 @@
 kde4_add_plugin(weather_panelapplet ${weather_panelapplet_PART_SRCS})
 
 
-target_link_libraries(weather_panelapplet  ${KDE4_KDE3SUPPORT_LIBS} \
${KDE4_KHTML_LIBS} kickermain ${KDE4_KUTILS_LIBS} ) \
+target_link_libraries(weather_panelapplet  ${KDE4_KDE3SUPPORT_LIBS} \
${KDE4_KHTML_LIBS} ${KDE4_KUTILS_LIBS} )  
 install(TARGETS weather_panelapplet  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- trunk/KDE/kdetoys/kweather/kweather.cpp #706408:706409
@@ -43,17 +43,17 @@
 #include "serviceinterface.h"
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
+    KDE_EXPORT K3PanelApplet* init(QWidget *parent, const QString& configFile)
     {
         KGlobal::locale()->insertCatalog("kweather");
-        kweather *theApplet = new kweather(configFile, Plasma::Normal, 0, parent);
+        kweather *theApplet = new kweather(configFile, K3PanelApplet::Normal, 0, \
parent);  return theApplet;
     }
 }
 
-kweather::kweather(const QString& configFile, Plasma::Type t, int actions,
+kweather::kweather(const QString& configFile, K3PanelApplet::Type t, int actions,
         QWidget *parent) :
-        KPanelApplet(configFile, t, actions, parent),
+        K3PanelApplet(configFile, t, actions, parent),
         mFirstRun( false ), mReport( 0 ),
         mContextMenu( 0 ), mWeatherService( 0 ), settingsDialog( 0 ), \
mTextColor(Qt::black)  {
@@ -354,7 +354,7 @@
 {
     if ( e->button() != Qt::RightButton )
     {
-        KPanelApplet::mousePressEvent( e );
+        K3PanelApplet::mousePressEvent( e );
         return;
     }
 
--- trunk/KDE/kdetoys/kweather/kweather.h #706408:706409
@@ -18,7 +18,7 @@
 #ifndef KWEATHER_H
 #define KWEATHER_H
 
-#include <plasma/kpanelapplet.h>
+#include <k3panelapplet.h>
 
 class QMouseEvent;
 class QResizeEvent;
@@ -30,12 +30,12 @@
 class OrgKdeKweatherServiceInterface;
 class KCMultiDialog;
 
-class kweather : public KPanelApplet
+class kweather : public K3PanelApplet
 {
     Q_OBJECT
 
 public:
-	explicit kweather(const QString& configFile, Plasma::Type t = Plasma::Normal, int \
actions = 0, QWidget *parent = 0); +	explicit kweather(const QString& configFile, \
K3PanelApplet::Type t = K3PanelApplet::Normal, int actions = 0, QWidget *parent = 0); \
~kweather();  void help();
 	void resizeEvent(QResizeEvent*);


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