[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=022b863

The following commit has been merged in the master branch:
commit 022b8631132fc7906f2e8654e3337436b873ddc2
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Feb 28 23:26:03 2011 +0100

    Remove Nepomuk includes
---
 CMakeLists.txt  |  1 -
 main-widget.cpp | 32 --------------------------------
 2 files changed, 33 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b948a24..e790699 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,6 @@ include (KDE4Defaults)
 include (MacroLibrary)
 
 add_definitions (${KDE4_DEFINITIONS}
-                 -DDISABLE_NEPOMUK_LEGACY
 )
 
 include_directories (${KDE4_INCLUDES}
diff --git a/main-widget.cpp b/main-widget.cpp
index 9cb4da8..282cdef 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -37,16 +37,6 @@
 
 #include <KDebug>
 
-#include <Nepomuk/ResourceManager>
-#include <Nepomuk/Variant>
-#include <Nepomuk/Query/QueryServiceClient>
-#include <Nepomuk/Query/ComparisonTerm>
-#include <Nepomuk/Query/ResourceTerm>
-#include <Nepomuk/Query/ResourceTypeTerm>
-#include <Nepomuk/Query/LiteralTerm>
-#include <Nepomuk/Query/AndTerm>
-#include <Nepomuk/Query/Result>
-
 #include "main-widget.h"
 #include "ui_main-widget.h"
 #include "accountbutton.h"
@@ -57,33 +47,11 @@
 
 #define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KDEChatHandler"
 
-
-
-// using KTelepathy::ContactsListModel;
-// using KTelepathy::GroupedContactsProxyModel;
-// using KTelepathy::TelepathyBridge;
-// using KTelepathy::AbstractTreeItem;
-// using KTelepathy::ContactItem;
-// using KTelepathy::MetaContactItem;
-// using KTelepathy::RequestTextChatJob;
-
-
-//---------------------------------------------------------------------------------------
-
 MainWidget::MainWidget(QWidget *parent)
  : QWidget(parent),
    m_model(0),
    m_modelFilter(0)
 {
-
-    // Check if Nepomuk Query service client is up and running
-//     if (!Nepomuk::Query::QueryServiceClient::serviceAvailable()) {
-//         // That's a failure
-//         KMessageBox::error(this, i18n("The Nepomuk Query Service client is not available on your system. "
-//                                       "Contactlist requires the query service client to be available: please "
-//                                       "check your system settings"));
-//     }
-
     Tp::registerTypes();
 
     setupUi(this);

-- 
ktp-contact-list packaging