[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:23:07 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=526fb97
The following commit has been merged in the master branch:
commit 526fb9762041f6d82cb3dd4dbda83816ef530dde
Author: Dan Vrátil <dvratil at redhat.com>
Date: Fri Jan 4 15:21:47 2013 +0100
Fix build against ktp-common-internals
---
config/CMakeLists.txt | 1 +
config/messages-config.cpp | 6 +++---
filters/emoticons/CMakeLists.txt | 1 +
filters/emoticons/emoticon-filter.cpp | 4 ++--
filters/emoticons/emoticon-filter.h | 6 +++---
filters/formatting/CMakeLists.txt | 1 +
filters/formatting/format-filter.cpp | 4 ++--
filters/formatting/format-filter.h | 7 ++++---
filters/images/CMakeLists.txt | 1 +
filters/images/images-filter.cpp | 4 ++--
filters/images/images-filter.h | 7 ++++---
filters/searchexpansion/CMakeLists.txt | 1 +
filters/searchexpansion/searchexpansion-filter.h | 6 +++---
filters/texttospeech/CMakeLists.txt | 1 +
filters/texttospeech/tts-filter.cpp | 4 ++--
filters/texttospeech/tts-filter.h | 6 +++---
lib/KTp/AbstractMessageFilter | 6 ------
lib/adium-theme-view.cpp | 5 +++--
lib/chat-widget.cpp | 7 ++++---
lib/logmanager.cpp | 7 ++++---
logviewer/message-view.cpp | 4 ++--
tests/CMakeLists.txt | 1 +
tests/message-processor-basic-tests.cpp | 4 ++--
tests/sync-processor.cpp | 10 +++++-----
tests/sync-processor.h | 6 +++---
25 files changed, 58 insertions(+), 52 deletions(-)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index c1e8e5d..24e9e80 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(kcm_ktp_chat_messages
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KUTILS_LIBS}
+ ${KTP_LIBRARIES}
ktpchat
)
diff --git a/config/messages-config.cpp b/config/messages-config.cpp
index 8f7fee0..c4ff9d8 100644
--- a/config/messages-config.cpp
+++ b/config/messages-config.cpp
@@ -17,7 +17,7 @@
*/
#include "messages-config.h"
-#include "plugin-config-manager.h"
+#include <KTp/message-filter-config-manager.h>
#include <QVBoxLayout>
@@ -33,11 +33,11 @@ MessagesConfig::MessagesConfig(QWidget *parent, const QVariantList &args)
: PluginPage(KTpMessagesConfigFactory::componentData(), parent, args)
{
pluginSelector()->addPlugins(
- PluginConfigManager::self()->allPlugins(),
+ KTp::MessageFilterConfigManager::self()->allPlugins(),
KPluginSelector::ReadConfigFile,
i18n("Plugins"),
QString(),
- PluginConfigManager::self()->sharedConfig() //why won't this take a KConfigGroup?
+ KTp::MessageFilterConfigManager::self()->sharedConfig() //why won't this take a KConfigGroup?
);
//Am surprised that PluginPage() doesn't do this for me
diff --git a/filters/emoticons/CMakeLists.txt b/filters/emoticons/CMakeLists.txt
index 6ba9b27..5054e8d 100644
--- a/filters/emoticons/CMakeLists.txt
+++ b/filters/emoticons/CMakeLists.txt
@@ -15,6 +15,7 @@ target_link_libraries (ktptextui_message_filter_emoticons
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
${KDE4_KEMOTICONS_LIBS}
+ ${KTP_LIBRARIES}
)
# Install:
diff --git a/filters/emoticons/emoticon-filter.cpp b/filters/emoticons/emoticon-filter.cpp
index e656e47..194e449 100644
--- a/filters/emoticons/emoticon-filter.cpp
+++ b/filters/emoticons/emoticon-filter.cpp
@@ -28,12 +28,12 @@ public:
};
EmoticonFilter::EmoticonFilter(QObject *parent, const QVariantList &)
- : AbstractMessageFilter(parent),
+ : KTp::AbstractMessageFilter(parent),
d(new Private)
{
}
-void EmoticonFilter::filterMessage(Message& message)
+void EmoticonFilter::filterMessage(KTp::Message& message)
{
message.setMainMessagePart(d->emoticons.theme().parseEmoticons(message.mainMessagePart()));
}
diff --git a/filters/emoticons/emoticon-filter.h b/filters/emoticons/emoticon-filter.h
index 55158c7..8b54305 100644
--- a/filters/emoticons/emoticon-filter.h
+++ b/filters/emoticons/emoticon-filter.h
@@ -19,9 +19,9 @@
#ifndef EMOTICON_FILTER_H
#define EMOTICON_FILTER_H
-#include <KTp/AbstractMessageFilter>
+#include <KTp/abstract-message-filter.h>
-class EmoticonFilter : public AbstractMessageFilter
+class EmoticonFilter : public KTp::AbstractMessageFilter
{
Q_OBJECT
@@ -29,7 +29,7 @@ public:
EmoticonFilter(QObject* parent, const QVariantList &);
virtual ~EmoticonFilter();
- void filterMessage(Message& message);
+ void filterMessage(KTp::Message& message);
private:
class Private;
Private *d;
diff --git a/filters/formatting/CMakeLists.txt b/filters/formatting/CMakeLists.txt
index 11741f0..1bb818c 100644
--- a/filters/formatting/CMakeLists.txt
+++ b/filters/formatting/CMakeLists.txt
@@ -15,6 +15,7 @@ target_link_libraries (ktptextui_message_filter_formatting
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
${KDE4_KEMOTICONS_LIBS}
+ ${KTP_LIBRARIES}
)
# Install:
diff --git a/filters/formatting/format-filter.cpp b/filters/formatting/format-filter.cpp
index 601b657..74e9724 100644
--- a/filters/formatting/format-filter.cpp
+++ b/filters/formatting/format-filter.cpp
@@ -37,7 +37,7 @@ public:
};
FormatFilter::FormatFilter (QObject* parent, const QVariantList&) :
- AbstractMessageFilter (parent),
+ KTp::AbstractMessageFilter (parent),
d(new Private())
{
// Matches a string
@@ -78,7 +78,7 @@ FormatFilter::~FormatFilter()
delete d;
}
-void FormatFilter::filterMessage (Message& message)
+void FormatFilter::filterMessage (KTp::Message& message)
{
message.setMainMessagePart(d->filterString(message.mainMessagePart()));
}
diff --git a/filters/formatting/format-filter.h b/filters/formatting/format-filter.h
index 34b49f9..96f2b8c 100644
--- a/filters/formatting/format-filter.h
+++ b/filters/formatting/format-filter.h
@@ -18,16 +18,17 @@
#ifndef FORMAT_FILTER_H
#define FORMAT_FILTER_H
-#include <KTp/AbstractMessageFilter>
-class FormatFilter : public AbstractMessageFilter
+#include <KTp/abstract-message-filter.h>
+
+class FormatFilter : public KTp::AbstractMessageFilter
{
Q_OBJECT
public:
FormatFilter (QObject* parent, const QVariantList &);
virtual ~FormatFilter();
- virtual void filterMessage (Message& message);
+ virtual void filterMessage (KTp::Message& message);
private:
class Private;
diff --git a/filters/images/CMakeLists.txt b/filters/images/CMakeLists.txt
index f09c1f4..33bdbc9 100644
--- a/filters/images/CMakeLists.txt
+++ b/filters/images/CMakeLists.txt
@@ -15,6 +15,7 @@ target_link_libraries (ktptextui_message_filter_images
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
${KDE4_KEMOTICONS_LIBS}
+ ${KTP_LIBRARIES}
)
# Install:
diff --git a/filters/images/images-filter.cpp b/filters/images/images-filter.cpp
index ee7d6a6..ed18a5a 100644
--- a/filters/images/images-filter.cpp
+++ b/filters/images/images-filter.cpp
@@ -33,7 +33,7 @@ public:
};
ImagesFilter::ImagesFilter (QObject* parent, const QVariantList&) :
- AbstractMessageFilter (parent), d(new Private)
+ KTp::AbstractMessageFilter (parent), d(new Private)
{
QString imagePattern = QLatin1String("\.(?:");
Q_FOREACH (const QByteArray &format, QImageReader::supportedImageFormats()) {
@@ -50,7 +50,7 @@ ImagesFilter::~ImagesFilter()
delete d;
}
-void ImagesFilter::filterMessage (Message& message)
+void ImagesFilter::filterMessage (KTp::Message& message)
{
kDebug() << message.property("Urls").toList().size();
Q_FOREACH (const QVariant &var, message.property("Urls").toList()) {
diff --git a/filters/images/images-filter.h b/filters/images/images-filter.h
index bbf3b44..807de4b 100644
--- a/filters/images/images-filter.h
+++ b/filters/images/images-filter.h
@@ -18,16 +18,17 @@
#ifndef IMAGES_FILTER_H
#define IMAGES_FILTER_H
-#include <KTp/AbstractMessageFilter>
-class ImagesFilter : public AbstractMessageFilter
+#include <KTp/abstract-message-filter.h>
+
+class ImagesFilter : public KTp::AbstractMessageFilter
{
Q_OBJECT
public:
ImagesFilter (QObject* parent, const QVariantList &);
virtual ~ImagesFilter();
- virtual void filterMessage (Message& message);
+ virtual void filterMessage (KTp::Message& message);
private:
class Private;
diff --git a/filters/searchexpansion/CMakeLists.txt b/filters/searchexpansion/CMakeLists.txt
index 10f7c34..2b6c95d 100644
--- a/filters/searchexpansion/CMakeLists.txt
+++ b/filters/searchexpansion/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries (ktptextui_message_filter_searchexpansion
${KDE4_KIO_LIBS}
${TELEPATHY_QT4_LIBRARIES}
${KDE4_KEMOTICONS_LIBS}
+ ${KTP_LIBRARIES}
)
# Install:
diff --git a/filters/searchexpansion/searchexpansion-filter.h b/filters/searchexpansion/searchexpansion-filter.h
index cadd449..1d8f731 100644
--- a/filters/searchexpansion/searchexpansion-filter.h
+++ b/filters/searchexpansion/searchexpansion-filter.h
@@ -19,16 +19,16 @@
#ifndef SEARCHEXPANSION_FILTER_H
#define SEARCHEXPANSION_FILTER_H
-#include <KTp/AbstractMessageFilter>
+#include <KTp/abstract-message-filter.h>
-class SearchexpansionFilter : public AbstractMessageFilter
+class SearchexpansionFilter : public KTp::AbstractMessageFilter
{
Q_OBJECT
public:
SearchexpansionFilter(QObject *parent, const QVariantList &);
virtual ~SearchexpansionFilter();
- virtual void filterMessage(Message &message);
+ virtual void filterMessage(KTp::Message &message);
private:
class Private;
diff --git a/filters/texttospeech/CMakeLists.txt b/filters/texttospeech/CMakeLists.txt
index b59332c..8f25696 100644
--- a/filters/texttospeech/CMakeLists.txt
+++ b/filters/texttospeech/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries (ktptextui_message_filter_tts
${QT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
+ ${KTP_LIBRARIES}
)
# Install:
diff --git a/filters/texttospeech/tts-filter.cpp b/filters/texttospeech/tts-filter.cpp
index 2df979e..134ebc9 100644
--- a/filters/texttospeech/tts-filter.cpp
+++ b/filters/texttospeech/tts-filter.cpp
@@ -33,7 +33,7 @@ public:
};
TTSFilter::TTSFilter(QObject *parent, const QVariantList &)
- : AbstractMessageFilter(parent),
+ : KTp::AbstractMessageFilter(parent),
d(new Private)
{
d->kspeech = new org::kde::KSpeech(QLatin1String("org.kde.kttsd"), QLatin1String("/KSpeech"), QDBusConnection::sessionBus());
@@ -46,7 +46,7 @@ TTSFilter::~TTSFilter()
delete d;
}
-void TTSFilter::filterIncomingMessage(Message &message)
+void TTSFilter::filterIncomingMessage(KTp::Message &message)
{
//FIXME with real name.
d->kspeech->say(i18n("New message. %1").arg(message.mainMessagePart()), KSpeech::soHtml);
diff --git a/filters/texttospeech/tts-filter.h b/filters/texttospeech/tts-filter.h
index ab4f74e..6da94f6 100644
--- a/filters/texttospeech/tts-filter.h
+++ b/filters/texttospeech/tts-filter.h
@@ -19,16 +19,16 @@
#ifndef TTS_FILTER_H
#define TTS_FILTER_H
-#include <KTp/AbstractMessageFilter>
+#include <KTp/abstract-message-filter.h>
-class TTSFilter : public AbstractMessageFilter
+class TTSFilter : public KTp::AbstractMessageFilter
{
Q_OBJECT
public:
TTSFilter(QObject *parent, const QVariantList &);
virtual ~TTSFilter();
- virtual void filterIncomingMessage(Message &message);
+ virtual void filterIncomingMessage(KTp::Message &message);
private:
class Private;
diff --git a/lib/KTp/AbstractMessageFilter b/lib/KTp/AbstractMessageFilter
deleted file mode 100644
index 741455a..0000000
--- a/lib/KTp/AbstractMessageFilter
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef KTP_TEXT_UI_ABSTRACT_MESSAGE_FILTER
-#define KTP_TEXT_UI_ABSTRACT_MESSAGE_FILTER
-
-#include "abstract-message-filter.h"
-
-#endif
\ No newline at end of file
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index df536fb..81beaa5 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -25,7 +25,8 @@
#include "adium-theme-status-info.h"
#include "chat-window-style-manager.h"
#include "chat-window-style.h"
-#include "message-processor.h"
+
+#include <KTp/message-processor.h>
#include <QtCore/QFile>
#include <QtCore/QTextCodec>
@@ -214,7 +215,7 @@ void AdiumThemeView::initialise(const AdiumThemeHeaderInfo &chatInfo)
// Inject the scripts and the css just before the end of the head tag
index = templateHtml.indexOf(QLatin1String("</head>"));
- templateHtml.insert(index, MessageProcessor::instance()->header());
+ templateHtml.insert(index, KTp::MessageProcessor::instance()->header());
//kDebug() << templateHtml;
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index daaaec1..35c1512 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -48,10 +48,11 @@
#include <TelepathyQt/Presence>
#include <TelepathyQt/PendingChannelRequest>
#include <TelepathyQt/OutgoingFileTransferChannel>
+#include <TelepathyLoggerQt4/TextEvent>
#include <KTp/presence.h>
#include <KTp/actions.h>
-#include "message-processor.h"
+#include <KTp/message-processor.h>
class ChatWidgetPrivate
{
@@ -610,7 +611,7 @@ void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message)
} else {
AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::RemoteToLocal);
- Message processedMessage(MessageProcessor::instance()->processIncomingMessage(message));
+ KTp::Message processedMessage(KTp::MessageProcessor::instance()->processIncomingMessage(message));
messageInfo.setMessage(processedMessage.finalizedMessage());
messageInfo.setScript(processedMessage.finalizedScript());
@@ -720,7 +721,7 @@ void ChatWidget::handleMessageSent(const Tp::Message &message, Tp::MessageSendin
}
else {
AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::LocalToRemote);
- Message processedMessage(MessageProcessor::instance()->processOutgoingMessage(message));
+ KTp::Message processedMessage(KTp::MessageProcessor::instance()->processOutgoingMessage(message));
messageInfo.setMessage(processedMessage.finalizedMessage());
messageInfo.setScript(processedMessage.finalizedScript());
diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index 33cbe7e..cc664bb 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -20,7 +20,8 @@
#include "logmanager.h"
#include "adium-theme-content-info.h"
-#include "message-processor.h"
+
+#include <KTp/message-processor.h>
#include <KDebug>
@@ -171,8 +172,8 @@ void LogManager::onEventsFinished(Tpl::PendingOperation *po)
}
AdiumThemeContentInfo message(type);
- Message processedEvent(type == AdiumThemeMessageInfo::HistoryLocalToRemote ? MessageProcessor::instance()->processOutgoingMessage(event)
- : MessageProcessor::instance()->processIncomingMessage(event));
+ KTp::Message processedEvent(type == AdiumThemeMessageInfo::HistoryLocalToRemote ? KTp::MessageProcessor::instance()->processOutgoingMessage(event)
+ : KTp::MessageProcessor::instance()->processIncomingMessage(event));
message.setMessage(processedEvent.finalizedMessage());
message.setScript(processedEvent.finalizedScript());
diff --git a/logviewer/message-view.cpp b/logviewer/message-view.cpp
index d80a3eb..1a970bd 100644
--- a/logviewer/message-view.cpp
+++ b/logviewer/message-view.cpp
@@ -21,7 +21,7 @@
#include "adium-theme-view.h"
#include "adium-theme-status-info.h"
-#include "message-processor.h"
+#include <KTp/message-processor.h>
#include <KDebug>
@@ -135,7 +135,7 @@ void MessageView::processStoredEvents()
}
AdiumThemeContentInfo message(type);
- message.setMessage(MessageProcessor::instance()->processIncomingMessage(textEvent).finalizedMessage());
+ message.setMessage(KTp::MessageProcessor::instance()->processIncomingMessage(textEvent).finalizedMessage());
message.setService(m_account->serviceName());
message.setSenderDisplayName(textEvent->sender()->alias());
message.setSenderScreenName(textEvent->sender()->identifier());
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6434826..41b7fa4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(ktpchat_tests
${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY}
${TELEPATHY_QT4_LIBRARIES}
+ ${KTP_LIBRARIES}
)
add_definitions (-DQT_GUI_LIB)
\ No newline at end of file
diff --git a/tests/message-processor-basic-tests.cpp b/tests/message-processor-basic-tests.cpp
index 580a3b3..65d51bf 100644
--- a/tests/message-processor-basic-tests.cpp
+++ b/tests/message-processor-basic-tests.cpp
@@ -93,7 +93,7 @@ void MessageProcessorBasicTests::testUnsupportedProtocolCatching()
void MessageProcessorBasicTests::testMetadataGeneration()
{
- Message processed = this->s.processOutGoingMessage(
+ KTp::Message processed = this->s.processOutGoingMessage(
Tp::Message(
Tp::ChannelTextMessageTypeNormal,
QLatin1String("http://www.google.com.au/")
@@ -108,7 +108,7 @@ void MessageProcessorBasicTests::testMetadataGeneration()
void MessageProcessorBasicTests::testMultipleURLCatching()
{
- Message processed = this->s.processOutGoingMessage(
+ KTp::Message processed = this->s.processOutGoingMessage(
Tp::Message(
Tp::ChannelTextMessageTypeNormal,
QLatin1String("You should consider using http://duckduckgo.com/ instead of www.google.com.au")
diff --git a/tests/sync-processor.cpp b/tests/sync-processor.cpp
index ec93e9d..324f4be 100644
--- a/tests/sync-processor.cpp
+++ b/tests/sync-processor.cpp
@@ -17,26 +17,26 @@
*/
#include "sync-processor.h"
-#include <message-processor.h>
+#include <KTp/message-processor.h>
#include <QString>
struct SyncProcessor::SyncProcessorPrivate {
- MessageProcessor *actualProcessor;
+ KTp::MessageProcessor *actualProcessor;
};
SyncProcessor::SyncProcessor() :
d(new SyncProcessor::SyncProcessorPrivate())
{
- d->actualProcessor = MessageProcessor::instance();
+ d->actualProcessor = KTp::MessageProcessor::instance();
}
-Message SyncProcessor::processIncommingMessage(const Tp::ReceivedMessage &message)
+KTp::Message SyncProcessor::processIncommingMessage(const Tp::ReceivedMessage &message)
{
return d->actualProcessor->processIncomingMessage(message);
}
-Message SyncProcessor::processOutGoingMessage(Tp::Message message)
+KTp::Message SyncProcessor::processOutGoingMessage(Tp::Message message)
{
return d->actualProcessor->processOutgoingMessage(message);
}
diff --git a/tests/sync-processor.h b/tests/sync-processor.h
index 7ae999e..40a25fa 100644
--- a/tests/sync-processor.h
+++ b/tests/sync-processor.h
@@ -19,7 +19,7 @@
#ifndef SYNC_PROCESSOR_H
#define SYNC_PROCESSOR_H
-#include <message-processor.h>
+#include <KTp/message-processor.h>
class SyncProcessor
{
@@ -28,8 +28,8 @@ public:
SyncProcessor();
~SyncProcessor();
- Message processIncommingMessage(const Tp::ReceivedMessage& message);
- Message processOutGoingMessage ( Tp::Message message );
+ KTp::Message processIncommingMessage(const Tp::ReceivedMessage& message);
+ KTp::Message processOutGoingMessage ( Tp::Message message );
QString getProcessedMessage ( const char* contents );
private:
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list