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

The following commit has been merged in the master branch:
commit bd0a5aaf0f51745a7a05eb32f7277a3606f058f7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Mar 9 19:33:45 2011 +0000

    Fix rebase. Renamed new file chattab.cpp to chat-tab.cpp to reflect
    changes in master.
---
 app/CMakeLists.txt                |  3 +--
 app/{chattab.cpp => chat-tab.cpp} |  5 +++--
 app/{chattab.h => chat-tab.h}     |  2 +-
 app/chat-window.cpp               | 11 ++++-------
 lib/chat-widget.cpp               | 27 ---------------------------
 lib/chat-widget.h                 |  9 ---------
 6 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e1fda0a..07eea1e 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -6,8 +6,7 @@ set(telepathy_chat_handler_SRCS
         main.cpp
         telepathy-chat-ui.cpp
         chat-window.cpp
-        chattab.cpp
-        chat-window.cpp
+        chat-tab.cpp
 )
 
 kde4_add_executable(telepathy-chat-handler ${telepathy_chat_handler_SRCS})
diff --git a/app/chattab.cpp b/app/chat-tab.cpp
similarity index 97%
rename from app/chattab.cpp
rename to app/chat-tab.cpp
index d53467f..224429b 100644
--- a/app/chattab.cpp
+++ b/app/chat-tab.cpp
@@ -17,8 +17,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "chattab.h"
-#include "chatwidget.h"
+#include "chat-tab.h"
+
+#include "chat-widget.h"
 
 #include <KTabWidget>
 #include <KDebug>
diff --git a/app/chattab.h b/app/chat-tab.h
similarity index 98%
rename from app/chattab.h
rename to app/chat-tab.h
index a32cbe1..17924cc 100644
--- a/app/chattab.h
+++ b/app/chat-tab.h
@@ -20,7 +20,7 @@
 #ifndef CHATTAB_H
 #define CHATTAB_H
 
-#include "chatwidget.h"
+#include "chat-widget.h"
 
 #include <QtCore/QString>
 #include <QtGui/QWidget>
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 12af8bc..f5c695b 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -19,7 +19,7 @@
 
 #include "chat-window.h"
 
-#include "chattab.h"
+#include "chat-tab.h"
 
 #include <KStandardAction>
 #include <KIcon>
@@ -75,10 +75,10 @@ void ChatWindow::startChat(Tp::TextChannelPtr incomingTextChannel)
         ChatTab *auxChatTab = qobject_cast<ChatTab*>(m_tabWidget->widget(index));
 
         // this should never happen
-        if(!auxChatWidget)
+        if(!auxChatTab)
             return;
 
-        if(auxChatWidget->textChannel() == incomingTextChannel) {   // got duplicate tab
+        if(auxChatTab->textChannel() == incomingTextChannel) {   // got duplicate tab
             duplicateTab = true;
             m_tabWidget->setCurrentIndex(index);                    // set focus on selected tab
         }
@@ -86,7 +86,7 @@ void ChatWindow::startChat(Tp::TextChannelPtr incomingTextChannel)
 
     // got new chat, create it
     if(!duplicateTab) {
-        ChatTab *chatTab = new ChatWidget(incomingTextChannel, m_tabWidget);
+        ChatTab *chatTab = new ChatTab(incomingTextChannel, m_tabWidget);
         connect(chatTab, SIGNAL(titleChanged(QString)), this, SLOT(updateTabText(QString)));
         connect(chatTab, SIGNAL(iconChanged(KIcon)), this, SLOT(updateTabIcon(KIcon)));
         connect(chatTab, SIGNAL(userTypingChanged(bool)), this, SLOT(onUserTypingChanged(bool)));
@@ -170,9 +170,6 @@ void ChatWindow::onTabStateChanged()
         int tabIndex = m_tabWidget->indexOf(sender);
         setTabTextColor(tabIndex, sender->titleColor());
     }
-    else {
-        kDebug() << "AAARGH";
-    }
 }
 
 void ChatWindow::showSettingsDialog()
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 6bafc76..88cdd1c 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -658,32 +658,5 @@ KIcon ChatWidget::iconForPresence(Tp::ConnectionPresenceType presence)
     return KIcon(iconName);
 }
 
-QColor ChatWidget::colorForPresence(Tp::ConnectionPresenceType presence)
-{
-    TitleColor role;
-
-    switch (presence) {
-        case Tp::ConnectionPresenceTypeAvailable:
-        case Tp::ConnectionPresenceTypeAway:
-        case Tp::ConnectionPresenceTypeExtendedAway:
-        case Tp::ConnectionPresenceTypeHidden:
-        case Tp::ConnectionPresenceTypeBusy:
-            role = Default;
-            break;
-        default:
-            role = Offline;
-            break;
-    }
-
-    return colorForRole(role);
-}
-
-QColor ChatWidget::colorForRole(ChatWidget::TitleColor role)
-{
-    KColorScheme scheme(QPalette::Active, KColorScheme::Window);
-    return scheme.foreground(static_cast<KColorScheme::ForegroundRole>(role)).color();
-}
-
-
 #include "chat-widget.moc" //for MessageBoxEventFilter
 #include "moc_chat-widget.cpp" //for ChatWidget
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index e4f500d..5659662 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -39,15 +39,6 @@ class KDE_TELEPATHY_CHAT_EXPORT ChatWidget : public QWidget
     Q_OBJECT
 
 public:
-//    enum TitleColor {
-//        Default = KColorScheme::NormalText,
-//        Offline = KColorScheme::InactiveText,
-//        UnreadMessages = KColorScheme::ActiveText,
-//        UnreadStatus = KColorScheme::NeutralText,
-//        UnauthorizedContact = KColorScheme::NegativeText,
-//        CurrentlyTyping = KColorScheme::PositiveText
-//    };
-
     explicit ChatWidget(const Tp::TextChannelPtr & channel, QWidget *parent = 0);
     virtual ~ChatWidget();
 

-- 
ktp-text-ui packaging