[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=c3b6422

The following commit has been merged in the master branch:
commit c3b64227b44cb880c1414d26625dfac978dfebd9
Author: Vishesh Handa <handa.vish at gmail.com>
Date:   Wed Feb 15 00:03:07 2012 +0530

    Get everything to compile with the latest SDO
    
    Unfortunately, this means not generating the C++ Ontology classes
    and using them by hand.
---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp       |  5 -----
 kpeople/nepomuk-feeder/nepomuk-storage.h         |  3 ---
 kpeople/nepomuk-feeder/ontologies/CMakeLists.txt | 16 ++++++++--------
 kpeople/nepomuk-feeder/test-backdoors.cpp        |  4 ++--
 kpeople/nepomuk-feeder/test-backdoors.h          |  6 +++---
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index 52cc8e6..533fe12 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -22,12 +22,7 @@
  */
 
 #include "nepomuk-storage.h"
-
-#include "ontologies/contactgroup.h"
 #include "ontologies/telepathy.h"
-#include "ontologies/imcapability.h"
-#include "ontologies/personcontact.h"
-#include "ontologies/dataobject.h"
 
 #include <KDebug>
 #include <KJob>
diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.h b/kpeople/nepomuk-feeder/nepomuk-storage.h
index f721b01..f463c67 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.h
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.h
@@ -24,9 +24,6 @@
 
 #include "abstract-storage.h"
 
-#include "ontologies/imaccount.h"
-#include "ontologies/personcontact.h"
-
 #include <QtCore/QObject>
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QString>
diff --git a/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt b/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt
index 4099553..e6e9fd0 100644
--- a/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Build the nie static lib here so the tests can use it too.
-nepomuk_add_ontology_classes (telepathynie_SRCS
-                              ONTOLOGIES
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nmo.trig
-                              ${CMAKE_SOURCE_DIR}/telepathy.trig
-)
+#nepomuk_add_ontology_classes (telepathynie_SRCS
+#                              ONTOLOGIES
+#                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig
+#                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig
+#                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig
+#                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nmo.trig
+#                              ${CMAKE_SOURCE_DIR}/telepathy.trig
+#)
 
 # Add the ontologies we want to build the vocabulary for.
 soprano_add_ontology (telepathy_ontology_SRCS
diff --git a/kpeople/nepomuk-feeder/test-backdoors.cpp b/kpeople/nepomuk-feeder/test-backdoors.cpp
index c2ffe47..57ac2de 100644
--- a/kpeople/nepomuk-feeder/test-backdoors.cpp
+++ b/kpeople/nepomuk-feeder/test-backdoors.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "test-backdoors.h"
-
+/*
 Nepomuk::PersonContact
 TestBackdoors::nepomukStorageMePersonContact(NepomukStorage *storage)
 {
@@ -45,4 +45,4 @@ TestBackdoors::nepomukStorageContacts(NepomukStorage *storage)
 
     return &storage->m_contacts;
 }
-
+*/
diff --git a/kpeople/nepomuk-feeder/test-backdoors.h b/kpeople/nepomuk-feeder/test-backdoors.h
index 70055bf..654b387 100644
--- a/kpeople/nepomuk-feeder/test-backdoors.h
+++ b/kpeople/nepomuk-feeder/test-backdoors.h
@@ -26,9 +26,9 @@
 
 class TestBackdoors {
 public:
-    static Nepomuk::PersonContact nepomukStorageMePersonContact(NepomukStorage *storage);
-    static QHash<QString, AccountResources> *nepomukStorageAccounts(NepomukStorage *storage);
-    static QHash<ContactIdentifier, ContactResources> *nepomukStorageContacts(NepomukStorage *storage);
+    //static Nepomuk::PersonContact nepomukStorageMePersonContact(NepomukStorage *storage);
+    //static QHash<QString, AccountResources> *nepomukStorageAccounts(NepomukStorage *storage);
+    //static QHash<ContactIdentifier, ContactResources> *nepomukStorageContacts(NepomukStorage *storage);
 };
 
 

-- 
ktp-common-internals packaging