[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=66ad1a2

The following commit has been merged in the master branch:
commit 66ad1a2f02a2e25382097ab781a1331787d04df4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Dec 7 00:12:33 2010 +0000

    Fix AdiumTheme data storage classes to not leak everything and have copy constructors
---
 lib/adiumthemecontentinfo.cpp | 19 +++++++++++++++++++
 lib/adiumthemecontentinfo.h   |  6 ++++--
 lib/adiumthemeheaderinfo.cpp  | 13 +++++++++++++
 lib/adiumthemeheaderinfo.h    |  2 ++
 lib/adiumthememessageinfo.cpp | 17 +++++++++++++++++
 lib/adiumthememessageinfo.h   |  3 +++
 lib/adiumthemestatusinfo.cpp  | 19 +++++++++++++++++++
 lib/adiumthemestatusinfo.h    |  4 ++++
 8 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/lib/adiumthemecontentinfo.cpp b/lib/adiumthemecontentinfo.cpp
index 7c084a9..4dac788 100644
--- a/lib/adiumthemecontentinfo.cpp
+++ b/lib/adiumthemecontentinfo.cpp
@@ -20,6 +20,25 @@ AdiumThemeContentInfo::AdiumThemeContentInfo(AdiumThemeMessageInfo::MessageType
 
 }
 
+AdiumThemeContentInfo::AdiumThemeContentInfo(const AdiumThemeContentInfo &other) :
+    AdiumThemeMessageInfo(other),
+    d(new AdiumThemeContentInfoPrivate(*other.d))
+{
+
+}
+
+AdiumThemeContentInfo::~AdiumThemeContentInfo()
+{
+    delete d;
+}
+
+AdiumThemeContentInfo& AdiumThemeContentInfo::operator=(const AdiumThemeContentInfo& other)
+{
+    *d = *other.d;
+    return *this;
+}
+
+
 QString AdiumThemeContentInfo::userIconPath() const
 {
     return d->userIconPath;
diff --git a/lib/adiumthemecontentinfo.h b/lib/adiumthemecontentinfo.h
index 4d35393..060e817 100644
--- a/lib/adiumthemecontentinfo.h
+++ b/lib/adiumthemecontentinfo.h
@@ -5,12 +5,14 @@
 class QString;
 class AdiumThemeContentInfoPrivate;
 
-
-
 class AdiumThemeContentInfo : public AdiumThemeMessageInfo
 {
 public:
     explicit AdiumThemeContentInfo(AdiumThemeMessageInfo::MessageType);
+    explicit AdiumThemeContentInfo(const AdiumThemeContentInfo &other);
+    ~AdiumThemeContentInfo();
+    AdiumThemeContentInfo &operator=(const AdiumThemeContentInfo &other);
+
 
     /** Path to the user icon associated with this message */
     QString userIconPath() const;
diff --git a/lib/adiumthemeheaderinfo.cpp b/lib/adiumthemeheaderinfo.cpp
index 5a51f71..6a0a543 100644
--- a/lib/adiumthemeheaderinfo.cpp
+++ b/lib/adiumthemeheaderinfo.cpp
@@ -38,11 +38,24 @@ AdiumThemeHeaderInfo::AdiumThemeHeaderInfo()
 {
 }
 
+AdiumThemeHeaderInfo::AdiumThemeHeaderInfo(const AdiumThemeHeaderInfo &other) :
+    d(new AdiumThemeHeaderInfoPrivate(*other.d))
+{
+
+}
+
 AdiumThemeHeaderInfo::~AdiumThemeHeaderInfo()
 {
     delete d;
 }
 
+AdiumThemeHeaderInfo& AdiumThemeHeaderInfo::operator=(const AdiumThemeHeaderInfo& other)
+{
+    *d = *other.d;
+    return *this;
+}
+
+
 QString AdiumThemeHeaderInfo::chatName() const
 {
     return d->chatName;
diff --git a/lib/adiumthemeheaderinfo.h b/lib/adiumthemeheaderinfo.h
index bf007da..0bb77ce 100644
--- a/lib/adiumthemeheaderinfo.h
+++ b/lib/adiumthemeheaderinfo.h
@@ -32,7 +32,9 @@ class AdiumThemeHeaderInfo
 {
 public:
     AdiumThemeHeaderInfo();
+    AdiumThemeHeaderInfo(const AdiumThemeHeaderInfo &other);
     ~AdiumThemeHeaderInfo();
+    AdiumThemeHeaderInfo &operator=(const AdiumThemeHeaderInfo &other);
 
     /** A name for the chat. For a one-on-one chat, this will be the display name of the remote user. For a group chat, it is the group chat name or topic, as appropriate. */
     QString chatName() const;
diff --git a/lib/adiumthememessageinfo.cpp b/lib/adiumthememessageinfo.cpp
index c1e8e10..01e38ee 100644
--- a/lib/adiumthememessageinfo.cpp
+++ b/lib/adiumthememessageinfo.cpp
@@ -21,6 +21,23 @@ AdiumThemeMessageInfo::AdiumThemeMessageInfo(MessageType type)
     d->type = type;
 }
 
+AdiumThemeMessageInfo::AdiumThemeMessageInfo(const AdiumThemeMessageInfo &other)
+    : d(new AdiumThemeMessageInfoPrivate(*other.d))
+{
+
+}
+
+AdiumThemeMessageInfo::~AdiumThemeMessageInfo()
+{
+    delete d;
+}
+
+AdiumThemeMessageInfo& AdiumThemeMessageInfo::operator=(const AdiumThemeMessageInfo& other)
+{
+    *d = *other.d;
+    return *this;
+}
+
 AdiumThemeMessageInfo::MessageType AdiumThemeMessageInfo::type() const
 {
     return d->type;
diff --git a/lib/adiumthememessageinfo.h b/lib/adiumthememessageinfo.h
index 2eef423..bd5c650 100644
--- a/lib/adiumthememessageinfo.h
+++ b/lib/adiumthememessageinfo.h
@@ -15,6 +15,9 @@ public:
     };
 
     explicit AdiumThemeMessageInfo(MessageType);
+    explicit AdiumThemeMessageInfo(const AdiumThemeMessageInfo &other);
+    ~AdiumThemeMessageInfo();
+    AdiumThemeMessageInfo &operator=(const AdiumThemeMessageInfo &other);
 
     MessageType type() const;
 
diff --git a/lib/adiumthemestatusinfo.cpp b/lib/adiumthemestatusinfo.cpp
index 4f42242..396b1cd 100644
--- a/lib/adiumthemestatusinfo.cpp
+++ b/lib/adiumthemestatusinfo.cpp
@@ -13,6 +13,25 @@ AdiumThemeStatusInfo::AdiumThemeStatusInfo():
 {
 }
 
+AdiumThemeStatusInfo::AdiumThemeStatusInfo(const AdiumThemeStatusInfo &other) :
+    AdiumThemeMessageInfo(other),
+    d(new AdiumThemeStatusInfoPrivate(*other.d))
+{
+
+}
+
+AdiumThemeStatusInfo::~AdiumThemeStatusInfo()
+{
+    delete d;
+}
+
+
+AdiumThemeStatusInfo& AdiumThemeStatusInfo::operator=(const AdiumThemeStatusInfo& other)
+{
+    *d = *other.d;
+    return *this;
+}
+
 QString AdiumThemeStatusInfo::status() const
 {
     return d->status;
diff --git a/lib/adiumthemestatusinfo.h b/lib/adiumthemestatusinfo.h
index d48c18a..7cd73ce 100644
--- a/lib/adiumthemestatusinfo.h
+++ b/lib/adiumthemestatusinfo.h
@@ -9,6 +9,10 @@ class AdiumThemeStatusInfo : public AdiumThemeMessageInfo
 {
 public:
     explicit AdiumThemeStatusInfo();
+    explicit AdiumThemeStatusInfo(const AdiumThemeStatusInfo &other);
+
+    ~AdiumThemeStatusInfo();
+    AdiumThemeStatusInfo &operator=(const AdiumThemeStatusInfo &other);
 
     /** A description of the status event. This is neither in the user's local language nor expected to be displayed*/
     QString status() const;

-- 
ktp-text-ui packaging