remove DataEngine::name()

src/plasma/dataengine.cpp

@@ -430,17 +430,6 @@ void DataEngine::scheduleSourcesUpdated()
     d->checkSourcesTimerId = startTimer(0);
 }
 
-QString DataEngine::name() const
-{
-    return d->engineName;
-}
-
-void DataEngine::setName(const QString &name)
-{
-    d->engineName = name;
-    setObjectName(name);
-}
-
 void DataEngine::setStorageEnabled(const QString &source, bool store)
 {
     DataContainer *s = d->source(source, false);
@@ -463,16 +452,7 @@ DataEnginePrivate::DataEnginePrivate(DataEngine *e, const KPluginInfo &info)
 {
     updateTimestamp.start();
 
-    if (!info.isValid()) {
-        engineName = i18n("Unnamed");
-        return;
-    }
-
-    engineName = info.name();
-    if (engineName.isEmpty()) {
-        engineName = i18n("Unnamed");
-    }
-    e->setObjectName(engineName);
+    e->setObjectName(info.name());
     icon = info.icon();
 
     if (dataEngineDescription.isValid()) {

src/plasma/dataengine.h

@@ -58,10 +58,6 @@ class DataEnginePrivate;
 class PLASMA_EXPORT DataEngine : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QStringList sources READ sources)
-    Q_PROPERTY(bool valid READ isValid)
-    Q_PROPERTY(QString icon READ icon WRITE setIcon)
-    Q_PROPERTY(QString name READ name)
 
     public:
         typedef QHash<QString, DataEngine*> Dict;
@@ -111,11 +107,6 @@ class PLASMA_EXPORT DataEngine : public QObject
          */
         KPluginInfo pluginInfo() const;
 
-        /**
-         * Returns the engine name for the DataEngine
-         */
-        QString name() const;
-
         /**
          * Connects a source to an object for data updates. The object must
          * have a slot with the following signature:
@@ -458,11 +449,6 @@ NoAlignment) const;
          **/
         void timerEvent(QTimerEvent *event);
 
-        /**
-         * Sets the engine name for the DataEngine
-         */
-        void setName(const QString &name);
-
         /**
          * Sets the icon for this data engine
          **/

src/plasma/private/dataengine_p.h

@@ -95,7 +95,6 @@ class DataEnginePrivate
         QString icon;
         bool valid;
         DataEngineScript *script;
-        QString engineName;
         QString serviceName;
         Package *package;
         QString waitingSourceRequest;

src/plasma/scripting/dataenginescript.cpp

@@ -174,13 +174,6 @@ DataEngine::SourceDict DataEngineScript::containerDict() const
     return DataEngine::SourceDict();
 }
 
-void DataEngineScript::setName(const QString &name)
-{
-    if (d->dataEngine) {
-        d->dataEngine->setName(name);
-    }
-}
-
 void DataEngineScript::setIcon(const QString &icon)
 {
     if (d->dataEngine) {

src/plasma/scripting/dataenginescript.h

@@ -135,7 +135,6 @@ protected:
     void removeAllSources();
     void addSource(DataContainer *source);
     DataEngine::SourceDict containerDict() const;
-    void setName(const QString &name);
     void setIcon(const QString &icon);
     void scheduleSourcesUpdated();
     void removeSource(const QString &source);