[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=1b8fddf

The following commit has been merged in the master branch:
commit 1b8fddf8128bd2539b943abb92bb0300dde1b854
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Feb 7 22:29:55 2011 +0000

    Move contents of an init slot (previously used when the channel became
    ready) to the constructor now that we are using factories.
---
 lib/chatwidget.cpp | 12 ++++--------
 lib/chatwidget.h   |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/chatwidget.cpp b/lib/chatwidget.cpp
index a559adc..2d57f49 100644
--- a/lib/chatwidget.cpp
+++ b/lib/chatwidget.cpp
@@ -93,16 +93,8 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, QWidget *parent)
       d(new ChatWidgetPrivate)
 {
     d->channel = channel;
-    init();
-}
 
-ChatWidget::~ChatWidget()
-{
-    delete d;
-}
 
-void ChatWidget::init()
-{
     d->chatviewlInitialised = false;
     d->showFormatToolbarAction = new QAction(i18n("Show format options"), this);
     d->isGroupChat = false;
@@ -201,6 +193,10 @@ void ChatWidget::init()
     connect(d->ui.sendButton, SIGNAL(clicked()), SLOT(sendMessage()));
 }
 
+ChatWidget::~ChatWidget()
+{
+    delete d;
+}
 
 void ChatWidget::changeEvent(QEvent *e)
 {
diff --git a/lib/chatwidget.h b/lib/chatwidget.h
index c4b3945..dff8a1e 100644
--- a/lib/chatwidget.h
+++ b/lib/chatwidget.h
@@ -89,7 +89,6 @@ private slots:
     void onFormatColorReleased();
 
 private:
-    void init();
     //FIXME this should be in the ktelepathy lib
     static KIcon iconForPresence(Tp::ConnectionPresenceType presence);
 

-- 
ktp-text-ui packaging