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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/kttsplugin
From:       Pino Toscano <pino () kde ! org>
Date:       2008-03-07 0:52:36
Message-ID: 1204851156.390752.22596.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 783094 by pino:

- remove 'lib' prefix to the library
- port to the new plugin factory


 M  +1 -1      CMakeLists.txt  
 M  +4 -3      khtmlkttsd.cpp  
 M  +1 -1      khtmlkttsd.h  
 M  +1 -1      khtmlkttsd.rc  


--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/CMakeLists.txt #783093:783094
@@ -6,7 +6,7 @@
 set(khtmlkttsdplugin_PART_SRCS khtmlkttsd.cpp )
 
 
-kde4_add_plugin(khtmlkttsdplugin WITH_PREFIX ${khtmlkttsdplugin_PART_SRCS})
+kde4_add_plugin(khtmlkttsdplugin ${khtmlkttsdplugin_PART_SRCS})
 
 
 target_link_libraries(khtmlkttsdplugin  ${KDE4_KHTML_LIBS} )
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/khtmlkttsd.cpp #783093:783094
@@ -29,17 +29,17 @@
 #include <kactioncollection.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kgenericfactory.h>
 #include <khtml_part.h> // this plugin applies to a khtml part
 #include <kicon.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
+#include <kpluginfactory.h>
 #include <kservicetypetrader.h>
 #include <kspeech.h>
 #include <ktoolinvocation.h>
 
-KHTMLPluginKTTSD::KHTMLPluginKTTSD( QObject* parent, const QStringList& )
+KHTMLPluginKTTSD::KHTMLPluginKTTSD( QObject* parent, const QVariantList& )
     : Plugin( parent )
 {
     // If KTTSD is not installed, hide action.
@@ -127,6 +127,7 @@
     }
 }
 
-K_EXPORT_COMPONENT_FACTORY( libkhtmlkttsdplugin, KGenericFactory<KHTMLPluginKTTSD>("khtmlkttsd") )
+K_PLUGIN_FACTORY( KHTMLPluginKTTSDFactory, registerPlugin< KHTMLPluginKTTSD >(); )
+K_EXPORT_PLUGIN( KHTMLPluginKTTSDFactory( "khtmlkttsd" ) )
 
 #include "khtmlkttsd.moc"
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/khtmlkttsd.h #783093:783094
@@ -30,7 +30,7 @@
     /**
      * Construct a new KParts plugin.
      */
-    KHTMLPluginKTTSD( QObject* parent, const QStringList& );
+    KHTMLPluginKTTSD( QObject* parent, const QVariantList& );
 
     /**
      * Destructor.
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/khtmlkttsd.rc #783093:783094
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="khtmlkttsdplugin" library="libkhtmlkttsdplugin" version="2" >
+<kpartgui name="khtmlkttsdplugin" library="khtmlkttsdplugin" version="3" >
 	<MenuBar>
 		<Menu name="tools">
 		<Text>&amp;Tools</Text>
[prev in list] [next in list] [prev in thread] [next in thread]