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

List:       kde-commits
Subject:    koffice/karbon
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2006-05-31 23:02:50
Message-ID: 1149116570.757971.8184.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 547145 by jaham:

port loading of tools but leave it disabled for now



 M  +7 -7      karbon_factory.cc  


--- trunk/koffice/karbon/karbon_factory.cc #547144:547145
@@ -24,7 +24,7 @@
 #include <kinstance.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-//#include <ktrader.h>
+#include <kservicetypetrader.h>
 #include <kparts/componentfactory.h>
 #include <kparts/plugin.h>
 
@@ -49,22 +49,22 @@
 	KarbonToolRegistry::instance();
 
 	// Load plugins
-
-	// Disabled untill ported to KDE4
-	/*KTrader::OfferList offers = KTrader::self() -> \
query(QString::fromLatin1("Karbon/CoreModule"), +	/* TODO enable it when we are in \
better shape (already ported to kde4) +	KService::List offers = \
                KServiceTypeTrader::self() -> \
                query(QString::fromLatin1("Karbon/CoreModule"),
                                     QString::fromLatin1("Type == 'Service'"));
 
-	KTrader::OfferList::ConstIterator iter;
+	KService::List::ConstIterator iter;
 
 	for(iter = offers.begin(); iter != offers.end(); ++iter)
 	{
 		KService::Ptr service = *iter;
 		int errCode = 0;
 		KParts::Plugin* plugin =
-		KParts::ComponentFactory::createInstanceFromService<KParts::Plugin> ( service, \
this, 0, QStringList(), &errCode); \
+		KParts::ComponentFactory::createInstanceFromService<KParts::Plugin> ( service, \
this, QStringList(), &errCode);  if ( plugin )
 			kDebug() << "found plugin " << service -> property("Name").toString() << "\n";
-	}*/
+	}
+	*/
 }
 
 KarbonFactory::~KarbonFactory()


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