[Kst] branches/work/kst/pluginify/kst/src

[Adam Treat]

SVN commit 581574 by treat:

Use the desktop service name instead of a new function...


 M  +1 -1      libkstmath/kstdataobject.cpp  
 M  +0 -2      libkstmath/kstdataobject.h  
 M  +0 -2      plugins/testplugin/testplugin.cpp  
 M  +0 -5      plugins/testplugin/testplugin.h  


--- branches/work/kst/pluginify/kst/src/libkstmath/kstdataobject.cpp #581573:581574
@@ -110,7 +110,7 @@
         KParts::ComponentFactory::createInstanceFromService<KstDataObject>( service, 0, "",
                                                                             QStringList(), &err );
     if ( object ) {
-        pluginInfo.insert( object->name(), KstDataObjectPtr( object ) );
+      pluginInfo.insert( service->name(), KstDataObjectPtr( object ) );
     }
     else
         kdDebug() << "FAILURE! " << k_funcinfo << " " << err << endl;
--- branches/work/kst/pluginify/kst/src/libkstmath/kstdataobject.h #581573:581574
@@ -44,8 +44,6 @@
     static QStringList pluginList();
     static KstDataObjectPtr plugin( const QString &name );
 
-    virtual QString name() const { return QString::null; }
-
     virtual UpdateType update(int updateCounter = -1) = 0;
     virtual const QString& typeString() const { return _typeString; }
     virtual QString propertyString() const = 0;
--- branches/work/kst/pluginify/kst/src/plugins/testplugin/testplugin.cpp #581573:581574
@@ -24,8 +24,6 @@
 
 TestPlugin::TestPlugin( QObject */*parent*/, const char */*name*/, const QStringList &/*args*/ )
     : KstDataObject() {
-
-    _name = "testplugin";
 }
 
 TestPlugin::~TestPlugin() {
--- branches/work/kst/pluginify/kst/src/plugins/testplugin/testplugin.h #581573:581574
@@ -28,8 +28,6 @@
     TestPlugin(QObject *parent, const char *name, const QStringList &args);
     virtual ~TestPlugin();
 
-    virtual QString name() const { return _name; }
-
     virtual KstObject::UpdateType update(int)
     {
         return UPDATE;
@@ -48,9 +46,6 @@
     {
         KMessageBox::information( 0, "insert testplugin config widget here :)", "testpluginconfig" );
     }
-
-private:
-    QString _name;
 };
 
 #endif