[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=4824f6e

The following commit has been merged in the master branch:
commit 4824f6e2fe13b443af488ceafac37adf96448b59
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Wed Oct 5 01:34:58 2011 +0200

    Fix NO_ASCII and NO_KEYWORDS comp
---
 lib/chat-window-style.cpp | 4 ++--
 lib/logmanager.cpp        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index f7b60d0..422db26 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -411,8 +411,8 @@ void ChatWindowStyle::readStyleFiles()
 
     // make sure VoiceClip is displayed correctly
     if (content(VoiceClipIncoming).isEmpty() ||
-            (!content(VoiceClipIncoming).contains("playVoiceHandlerId") &&
-             !content(VoiceClipIncoming).contains("saveAsVoiceHandlerId"))) {   // Create default html
+            (!content(VoiceClipIncoming).contains(QLatin1String("playVoiceHandlerId")) &&
+             !content(VoiceClipIncoming).contains(QLatin1String("saveAsVoiceHandlerId")))) {   // Create default html
         QString message = QString(QLatin1String("%message%
"
                                   "<div>
"
                                   " <div style=\"width:37px; float:left;\">
"
diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index b3c0b39..c277120 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -61,7 +61,7 @@ LogManager::LogManager(const Tp::AccountPtr &account, const Tp::ContactPtr &cont
         Q_ASSERT(false);
     }
 
-    m_contactEntity = Tpl::Entity::create(m_contact->id().toStdString().c_str(),
+    m_contactEntity = Tpl::Entity::create(m_contact->id().toLatin1().data(),
                                             Tpl::EntityTypeContact,
                                             NULL,
                                             NULL);
@@ -102,7 +102,7 @@ void LogManager::fetchLast()
     connect(dates, SIGNAL(finished(Tpl::PendingOperation*)), SLOT(onDatesFinished(Tpl::PendingOperation*)));
 #else
     QList<AdiumThemeContentInfo> messages;
-    emit fetched(messages);
+    Q_EMIT fetched(messages);
 #endif
 
 }
@@ -130,7 +130,7 @@ void LogManager::onDatesFinished(Tpl::PendingOperation* po)
         connect(events, SIGNAL(finished(Tpl::PendingOperation*)), SLOT(onEventsFinished(Tpl::PendingOperation*)));
     } else {
         QList<AdiumThemeContentInfo> messages;
-        emit fetched(messages);
+        Q_EMIT fetched(messages);
     }
 }
 
@@ -198,6 +198,6 @@ void LogManager::onEventsFinished(Tpl::PendingOperation* po)
     }
 
     kDebug() << "emit all messages" << messages.count();
-    emit fetched(messages);
+    Q_EMIT fetched(messages);
 }
 #endif
\ No newline at end of file

-- 
ktp-text-ui packaging