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

The following commit has been merged in the master branch:
commit d88bbf8ad5e7b1751ebf3d8790539feaafc2314e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Sep 22 16:16:06 2010 +0000

    Rename ChatView to AdiumThemeView to be a bit more descriptive.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1178281
---
 lib/CMakeLists.txt                       |  2 +-
 lib/{chatview.cpp => adiumthemeview.cpp} | 30 +++++++++++++++---------------
 lib/{chatview.h => adiumthemeview.h}     |  4 ++--
 lib/chatwindow.ui                        |  6 +++---
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a9d2de6..77a0ae1 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -3,7 +3,7 @@ set(telepathy_chat_handler_lib_SRCS
         chatwindow.cpp
         chatwindowstyle.cpp
         chatwindowstylemanager.cpp
-        chatview.cpp
+        adiumthemeview.cpp
         telepathychatmessageinfo.cpp
         telepathychatinfo.cpp
         channelcontactlist.cpp
diff --git a/lib/chatview.cpp b/lib/adiumthemeview.cpp
similarity index 92%
rename from lib/chatview.cpp
rename to lib/adiumthemeview.cpp
index e324812..80c89c6 100644
--- a/lib/chatview.cpp
+++ b/lib/adiumthemeview.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "chatview.h"
+#include "adiumthemeview.h"
 #include "chatwindowstylemanager.h"
 
 #include <QDebug>
@@ -38,7 +38,7 @@
 #include <KMessageBox>
 
 
-ChatView::ChatView(QWidget *parent) :
+AdiumThemeView::AdiumThemeView(QWidget *parent) :
         QWebView(parent),
         m_displayHeader(true)
 {
@@ -68,7 +68,7 @@ ChatView::ChatView(QWidget *parent) :
     m_webInspector = appearanceConfig.readEntry("debug", false);
 }
 
-void ChatView::initialise(const TelepathyChatInfo &chatInfo)
+void AdiumThemeView::initialise(const TelepathyChatInfo &chatInfo)
 {
     QString templateHtml;
     QString templateFileName(KGlobal::dirs()->findResource("data", "ktelepathy/template.html"));
@@ -144,7 +144,7 @@ void ChatView::initialise(const TelepathyChatInfo &chatInfo)
     }
 }
 
-void ChatView::setVariant(const QString &variant)
+void AdiumThemeView::setVariant(const QString &variant)
 {
     m_variantName = variant;
     m_variantPath = QString("Variants/%1.css").arg(variant);
@@ -153,12 +153,12 @@ void ChatView::setVariant(const QString &variant)
     initialise(m_chatInfo);
 }
 
-ChatWindowStyle* ChatView::chatStyle() const
+ChatWindowStyle* AdiumThemeView::chatStyle() const
 {
     return m_chatStyle;
 }
 
-void ChatView::setChatStyle(ChatWindowStyle *chatStyle)
+void AdiumThemeView::setChatStyle(ChatWindowStyle *chatStyle)
 {
     m_chatStyle = chatStyle;
 
@@ -180,18 +180,18 @@ void ChatView::setChatStyle(ChatWindowStyle *chatStyle)
 }
 
 
-bool ChatView::isHeaderDisplayed() const
+bool AdiumThemeView::isHeaderDisplayed() const
 {
     return m_displayHeader;
 }
 
-void ChatView::setHeaderDisplayed(bool displayHeader)
+void AdiumThemeView::setHeaderDisplayed(bool displayHeader)
 {
     m_displayHeader = displayHeader;
     initialise(m_chatInfo);
 }
 
-void ChatView::addMessage(const TelepathyChatMessageInfo &message)
+void AdiumThemeView::addMessage(const TelepathyChatMessageInfo &message)
 {
     QString styleHtml;
     bool consecutiveMessage = false;
@@ -258,7 +258,7 @@ void ChatView::addMessage(const TelepathyChatMessageInfo &message)
 }
 
 
-QString ChatView::replaceHeaderKeywords(QString htmlTemplate, const TelepathyChatInfo & info)
+QString AdiumThemeView::replaceHeaderKeywords(QString htmlTemplate, const TelepathyChatInfo & info)
 {
     htmlTemplate.replace("%chatName%", info.chatName());
     htmlTemplate.replace("%sourceName%", info.sourceName());
@@ -281,7 +281,7 @@ QString ChatView::replaceHeaderKeywords(QString htmlTemplate, const TelepathyCha
     return htmlTemplate;
 }
 
-void ChatView::appendNewMessage(QString &html)
+void AdiumThemeView::appendNewMessage(QString &html)
 {
     //by making the JS return false evaluateJavaScript is a _lot_ faster, as it has nothing to convert to QVariant.
     //escape quotes, and merge HTML onto one line.
@@ -289,7 +289,7 @@ void ChatView::appendNewMessage(QString &html)
     page()->mainFrame()->evaluateJavaScript(js);
 }
 
-void ChatView::appendNextMessage(QString &html)
+void AdiumThemeView::appendNextMessage(QString &html)
 {
     QString js = QString("appendNextMessage(\"%1\");false;").arg(html.replace('"', "\\"").replace('
', ""));
     page()->mainFrame()->evaluateJavaScript(js);
@@ -297,7 +297,7 @@ void ChatView::appendNextMessage(QString &html)
 
 
 //taken from Kopete code
-QString ChatView::formatTime(const QString &_timeFormat, const QDateTime &dateTime)
+QString AdiumThemeView::formatTime(const QString &_timeFormat, const QDateTime &dateTime)
 {
     char buffer[256];
 #ifdef Q_WS_WIN
@@ -317,12 +317,12 @@ QString ChatView::formatTime(const QString &_timeFormat, const QDateTime &dateTi
     return QString(buffer);
 }
 
-const QString ChatView::variantName() const
+const QString AdiumThemeView::variantName() const
 {
     return m_variantName;
 }
 
-const QString ChatView::variantPath() const
+const QString AdiumThemeView::variantPath() const
 {
     return m_variantPath;
 }
diff --git a/lib/chatview.h b/lib/adiumthemeview.h
similarity index 96%
rename from lib/chatview.h
rename to lib/adiumthemeview.h
index 735e288..d01dfca 100644
--- a/lib/chatview.h
+++ b/lib/adiumthemeview.h
@@ -28,11 +28,11 @@
 
 
 
-class ChatView : public QWebView
+class AdiumThemeView : public QWebView
 {
     Q_OBJECT
 public:
-    explicit ChatView(QWidget *parent = 0);
+    explicit AdiumThemeView(QWidget *parent = 0);
     void initialise(const TelepathyChatInfo&);
 
     //override various parts loaded from the config file.
diff --git a/lib/chatwindow.ui b/lib/chatwindow.ui
index 0dc4ddf..9339455 100644
--- a/lib/chatwindow.ui
+++ b/lib/chatwindow.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="ChatView" name="chatArea" native="true"/>
+    <widget class="AdiumThemeView" name="chatArea" native="true"/>
    </item>
    <item>
     <widget class="QSplitter" name="splitter">
@@ -60,9 +60,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>ChatView</class>
+   <class>AdiumThemeView</class>
    <extends>QWidget</extends>
-   <header>chatview.h</header>
+   <header>adiumthemeview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

-- 
ktp-text-ui packaging