[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:24:58 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=659fdde
The following commit has been merged in the master branch:
commit 659fdde6f6df8a5a0f48e187869be655da276f68
Author: Aleix Pol <aleixpol at kde.org>
Date: Wed Oct 29 13:52:21 2014 +0100
Port away from some kdelibs4support
REVIEW: 120862
---
.../adiumxtra-protocol-handler.cpp | 1 -
app/chat-tab.h | 1 -
app/emoticon-text-edit-action.cpp | 1 -
config/appearance-config-tab.cpp | 5 +++--
config/appearance-config.cpp | 1 -
filters/latex/latex-filter.cpp | 9 ++++-----
filters/urlexpansion/urlexpansion-filter.cpp | 7 +++----
lib/adium-theme-view.cpp | 1 -
lib/channel-contact-model.cpp | 3 ++-
lib/chat-search-bar.cpp | 1 -
lib/chat-window-style-manager.cpp | 14 +++++++-------
lib/chat-window-style.cpp | 18 +++++++++---------
lib/contact-delegate.cpp | 9 +++------
lib/proxy-service.cpp | 1 -
logviewer/dates-view-delegate.cpp | 9 ++++-----
logviewer/entity-view-delegate.cpp | 10 +++++-----
logviewer/log-viewer.cpp | 1 -
logviewer/logs-import-dialog.cpp | 1 -
18 files changed, 40 insertions(+), 53 deletions(-)
diff --git a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
index eab1cca..92f11bd 100644
--- a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
+++ b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
@@ -28,7 +28,6 @@
#include <KIO/Job>
#include <KIO/NetAccess>
#include <KNotification>
-#include <KIcon>
#include <KMimeType>
#include <KAboutData>
#include <KComponentData>
diff --git a/app/chat-tab.h b/app/chat-tab.h
index 5d05545..0132d53 100644
--- a/app/chat-tab.h
+++ b/app/chat-tab.h
@@ -24,7 +24,6 @@
#include <QtCore/QString>
#include <QWidget>
-#include <KIcon>
#include <KColorScheme>
class ChatWidgetPrivate;
diff --git a/app/emoticon-text-edit-action.cpp b/app/emoticon-text-edit-action.cpp
index 10de010..727bae9 100644
--- a/app/emoticon-text-edit-action.cpp
+++ b/app/emoticon-text-edit-action.cpp
@@ -22,7 +22,6 @@
#include <KLocale>
#include <KMenu>
-#include <KIcon>
#include <QWidgetAction>
diff --git a/config/appearance-config-tab.cpp b/config/appearance-config-tab.cpp
index 41649ec..9077599 100644
--- a/config/appearance-config-tab.cpp
+++ b/config/appearance-config-tab.cpp
@@ -29,7 +29,8 @@
#include <KMessageBox>
#include <KLocalizedString>
#include <KIconLoader>
-#include <KGlobalSettings>
+
+#include <QFontDatabase>
AppearanceConfigTab::AppearanceConfigTab(QWidget *parent, TabMode mode)
: QWidget(parent),
@@ -336,7 +337,7 @@ void AppearanceConfigTab::defaultTab()
ui->showHeader->setChecked(false);
ui->customFontBox->setChecked(false);
ui->chatView->setUseCustomFont(false);
- ui->fontFamily->setCurrentFont(KGlobalSettings::generalFont());
+ ui->fontFamily->setCurrentFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
ui->fontSize->setValue(QWebSettings::DefaultFontSize);
ui->showPresenceCheckBox->setChecked(!m_groupChat);
ui->showJoinLeaveCheckBox->setChecked(!m_groupChat);
diff --git a/config/appearance-config.cpp b/config/appearance-config.cpp
index 7855523..fa85572 100644
--- a/config/appearance-config.cpp
+++ b/config/appearance-config.cpp
@@ -33,7 +33,6 @@
#include <KDialog>
#include <KLocalizedString>
#include <KPluginFactory>
-#include <KIcon>
#include <KSharedConfig>
K_PLUGIN_FACTORY(KCMTelepathyChatAppearanceConfigFactory, registerPlugin<AppearanceConfig>();)
diff --git a/filters/latex/latex-filter.cpp b/filters/latex/latex-filter.cpp
index 5ee008a..fc5a1ae 100644
--- a/filters/latex/latex-filter.cpp
+++ b/filters/latex/latex-filter.cpp
@@ -30,7 +30,6 @@
#include <KPluginFactory>
#include <KDebug>
-#include <KStandardDirs>
#include <KProcess>
LatexFilter::LatexFilter(QObject* parent, const QVariantList &)
@@ -110,11 +109,11 @@ QString LatexFilter::handleLatex(const QString &latexFormula)
Q_FOREACH(const QString &cmd, latexCmd.mid(1, latexCmd.size())) {
latexArgs << cmd;
}
- const KStandardDirs outputDir;
- latexArgs << QString(QLatin1String("-output-directory=%1")).arg(outputDir.resourceDirs("tmp").first());
+
+ latexArgs << QStringLiteral("-output-directory=%1").arg(QStandardPaths::standardLocations(QStandardPaths::TempLocation).first());
latexArgs << texFile.fileName();
- if (KStandardDirs::findExe(latexCmd.first()).isEmpty()) {
+ if (QStandardPaths::findExecutable(latexCmd.first()).isEmpty()) {
kError() << "Cannot find the TeX" << latexCmd.first() << " program.
;"
<< "Please get the software from http://tug.org/texlive/"
<< "or from your distribution's package manager.";
@@ -130,7 +129,7 @@ QString LatexFilter::handleLatex(const QString &latexFormula)
return QString();
}
- if (KStandardDirs::findExe(QLatin1String("dvipng")).isEmpty()) {
+ if (QStandardPaths::findExecutable(QLatin1String("dvipng")).isEmpty()) {
kError() << "Cannot find the TeX 'dvipng' program.
;"
<< "Please get the software from http://tug.org/texlive/"
<< "or from your distribution's package manager.";
diff --git a/filters/urlexpansion/urlexpansion-filter.cpp b/filters/urlexpansion/urlexpansion-filter.cpp
index 1ee0d1f..a1563ba 100644
--- a/filters/urlexpansion/urlexpansion-filter.cpp
+++ b/filters/urlexpansion/urlexpansion-filter.cpp
@@ -19,11 +19,10 @@
#include "urlexpansion-filter.h"
#include <QtCore/qjsondocument.h>
-#include<QFile>
+#include <QFile>
+#include <QStandardPaths>
#include <KPluginFactory>
-#include <KDE/KStandardDirs>
-#include <KGlobal>
class UrlExpansionFilter::Private
{
@@ -48,7 +47,7 @@ UrlExpansionFilter::~UrlExpansionFilter()
void UrlExpansionFilter::getSupportedServices()
{
- QFile servicesFile(KGlobal::dirs()->findResource("data", QLatin1String("ktelepathy/longurlServices.json")));
+ QFile servicesFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("ktelepathy/longurlServices.json")));
bool b = servicesFile.open(QIODevice::ReadOnly);
Q_ASSERT(b);
QVariantMap response = QJsonDocument::fromJson(servicesFile.readAll()).toVariant().toMap();
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 782786a..16935d4 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -44,7 +44,6 @@
#include <KDebug>
#include <KEmoticonsTheme>
#include <KGlobal>
-#include <KStandardDirs>
#include <KConfig>
#include <KConfigGroup>
#include <KMessageBox>
diff --git a/lib/channel-contact-model.cpp b/lib/channel-contact-model.cpp
index 40607ca..84ea767 100644
--- a/lib/channel-contact-model.cpp
+++ b/lib/channel-contact-model.cpp
@@ -20,8 +20,9 @@
#include "channel-contact-model.h"
#include "text-chat-config.h"
+#include <QPixmap>
+
#include <KDebug>
-#include <KIcon>
#include <KTp/types.h>
diff --git a/lib/chat-search-bar.cpp b/lib/chat-search-bar.cpp
index 522ac66..1c232ea 100644
--- a/lib/chat-search-bar.cpp
+++ b/lib/chat-search-bar.cpp
@@ -24,7 +24,6 @@
#include <KLineEdit>
#include <KLocale>
#include <KPushButton>
-#include <KIcon>
#include <QCheckBox>
#include <QDebug>
diff --git a/lib/chat-window-style-manager.cpp b/lib/chat-window-style-manager.cpp
index f63ea6f..196c362 100644
--- a/lib/chat-window-style-manager.cpp
+++ b/lib/chat-window-style-manager.cpp
@@ -22,9 +22,10 @@
// Qt includes
#include <QtCore/QStack>
#include <QtCore/QFileInfo>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QDir>
// KDE includes
-#include <KStandardDirs>
#include <KDirLister>
#include <KDebug>
#include <KUrl>
@@ -83,9 +84,8 @@ ChatWindowStyleManager::~ChatWindowStyleManager()
void ChatWindowStyleManager::loadStyles()
{
// Make sure there exists a directory where chat styles can be installed to and it will be watched for changes
- KStandardDirs::locateLocal("data", QLatin1String("ktelepathy/styles/"));
-
- QStringList chatStyles = KGlobal::dirs()->findDirs("data", QLatin1String("ktelepathy/styles"));
+ QDir().mkpath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/ktelepathy/styles/"));
+ QStringList chatStyles = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("ktelepathy/styles"), QStandardPaths::LocateDirectory);
Q_FOREACH(const QString &styleDir, chatStyles) {
kDebug() << styleDir;
@@ -112,8 +112,8 @@ QMap<QString, QString> ChatWindowStyleManager::getAvailableStyles() const
int ChatWindowStyleManager::installStyle(const QString &styleBundlePath)
{
QString localStyleDir;
- KStandardDirs::locateLocal("data", QLatin1String("ktelepathy/styles/"));
- QStringList chatStyles = KGlobal::dirs()->findDirs("data", QLatin1String("ktelepathy/styles"));
+ QDir().mkpath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/ktelepathy/styles/"));
+ QStringList chatStyles = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("ktelepathy/styles"), QStandardPaths::LocateDirectory);
// findDirs returns preferred paths first, let's check if one of them is writable
Q_FOREACH(const QString& styleDir, chatStyles) {
kDebug() << styleDir;
@@ -310,7 +310,7 @@ ChatWindowStyle *ChatWindowStyleManager::getStyleFromPool(const QString &styleId
// NOTE: This is a hidden config switch for style developers
// Check in the config if the cache is disabled.
// if the cache is disabled, reload the style every time it's getted.
- KConfigGroup config(KGlobal::config(), "KopeteStyleDebug");
+ KConfigGroup config(KSharedConfig::openConfig(), "KopeteStyleDebug");
bool disableCache = config.readEntry("disableStyleCache", false);
if (disableCache) {
d->stylePool[styleId]->reload();
diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index e993213..f2c5339 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -26,14 +26,13 @@
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
#include <QtCore/qmath.h>
+#include <QStandardPaths>
#include <QFont>
+#include <QFontDatabase>
// KDE includes
#include <KDebug>
-#include <KGlobal>
#include <KLocale>
-#include <KStandardDirs>
-#include <KGlobalSettings>
class ChatWindowStyle::Private
{
@@ -77,9 +76,10 @@ ChatWindowStyle::ChatWindowStyle(const QString &styleId, const QString &variantP
void ChatWindowStyle::init(const QString &styleId, StyleBuildMode styleBuildMode)
{
- QStringList styleDirs = KGlobal::dirs()->findDirs("data",
- QString(QLatin1String("ktelepathy/styles/%1/Contents/Resources/")).arg(styleId)
- );
+ QStringList styleDirs = QStandardPaths::locateAll(
+ QStandardPaths::GenericDataLocation,
+ QStringLiteral("ktelepathy/styles/%1/Contents/Resources/").arg(styleId),
+ QStandardPaths::LocateDirectory);
if (styleDirs.isEmpty()) {
kDebug() << "Failed to find style" << styleId;
@@ -353,13 +353,13 @@ void ChatWindowStyle::readStyleFiles()
d->defaultVariantName = i18nc("Normal style variant menu item", "Normal");
}
kDebug() << "defaultVariantName = " << d->defaultVariantName;
- d->defaultFontFamily = plistReader.defaultFontFamily().isEmpty() ? KGlobalSettings::generalFont().family()
+ d->defaultFontFamily = plistReader.defaultFontFamily().isEmpty() ? QFontDatabase::systemFont(QFontDatabase::GeneralFont).family()
: plistReader.defaultFontFamily();
// If the theme has no default font size, use the system font size, but since that is in points (pt), we need to convert
// it to pixel size (and using pixelSize() does not work if the QFont was not set up using setPixelSize), so we use the
// rough conversion ratio 4/3 and floor the number
- d->defaultFontSize = plistReader.defaultFontSize() == 0 ? qFloor(KGlobalSettings::generalFont().pointSizeF() * (4.0/3.0))
+ d->defaultFontSize = plistReader.defaultFontSize() == 0 ? qFloor(QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSizeF() * (4.0/3.0))
: plistReader.defaultFontSize();
d->disableCombineConsecutive = plistReader.disableCombineConsecutive();
d->messageViewVersion = plistReader.messageViewVersion();
@@ -451,7 +451,7 @@ void ChatWindowStyle::readStyleFiles()
if (content(Template).isEmpty())
{
d->hasCustomTemplateHtml = false;
- QString templateFileName(KGlobal::dirs()->findResource("data", QLatin1String("ktelepathy/Template.html")));
+ QString templateFileName(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("ktelepathy/Template.html")));
if (!templateFileName.isEmpty() && QFile::exists(templateFileName)) {
fileAccess.setFileName(templateFileName);
diff --git a/lib/contact-delegate.cpp b/lib/contact-delegate.cpp
index 478c7e3..b42169e 100644
--- a/lib/contact-delegate.cpp
+++ b/lib/contact-delegate.cpp
@@ -28,13 +28,11 @@
#include <QApplication>
#include <QStyle>
#include <QHelpEvent>
+#include <QFontDatabase>
#include <KIconLoader>
-#include <KIcon>
#include <KDebug>
-#include <KGlobalSettings>
#include <KDE/KLocale>
-#include <KStandardDirs>
#include <KTp/types.h>
@@ -109,8 +107,7 @@ void ContactDelegate::paint(QPainter *painter, const QStyleOptionViewItem &optio
painter->drawPixmap(phoneIconRect, phone);
}
- QFont nameFont;
- nameFont = KGlobalSettings::generalFont();
+ QFont nameFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
const QFontMetrics nameFontMetrics(nameFont);
@@ -140,7 +137,7 @@ QSize ContactDelegate::sizeHint(const QStyleOptionViewItem &option, const QModel
Q_UNUSED(option);
Q_UNUSED(index);
- return QSize(0, qMax(m_avatarSize + 2 * m_spacing, KGlobalSettings::smallestReadableFont().pixelSize() + m_spacing));
+ return QSize(0, qMax(m_avatarSize + 2 * m_spacing, QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pixelSize() + m_spacing));
}
#include "contact-delegate.moc"
diff --git a/lib/proxy-service.cpp b/lib/proxy-service.cpp
index 5179549..da3a363 100644
--- a/lib/proxy-service.cpp
+++ b/lib/proxy-service.cpp
@@ -26,7 +26,6 @@
#include <KDebug>
#include <KDialog>
#include <KLocale>
-#include <KIcon>
class KeyGenDialog : public KDialog
{
diff --git a/logviewer/dates-view-delegate.cpp b/logviewer/dates-view-delegate.cpp
index f15d9fc..33e5820 100644
--- a/logviewer/dates-view-delegate.cpp
+++ b/logviewer/dates-view-delegate.cpp
@@ -21,10 +21,9 @@
#include <QPainter>
#include <QApplication>
+#include <QFontDatabase>
-#include <KDE/KGlobalSettings>
#include <KDE/KIconLoader>
-#include <KDE/KIcon>
#include <TelepathyQt/Account>
@@ -47,10 +46,10 @@ QSize DatesViewDelegate::sizeHint(const QStyleOptionViewItem& option, const QMod
Q_UNUSED(option);
if (index.data(DatesModel::TypeRole).toUInt() == DatesModel::GroupRow) {
- return QSize(0, qMax(22, KGlobalSettings::smallestReadableFont().pixelSize()) + 2 + 1);
+ return QSize(0, qMax(22, QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pixelSize()) + 2 + 1);
} else {
return QSize(0, qMax(KIconLoader::global()->currentSize(KIconLoader::Small) + m_spacing,
- KGlobalSettings::smallestReadableFont().pixelSize() + 2 + 1));
+ QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pixelSize() + 2 + 1));
}
}
@@ -111,7 +110,7 @@ void DatesViewDelegate::paintGroup(QPainter* painter, const QStyleOptionViewItem
style->drawPrimitive(QStyle::PE_IndicatorArrowRight, &expandSignOption, painter);
}
- const QFont groupFont = KGlobalSettings::smallestReadableFont();
+ const QFont groupFont = QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont);
//paint the header string
const QRect groupLabelRect = groupRect.adjusted(expandSignOption.rect.width() + 2 * 2, 0, -2, 0);
const QString groupHeaderString = index.data(Qt::DisplayRole).toString();
diff --git a/logviewer/entity-view-delegate.cpp b/logviewer/entity-view-delegate.cpp
index 36854e7..3dbb14c 100644
--- a/logviewer/entity-view-delegate.cpp
+++ b/logviewer/entity-view-delegate.cpp
@@ -23,9 +23,9 @@
#include <QPainter>
#include <QApplication>
+#include <QFontDatabase>
#include <KDE/KIconLoader>
-#include <KDE/KGlobalSettings>
#include <KDE/KDebug>
#include <KDE/KIcon>
@@ -102,7 +102,7 @@ void EntityViewDelegate::paintContact(QPainter* painter, const QStyleOptionViewI
style->drawItemPixmap(painter, iconRect, Qt::AlignCenter, avatar.scaled(iconRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
- const QFont nameFont = KGlobalSettings::generalFont();
+ const QFont nameFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
const QFontMetrics nameFontMetrics(nameFont);
if (option.state & QStyle::State_Selected) {
@@ -142,7 +142,7 @@ QSize EntityViewDelegate::sizeHintContact(const QStyleOptionViewItem& option, co
{
Q_UNUSED(option);
Q_UNUSED(index);
- return QSize(0, qMax(m_avatarSize + 2 * m_spacing, KGlobalSettings::smallestReadableFont().pixelSize() + m_spacing));
+ return QSize(0, qMax(m_avatarSize + 2 * m_spacing, QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pixelSize() + m_spacing));
}
@@ -194,7 +194,7 @@ void EntityViewDelegate::paintHeader(QPainter* painter, const QStyleOptionViewIt
style->drawPrimitive(QStyle::PE_IndicatorArrowRight, &expandSignOption, painter);
}
- const QFont groupFont = KGlobalSettings::smallestReadableFont();
+ const QFont groupFont = QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont);
//paint the header string
const QRect groupLabelRect = groupRect.adjusted(expandSignOption.rect.width() + m_spacing * 2, 0, -m_spacing, 0);
@@ -216,7 +216,7 @@ QSize EntityViewDelegate::sizeHintHeader(const QStyleOptionViewItem& option, con
Q_UNUSED(option)
Q_UNUSED(index)
// Add one point to the bottom for the 1px line
- return QSize(0, qMax(m_avatarSize, KGlobalSettings::smallestReadableFont().pixelSize()) + m_spacing + 1);
+ return QSize(0, qMax(m_avatarSize, QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pixelSize()) + m_spacing + 1);
}
diff --git a/logviewer/log-viewer.cpp b/logviewer/log-viewer.cpp
index 3354e1e..e1a4648 100644
--- a/logviewer/log-viewer.cpp
+++ b/logviewer/log-viewer.cpp
@@ -48,7 +48,6 @@
#include <KMenuBar>
#include <KSettings/Dialog>
#include <KLocalizedString>
-#include <KIcon>
#include <KIconLoader>
#include <KDE/KCModuleProxy>
diff --git a/logviewer/logs-import-dialog.cpp b/logviewer/logs-import-dialog.cpp
index b145e21..425587a 100644
--- a/logviewer/logs-import-dialog.cpp
+++ b/logviewer/logs-import-dialog.cpp
@@ -27,7 +27,6 @@
#include <KLocalizedString>
#include <KTp/logs-importer.h>
#include <TelepathyQt/Account>
-#include <KIcon>
Q_DECLARE_METATYPE(Tp::AccountPtr);
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list