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

The following commit has been merged in the master branch:
commit a287800531ba3f95c56fb1b442cd7023e1c110eb
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Sun Sep 18 07:16:39 2011 +0200

    Add inheritContent method
---
 lib/chat-window-style.cpp | 8 +++++++-
 lib/chat-window-style.h   | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 43320d5..a017b2c 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -268,10 +268,16 @@ QString ChatWindowStyle::content(InternalIdentifier id) const
     return d->templateContents.value( id );
 }
 
+void ChatWindowStyle::inheritContent(InternalIdentifier subType, InternalIdentifier superType)
+{
+    if (content(subType).isEmpty()) {
+        setContent(subType, content(superType));
+    }
+}
+
 
 void ChatWindowStyle::readStyleFiles()
 {
-
     // load style infos
     QString infoPlistFile = d->baseHref + QLatin1String("../Info.plist");
     ChatStylePlistFileReader plistReader(infoPlistFile);
diff --git a/lib/chat-window-style.h b/lib/chat-window-style.h
index 710f818..a706d13 100644
--- a/lib/chat-window-style.h
+++ b/lib/chat-window-style.h
@@ -193,6 +193,11 @@ private:
      */
     QString content(InternalIdentifier id) const;
 
+    /**
+     * If subType is empty, use the superType
+     */
+    void inheritContent(InternalIdentifier subType, InternalIdentifier superType);
+
 private:
     class Private;
     Private * const d;

-- 
ktp-text-ui packaging