[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:14:57 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=ed940a4
The following commit has been merged in the master branch:
commit ed940a4d0ffd9c6e4638ca6566a10481a9098660
Author: Aleix Pol <aleixpol at kde.org>
Date: Wed Oct 29 13:45:38 2014 +0100
Port away from some kdelibs4support
REVIEW: 120861
---
abstract-contact-delegate.cpp | 10 ++++------
account-button.cpp | 11 +++++------
contact-delegate-compact.cpp | 15 ++++++---------
contact-delegate.cpp | 10 ++++------
contact-list-widget.cpp | 16 +++++++---------
contact-overlays.cpp | 2 +-
context-menu.cpp | 1 -
dialogs/remove-contact-dialog.cpp | 3 +--
filter-bar.cpp | 3 +--
global-presence-chooser.cpp | 8 ++++----
main-widget.cpp | 17 +++++++----------
main-widget.h | 1 -
tooltips/contacttooltip.cpp | 1 -
tooltips/ktooltip.cpp | 4 ++--
tooltips/persontooltip.cpp | 1 -
tooltips/tooltipmanager.cpp | 1 -
16 files changed, 42 insertions(+), 62 deletions(-)
diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index 64b0b4f..a203a04 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -25,12 +25,10 @@
#include <QPainter>
#include <QToolTip>
#include <QHelpEvent>
+#include <QFontDatabase>
#include <QAbstractItemView>
-#include <KDE/KGlobalSettings>
-#include <KDE/KLocale>
-#include <KDE/KIconLoader>
-#include <KDE/KIcon>
+#include <KIconLoader>
#include <KTp/types.h>
@@ -118,7 +116,7 @@ void AbstractContactDelegate::paintHeader(QPainter *painter, const QStyleOptionV
style->drawPrimitive(QStyle::PE_IndicatorArrowRight, &expandSignOption, painter);
}
- QFont groupFont = KGlobalSettings::smallestReadableFont();
+ QFont groupFont = QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont);
//paint the group icon
QRect groupIconRect;
@@ -162,7 +160,7 @@ QSize AbstractContactDelegate::sizeHintHeader(const QStyleOptionViewItem &option
Q_UNUSED(index)
// Add one point to the bottom for the 1px line
- return QSize(0, qMax(ACCOUNT_ICON_SIZE, KGlobalSettings::smallestReadableFont().pixelSize()) + SPACING + 1);
+ return QSize(0, qMax(ACCOUNT_ICON_SIZE, QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pixelSize()) + SPACING + 1);
}
bool AbstractContactDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index)
diff --git a/account-button.cpp b/account-button.cpp
index 6b87a73..574b72a 100644
--- a/account-button.cpp
+++ b/account-button.cpp
@@ -22,17 +22,16 @@
#include <QPainter>
#include <QPixmap>
+#include <QFontDatabase>
#include <KAction>
-#include <KIcon>
-#include <KLocale>
+#include <KLocalizedString>
#include <KGlobal>
#include <KMenu>
#include <KPixmapSequenceOverlayPainter>
#include <KPixmapSequence>
#include <KIconLoader>
#include <KLineEdit>
-#include <KGlobalSettings>
#include <TelepathyQt/Account>
#include <TelepathyQt/PendingOperation>
@@ -121,7 +120,7 @@ AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent)
presenceMenu->setMinimumWidth(180);
presenceMenu->addActions(presenceActions->actions());
- QFont titleFont = KGlobalSettings::menuFont();
+ QFont titleFont = QFontDatabase::systemFont(QFontDatabase::TitleFont);
QFontMetrics titleFontMetrics(titleFont);
QString accountName = titleFontMetrics.elidedText(m_account->displayName(), Qt::ElideMiddle, presenceMenu->width());
@@ -212,7 +211,7 @@ void AccountButton::presenceChanged(const Tp::Presence &presence)
}
resetMenuFormatting();
- QFont presenceFont = KGlobalSettings::generalFont();
+ QFont presenceFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
presenceFont.setBold(true);
presenceFont.setItalic(true);
@@ -285,7 +284,7 @@ void AccountButton::setCustomPresenceMessage(const QString& message)
void AccountButton::resetMenuFormatting()
{
- QFont presenceFont = KGlobalSettings::generalFont();
+ QFont presenceFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
presenceFont.setBold(false);
presenceFont.setItalic(false);
diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index d70853a..58196f5 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -27,13 +27,10 @@
#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>
@@ -118,9 +115,9 @@ void ContactDelegateCompact::paintContact(QPainter *painter, const QStyleOptionV
QFont nameFont;
if (m_listSize == ContactDelegateCompact::Mini) {
- nameFont = KGlobalSettings::smallestReadableFont();
+ nameFont = QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont);
} else {
- nameFont = KGlobalSettings::generalFont();
+ nameFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
}
const QFontMetrics nameFontMetrics(nameFont);
@@ -166,7 +163,7 @@ QSize ContactDelegateCompact::sizeHintContact(const QStyleOptionViewItem &option
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));
}
QSize ContactDelegateCompact::sizeHintHeader(const QStyleOptionViewItem& option, const QModelIndex& index) const
@@ -175,7 +172,7 @@ QSize ContactDelegateCompact::sizeHintHeader(const QStyleOptionViewItem& option,
Q_UNUSED(index);
if (m_listSize == ContactDelegateCompact::Mini) {
- 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));
} else {
return AbstractContactDelegate::sizeHintHeader(option, index);
}
@@ -186,7 +183,7 @@ void ContactDelegateCompact::setListMode(ContactDelegateCompact::ListSize size)
if (size == ContactDelegateCompact::Mini) {
m_spacing = 1;
int iconSize = qMax(KIconLoader::global()->currentSize(KIconLoader::Small),
- KGlobalSettings::smallestReadableFont().pixelSize() + m_spacing);
+ QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pixelSize() + m_spacing);
m_avatarSize = iconSize;
m_presenceIconSize = iconSize;
m_clientTypeIconSize = iconSize;
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index e7de812..3c1488d 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -26,13 +26,11 @@
#include <QPainter>
#include <QPainterPath>
#include <QApplication>
+#include <QFontDatabase>
#include <QStyle>
#include <KIconLoader>
-#include <KIcon>
#include <KDebug>
-#include <KGlobalSettings>
-#include <KDE/KLocale>
#include <KTp/types.h>
#include <KTp/presence.h>
@@ -128,7 +126,7 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
userNameRect.setY(userNameRect.y() + m_spacing / 2);
userNameRect.setWidth(userNameRect.width() - rightIconsWidth);
- const QFontMetrics nameFontMetrics(KGlobalSettings::generalFont());
+ const QFontMetrics nameFontMetrics(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
if (option.state & QStyle::State_Selected) {
painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
@@ -139,7 +137,7 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
painter->drawText(userNameRect,
nameFontMetrics.elidedText(optV4.text, Qt::ElideRight, userNameRect.width()));
- const QFontMetrics statusFontMetrics(KGlobalSettings::smallestReadableFont());
+ const QFontMetrics statusFontMetrics(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
QRect statusMsgRect = optV4.rect;
statusMsgRect.setX(iconRect.x() + iconRect.width() + m_spacing);
@@ -160,7 +158,7 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
painter->setPen(fadingColor);
- painter->setFont(KGlobalSettings::smallestReadableFont());
+ painter->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
painter->drawText(statusMsgRect,
statusFontMetrics.elidedText(index.data(KTp::ContactPresenceMessageRole).toString().trimmed(),
Qt::ElideRight, statusMsgRect.width()));
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index b659ae5..8641156 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -33,7 +33,6 @@
#include <KTp/contact.h>
#include <KTp/Widgets/settings-kcm-dialog.h>
-#include <KGlobal>
#include <KSharedConfig>
#include <KConfigGroup>
#include <KDebug>
@@ -45,7 +44,6 @@
#include <KMenu>
#include <KNotifyConfigWidget>
#include <KPushButton>
-#include <KIcon>
#include <QHeaderView>
#include <QLabel>
@@ -97,7 +95,7 @@ ContactListWidget::ContactListWidget(QWidget *parent)
{
Q_D(ContactListWidget);
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup guiConfigGroup(config, "GUI");
d->groupMode = KTp::ContactsModel::NoGrouping;
@@ -546,7 +544,7 @@ void ContactListWidget::onSwitchToFullView()
emit enableOverlays(true);
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup guiConfigGroup(config, "GUI");
guiConfigGroup.writeEntry("selected_delegate", "full");
guiConfigGroup.config()->sync();
@@ -562,7 +560,7 @@ void ContactListWidget::onSwitchToCompactView()
emit enableOverlays(false);
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup guiConfigGroup(config, "GUI");
guiConfigGroup.writeEntry("selected_delegate", "normal");
guiConfigGroup.config()->sync();
@@ -578,7 +576,7 @@ void ContactListWidget::onSwitchToMiniView()
emit enableOverlays(false);
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup guiConfigGroup(config, "GUI");
guiConfigGroup.writeEntry("selected_delegate", "mini");
guiConfigGroup.config()->sync();
@@ -590,7 +588,7 @@ void ContactListWidget::onShowAllContacts()
d->model->setSubscriptionStateFilterFlags(KTp::ContactsFilterModel::DoNotFilterBySubscription);
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup guiConfigGroup(config, "GUI");
guiConfigGroup.writeEntry("shown_contacts", "all");
guiConfigGroup.config()->sync();
@@ -602,7 +600,7 @@ void ContactListWidget::onShowUnblockedContacts()
d->model->setSubscriptionStateFilterFlags(KTp::ContactsFilterModel::HideBlocked);
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup guiConfigGroup(config, "GUI");
guiConfigGroup.writeEntry("shown_contacts", "unblocked");
guiConfigGroup.config()->sync();
@@ -614,7 +612,7 @@ void ContactListWidget::onShowBlockedContacts()
d->model->setSubscriptionStateFilterFlags(KTp::ContactsFilterModel::ShowOnlyBlocked);
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup guiConfigGroup(config, "GUI");
guiConfigGroup.writeEntry("shown_contacts", "blocked");
guiConfigGroup.config()->sync();
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index ee14e8f..62f9bda 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -21,7 +21,7 @@
#include "contact-overlays.h"
-#include <KLocale>
+#include <KLocalizedString>
#include <KIconLoader>
#include <KDebug>
diff --git a/context-menu.cpp b/context-menu.cpp
index 586d645..e51a376 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -23,7 +23,6 @@
#include <KMenu>
#include <KLocalizedString>
-#include <KIcon>
#include <KToolInvocation>
#include <KInputDialog>
#include <KMessageBox>
diff --git a/dialogs/remove-contact-dialog.cpp b/dialogs/remove-contact-dialog.cpp
index 78c8197..6536c5d 100644
--- a/dialogs/remove-contact-dialog.cpp
+++ b/dialogs/remove-contact-dialog.cpp
@@ -49,8 +49,7 @@ RemoveContactDialog::RemoveContactDialog(Tp::ContactPtr contact, QWidget* parent
// load contact avatar
if (contact->avatarData().fileName.isEmpty()) {
- KIcon defaultIcon("im-user"); // load KIcon with the desired pixmap
- ui->contactAvatarLabel->setPixmap(defaultIcon.pixmap(QSize(90, 90)));
+ ui->contactAvatarLabel->setPixmap(QIcon::fromTheme("im-user").pixmap(QSize(90, 90)));
} else {
ui->contactAvatarLabel->setPixmap(QPixmap(contact->avatarData().fileName).scaled(QSize(128, 128), Qt::KeepAspectRatio));
}
diff --git a/filter-bar.cpp b/filter-bar.cpp
index 6ae98df..e912bbf 100644
--- a/filter-bar.cpp
+++ b/filter-bar.cpp
@@ -24,8 +24,7 @@
#include <QLabel>
#include <QToolButton>
-#include <KIcon>
-#include <KLocale>
+#include <KLocalizedString>
#include <KLineEdit>
#include <KIconLoader>
diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 1605486..ce0c460 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -26,19 +26,19 @@
#include "dialogs/custom-presence-dialog.h"
-#include <KIcon>
-#include <KLocale>
+#include <KLocalizedString>
+#include <KSharedConfig>
#include <KLineEdit>
#include <KDebug>
#include <KPixmapSequence>
#include <KPixmapSequenceOverlayPainter>
#include <KMessageBox>
#include <KIconLoader>
-#include <KGlobalSettings>
#include <TelepathyQt/Presence>
#include <TelepathyQt/Account>
+#include <QFontDatabase>
#include <QMouseEvent>
#include <QToolTip>
#include <QStyle>
@@ -90,7 +90,7 @@ int PresenceModelExtended::rowCount(const QModelIndex &parent) const
QVariant PresenceModelExtended::data(const QModelIndex &index, int role) const
{
if (role == Qt::SizeHintRole) {
- const QFontMetrics fontMetrics(KGlobalSettings::generalFont());
+ const QFontMetrics fontMetrics(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
return QSize(0, qMax(fontMetrics.height(), (int)(KIconLoader::SizeSmall)) + 8);
}
if (index.row() == rowCount() - 1) {
diff --git a/main-widget.cpp b/main-widget.cpp
index 7e9614f..cecfdb0 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -53,7 +53,6 @@
#include <KProtocolInfo>
#include <KSettings/Dialog>
#include <KSharedConfig>
-#include <KStandardDirs>
#include <KStandardShortcut>
#include <KNotification>
#include <KToolInvocation>
@@ -61,8 +60,6 @@
#include <KStandardAction>
#include <KWindowSystem>
#include <KLocalizedString>
-#include <KGlobal>
-#include <KIcon>
#include <kdeversion.h>
@@ -99,7 +96,7 @@ MainWidget::MainWidget(QWidget *parent)
setAutoSaveSettings();
setupTelepathy();
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup guiConfigGroup(config, "GUI");
setupActions(guiConfigGroup);
setupToolBar();
@@ -165,7 +162,7 @@ MainWidget::MainWidget(QWidget *parent)
MainWidget::~MainWidget()
{
//save the state of the filter bar, pinned or not
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup configGroup(config, "GUI");
configGroup.writeEntry("pin_filterbar", m_searchContactAction->isChecked());
configGroup.writeEntry("use_groups", m_groupContactsActionGroup->actions().first()->isChecked());
@@ -292,7 +289,7 @@ void MainWidget::onMergeContactsDialogRequested()
void MainWidget::closeEvent(QCloseEvent* e)
{
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup generalConfigGroup(config, "General");
KConfigGroup notifyConigGroup(config, "Notification Messages");
KConfigGroup guiConfigGroup(config, "GUI");
@@ -373,7 +370,7 @@ bool MainWidget::isAnyAccountOnline() const
void MainWidget::onUseGlobalPresenceTriggered()
{
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup configGroup(config, "GUI");
m_presenceChooser->show();
@@ -386,7 +383,7 @@ void MainWidget::onUseGlobalPresenceTriggered()
void MainWidget::onUsePerAccountPresenceTriggered()
{
- KSharedConfigPtr config = KGlobal::config();
+ KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup configGroup(config, "GUI");
m_presenceChooser->hide();
@@ -427,7 +424,7 @@ void MainWidget::setupGlobalMenu()
KMenu *contacts = new KMenu(i18n("Contacts"), m_globalMenu);
contacts->addAction(m_addContactAction);
contacts->addAction(m_joinChatRoom);
- if (!KStandardDirs::findExe("ktp-dialout-ui").isEmpty()) {
+ if (!QStandardPaths::findExecutable("ktp-dialout-ui").isEmpty()) {
contacts->addAction(m_makeCall);
}
//temporarily disable until funcationality is restored in libkpeople
@@ -501,7 +498,7 @@ void MainWidget::setupToolBar()
showGroupedMenu->addActions(m_groupContactsActionGroup->actions());
settingsButtonMenu->addMenu(showGroupedMenu);
- if (!KStandardDirs::findExe("ktp-dialout-ui").isEmpty()) {
+ if (!QStandardPaths::findExecutable("ktp-dialout-ui").isEmpty()) {
settingsButtonMenu->addAction(m_makeCall);
}
diff --git a/main-widget.h b/main-widget.h
index 227757e..3ece8a3 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -31,7 +31,6 @@
#include <KXmlGuiWindow>
#include <QAction>
-#include <KIcon>
#include <KDualAction>
#include "ui_main-widget.h"
diff --git a/tooltips/contacttooltip.cpp b/tooltips/contacttooltip.cpp
index b738e3d..ae64ff7 100644
--- a/tooltips/contacttooltip.cpp
+++ b/tooltips/contacttooltip.cpp
@@ -35,7 +35,6 @@
#include <KDebug>
#include <KLocalizedString>
#include <KIconLoader>
-#include <KIcon>
ContactToolTip::ContactToolTip(const QModelIndex &index) :
QWidget(0),
diff --git a/tooltips/ktooltip.cpp b/tooltips/ktooltip.cpp
index 246b703..6e82718 100644
--- a/tooltips/ktooltip.cpp
+++ b/tooltips/ktooltip.cpp
@@ -23,8 +23,8 @@
#include <QLabel>
#include <QPoint>
#include <QWidget>
+#include <QtGlobal>
-#include <kglobal.h>
class KToolTipManager
{
@@ -41,7 +41,7 @@ private:
QWeakPointer<KToolTipWindow> m_window;
};
-K_GLOBAL_STATIC(KToolTipManager, s_instance)
+Q_GLOBAL_STATIC(KToolTipManager, s_instance)
KToolTipManager::KToolTipManager()
{
diff --git a/tooltips/persontooltip.cpp b/tooltips/persontooltip.cpp
index f086c8b..6b3bb2b 100644
--- a/tooltips/persontooltip.cpp
+++ b/tooltips/persontooltip.cpp
@@ -34,7 +34,6 @@
#include <KIconLoader>
#include <KLocalizedString>
#include <KToolInvocation>
-#include <KIcon>
bool contactLessThan(const QVariant &left, const QVariant &right)
{
diff --git a/tooltips/tooltipmanager.cpp b/tooltips/tooltipmanager.cpp
index 555d425..2315d35 100644
--- a/tooltips/tooltipmanager.cpp
+++ b/tooltips/tooltipmanager.cpp
@@ -35,7 +35,6 @@
#include <QX11Info>
#endif
-#include <KIcon>
#include <KColorScheme>
#include <KTp/types.h>
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list