[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=4ea772a

The following commit has been merged in the master branch:
commit 4ea772afcc43a08c06db7865fd7515344ef1d746
Author: Vishesh Handa <me at vhanda.in>
Date:   Wed Aug 29 02:33:08 2012 +0530

    Minor cleanup
    
    Remove the ResourceManager error handling code. It never reports any
    errors.
---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp | 19 -------------------
 kpeople/nepomuk-feeder/nepomuk-storage.h   |  2 --
 2 files changed, 21 deletions(-)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index 55ef596..e4187e1 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -268,18 +268,6 @@ bool ContactResources::isEmpty() const
 NepomukStorage::NepomukStorage(QObject *parent)
 : AbstractStorage(parent)
 {
-    kDebug();
-
-    // *********************************************************************************************
-    // Nepomuk error handling
-
-    // Create an instance of the Nepomuk Resource Manager, and connect to it's error signal.
-    m_resourceManager = Nepomuk2::ResourceManager::instance();
-
-    connect(m_resourceManager,
-            SIGNAL(error(QString,int)),
-            SLOT(onNepomukError(QString,int)));
-
     QTimer::singleShot(0, this, SLOT(init()));
 
     m_graphTimer.setSingleShot( true );
@@ -288,13 +276,6 @@ NepomukStorage::NepomukStorage(QObject *parent)
 
 NepomukStorage::~NepomukStorage()
 {
-    // Don't delete the Nepomuk Resource manager. Nepomuk should take care of this itself.
-    kDebug();
-}
-
-void NepomukStorage::onNepomukError(const QString &uri, int errorCode)
-{
-    kWarning() << "A Nepomuk Error occurred:" << uri << errorCode;
 }
 
 void NepomukStorage::onSaveJobResult(KJob *job)
diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.h b/kpeople/nepomuk-feeder/nepomuk-storage.h
index 7c22faa..78379aa 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.h
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.h
@@ -142,7 +142,6 @@ signals:
     void graphSaved();
 
 private Q_SLOTS:
-    void onNepomukError(const QString &uri, int errorCode);
     void init();
     void onSaveJobResult(KJob *job);
 
@@ -156,7 +155,6 @@ private:
 
     friend class TestBackdoors;
 
-    Nepomuk2::ResourceManager *m_resourceManager;
     QUrl m_mePersonContact;
 
     QHash<QString, AccountResources> m_accounts;

-- 
ktp-common-internals packaging