[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=98dc6ba

The following commit has been merged in the master branch:
commit 98dc6badaa026e83d2db9815dd78db94eab4157d
Author: Daniele Elmo Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed May 26 16:58:25 2010 +0000

    Make q_ptr protected in TelepathyBaseJobPrivate and use it in subclasses
    see http://reviewboard.kde.org/r/4153/
    
    svn path=/trunk/playground/network/telepathy-contactlist/; revision=1130869
---
 add-contact-job.cpp                | 3 +--
 add-contacts-to-group-job.cpp      | 3 +--
 add-meta-contact-job.cpp           | 3 +--
 remove-contacts-from-group-job.cpp | 3 +--
 remove-contacts-job.cpp            | 3 +--
 telepathy-base-job_p.h             | 2 ++
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/add-contact-job.cpp b/add-contact-job.cpp
index b2e8776..acab713 100644
--- a/add-contact-job.cpp
+++ b/add-contact-job.cpp
@@ -39,11 +39,10 @@
 class AddContactJobPrivate : public TelepathyBaseJobPrivate
 {
     Q_DECLARE_PUBLIC(AddContactJob)
-    AddContactJob * const q_ptr;
 
 public:
     AddContactJobPrivate(AddContactJob *parent)
-        : TelepathyBaseJobPrivate(parent), q_ptr(parent)
+        : TelepathyBaseJobPrivate(parent)
     {}
     virtual ~AddContactJobPrivate() {}
 
diff --git a/add-contacts-to-group-job.cpp b/add-contacts-to-group-job.cpp
index 215bf0b..29edbc7 100644
--- a/add-contacts-to-group-job.cpp
+++ b/add-contacts-to-group-job.cpp
@@ -42,12 +42,11 @@
 class AddContactsToGroupJobPrivate : public TelepathyBaseJobPrivate
 {
     Q_DECLARE_PUBLIC(AddContactsToGroupJob)
-    AddContactsToGroupJob * const q_ptr;
 
 public:
     AddContactsToGroupJobPrivate(AddContactsToGroupJob *parent,
                                       AddContactsToGroupJob::ProcessingMode m)
-        : TelepathyBaseJobPrivate(parent), q_ptr(parent), mode(m)
+        : TelepathyBaseJobPrivate(parent), mode(m)
     {}
     virtual ~AddContactsToGroupJobPrivate() {}
 
diff --git a/add-meta-contact-job.cpp b/add-meta-contact-job.cpp
index 2df3d02..14ade82 100644
--- a/add-meta-contact-job.cpp
+++ b/add-meta-contact-job.cpp
@@ -34,11 +34,10 @@
 class AddMetaContactJobPrivate : public TelepathyBaseJobPrivate
 {
     Q_DECLARE_PUBLIC(AddMetaContactJob)
-    AddMetaContactJob * const q_ptr;
 
 public:
     AddMetaContactJobPrivate(AddMetaContactJob *parent)
-        : TelepathyBaseJobPrivate(parent), q_ptr(parent)
+        : TelepathyBaseJobPrivate(parent)
     {}
     virtual ~AddMetaContactJobPrivate() {}
 
diff --git a/remove-contacts-from-group-job.cpp b/remove-contacts-from-group-job.cpp
index 542b112..075abe6 100644
--- a/remove-contacts-from-group-job.cpp
+++ b/remove-contacts-from-group-job.cpp
@@ -42,12 +42,11 @@
 class RemoveContactsFromGroupJobPrivate : public TelepathyBaseJobPrivate
 {
     Q_DECLARE_PUBLIC(RemoveContactsFromGroupJob)
-    RemoveContactsFromGroupJob * const q_ptr;
 
 public:
     RemoveContactsFromGroupJobPrivate(RemoveContactsFromGroupJob *parent,
                                       RemoveContactsFromGroupJob::ProcessingMode m)
-        : TelepathyBaseJobPrivate(parent), q_ptr(parent), mode(m)
+        : TelepathyBaseJobPrivate(parent), mode(m)
     {}
     virtual ~RemoveContactsFromGroupJobPrivate() {}
 
diff --git a/remove-contacts-job.cpp b/remove-contacts-job.cpp
index a08c2f1..8763f7b 100644
--- a/remove-contacts-job.cpp
+++ b/remove-contacts-job.cpp
@@ -54,12 +54,11 @@
 class RemoveContactsJobPrivate : public TelepathyBaseJobPrivate
 {
     Q_DECLARE_PUBLIC(RemoveContactsJob)
-    RemoveContactsJob * const q_ptr;
 
 public:
     RemoveContactsJobPrivate(RemoveContactsJob *parent,
                              RemoveContactsJob::ProcessingMode m, TelepathyBridge::RemovalModes rm)
-        : TelepathyBaseJobPrivate(parent), q_ptr(parent), mode(m), removalModes(rm)
+        : TelepathyBaseJobPrivate(parent), mode(m), removalModes(rm)
     {}
     virtual ~RemoveContactsJobPrivate() {}
 
diff --git a/telepathy-base-job_p.h b/telepathy-base-job_p.h
index 2ce4199..2396c59 100644
--- a/telepathy-base-job_p.h
+++ b/telepathy-base-job_p.h
@@ -31,6 +31,8 @@ class PendingOperation;
 class TelepathyBaseJobPrivate
 {
     Q_DECLARE_PUBLIC(TelepathyBaseJob)
+
+protected:
     TelepathyBaseJob * const q_ptr;
 
 public:

-- 
ktp-contact-list packaging