[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=6b28738

The following commit has been merged in the master branch:
commit 6b2873841621004db9682655114fe78cc3a4dd34
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Feb 16 18:52:41 2014 +0100

    Add test app to visualise KPeopleTranslationProxy model
---
 tests/CMakeLists.txt                                      | 15 +++++++++++++++
 ...st-model-view-main.cpp => kpeople-model-view-main.cpp} |  9 ++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dcd774d..8018c30 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -29,3 +29,18 @@ target_link_libraries(ktp_contact_list_model_view
   ktpmodelsprivate
 )
 
+
+kde4_add_executable(ktp_kpeople_list_model_view
+    ${model_view_SRCS}
+    kpeople-model-view-main.cpp
+)
+
+target_link_libraries(ktp_kpeople_list_model_view
+  ${QT_QTTEST_LIBRARY}
+  ${KDE4_KDECORE_LIBS}
+  ${KDE4_KDEUI_LIBS}
+  ${TELEPATHY_QT4_LIBRARIES}
+  ktpcommoninternalsprivate
+  ktpmodelsprivate
+)
+
diff --git a/tests/contact-list-model-view-main.cpp b/tests/kpeople-model-view-main.cpp
similarity index 87%
copy from tests/contact-list-model-view-main.cpp
copy to tests/kpeople-model-view-main.cpp
index a2ddde4..fdd20a3 100644
--- a/tests/contact-list-model-view-main.cpp
+++ b/tests/kpeople-model-view-main.cpp
@@ -1,8 +1,7 @@
 /*
  * This file is part of telepathy-kde-models-test-ui
  *
- * Copyright (C) 2011 Collabora Ltd. <info at collabora.co.uk>
- *   @Author George Goldberg <george.goldberg at collabora.co.uk>
+ * Copyright (C) 2014 David Edmundson <davidedmundson at kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,7 +35,7 @@
 
 #include <QDBusConnection>
 
-#include "KTp/Models/contacts-list-model.h"
+#include "KTp/Models/kpeopletranslationproxy.h"
 #include "KTp/contact-factory.h"
 #include "KTp/core.h"
 
@@ -62,8 +61,8 @@ int main(int argc, char *argv[])
     
     const Tp::AccountManagerPtr accountManager = KTp::accountManager();
 
-    KTp::ContactsListModel *model = new KTp::ContactsListModel(&app);
-    model->setAccountManager(accountManager);
+    KPeopleTranslationProxy *model = new KPeopleTranslationProxy(&app);
+//     model->setAccountManager(accountManager);
     
     // Set up and show the main widget
     ModelView *mainWidget = new ModelView(model, 0);

-- 
ktp-common-internals packaging