[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:06:47 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=898dee1
The following commit has been merged in the master branch:
commit 898dee16d8da61a648c8960269365a97141ab9ea
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Sat Jun 18 01:58:34 2011 +0100
Moved all model related code into a model folder
---
CMakeLists.txt | 16 ++++++++--------
abstract-contact-delegate.cpp | 9 +++++----
contact-delegate-compact.cpp | 10 +++++-----
contact-delegate.cpp | 10 +++++-----
contact-overlays.cpp | 4 ++--
dialogs/add-contact-dialog.cpp | 4 ++--
main-widget.cpp | 14 ++++++++------
.../account-filter-model.cpp | 0
account-filter-model.h => models/account-filter-model.h | 0
.../accounts-model-item.cpp | 0
accounts-model-item.h => models/accounts-model-item.h | 0
accounts-model.cpp => models/accounts-model.cpp | 0
accounts-model.h => models/accounts-model.h | 0
contact-model-item.cpp => models/contact-model-item.cpp | 0
contact-model-item.h => models/contact-model-item.h | 0
groups-model-item.cpp => models/groups-model-item.cpp | 0
groups-model-item.h => models/groups-model-item.h | 0
groups-model.cpp => models/groups-model.cpp | 0
groups-model.h => models/groups-model.h | 0
proxy-tree-node.cpp => models/proxy-tree-node.cpp | 0
proxy-tree-node.h => models/proxy-tree-node.h | 0
tree-node.cpp => models/tree-node.cpp | 0
tree-node.h => models/tree-node.h | 0
23 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9586fa7..92ccec1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,20 +27,20 @@ set (contactlist_SRCS
contact-delegate.cpp
contact-delegate-compact.cpp
account-button.cpp
- accounts-model.cpp
- account-filter-model.cpp
- contact-model-item.cpp
- tree-node.cpp
- accounts-model-item.cpp
filter-bar.cpp
main.cpp
main-widget.cpp
fetch-avatar-job.cpp
- groups-model-item.cpp
- groups-model.cpp
- proxy-tree-node.cpp
dialogs/add-contact-dialog.cpp
dialogs/remove-contact-dialog.cpp
+ models/account-filter-model.cpp
+ models/contact-model-item.cpp
+ models/accounts-model-item.cpp
+ models/tree-node.cpp
+ models/accounts-model.cpp
+ models/groups-model-item.cpp
+ models/groups-model.cpp
+ models/proxy-tree-node.cpp
)
diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index 0014c23..309910d 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "abstract-contact-delegate.h"
+
#include <QApplication>
#include <QtGui/QStyle>
#include <QtGui/QPainter>
@@ -30,10 +32,9 @@
#include <KDE/KIconLoader>
#include <KDE/KIcon>
-#include "abstract-contact-delegate.h"
-#include "accounts-model.h"
-#include "groups-model.h"
-#include "contact-model-item.h"
+#include "models/accounts-model.h"
+#include "models/groups-model.h"
+#include "models/contact-model-item.h"
const int SPACING = 2;
const int ACCOUNT_ICON_SIZE = 13;
diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 4521a0b..45cd282 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -33,11 +33,11 @@
#include <KGlobalSettings>
#include <KDE/KLocale>
-#include "accounts-model.h"
-#include "contact-model-item.h"
-#include "proxy-tree-node.h"
-#include "groups-model-item.h"
-#include "groups-model.h"
+#include "models/accounts-model.h"
+#include "models/contact-model-item.h"
+#include "models/proxy-tree-node.h"
+#include "models/groups-model-item.h"
+#include "models/groups-model.h"
const int SPACING = 4;
const int AVATAR_SIZE = 22;
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 202ef04..159894f 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -33,11 +33,11 @@
#include <KGlobalSettings>
#include <KDE/KLocale>
-#include "accounts-model.h"
-#include "contact-model-item.h"
-#include "proxy-tree-node.h"
-#include "groups-model-item.h"
-#include "groups-model.h"
+#include "models/accounts-model.h"
+#include "models/contact-model-item.h"
+#include "models/proxy-tree-node.h"
+#include "models/groups-model-item.h"
+#include "models/groups-model.h"
const int SPACING = 4;
const int AVATAR_SIZE = 32;
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index 07a93b3..99119a6 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -25,8 +25,8 @@
#include <KIconLoader>
#include <KDebug>
-#include "accounts-model.h"
-#include "contact-model-item.h"
+#include "models/accounts-model.h"
+#include "models/contact-model-item.h"
class TextChannelContactOverlay::Button : public ContactViewHoverButton
{
diff --git a/dialogs/add-contact-dialog.cpp b/dialogs/add-contact-dialog.cpp
index 83c2362..c597119 100644
--- a/dialogs/add-contact-dialog.cpp
+++ b/dialogs/add-contact-dialog.cpp
@@ -21,8 +21,8 @@
#include "add-contact-dialog.h"
#include "ui_add-contact-dialog.h"
-#include "accounts-model.h"
-#include "accounts-model-item.h"
+#include "models/accounts-model.h"
+#include "models/accounts-model-item.h"
#include <QObject>
#include <QSortFilterProxyModel>
diff --git a/main-widget.cpp b/main-widget.cpp
index 94b9d05..214b22b 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -55,16 +55,18 @@
#include "ui_main-widget.h"
#include "account-button.h"
#include "contact-overlays.h"
-#include "accounts-model.h"
-#include "account-filter-model.h"
#include "contact-delegate.h"
#include "contact-delegate-compact.h"
-#include "contact-model-item.h"
+#include "fetch-avatar-job.h"
+
#include "dialogs/add-contact-dialog.h"
#include "dialogs/remove-contact-dialog.h"
-#include "fetch-avatar-job.h"
-#include "groups-model.h"
-#include "groups-model-item.h"
+
+#include "models/groups-model.h"
+#include "models/contact-model-item.h"
+#include "models/groups-model-item.h"
+#include "models/accounts-model.h"
+#include "models/account-filter-model.h"
#define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KDE.TextUi"
#define PREFERRED_FILETRANSFER_HANDLER "org.freedesktop.Telepathy.Client.KDE.FileTransfer"
diff --git a/account-filter-model.cpp b/models/account-filter-model.cpp
similarity index 100%
rename from account-filter-model.cpp
rename to models/account-filter-model.cpp
diff --git a/account-filter-model.h b/models/account-filter-model.h
similarity index 100%
rename from account-filter-model.h
rename to models/account-filter-model.h
diff --git a/accounts-model-item.cpp b/models/accounts-model-item.cpp
similarity index 100%
rename from accounts-model-item.cpp
rename to models/accounts-model-item.cpp
diff --git a/accounts-model-item.h b/models/accounts-model-item.h
similarity index 100%
rename from accounts-model-item.h
rename to models/accounts-model-item.h
diff --git a/accounts-model.cpp b/models/accounts-model.cpp
similarity index 100%
rename from accounts-model.cpp
rename to models/accounts-model.cpp
diff --git a/accounts-model.h b/models/accounts-model.h
similarity index 100%
rename from accounts-model.h
rename to models/accounts-model.h
diff --git a/contact-model-item.cpp b/models/contact-model-item.cpp
similarity index 100%
rename from contact-model-item.cpp
rename to models/contact-model-item.cpp
diff --git a/contact-model-item.h b/models/contact-model-item.h
similarity index 100%
rename from contact-model-item.h
rename to models/contact-model-item.h
diff --git a/groups-model-item.cpp b/models/groups-model-item.cpp
similarity index 100%
rename from groups-model-item.cpp
rename to models/groups-model-item.cpp
diff --git a/groups-model-item.h b/models/groups-model-item.h
similarity index 100%
rename from groups-model-item.h
rename to models/groups-model-item.h
diff --git a/groups-model.cpp b/models/groups-model.cpp
similarity index 100%
rename from groups-model.cpp
rename to models/groups-model.cpp
diff --git a/groups-model.h b/models/groups-model.h
similarity index 100%
rename from groups-model.h
rename to models/groups-model.h
diff --git a/proxy-tree-node.cpp b/models/proxy-tree-node.cpp
similarity index 100%
rename from proxy-tree-node.cpp
rename to models/proxy-tree-node.cpp
diff --git a/proxy-tree-node.h b/models/proxy-tree-node.h
similarity index 100%
rename from proxy-tree-node.h
rename to models/proxy-tree-node.h
diff --git a/tree-node.cpp b/models/tree-node.cpp
similarity index 100%
rename from tree-node.cpp
rename to models/tree-node.cpp
diff --git a/tree-node.h b/models/tree-node.h
similarity index 100%
rename from tree-node.h
rename to models/tree-node.h
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list