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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/lib
From:       Matt Broadstone <mbroadst () gmail ! com>
Date:       2007-02-28 23:45:35
Message-ID: 1172706335.108455.31378.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 638150 by mbroadst:

Fix build

 M  +1 -19     interface.cpp  
 M  +2 -7      interface.h  


--- trunk/KDE/kdebase/workspace/plasma/lib/interface.cpp #638149:638150
@@ -23,13 +23,10 @@
 namespace Plasma
 {
 
-Interface* Interface::m_interface = 0;
+Interface* Interface::m_interface;
 
 Interface *Interface::self()
 {
-    if (!m_interface)
-        m_interface = new Interface;
-
     return m_interface;
 }
 
@@ -41,19 +38,4 @@
 {
 }
 
-bool loadDataEngine(const QString& name)
-{
-    Q_UNUSED(name)
-
-    kDebug() << k_funcinfo << " not implemented";
-    return false;
 }
-
-void unloadDataEngine(const QString& name)
-{
-    Q_UNUSED(name)
-
-    kDebug() << k_funcinfo << " not implemented";
-}
-
-}
--- trunk/KDE/kdebase/workspace/plasma/lib/interface.h #638149:638150
@@ -29,15 +29,10 @@
 class KDE_EXPORT Interface
 {
     public:
-        // NOTE: Fix this stuff, not sure what the design was supposed to be,
-        //       but, this thing can't be a singleton because we can't create
-        //       an Interface object due to the pure virtuals. Maybe make them
-        //       just virtual? -MB
-
         static Interface* self();
 
-        virtual bool loadDataEngine(const QString &name);
-        virtual void unloadDataEngine(const QString &name);
+        virtual bool loadDataEngine(const QString &name) = 0;
+        virtual void unloadDataEngine(const QString &name) = 0;
 
     protected:
         Interface();
[prev in list] [next in list] [prev in thread] [next in thread]