[SCM] ktp-text-ui packaging branch, master, updated. debian/0.7.0-1-111-g633eaac

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=9d8aaf3

The following commit has been merged in the master branch:
commit 9d8aaf37b872f29111788b62529d3f50be0cd3b3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 29 11:13:44 2016 +0100

    Imported Upstream version 15.12.1
---
 CMakeLists.txt         | 2 +-
 app/chat-window.cpp    | 4 ++--
 lib/chat-text-edit.cpp | 4 ++--
 lib/chat-text-edit.h   | 4 ++--
 lib/chat-widget.cpp    | 2 +-
 lib/chat-widget.h      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4a4ee0..9c35c9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.8.12)
 # KDE Application Version, managed by release script
 set(KDE_APPLICATIONS_VERSION_MAJOR "15")
 set(KDE_APPLICATIONS_VERSION_MINOR "12")
-set(KDE_APPLICATIONS_VERSION_MICRO "0")
+set(KDE_APPLICATIONS_VERSION_MICRO "1")
 set(KTP_TEXT_UI_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 set(KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
 set(IS_KTP_INTERNAL_MODULE TRUE)
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index fdde18d..c3f83bf 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -312,7 +312,7 @@ void ChatWindow::addTab(ChatTab *tab)
     }
 
     tab->setFocus();
-    tab->updateSendMessageShortcuts(m_sendMessage->shortcut());
+    tab->updateSendMessageShortcuts(m_sendMessage->shortcuts());
     // block text input if key is being generated for this account
     if(m_proxyService->isOngoingGeneration(QDBusObjectPath(tab->account()->objectPath()))) {
         tab->blockTextInput(true);
@@ -1341,7 +1341,7 @@ void ChatWindow::onZoomFactorChanged(qreal zoom)
 
 void ChatWindow::updateSendMessageShortcuts()
 {
-    QKeySequence newSendMessageShortcuts = m_sendMessage->shortcut();
+    QList<QKeySequence> newSendMessageShortcuts = m_sendMessage->shortcuts();
     for (int i = 0; i < m_tabWidget->count(); i++) {
         ChatTab* tab = qobject_cast<ChatTab*>(m_tabWidget->widget(i));
         tab->updateSendMessageShortcuts(newSendMessageShortcuts);
diff --git a/lib/chat-text-edit.cpp b/lib/chat-text-edit.cpp
index 6fce622..4d16e20 100644
--- a/lib/chat-text-edit.cpp
+++ b/lib/chat-text-edit.cpp
@@ -148,7 +148,7 @@ bool ChatTextEdit::event(QEvent *e)
             key = QKeySequence(keyEvent->modifiers() | keyEvent->key());
         }
 
-        if (m_sendMessageShortcuts.matches(key) == QKeySequence::ExactMatch) {
+        if (m_sendMessageShortcuts.contains(key)) {
             // keyPressEvent() handles Control modifier wrong, so we need that thing
             // to be in event().
             this->sendMessage();
@@ -203,7 +203,7 @@ void ChatTextEdit::sendMessage()
     Q_EMIT returnKeyPressed();
 }
 
-void ChatTextEdit::setSendMessageShortcuts(const QKeySequence &shortcuts)
+void ChatTextEdit::setSendMessageShortcuts(const QList<QKeySequence> &shortcuts)
 {
     m_sendMessageShortcuts = shortcuts;
 }
diff --git a/lib/chat-text-edit.h b/lib/chat-text-edit.h
index 49fdef6..ced430f 100644
--- a/lib/chat-text-edit.h
+++ b/lib/chat-text-edit.h
@@ -71,7 +71,7 @@ public Q_SLOTS:
      * Updates internal message sending shortcuts. Must be called on every window
      * creation and every message sending shortcuts change.
      */
-    void setSendMessageShortcuts(const QKeySequence &shortcuts);
+    void setSendMessageShortcuts(const QList<QKeySequence> &shortcuts);
 
 private:
     QStringList m_history;
@@ -84,7 +84,7 @@ private:
     int m_completionPosition;
     bool m_continuousCompletion;
 
-    QKeySequence m_sendMessageShortcuts;
+    QList<QKeySequence> m_sendMessageShortcuts;
 };
 
 #endif // CHATTEXTEDIT_H
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index e26b57c..7975057 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -644,7 +644,7 @@ void ChatWidget::acknowledgeMessages()
     }
 }
 
-void ChatWidget::updateSendMessageShortcuts(const QKeySequence &shortcuts)
+void ChatWidget::updateSendMessageShortcuts(const QList<QKeySequence> &shortcuts)
 {
     d->ui.sendMessageBox->setSendMessageShortcuts(shortcuts);
 }
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index fd4136f..588407c 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -134,7 +134,7 @@ public Q_SLOTS:
       */
     void acknowledgeMessages();
 
-    void updateSendMessageShortcuts(const QKeySequence &shortcuts);
+    void updateSendMessageShortcuts(const QList<QKeySequence> &shortcuts);
 
     void reloadTheme();
 

-- 
ktp-text-ui packaging