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

List:       kde-commits
Subject:    KDE/kdepim/ktimetracker
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-23 10:30:12
Message-ID: 20101123103012.6B89CAC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199949 by ervin:

Don't use deprecated API.


 M  +2 -2      CMakeLists.txt  
 M  +1 -2      ktimetrackerpart.cpp  
 M  +3 -2      mainwindow.cpp  


--- trunk/KDE/kdepim/ktimetracker/CMakeLists.txt #1199948:1199949
@@ -15,7 +15,7 @@
 
 ########### next target ###############
 set(ktimetracker_shared_SRCS ktimetrackerconfigdialog.cpp
-	desktoptracker.cpp
+	desktoptracker.cpp ktimetrackerpart.cpp
 	edittaskdialog.cpp idletimedetector.cpp
 	timekard.cpp ktimetrackerutility.cpp
 	timetrackerstorage.cpp mainwindow.cpp preferences.cpp
@@ -86,7 +86,7 @@
 
 ########### next target ###############
 
-set(ktimetrackerpart_PART_SRCS ktimetrackerpart.cpp ${ktimetracker_shared_SRCS})
+set(ktimetrackerpart_PART_SRCS ${ktimetracker_shared_SRCS})
 
 kde4_add_plugin(ktimetrackerpart ${ktimetrackerpart_PART_SRCS})
 
--- trunk/KDE/kdepim/ktimetracker/ktimetrackerpart.cpp #1199948:1199949
@@ -35,7 +35,7 @@
 #include <KActionCollection>
 
 #include <kdemacros.h>
-#include <kparts/genericfactory.h>
+#include <kpluginfactory.h>
 #include "mainwindow.h"
 #include "ktimetrackerutility.h"
 #include "task.h"
@@ -54,7 +54,6 @@
     KGlobal::locale()->insertCatalog("ktimetracker");
     KGlobal::locale()->insertCatalog("libkdepim");
     // we need an instance
-    setComponentData( ktimetrackerPartFactory::componentData() );
     mMainWidget = new TimetrackerWidget( parentWidget );
     setWidget( mMainWidget );
     setXMLFile( "ktimetrackerui.rc" );
--- trunk/KDE/kdepim/ktimetracker/mainwindow.cpp #1199948:1199949
@@ -57,12 +57,13 @@
     setupActions();
 
     // this routine will find and load our Part.
-    KLibFactory *factory = KLibLoader::self()->factory("ktimetrackerpart");
+    KPluginLoader loader( "ktimetrackerpart" );
+    KPluginFactory *factory = loader.factory();
     if (factory)
     {
         // now that the Part is loaded, we cast it to a Part to get
         // our hands on it
-        m_part = static_cast<ktimetrackerpart *>(factory->create(this, "ktimetrackerpart" ));
+        m_part = factory->create<ktimetrackerpart>( this );
 
         if (m_part)
         {
[prev in list] [next in list] [prev in thread] [next in thread]