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

List:       kde-commits
Subject:    KDE/kdebase/runtime/nepomuk/services/backupsync/lib
From:       Vishesh Handa <handa.vish () gmail ! com>
Date:       2011-01-28 8:53:12
Message-ID: 20110128085312.B57A0AC8BB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1217723 by vhanda:

Donot use the ResourceManager in the ResourceMerger - I'm trying to keep this lib \
completely free from the core Nepomuk libraries so that it can be used with the, soon \
to come, data management service.



 M  +3 -20     resourcemerger.cpp  
 M  +1 -4      resourcemerger.h  


--- trunk/KDE/kdebase/runtime/nepomuk/services/backupsync/lib/resourcemerger.cpp \
#1217722:1217723 @@ -40,7 +40,6 @@
     Private( ResourceMerger * resMerger );
     
     Soprano::Model * m_model;
-    ResourceManager * m_resourceManager;
 
     Soprano::NRLModel * m_nrlModel;
     KUrl m_graphType;
@@ -61,11 +60,10 @@
 }
 
 
-Nepomuk::Sync::ResourceMerger::ResourceMerger(Nepomuk::ResourceManager* rm)
+Nepomuk::Sync::ResourceMerger::ResourceMerger()
     : d( new Nepomuk::Sync::ResourceMerger::Private( this ) )
 {
     d->m_nrlModel = 0;
-    setResourceManager( rm );
     d->m_graphType = Soprano::Vocabulary::NRL::InstanceBase();
 }
 
@@ -74,21 +72,6 @@
     delete d;
 }
 
-void Nepomuk::Sync::ResourceMerger::setResourceManager(Nepomuk::ResourceManager* rm)
-{
-    if( !rm )
-        d->m_resourceManager = ResourceManager::instance();
-    d->m_model = d->m_resourceManager->mainModel();
-    
-    delete d->m_nrlModel;
-    d->m_nrlModel = new Soprano::NRLModel( d->m_model );
-}
-
-Nepomuk::ResourceManager* Nepomuk::Sync::ResourceMerger::resourceManager() const
-{
-    return d->m_resourceManager;
-}
-
 void Nepomuk::Sync::ResourceMerger::setModel(Soprano::Model* model)
 {
     d->m_model = model;
@@ -98,7 +81,7 @@
 
 Soprano::Model* Nepomuk::Sync::ResourceMerger::model() const
 {
-    return d->m_resourceManager->mainModel();
+    return d->m_model;
 }
 
 
@@ -124,7 +107,7 @@
     if( it != d->m_newMappings.constEnd() )
         return it.value();
     
-    KUrl newUri = d->m_resourceManager->generateUniqueUri( QString("res") );
+    KUrl newUri = ResourceManager::instance()->generateUniqueUri( QString("res") );
     d->m_newMappings.insert( uri, newUri );
     return Nepomuk::Resource( newUri );
 }
--- trunk/KDE/kdebase/runtime/nepomuk/services/backupsync/lib/resourcemerger.h \
#1217722:1217723 @@ -62,12 +62,9 @@
         class NEPOMUKSYNC_EXPORT ResourceMerger
         {
         public:
-            ResourceMerger( ResourceManager * rm = 0 );
+            ResourceMerger();
             virtual ~ResourceMerger();
 
-            ResourceManager * resourceManager() const;
-            void setResourceManager( ResourceManager * rm );
-
             void setModel( Soprano::Model * model );
             Soprano::Model * model() const;
 


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