[Uml-devel] KDE

[Pascal Létourneau]

SVN commit 568086 by pletourn:

Unbreak porting


 M  +2 -1      kdegames/kolf/pluginloader.cpp  
 M  +2 -1      kdepim/akregator/src/browserframe.cpp  
 M  +2 -1      kdepim/akregator/src/mainwindow.cpp  
 M  +6 -6      kdesdk/kbabel/kbabeldict/kbabeldictbox.cpp  
 M  +2 -1      kdesdk/umbrello/umbrello/pluginloader.cpp  
 M  +2 -1      kdewebdev/kfilereplace/kfilereplace.cpp  
 M  +2 -2      kdewebdev/kxsldbg/kxsldbg.cpp  


--- trunk/KDE/kdegames/kolf/pluginloader.cpp #568085:568086
@@ -41,7 +41,7 @@
 		return 0;
 	}
 
-	QObject *newObject = factory->create(0, "objectInstance", QStringList("Object"));
+	QObject *newObject = factory->create(0, "Object");
 
 	if (!newObject)
 	{
@@ -49,6 +49,7 @@
 		return 0;
 	}
 
+	newObject->setObjectName("objectInstance");
 	Object *ret = dynamic_cast<Object *>(newObject);
 
 	if (!ret)
--- trunk/KDE/kdepim/akregator/src/browserframe.cpp #568085:568086
@@ -117,7 +117,8 @@
         KLibFactory* factory = KLibLoader::self()->factory( ptr->library().toLatin1() );
         if (factory)
         {
-            part = static_cast<KParts::ReadOnlyPart *>(factory->create(parent, ptr->name().toLatin1()));
+            part = static_cast<KParts::ReadOnlyPart *>(factory->create(parent, "KParts::ReadOnlyPart"));
+            part->setObjectName(ptr->name());
 
             layout->addWidget(part->widget());
             connectPart();
--- trunk/KDE/kdepim/akregator/src/mainwindow.cpp #568085:568086
@@ -106,10 +106,11 @@
     {
         // now that the Part is loaded, we cast it to a Part to get
         // our hands on it
-        m_part = static_cast<Akregator::Part*>(factory->create(this, "akregator_part"));
+        m_part = static_cast<Akregator::Part*>(factory->create(this, "KParts::ReadOnlyPart"));
 
         if (m_part)
         {
+            m_part->setObjectName("akregator_part");
             // tell the KParts::MainWindow that this is indeed the main widget
             setCentralWidget(m_part->widget());
 
--- trunk/KDE/kdesdk/kbabel/kbabeldict/kbabeldictbox.cpp #568085:568086
@@ -406,14 +406,14 @@
 
          if(factory)
          {
-            SearchEngine *e = (SearchEngine *)factory->create(this
-                  , "searchengine", QStringList("SearchEngine"));
+            SearchEngine *e = (SearchEngine *)factory->create(this, "SearchEngine");
             if(!e)
             {
                kError() << "searchengine not initialized" << endl;
             }
             else
             {
+                e->setObjectName("searchengine");
 		registerModule(e);
             }
          }
@@ -437,14 +437,14 @@
 
       if(factory)
       {
-            SearchEngine *e = (SearchEngine *)factory->create(this
-                  , "searchengine", QStringList("SearchEngine"));
+            SearchEngine *e = (SearchEngine *)factory->create(this, "SearchEngine");
             if(!e)
             {
                kError() << "searchengine not initialized" << endl;
             }
             else
             {
+                e->setObjectName("searchengine");
 		registerModule(e);
             }
       }
@@ -465,14 +465,14 @@
 
       if(factory)
       {
-            SearchEngine *e = (SearchEngine *)factory->create(this
-                  , "searchengine", QStringList("SearchEngine"));
+            SearchEngine *e = (SearchEngine *)factory->create(this, "SearchEngine");
             if(!e)
             {
                kError() << "searchengine not initialized" << endl;
             }
             else
             {
+                e->setObjectName( "searchengine" );
 		registerModule(e);
             }
       }
--- trunk/KDE/kdesdk/umbrello/umbrello/pluginloader.cpp #568085:568086
@@ -85,7 +85,7 @@
 
     // use the factory to create the plugin
     if(success) {
-        plugin = dynamic_cast<Plugin *>(factory->create((QObject*)0, name.latin1()));
+        plugin = dynamic_cast<Plugin *>(factory->create((QObject*)0));
         if(!plugin) {
             kError() << "failed to create a plugin object for " << name << endl;
             success = false;
@@ -93,6 +93,7 @@
         else {
             // we have to register the plugin here, otherwise, we can get
             // recursive loads
+            plugin->setObjectName( name );
             _plugins[name] = plugin;
             _categories[plugin->category()].append(plugin);
         }
--- trunk/KDE/kdewebdev/kfilereplace/kfilereplace.cpp #568085:568086
@@ -35,10 +35,11 @@
     KLibFactory *factory = KLibLoader::self()->factory("libkfilereplacepart");
     if (factory)
     {
-        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this));
+        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "KParts::ReadOnlyPart"));
 
         if (m_part)
         {
+            m_part->setObjectName("kfilereplace_part");
             setCentralWidget(m_part->widget());
             KStdAction::quit(this, SLOT(close()), actionCollection());
             KStdAction::keyBindings(this, SLOT(slotConfigureKeys()), actionCollection());
--- trunk/KDE/kdewebdev/kxsldbg/kxsldbg.cpp #568085:568086
@@ -46,11 +46,11 @@
     {
         // now that the Part is loaded, we cast it to a Part to get
         // our hands on it
-        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,
-                                "kxsldbg_part" ));
+        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "KParts::ReadOnlyPart"));
 
         if (m_part)
         {
+            m_part->setObjectName("kxsldbg_part");
             // tell the KParts::MainWindow that this is indeed the main widget
             setCentralWidget(m_part->widget());