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

List:       kde-commits
Subject:    KDE/kdeutils/superkaramba
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2007-08-04 2:23:28
Message-ID: 1186194208.472911.12829.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 696173 by sebsauer:

the engineadaptor is not needed any longer.


 M  +3 -3      skapplet/CMakeLists.txt  
 M  +6 -5      skapplet/skappletadaptor.h  
 D             skapplet/skengineadaptor.h  
 M  +2 -1      src/sensors/plasmaengine.h  


--- trunk/KDE/kdeutils/superkaramba/skapplet/CMakeLists.txt #696172:696173
@@ -5,14 +5,14 @@
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}
-    ${CMAKE_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/superkaramba/src
+    ${CMAKE_BINARY_DIR}/superkaramba/src
     ${KDE4_INCLUDES}
     ${PLASMA_INCLUDE_DIR}
 )
 
 set(skapplet_SRCS skapplet.cpp)
-qt4_wrap_cpp(skapplet_SRCS skappletadaptor.h skengineadaptor.h skwidgetadaptor.h)
+qt4_wrap_cpp(skapplet_SRCS skappletadaptor.h skwidgetadaptor.h)
 kde4_add_plugin(plasma_applet_skapplet ${skapplet_SRCS})
 target_link_libraries(plasma_applet_skapplet superkaramba plasma ${KDE4_KIO_LIBS})
 
--- trunk/KDE/kdeutils/superkaramba/skapplet/skappletadaptor.h #696172:696173
@@ -32,7 +32,7 @@
 //#include <plasma/widgets/lineedit.h>
 
 #include "skapplet.h"
-#include "skengineadaptor.h"
+#include "sensors/plasmaengine.h"
 #include "skwidgetadaptor.h"
 
 namespace Skip {
@@ -93,9 +93,10 @@
             Plasma::DataEngine* engine = m_applet->dataEngine(name);
             if( (! engine) || (! engine->isValid()) )
                 return 0;
-            EngineAdaptor* engineadaptor = new EngineAdaptor(engine);
-            m_engines.insert(name, engineadaptor);
-            return engineadaptor;
+            PlasmaSensor* sensor = new PlasmaSensor;
+            sensor->setEngineImpl(engine, name);
+            m_engines.insert(name, sensor);
+            return sensor;
         }
 
         /**
@@ -127,7 +128,7 @@
     private:
         SuperKarambaApplet *m_applet;
         Plasma::Widget* m_widget;
-        QHash<QString, EngineAdaptor*> m_engines;
+        QHash<QString, PlasmaSensor*> m_engines;
 };
 
 } // end of namespace SuperKarambaPlasmaApplet
--- trunk/KDE/kdeutils/superkaramba/src/sensors/plasmaengine.h #696172:696173
@@ -23,6 +23,7 @@
 
 #include <QObject>
 
+#include "superkaramba_export.h"
 #include "sensor.h"
 #include "meters/meter.h"
 
@@ -93,7 +94,7 @@
 * The PlasmaSensor class implements a SuperKaramba sensor that
 * provides access to Plasma::DataEngine objects.
 */
-class PlasmaSensor :  public Sensor
+class SUPERKARAMBA_EXPORT PlasmaSensor :  public Sensor
 {
         Q_OBJECT
     public:
[prev in list] [next in list] [prev in thread] [next in thread]