[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=3abb312

The following commit has been merged in the master branch:
commit 3abb312005344fcf46d9ce9704a21f808d447460
Merge: 27a1c1b00fcee7a9cd577a3467132f5fed482968 eae93e5cf83615e5180057af457df526190dcfaf
Author: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
Date:   Mon Jan 31 13:25:16 2011 +0200

    Merge branch 'cleanups'
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>

 .../adiumxtraprotocolhandler.cpp                   |  25 +-
 .../adiumxtraprotocolhandler.h                     |  11 +-
 adiumxtra-protocol-handler/bundleinstaller.cpp     |   6 +
 adiumxtra-protocol-handler/bundleinstaller.h       |  29 +-
 adiumxtra-protocol-handler/chatstyleinstaller.cpp  |  42 ++-
 adiumxtra-protocol-handler/chatstyleinstaller.h    |  36 +--
 .../emoticonsetinstaller.cpp                       |  11 +-
 adiumxtra-protocol-handler/emoticonsetinstaller.h  |  24 +-
 adiumxtra-protocol-handler/main.cpp                |   6 +-
 app/main.cpp                                       |  54 ++--
 app/mainwindow.cpp                                 |  72 +++--
 app/mainwindow.h                                   |  42 +--
 config/mainwindow.cpp                              |  36 +--
 config/mainwindow.h                                |   5 +-
 lib/CMakeLists.txt                                 |   1 -
 lib/adiumthemecontentinfo.cpp                      |  24 +-
 lib/adiumthemecontentinfo.h                        |   3 +-
 lib/adiumthemeheaderinfo.cpp                       |   6 +-
 lib/adiumthemeheaderinfo.h                         |  26 +-
 lib/adiumthememessageinfo.cpp                      |   8 +-
 lib/adiumthemestatusinfo.cpp                       |  14 +-
 lib/adiumthemestatusinfo.h                         |   4 +-
 lib/adiumthemeview.cpp                             |  25 +-
 lib/adiumthemeview.h                               |  11 +-
 lib/channelcontactlist.cpp                         |  34 ++-
 lib/channelcontactlist.h                           |  21 +-
 lib/chatconnection.cpp                             |  69 -----
 lib/chatconnection.h                               |  66 ----
 lib/chatstyleplistfilereader.cpp                   |  49 ++-
 lib/chatstyleplistfilereader.h                     |  43 ++-
 lib/chattextedit.cpp                               |  28 +-
 lib/chattextedit.h                                 |   2 +-
 lib/chatwindow.cpp                                 | 333 ++++++++++-----------
 lib/chatwindow.h                                   |  59 ++--
 lib/chatwindowstyle.cpp                            |  73 ++---
 lib/chatwindowstyle.h                              |  12 +-
 lib/chatwindowstylemanager.cpp                     |  85 +++---
 lib/chatwindowstylemanager.h                       |  13 +-
 38 files changed, 644 insertions(+), 764 deletions(-)

-- 
ktp-text-ui packaging