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

The following commit has been merged in the master branch:
commit b84c73d1cde38079d3d8abcb7f039518a77bbbdc
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Jan 19 20:42:41 2012 +0100

    Move FlatModelProxy to in Models directory
---
 KTp/Models/CMakeLists.txt                    | 2 ++
 KTp/{Widgets => Models}/flat-model-proxy.cpp | 0
 KTp/{Widgets => Models}/flat-model-proxy.h   | 0
 KTp/Widgets/CMakeLists.txt                   | 4 +---
 KTp/Widgets/contact-grid-widget.cpp          | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/KTp/Models/CMakeLists.txt b/KTp/Models/CMakeLists.txt
index ce62873..7c8d93d 100644
--- a/KTp/Models/CMakeLists.txt
+++ b/KTp/Models/CMakeLists.txt
@@ -12,6 +12,7 @@ set (ktp_models_private_SRCS
     groups-model.cpp
     proxy-tree-node.cpp
     tree-node.cpp
+    flat-model-proxy.cpp
 )
 
 set (ktp_models_private_HDRS
@@ -23,6 +24,7 @@ set (ktp_models_private_HDRS
     groups-model.h
     proxy-tree-node.h
     tree-node.h
+    flat-model-proxy.h
 )
 
 kde4_add_library (ktpmodelsprivate SHARED
diff --git a/KTp/Widgets/flat-model-proxy.cpp b/KTp/Models/flat-model-proxy.cpp
similarity index 100%
rename from KTp/Widgets/flat-model-proxy.cpp
rename to KTp/Models/flat-model-proxy.cpp
diff --git a/KTp/Widgets/flat-model-proxy.h b/KTp/Models/flat-model-proxy.h
similarity index 100%
rename from KTp/Widgets/flat-model-proxy.h
rename to KTp/Models/flat-model-proxy.h
diff --git a/KTp/Widgets/CMakeLists.txt b/KTp/Widgets/CMakeLists.txt
index 5240cbf..810af29 100644
--- a/KTp/Widgets/CMakeLists.txt
+++ b/KTp/Widgets/CMakeLists.txt
@@ -3,13 +3,11 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set (ktp_widgets_private_SRCS
-    flat-model-proxy.cpp
     contact-grid-widget.cpp
 )
 
 set (ktp_widgets_private_HDRS
-#    flat-model-proxy.h
-    contact-grid-widget.h
+     contact-grid-widget.h
 )
 
 kde4_add_library (ktpwidgetsprivate SHARED
diff --git a/KTp/Widgets/contact-grid-widget.cpp b/KTp/Widgets/contact-grid-widget.cpp
index 26f102b..5263fb6 100644
--- a/KTp/Widgets/contact-grid-widget.cpp
+++ b/KTp/Widgets/contact-grid-widget.cpp
@@ -19,7 +19,6 @@
 
 
 #include "contact-grid-widget.h"
-#include "flat-model-proxy.h"
 
 #include <KDE/KIcon>
 #include <KDE/KLineEdit>
@@ -34,6 +33,7 @@
 #include <KTp/Models/accounts-model.h>
 #include <KTp/Models/accounts-filter-model.h>
 #include <KTp/Models/contact-model-item.h>
+#include <KTp/Models/flat-model-proxy.h>
 
 
 KTp::ContactGridDelegate::ContactGridDelegate(QObject *parent)

-- 
ktp-common-internals packaging