[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:25:04 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=fdfeeab
The following commit has been merged in the master branch:
commit fdfeeabf780f49fab78d687f23bfcfff627d49a3
Author: Martin Klapetek <mklapetek at kde.org>
Date: Wed Jan 7 20:41:22 2015 +0100
[filters] Port filters away from KDELibs4Support
---
filters/bugzilla/CMakeLists.txt | 1 -
filters/bugzilla/bugzilla-filter.cpp | 48 +++++++++++-----------
filters/bugzilla/bugzilla-filter.h | 4 +-
filters/emoticons/CMakeLists.txt | 1 +
filters/emoticons/emoticon-filter.cpp | 1 -
filters/formatting/CMakeLists.txt | 1 +
filters/formatting/format-filter.cpp | 1 -
filters/highlight/CMakeLists.txt | 2 +-
filters/highlight/highlight-filter.cpp | 3 --
filters/images/CMakeLists.txt | 3 +-
filters/images/images-filter.cpp | 9 ++--
filters/latex/CMakeLists.txt | 3 +-
filters/latex/latex-config.cpp | 1 -
filters/latex/latex-config.ui | 7 +---
filters/latex/latex-filter.cpp | 26 ++++++------
filters/otr/CMakeLists.txt | 1 +
filters/otr/otr-filter.cpp | 1 -
filters/searchexpansion/CMakeLists.txt | 2 +-
filters/searchexpansion/searchexpansion-filter.cpp | 7 +---
filters/texttospeech/CMakeLists.txt | 2 +
filters/texttospeech/tts-filter.cpp | 2 -
filters/urlexpansion/CMakeLists.txt | 2 +-
filters/urlexpansion/urlexpansion-filter.cpp | 28 +++++++------
filters/urlexpansion/urlexpansion-filter.h | 4 +-
filters/youtube/youtube-filter.cpp | 14 +++----
25 files changed, 79 insertions(+), 95 deletions(-)
diff --git a/filters/bugzilla/CMakeLists.txt b/filters/bugzilla/CMakeLists.txt
index 37e88ec..f3dd39c 100644
--- a/filters/bugzilla/CMakeLists.txt
+++ b/filters/bugzilla/CMakeLists.txt
@@ -2,7 +2,6 @@ add_library (ktptextui_message_filter_bugzilla MODULE bugzilla-filter.cpp)
target_link_libraries (ktptextui_message_filter_bugzilla
KF5::KIOWidgets
- KF5::KDELibs4Support
KTp::CommonInternals
)
diff --git a/filters/bugzilla/bugzilla-filter.cpp b/filters/bugzilla/bugzilla-filter.cpp
index 08675ee..169ebfa 100644
--- a/filters/bugzilla/bugzilla-filter.cpp
+++ b/filters/bugzilla/bugzilla-filter.cpp
@@ -20,8 +20,9 @@
#include "bugzilla-filter.h"
#include <KPluginFactory>
-#include <KDebug>
-#include <KUrl>
+
+#include <QDebug>
+#include <QUrl>
class BugzillaFilter::Private
{
@@ -59,27 +60,26 @@ BugzillaFilter::~BugzillaFilter()
delete d;
}
-void BugzillaFilter::addBugDescription(KTp::Message &message, const KUrl &baseUrl)
+void BugzillaFilter::addBugDescription(KTp::Message &message, const QUrl &baseUrl)
{
QString bugRequestId((QLatin1String("bug_") + QString::number(d->requestCounter)));
d->requestCounter++;
- KUrl request;
- request.setHost(baseUrl.host());
- request.setProtocol(baseUrl.protocol());
- request.setDirectory(baseUrl.directory());
- request.setFileName(QLatin1String("jsonrpc.cgi"));
+ QUrl request(baseUrl);
+ request.setPath(request.path() + QStringLiteral("jsonrpc.cgi"));
+
+ QUrlQuery query(request);
- request.addQueryItem(QLatin1String("method"), QLatin1String("Bug.get"));
- request.addQueryItem(QLatin1String("params"),
- QString(QLatin1String("[{\"ids\":[%1]}]")).
- arg(baseUrl.queryItemValue(QLatin1String("id"))));
+ query.addQueryItem(QStringLiteral("method"), QStringLiteral("Bug.get"));
+ query.addQueryItem(QStringLiteral("params"),
+ QString(QStringLiteral("[{\"ids\":[%1]}]")).
+ arg(query.queryItemValue(QStringLiteral("id"))));
- request.addQueryItem(QLatin1String("callback"), QLatin1String("showBugCallback"));
- request.addQueryItem(QLatin1String("id"), bugRequestId);
+ query.addQueryItem(QStringLiteral("callback"), QStringLiteral("showBugCallback"));
+ query.addQueryItem(QStringLiteral("id"), bugRequestId);
- message.appendMessagePart(QString::fromLatin1("<p><a href=\"%1\" id=\"%2\"></a></p>").arg(baseUrl.prettyUrl(), bugRequestId));
- message.appendScript(QString::fromLatin1("showBug(\"%1\");").arg(request.prettyUrl()));
+ message.appendMessagePart(QString::fromLatin1("<p><a href=\"%1\" id=\"%2\"></a></p>").arg(baseUrl.toDisplayString(), bugRequestId));
+ message.appendScript(QString::fromLatin1("showBug(\"%1\");").arg(request.toDisplayString()));
}
void BugzillaFilter::filterMessage(KTp::Message &message, const KTp::MessageContext &context)
@@ -92,13 +92,15 @@ void BugzillaFilter::filterMessage(KTp::Message &message, const KTp::MessageCont
QString msg = message.mainMessagePart();
int index = msg.indexOf(d->bugText);
while (index >= 0) {
- KUrl baseUrl;
+ QUrl baseUrl;
//TODO make this configurable
- baseUrl.setProtocol(QLatin1String("https"));
+ baseUrl.setScheme(QLatin1String("https"));
baseUrl.setHost(QLatin1String("bugs.kde.org"));
- baseUrl.setFileName(QLatin1String("show_bug.cgi"));
- baseUrl.addQueryItem(QLatin1String("id"), d->bugText.cap(1));
+ baseUrl.setPath(QLatin1String("/show_bug.cgi"));
+
+ QUrlQuery query(baseUrl);
+ query.addQueryItem(QLatin1String("id"), d->bugText.cap(1));
addBugDescription(message, baseUrl);
@@ -106,9 +108,9 @@ void BugzillaFilter::filterMessage(KTp::Message &message, const KTp::MessageCont
}
Q_FOREACH (QVariant var, message.property("Urls").toList()) {
- KUrl url = qvariant_cast<KUrl>(var);
+ QUrl url = qvariant_cast<QUrl>(var);
- if (url.fileName() == QLatin1String("show_bug.cgi")) { //a bugzilla of some sort
+ if (url.path().contains(QLatin1String("show_bug.cgi"))) { //a bugzilla of some sort
//as we have to use jsonp to get round making a cross-domain http request, a malicious website
//could pretend to be bugzilla and return arbitrary data that we cannot sanitise, filling the text-ui
@@ -136,6 +138,6 @@ QStringList BugzillaFilter::requiredScripts()
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<BugzillaFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_bugzilla"))
+// K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_bugzilla"))
#include "bugzilla-filter.moc"
diff --git a/filters/bugzilla/bugzilla-filter.h b/filters/bugzilla/bugzilla-filter.h
index e3271b3..b6b0f0a 100644
--- a/filters/bugzilla/bugzilla-filter.h
+++ b/filters/bugzilla/bugzilla-filter.h
@@ -21,7 +21,7 @@
#include <KTp/abstract-message-filter.h>
-#include <KUrl>
+#include <QUrl>
class BugzillaFilter : public KTp::AbstractMessageFilter
{
@@ -34,7 +34,7 @@ public:
virtual void filterMessage(KTp::Message &message, const KTp::MessageContext &context);
virtual QStringList requiredScripts();
private:
- void addBugDescription(KTp::Message &message, const KUrl &baseUrl);
+ void addBugDescription(KTp::Message &message, const QUrl &baseUrl);
class Private;
Private *d;
diff --git a/filters/emoticons/CMakeLists.txt b/filters/emoticons/CMakeLists.txt
index e2f9392..447b223 100644
--- a/filters/emoticons/CMakeLists.txt
+++ b/filters/emoticons/CMakeLists.txt
@@ -2,6 +2,7 @@ add_library (ktptextui_message_filter_emoticons MODULE emoticon-filter.cpp)
target_link_libraries (ktptextui_message_filter_emoticons
KF5::Emoticons
+ KF5::CoreAddons
KTp::CommonInternals
)
diff --git a/filters/emoticons/emoticon-filter.cpp b/filters/emoticons/emoticon-filter.cpp
index bfe11f8..565ae84 100644
--- a/filters/emoticons/emoticon-filter.cpp
+++ b/filters/emoticons/emoticon-filter.cpp
@@ -45,6 +45,5 @@ EmoticonFilter::~EmoticonFilter()
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<EmoticonFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_emoticons"))
#include "emoticon-filter.moc"
diff --git a/filters/formatting/CMakeLists.txt b/filters/formatting/CMakeLists.txt
index 0684733..54b6dc3 100644
--- a/filters/formatting/CMakeLists.txt
+++ b/filters/formatting/CMakeLists.txt
@@ -2,6 +2,7 @@ add_library (ktptextui_message_filter_formatting MODULE format-filter.cpp)
target_link_libraries (ktptextui_message_filter_formatting
KTp::CommonInternals
+ KF5::CoreAddons
)
# Install:
diff --git a/filters/formatting/format-filter.cpp b/filters/formatting/format-filter.cpp
index b59ddb8..7779365 100644
--- a/filters/formatting/format-filter.cpp
+++ b/filters/formatting/format-filter.cpp
@@ -113,6 +113,5 @@ void FormatFilter::Private::addTag (const QString &markingCharacter, const QStri
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<FormatFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_formatting"))
#include "format-filter.moc"
diff --git a/filters/highlight/CMakeLists.txt b/filters/highlight/CMakeLists.txt
index d8f4105..6889142 100644
--- a/filters/highlight/CMakeLists.txt
+++ b/filters/highlight/CMakeLists.txt
@@ -2,7 +2,7 @@ add_library (ktptextui_message_filter_highlight MODULE highlight-filter.cpp)
target_link_libraries (ktptextui_message_filter_highlight
ktpchat
-
+ KF5::CoreAddons
KTp::CommonInternals
)
diff --git a/filters/highlight/highlight-filter.cpp b/filters/highlight/highlight-filter.cpp
index 64d9bf6..a40b9e8 100644
--- a/filters/highlight/highlight-filter.cpp
+++ b/filters/highlight/highlight-filter.cpp
@@ -21,7 +21,6 @@
#include <QStringBuilder>
#include <KPluginFactory>
-#include <KDebug>
#include <KUser>
#include <TelepathyQt/AccountManager>
@@ -53,12 +52,10 @@ void HighlightFilter::filterMessage(KTp::Message &message,
}
if (msg.contains(d->user.loginName(), Qt::CaseInsensitive)) {
- kDebug() << "messge contains user login name" << d->user.loginName();
message.setProperty("highlight", true);
}
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<HighlightFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_highlight"))
#include "highlight-filter.moc"
diff --git a/filters/images/CMakeLists.txt b/filters/images/CMakeLists.txt
index 9ab3f4a..5986125 100644
--- a/filters/images/CMakeLists.txt
+++ b/filters/images/CMakeLists.txt
@@ -4,7 +4,8 @@ add_library(ktptextui_message_filter_images MODULE images-filter.cpp)
target_link_libraries (ktptextui_message_filter_images
KF5::Emoticons
- KF5::KDELibs4Support
+ KF5::I18n
+ KF5::CoreAddons
KTp::CommonInternals
)
diff --git a/filters/images/images-filter.cpp b/filters/images/images-filter.cpp
index 4fea152..4a773f6 100644
--- a/filters/images/images-filter.cpp
+++ b/filters/images/images-filter.cpp
@@ -21,10 +21,9 @@
#include <QStringBuilder>
#include <QRegExp>
#include <QImageReader>
+#include <QUrl>
#include <KPluginFactory>
-#include <KDebug>
-#include <KUrl>
#include <KLocalizedString>
class ImagesFilter::Private {
@@ -46,10 +45,9 @@ ImagesFilter::~ImagesFilter()
void ImagesFilter::filterMessage(KTp::Message &message, const KTp::MessageContext &context)
{
Q_UNUSED(context)
- kDebug() << message.property("Urls").toList().size();
Q_FOREACH (const QVariant &var, message.property("Urls").toList()) {
- const KUrl url = qvariant_cast<KUrl>(var);
- QString fileName = url.fileName().toLower();
+ const QUrl url = qvariant_cast<QUrl>(var);
+ QString fileName = url.adjusted(QUrl::StripTrailingSlash).fileName().toLower();
//get everything after the . The +1 means we don't include the . character
QString extension = fileName.mid(fileName.lastIndexOf(QLatin1Char('.'))+1);
@@ -68,6 +66,5 @@ void ImagesFilter::filterMessage(KTp::Message &message, const KTp::MessageContex
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<ImagesFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_images"))
#include "images-filter.moc"
diff --git a/filters/latex/CMakeLists.txt b/filters/latex/CMakeLists.txt
index f5d5f5d..4deb5e0 100644
--- a/filters/latex/CMakeLists.txt
+++ b/filters/latex/CMakeLists.txt
@@ -7,8 +7,9 @@ add_library(ktptextui_message_filter_latex MODULE latex-filter.cpp
target_link_libraries (ktptextui_message_filter_latex
ktpchat
Qt5::Gui
-
KTp::CommonInternals
+ KF5::CoreAddons
+ KF5::KCMUtils
)
kconfig_add_kcfg_files(kcm_ktptextui_message_filter_latex_SRCS latexconfig.kcfgc)
diff --git a/filters/latex/latex-config.cpp b/filters/latex/latex-config.cpp
index 94fb9fe..9d48ec5 100644
--- a/filters/latex/latex-config.cpp
+++ b/filters/latex/latex-config.cpp
@@ -23,7 +23,6 @@
#include <KPluginFactory>
K_PLUGIN_FACTORY(LatexConfigFactory, registerPlugin<LatexFilterConfig>();)
-K_EXPORT_PLUGIN(LatexConfigFactory( "kcm_ktptextui_message_filter_latex" ))
LatexFilterConfig::LatexFilterConfig(QWidget* parent, const QVariantList& args)
: KCModule(parent, args)
diff --git a/filters/latex/latex-config.ui b/filters/latex/latex-config.ui
index 295968e..14f525d 100644
--- a/filters/latex/latex-config.ui
+++ b/filters/latex/latex-config.ui
@@ -40,7 +40,7 @@
</widget>
</item>
<item>
- <widget class="KLineEdit" name="kcfg_LatexCmd">
+ <widget class="QLineEdit" name="kcfg_LatexCmd">
<property name="text">
<string>latex -interaction=batchmode -halt-on-error</string>
</property>
@@ -49,11 +49,6 @@
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/filters/latex/latex-filter.cpp b/filters/latex/latex-filter.cpp
index fc5a1ae..67d9721 100644
--- a/filters/latex/latex-filter.cpp
+++ b/filters/latex/latex-filter.cpp
@@ -27,9 +27,10 @@
#include <QImage>
#include <QTextDocument>
+#include <QDebug>
+#include <QTemporaryFile>
#include <KPluginFactory>
-#include <KDebug>
#include <KProcess>
LatexFilter::LatexFilter(QObject* parent, const QVariantList &)
@@ -89,18 +90,16 @@ QString LatexFilter::handleLatex(const QString &latexFormula)
.arg(latexFormula));
latexText.append(QLatin1String("\end{document}"));
- KTemporaryFile texFile;
- texFile.setPrefix(QLatin1String("ktplatex-"));
- texFile.setSuffix(QLatin1String(".tex"));
+ QTemporaryFile texFile(QStringLiteral("ktplatex-XXXXXX.tex"));
if (!texFile.open()) {
- kError() << "Cannot create the TeX file";
- return QString();
+ qCritical() << "Cannot create the TeX file";
+ return QString();
}
texFile.write(latexText.toAscii());
texFile.close();
if (LatexConfig::latexCmd().isEmpty()) {
- kError() << "No TeX compiler set!";
+ qCritical() << "No TeX compiler set!";
return QString();
}
const QStringList latexCmd = LatexConfig::latexCmd().split(QRegExp(QLatin1String("\s+")));
@@ -114,23 +113,23 @@ QString LatexFilter::handleLatex(const QString &latexFormula)
latexArgs << texFile.fileName();
if (QStandardPaths::findExecutable(latexCmd.first()).isEmpty()) {
- kError() << "Cannot find the TeX" << latexCmd.first() << " program.
;"
+ qCritical() << "Cannot find the TeX" << latexCmd.first() << " program.
;"
<< "Please get the software from http://tug.org/texlive/"
<< "or from your distribution's package manager.";
return QString();
}
- kDebug() << "Running " << latexCmd.first() << latexArgs;
+ qDebug() << "Running " << latexCmd.first() << latexArgs;
KProcess p;
p.execute(latexCmd.first(), latexArgs);
if (p.exitCode()) {
- kError() << "Error compiling the TeX text";
+ qCritical() << "Error compiling the TeX text";
return QString();
}
if (QStandardPaths::findExecutable(QLatin1String("dvipng")).isEmpty()) {
- kError() << "Cannot find the TeX 'dvipng' program.
;"
+ qCritical() << "Cannot find the TeX 'dvipng' program.
;"
<< "Please get the software from http://tug.org/texlive/"
<< "or from your distribution's package manager.";
return QString();
@@ -145,11 +144,11 @@ QString LatexFilter::handleLatex(const QString &latexFormula)
dvipngArgs << QString(QLatin1String("-o%1")).arg(imageFile);
dvipngArgs << dviFile;
- kDebug() << "Rendering dvipng" << dvipngArgs;
+ qDebug() << "Rendering dvipng" << dvipngArgs;
p.execute(QLatin1String("dvipng"), dvipngArgs);
if (p.exitCode()){
- kError() << "Error rendering the image to PNG";
+ qCritical() << "Error rendering the image to PNG";
return QString();
}
@@ -182,6 +181,5 @@ LatexFilter::~LatexFilter()
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<LatexFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_latex"))
#include "latex-filter.moc"
diff --git a/filters/otr/CMakeLists.txt b/filters/otr/CMakeLists.txt
index cda0fa9..5a0d826 100644
--- a/filters/otr/CMakeLists.txt
+++ b/filters/otr/CMakeLists.txt
@@ -3,6 +3,7 @@ add_library (ktptextui_message_filter_otr MODULE otr-filter.cpp)
target_link_libraries (ktptextui_message_filter_otr
KF5::KIOWidgets
KF5::I18n
+ KF5::CoreAddons
KTp::CommonInternals
KTp::OTR
)
diff --git a/filters/otr/otr-filter.cpp b/filters/otr/otr-filter.cpp
index d1fba36..86eef68 100644
--- a/filters/otr/otr-filter.cpp
+++ b/filters/otr/otr-filter.cpp
@@ -36,6 +36,5 @@ void OTRFilter::filterMessage(KTp::Message &message, const KTp::MessageContext&)
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<OTRFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_otr"))
#include "otr-filter.moc"
diff --git a/filters/searchexpansion/CMakeLists.txt b/filters/searchexpansion/CMakeLists.txt
index a690709..429f40c 100644
--- a/filters/searchexpansion/CMakeLists.txt
+++ b/filters/searchexpansion/CMakeLists.txt
@@ -3,7 +3,7 @@ add_library (ktptextui_message_filter_searchexpansion MODULE searchexpansion-fil
target_link_libraries (ktptextui_message_filter_searchexpansion
ktpchat
KF5::KIOWidgets
- KF5::Emoticons
+ KF5::CoreAddons
KTp::CommonInternals
)
diff --git a/filters/searchexpansion/searchexpansion-filter.cpp b/filters/searchexpansion/searchexpansion-filter.cpp
index b39f032..0ca36a3 100644
--- a/filters/searchexpansion/searchexpansion-filter.cpp
+++ b/filters/searchexpansion/searchexpansion-filter.cpp
@@ -18,9 +18,9 @@
#include "searchexpansion-filter.h"
+#include <QUrl>
+
#include <KPluginFactory>
-#include <KDebug>
-#include <KUrl>
#include <KUriFilter>
class SearchexpansionFilter::Private
@@ -49,13 +49,10 @@ void SearchexpansionFilter::filterOutgoingMessage(KTp::OutgoingMessage &message,
Q_UNUSED(context);
KUriFilterData data(message.text().trimmed());
if(KUriFilter::self()->filterSearchUri(data, KUriFilter::WebShortcutFilter)) {
-
-// kDebug() << "Succesfully filtered" << data.typedString() << "to" << data.uri();
message.setText(data.uri().url());
}
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<SearchexpansionFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_searchexpansion"))
#include "searchexpansion-filter.moc"
diff --git a/filters/texttospeech/CMakeLists.txt b/filters/texttospeech/CMakeLists.txt
index f9ae785..f3aaff8 100644
--- a/filters/texttospeech/CMakeLists.txt
+++ b/filters/texttospeech/CMakeLists.txt
@@ -3,6 +3,8 @@ qt5_add_dbus_interfaces(ktptextui_message_filter_tts_SRCS ${KDE4_DBUS_INTERFACES
add_library (ktptextui_message_filter_tts MODULE tts-filter.cpp)
target_link_libraries (ktptextui_message_filter_tts
+ KF5::CoreAddons
+ KF5::I18n
KTp::CommonInternals
)
diff --git a/filters/texttospeech/tts-filter.cpp b/filters/texttospeech/tts-filter.cpp
index adaa54e..bb9c7a5 100644
--- a/filters/texttospeech/tts-filter.cpp
+++ b/filters/texttospeech/tts-filter.cpp
@@ -20,7 +20,6 @@
#include <KPluginFactory>
-#include <KDebug>
#include <KLocalizedString>
#include <kspeech.h>
@@ -68,4 +67,3 @@ void TTSFilter::filterMessage(KTp::Message &message, const KTp::MessageContext &
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<TTSFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_tts"))
diff --git a/filters/urlexpansion/CMakeLists.txt b/filters/urlexpansion/CMakeLists.txt
index 517612f..2411918 100644
--- a/filters/urlexpansion/CMakeLists.txt
+++ b/filters/urlexpansion/CMakeLists.txt
@@ -2,7 +2,7 @@ add_library (ktptextui_message_filter_urlexpansion MODULE urlexpansion-filter.cp
target_link_libraries (ktptextui_message_filter_urlexpansion
KF5::KIOWidgets
- KF5::KDELibs4Support
+ KF5::CoreAddons
KTp::CommonInternals
)
diff --git a/filters/urlexpansion/urlexpansion-filter.cpp b/filters/urlexpansion/urlexpansion-filter.cpp
index a1563ba..34d4dea 100644
--- a/filters/urlexpansion/urlexpansion-filter.cpp
+++ b/filters/urlexpansion/urlexpansion-filter.cpp
@@ -21,6 +21,7 @@
#include <QFile>
#include <QStandardPaths>
+#include <QUrlQuery>
#include <KPluginFactory>
@@ -54,19 +55,21 @@ void UrlExpansionFilter::getSupportedServices()
d->supportedServices = response.uniqueKeys();
}
-void UrlExpansionFilter::addExpandedUrl(KTp::Message &message, const KUrl &url)
+void UrlExpansionFilter::addExpandedUrl(KTp::Message &message, const QUrl &url)
{
d->requestCounter++;
- QString urlId = QString((QLatin1String("url") + QString::number(d->requestCounter)));
- QString callbackFunction = QString((QLatin1String("expandUrlCallbacks.") + urlId));
- KUrl request = KUrl(QLatin1String("http://api.longurl.org/v2/expand"));
- request.addQueryItem(QLatin1String("url"), url.url());
- request.addQueryItem(QLatin1String("format"), QLatin1String("json"));
- request.addQueryItem(QLatin1String("callback"), callbackFunction);
- request.addQueryItem(QLatin1String("user-agent"), QLatin1String("KTp"));
+ QString urlId = QString((QStringLiteral("url") + QString::number(d->requestCounter)));
+ QString callbackFunction = QString((QStringLiteral("expandUrlCallbacks.") + urlId));
+ QUrl request = QUrl::fromUserInput(QStringLiteral("http://api.longurl.org/v2/expand"));
+
+ QUrlQuery query(request);
+ query.addQueryItem(QStringLiteral("url"), url.url());
+ query.addQueryItem(QStringLiteral("format"), QStringLiteral("json"));
+ query.addQueryItem(QStringLiteral("callback"), callbackFunction);
+ query.addQueryItem(QStringLiteral("user-agent"), QStringLiteral("KTp"));
message.appendMessagePart(QString::fromLatin1("<p id = \"%1\">Redirects to </p>").arg(urlId));
- message.appendScript(QString::fromLatin1("showShortUrl(\"%1\",\"%2\");").arg(request.prettyUrl(),urlId));
+ message.appendScript(QString::fromLatin1("showShortUrl(\"%1\",\"%2\");").arg(request.toString(), urlId));
}
void UrlExpansionFilter::filterMessage(KTp::Message &message, const KTp::MessageContext &context)
@@ -77,9 +80,9 @@ void UrlExpansionFilter::filterMessage(KTp::Message &message, const KTp::Message
}
Q_FOREACH (const QVariant &var, message.property("Urls").toList()) {
- KUrl url = qvariant_cast<KUrl>(var);
+ QUrl url = qvariant_cast<QUrl>(var);
- if (!url.path().isEmpty() && QString::compare(url.path(),QLatin1String("/")) && d->supportedServices.contains(url.host())) {
+ if (!url.path().isEmpty() && QString::compare(url.path(), QLatin1String("/")) && d->supportedServices.contains(url.host())) {
addExpandedUrl(message, url);
}
}
@@ -87,10 +90,9 @@ void UrlExpansionFilter::filterMessage(KTp::Message &message, const KTp::Message
QStringList UrlExpansionFilter::requiredScripts()
{
- return QStringList() << QLatin1String("ktelepathy/longurl.js");
+ return QStringList() << QStringLiteral("ktelepathy/longurl.js");
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<UrlExpansionFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_urlexpansion"))
#include "urlexpansion-filter.moc"
diff --git a/filters/urlexpansion/urlexpansion-filter.h b/filters/urlexpansion/urlexpansion-filter.h
index 2c57ea9..47af7e9 100644
--- a/filters/urlexpansion/urlexpansion-filter.h
+++ b/filters/urlexpansion/urlexpansion-filter.h
@@ -21,7 +21,7 @@
#include <KTp/abstract-message-filter.h>
-#include <KUrl>
+#include <QUrl>
class UrlExpansionFilter : public KTp::AbstractMessageFilter
{
@@ -34,7 +34,7 @@ public:
virtual void filterMessage(KTp::Message &message, const KTp::MessageContext &context);
virtual QStringList requiredScripts();
private:
- void addExpandedUrl(KTp::Message &message, const KUrl &baseUrl);
+ void addExpandedUrl(KTp::Message &message, const QUrl &baseUrl);
void getSupportedServices();
class Private;
diff --git a/filters/youtube/youtube-filter.cpp b/filters/youtube/youtube-filter.cpp
index ff3d8f7..b87dc46 100644
--- a/filters/youtube/youtube-filter.cpp
+++ b/filters/youtube/youtube-filter.cpp
@@ -19,8 +19,9 @@
#include "youtube-filter.h"
#include <KPluginFactory>
-#include <KDebug>
-#include <KUrl>
+
+#include <QUrl>
+#include <QUrlQuery>
YoutubeFilter::YoutubeFilter(QObject *parent, const QVariantList &) :
AbstractMessageFilter(parent)
@@ -46,13 +47,11 @@ void YoutubeFilter::filterMessage(KTp::Message &message, const KTp::MessageConte
static const QRegExp validId(QLatin1String("[a-zA-Z0-9_-]+"));
Q_FOREACH (QVariant var, message.property("Urls").toList()) {
- KUrl url = qvariant_cast<KUrl>(var);
+ QUrl url = qvariant_cast<QUrl>(var);
if (url.host() == QLatin1String("www.youtube.com") ||
url.host() == QLatin1String("youtube.com")) {
- kDebug() << "found youtube url :" << url.url();
- QString v = url.queryItemValue(QLatin1String("v"));
- kDebug() << "v =" << v;
+ QString v = QUrlQuery(url.query()).queryItemValue(QLatin1String("v"));
if (validId.exactMatch(v)){
message.appendMessagePart(html.arg(v));
@@ -60,13 +59,11 @@ void YoutubeFilter::filterMessage(KTp::Message &message, const KTp::MessageConte
}
else if (url.host() == QLatin1String("www.youtu.be") ||
url.host() == QLatin1String("youtu.be")) {
- kDebug() << "found youtube url :" << url.url();
QString v = url.path().mid(1);
if (v.endsWith(QLatin1Char('/'))) {
v.chop(1);
}
- kDebug() << "v =" << v;
if (validId.exactMatch(v)){
message.appendMessagePart(html.arg(v));
@@ -76,6 +73,5 @@ void YoutubeFilter::filterMessage(KTp::Message &message, const KTp::MessageConte
}
K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<YoutubeFilter>();)
-K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_youtube"))
#include "youtube-filter.moc"
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list