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

The following commit has been merged in the master branch:
commit b138e585f7b957496dc57caa2e2d028c7b385255
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Feb 24 00:12:49 2011 +0100

    Another code cleanup and unused files removal.
---
 models/accounts-model-item.cpp | 1 -
 models/accounts-model.cpp      | 2 +-
 models/accounts-model.h        | 6 +++---
 models/tree-node.cpp           | 6 ++----
 models/tree-node.h             | 4 +---
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/models/accounts-model-item.cpp b/models/accounts-model-item.cpp
index 5053c84..8cc907c 100644
--- a/models/accounts-model-item.cpp
+++ b/models/accounts-model-item.cpp
@@ -23,7 +23,6 @@
 
 #include "accounts-model-item.h"
 #include "accounts-model.h"
-#include "avatar-image-provider.h"
 #include "contact-model-item.h"
 
 namespace Tpy
diff --git a/models/accounts-model.cpp b/models/accounts-model.cpp
index dbc4e8f..800646a 100644
--- a/models/accounts-model.cpp
+++ b/models/accounts-model.cpp
@@ -28,7 +28,7 @@
 namespace Tpy
 {
 
-struct TELEPATHY_QT4_YELL_MODELS_NO_EXPORT AccountsModel::Private
+struct AccountsModel::Private
 {
     Private(const Tp::AccountManagerPtr &am)
         : mAM(am)
diff --git a/models/accounts-model.h b/models/accounts-model.h
index 4dfcb30..ac985ba 100644
--- a/models/accounts-model.h
+++ b/models/accounts-model.h
@@ -21,19 +21,19 @@
 #ifndef _TelepathyQt4Yell_Models_accounts_model_h_HEADER_GUARD_
 #define _TelepathyQt4Yell_Models_accounts_model_h_HEADER_GUARD_
 
-#include <accounts-model-item.h>
+#include <QAbstractListModel>
 
 #include <TelepathyQt4/Account>
 #include <TelepathyQt4/AccountManager>
 #include <TelepathyQt4/TextChannel>
 #include <TelepathyQt4/Types>
 
-#include <QAbstractListModel>
+#include "accounts-model-item.h"
 
 namespace Tpy
 {
 
-class TELEPATHY_QT4_YELL_MODELS_EXPORT AccountsModel : public QAbstractItemModel
+class AccountsModel : public QAbstractItemModel
 {
     Q_OBJECT
     Q_DISABLE_COPY(AccountsModel)
diff --git a/models/tree-node.cpp b/models/tree-node.cpp
index 8b81ec8..9e9f1ee 100644
--- a/models/tree-node.cpp
+++ b/models/tree-node.cpp
@@ -18,14 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <tree-node.h>
-
-//#include "TelepathyQt4Yell/Models/_gen/tree-node.moc.hpp"
+#include "tree-node.h"
 
 namespace Tpy
 {
 
-struct TELEPATHY_QT4_YELL_MODELS_NO_EXPORT TreeNode::Private
+struct TreeNode::Private
 {
     Private() :
         mParent(0)
diff --git a/models/tree-node.h b/models/tree-node.h
index 4e1b83c..5206971 100644
--- a/models/tree-node.h
+++ b/models/tree-node.h
@@ -24,12 +24,10 @@
 #include <QObject>
 #include <QVariant>
 
-#include "global.h"
-
 namespace Tpy
 {
 
-class TELEPATHY_QT4_YELL_MODELS_EXPORT TreeNode : public QObject
+class TreeNode : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY(TreeNode)

-- 
ktp-common-internals packaging