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

The following commit has been merged in the master branch:
commit c291261cfd8442d4fdfa2bdb041c69ecfc2e644b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Jan 15 17:35:02 2013 +0000

    Correctly namespace ContactsFilterModel
---
 KTp/Models/accounts-filter-model.h   | 2 +-
 KTp/Models/contacts-filter-model.cpp | 4 +++-
 KTp/Models/contacts-filter-model.h   | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/KTp/Models/accounts-filter-model.h b/KTp/Models/accounts-filter-model.h
index 61e97a2..0733e14 100644
--- a/KTp/Models/accounts-filter-model.h
+++ b/KTp/Models/accounts-filter-model.h
@@ -24,7 +24,7 @@
 #include "contacts-filter-model.h"
 
 //temporary hack to ensure compatiability for a while
-class AccountsFilterModel : public ContactsFilterModel {
+class AccountsFilterModel : public KTp::ContactsFilterModel {
 public:
     AccountsFilterModel(QObject *parent = 0) :
         ContactsFilterModel(parent){}
diff --git a/KTp/Models/contacts-filter-model.cpp b/KTp/Models/contacts-filter-model.cpp
index 6f26992..39cd7e8 100644
--- a/KTp/Models/contacts-filter-model.cpp
+++ b/KTp/Models/contacts-filter-model.cpp
@@ -30,7 +30,7 @@
 #include <KDebug>
 
 
-class ContactsFilterModel::Private
+class KTp::ContactsFilterModel::Private
 {
 public:
     Private(ContactsFilterModel *parent)
@@ -78,6 +78,8 @@ public:
     QHash<QString, int> m_totalContactsCounts;
 };
 
+using namespace KTp;
+
 bool ContactsFilterModel::Private::filterAcceptsAccount(const QModelIndex &index) const
 {
     // Hide disabled accounts
diff --git a/KTp/Models/contacts-filter-model.h b/KTp/Models/contacts-filter-model.h
index bddebb0..bce9e46 100644
--- a/KTp/Models/contacts-filter-model.h
+++ b/KTp/Models/contacts-filter-model.h
@@ -26,6 +26,10 @@
 
 #include <KTp/ktp-export.h>
 
+namespace KTp
+
+{
+
 /**
   * rief Class used to sort and filter the contacts.
   */
@@ -292,4 +296,6 @@ private:
     Q_PRIVATE_SLOT(d, void countContacts(const QModelIndex &index))
 };
 
+} //namespace
+
 #endif // ACCOUNTFILTERMODEL_H

-- 
ktp-common-internals packaging