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

List:       kde-commits
Subject:    KDE/kdebase/runtime/nepomuk/server
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-07-07 15:23:21
Message-ID: 20100707152321.ECE42AC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1147191 by trueg:

Finally removed the legacy storage bridge.

 M  +0 -1      CMakeLists.txt  
 D             legacystoragebridge.cpp  
 D             legacystoragebridge.h  
 M  +0 -11     nepomukserver.cpp  
 M  +0 -3      nepomukserver.h  


--- trunk/KDE/kdebase/runtime/nepomuk/server/CMakeLists.txt #1147190:1147191
@@ -18,7 +18,6 @@
   servicecontroller.cpp
   processcontrol.cpp
   main.cpp
-  legacystoragebridge.cpp
   )
 
 # Server configuration
--- trunk/KDE/kdebase/runtime/nepomuk/server/nepomukserver.cpp #1147190:1147191
@@ -21,7 +21,6 @@
 #include "nepomukserversettings.h"
 #include "servicemanager.h"
 #include "servicemanageradaptor.h"
-#include "legacystoragebridge.h"
 
 #include <Soprano/Global>
 
@@ -39,7 +38,6 @@
 Nepomuk::Server::Server( QObject* parent )
     : QObject( parent ),
       m_enabled( false ),
-      m_legacyStorageBridge( 0 ),
       m_strigiServiceName( "nepomukstrigiservice" )
 {
     s_self = this;
@@ -87,11 +85,6 @@
             // register the service manager interface
             QDBusConnection::sessionBus().registerObject( "/servicemanager", m_serviceManager );
 
-            // provide the storage interface for backwards compatibility
-            if ( !m_legacyStorageBridge ) {
-                m_legacyStorageBridge = new LegacyStorageBridge( this );
-            }
-
             // now nepomuk is enabled
             m_enabled = true;
         }
@@ -102,10 +95,6 @@
             // unregister the service manager interface
             QDBusConnection::sessionBus().unregisterObject( "/servicemanager" );
 
-            // we delete since Soprano::Server::ServerCore does not have an unregister method yet
-            delete m_legacyStorageBridge;
-            m_legacyStorageBridge = 0;
-
             // nepomuk is disabled
             m_enabled = false;
         }
--- trunk/KDE/kdebase/runtime/nepomuk/server/nepomukserver.h #1147190:1147191
@@ -30,7 +30,6 @@
 namespace Nepomuk {
 
     class ServiceManager;
-    class LegacyStorageBridge;
 
     class Server : public QObject
     {
@@ -63,8 +62,6 @@
         ServiceManager* m_serviceManager;
         bool m_enabled;
 
-        LegacyStorageBridge* m_legacyStorageBridge;
-
         KSharedConfigPtr m_config;
 
         const QString m_strigiServiceName;
[prev in list] [next in list] [prev in thread] [next in thread]