[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:55 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=931d47f
The following commit has been merged in the master branch:
commit 931d47fdddb6d8d97d6a60ced433c23fb4825c02
Author: Aleix Pol <aleixpol at kde.org>
Date: Tue Oct 21 16:12:13 2014 +0200
Initial port to Qt5/KF5
---
CMakeLists.txt | 84 +++++++++++++++-----------------------
abstract-contact-delegate.cpp | 10 ++---
abstract-contact-delegate.h | 2 +-
account-button.cpp | 8 ++--
contact-delegate-compact.cpp | 6 +--
contact-delegate.cpp | 4 +-
contact-list-widget.cpp | 2 +
contact-view-hover-button.cpp | 4 +-
contact-view-hover-button.h | 4 +-
dialogs/custom-presence-dialog.cpp | 11 ++---
dialogs/remove-contact-dialog.cpp | 4 +-
global-presence-chooser.cpp | 8 ++--
main-widget.cpp | 16 ++++----
main-widget.h | 10 +++--
main.cpp | 6 +--
tooltips/contacttooltip.cpp | 5 ++-
tooltips/ktooltipwindow.cpp | 2 +-
tooltips/persontooltip.cpp | 5 ++-
18 files changed, 96 insertions(+), 95 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2520a96..984ed60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
project (ktp-contactlist)
+cmake_minimum_required(VERSION 2.8.12)
+
set(KTP_CONTACT_LIST_VERSION "0.8.80")
set (CMAKE_MODULE_PATH
@@ -8,32 +10,25 @@ set (CMAKE_MODULE_PATH
)
set(IS_KTP_INTERNAL_MODULE TRUE)
-set(KDE_MIN_VERSION "4.4.75")
-find_package (KDE4 4.4.75 REQUIRED)
-find_package (TelepathyQt4 0.9.3 REQUIRED)
-find_package (KTp REQUIRED)
-find_package (KPeople 0.2.1)
-
-
-macro_log_feature(KPEOPLE_FOUND "KPeople" "Support for KDE Contact Aggregation" "https://projects.kde.org/libkpeople" FALSE "" "")
-macro_display_feature_log()
-if (KPEOPLE_FOUND)
- add_definitions(-DHAVE_KPEOPLE)
- find_package (KdepimLibs REQUIRED)
- include_directories(${KPEOPLE_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS})
-endif (KPEOPLE_FOUND)
+find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-include (KDE4Defaults)
-include (MacroLibrary)
+find_package (Qt5 5.0 REQUIRED COMPONENTS Widgets Xml)
+find_package (KF5 5.0 REQUIRED COMPONENTS DBusAddons KIO KCMUtils NotifyConfig KDELibs4Support)
+find_package (TelepathyQt5 0.9.3 REQUIRED)
+find_package (KTp REQUIRED)
+find_package (KF5People 0.5)
-add_definitions (${KDE4_DEFINITIONS})
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
-include_directories (${KDE4_INCLUDES}
- ${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTP_INCLUDE_DIR}
-)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+if (KF5People_FOUND)
+ add_definitions(-DHAVE_KPEOPLE)
+endif ()
set (ktp_contactlist_SRCS
contact-list-widget.cpp
@@ -61,52 +56,41 @@ set (ktp_contactlist_SRCS
tooltips/persontooltip.cpp
)
-
-
-set (ktp_contactlist_LIBS
- ${KTP_LIBRARIES}
- ${KTP_MODELS_LIBRARIES}
- ${KTP_WIDGETS_LIBRARIES}
- ${KTP_LOGGER_LIBRARIES}
- ${KDE4_KDEUI_LIBS}
- ${KDE4_KIO_LIBS}
- ${KDE4_KCMUTILS_LIBS}
- ${TELEPATHY_QT4_LIBRARIES}
- ${KDE4_KNOTIFYCONFIG_LIBS}
+if(KF5People_FOUND)
+ set (ktp_contactlist_LIBS
+ KF5::PeopleWidgets
)
-
-if(KPEOPLE_FOUND)
-set (ktp_contactlist_LIBS
- ${ktp_contactlist_LIBS}
- ${KPEOPLE_LIBRARY}
- ${KDEPIMLIBS_KABC_LIBS}
- ${KPEOPLEWIDGETS_LIBRARY}
-)
-endif(KPEOPLE_FOUND)
+endif()
configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-kde4_add_ui_files (ktp_contactlist_SRCS
+qt5_wrap_ui (ktp_contactlist_SRCS
main-widget.ui
dialogs/remove-contact-dialog.ui
tooltips/contacttooltip.ui
tooltips/persontooltip.ui
)
-kde4_add_executable (ktp-contactlist
- ${ktp_contactlist_SRCS}
-)
-
-target_link_libraries (ktp-contactlist
- ${ktp_contactlist_LIBS}
+add_executable (ktp-contactlist ${ktp_contactlist_SRCS})
+
+target_link_libraries (ktp-contactlist ${ktp_contactlist_LIBS}
+ KF5::KIOWidgets
+ KF5::KCMUtils
+ KF5::NotifyConfig
+ KF5::KDELibs4Support
+ KTp::Models
+ KTp::Widgets
+ KTp::Logger
+ KTp::CommonInternals
)
# Install:
install (TARGETS ktp-contactlist
- DESTINATION ${BIN_INSTALL_DIR}
+ ${INSTALL_TARGETS_DEFAULT_ARGS}
)
install (PROGRAMS ktp-contactlist.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
+
diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index a92cc4e..1d8f770 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -20,11 +20,11 @@
#include "abstract-contact-delegate.h"
-#include <QtGui/QApplication>
-#include <QtGui/QStyle>
-#include <QtGui/QPainter>
-#include <QtGui/QToolTip>
-#include <QtGui/QHelpEvent>
+#include <QApplication>
+#include <QStyle>
+#include <QPainter>
+#include <QToolTip>
+#include <QHelpEvent>
#include <QAbstractItemView>
#include <KDE/KGlobalSettings>
diff --git a/abstract-contact-delegate.h b/abstract-contact-delegate.h
index 2339833..ee7ebe5 100644
--- a/abstract-contact-delegate.h
+++ b/abstract-contact-delegate.h
@@ -22,7 +22,7 @@
#ifndef ABSTRACT_CONTACT_DELEGATE_H
#define ABSTRACT_CONTACT_DELEGATE_H
-#include <QtGui/QStyledItemDelegate>
+#include <QStyledItemDelegate>
class AbstractContactDelegate : public QStyledItemDelegate
{
diff --git a/account-button.cpp b/account-button.cpp
index 3725fd9..a69de76 100644
--- a/account-button.cpp
+++ b/account-button.cpp
@@ -20,17 +20,19 @@
#include "account-button.h"
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
+#include <QPainter>
+#include <QPixmap>
#include <KAction>
#include <KIcon>
#include <KLocale>
+#include <KGlobal>
#include <KMenu>
#include <KPixmapSequenceOverlayPainter>
#include <KPixmapSequence>
#include <KIconLoader>
#include <KLineEdit>
+#include <KGlobalSettings>
#include <TelepathyQt/Account>
#include <TelepathyQt/PendingOperation>
@@ -256,7 +258,7 @@ QString AccountButton::presenceDisplayString(const Tp::Presence &presence)
{
QAction *action = actionForPresence(presence);
if (action) {
- return KGlobal::locale()->removeAcceleratorMarker(action->text());
+ return KLocalizedString::removeAcceleratorMarker(action->text());
} else {
return QString();
}
diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index c51a210..2c825f7 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -21,9 +21,9 @@
#include "contact-delegate-compact.h"
-#include <QtGui/QPainter>
-#include <QtGui/QPainterPath>
-#include <QtGui/QToolTip>
+#include <QPainter>
+#include <QPainterPath>
+#include <QToolTip>
#include <QApplication>
#include <QStyle>
#include <QHelpEvent>
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 537e204..a71feba 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -23,8 +23,8 @@
#include "contact-delegate.h"
-#include <QtGui/QPainter>
-#include <QtGui/QPainterPath>
+#include <QPainter>
+#include <QPainterPath>
#include <QApplication>
#include <QStyle>
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 3ffa1cc..d79085e 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -45,6 +45,7 @@
#include <KMenu>
#include <KNotifyConfigWidget>
#include <KPushButton>
+#include <KIcon>
#include <QHeaderView>
#include <QLabel>
@@ -56,6 +57,7 @@
#include <QPainter>
#include <QPixmap>
#include <QMenu>
+#include <QDrag>
#include "contact-delegate.h"
#include "contact-delegate-compact.h"
diff --git a/contact-view-hover-button.cpp b/contact-view-hover-button.cpp
index bb0e95c..166d392 100644
--- a/contact-view-hover-button.cpp
+++ b/contact-view-hover-button.cpp
@@ -24,8 +24,8 @@
// Qt includes
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
+#include <QPainter>
+#include <QPaintEvent>
#include <QtCore/QRect>
#include <QtCore/QTimer>
#include <QtCore/QTimeLine>
diff --git a/contact-view-hover-button.h b/contact-view-hover-button.h
index f38f157..804656b 100644
--- a/contact-view-hover-button.h
+++ b/contact-view-hover-button.h
@@ -25,8 +25,8 @@
// Qt includes
-#include <QtGui/QAbstractButton>
-#include <QtGui/QAbstractItemView>
+#include <QAbstractButton>
+#include <QAbstractItemView>
// Local includes
diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 5e7b76e..26f49b1 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -20,17 +20,18 @@
#include "custom-presence-dialog.h"
-#include <QtGui/QListView>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QSortFilterProxyModel>
+#include <QListView>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QSortFilterProxyModel>
#include <QtCore/QModelIndex>
#include <KDE/KDialog>
#include <KDE/KLocalizedString>
#include <KDE/KConfig>
#include <KDE/KSharedConfigPtr>
+#include <KDE/KIcon>
#include <TelepathyQt/Presence>
#include <QLineEdit>
diff --git a/dialogs/remove-contact-dialog.cpp b/dialogs/remove-contact-dialog.cpp
index a800b4f..78c8197 100644
--- a/dialogs/remove-contact-dialog.cpp
+++ b/dialogs/remove-contact-dialog.cpp
@@ -24,8 +24,8 @@
#include <KIcon>
#include <KLocalizedString>
-#include <QtGui/QCheckBox>
-#include <QtGui/QLabel>
+#include <QCheckBox>
+#include <QLabel>
#include <TelepathyQt/AvatarData>
#include <TelepathyQt/Contact>
diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index da6a87b..e64c76a 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -33,14 +33,16 @@
#include <KPixmapSequence>
#include <KPixmapSequenceOverlayPainter>
#include <KMessageBox>
+#include <KIconLoader>
+#include <KGlobalSettings>
#include <TelepathyQt/Presence>
#include <TelepathyQt/Account>
#include <QMouseEvent>
-#include <QtGui/QToolTip>
+#include <QToolTip>
#include <QStyle>
-#include <QtGui/QPushButton>
+#include <QPushButton>
#include <QMenu>
//A sneaky class that adds an extra entries to the end of the presence model,
@@ -182,7 +184,7 @@ GlobalPresenceChooser::GlobalPresenceChooser(QWidget *parent) :
//needed for mousemove events
setMouseTracking(true);
- m_busyOverlay->setSequence(KPixmapSequence("process-working"));
+ m_busyOverlay->setSequence(KPixmapSequence("process-working", KIconLoader::SizeMedium));
setEditable(false);
m_changePresenceMessageButton->setIcon(KIcon("document-edit"));
diff --git a/main-widget.cpp b/main-widget.cpp
index 0734e3c..6c00c70 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -24,10 +24,10 @@
#include "main-widget.h"
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QPainter>
-#include <QtGui/QMenu>
-#include <QtGui/QToolButton>
+#include <QSortFilterProxyModel>
+#include <QPainter>
+#include <QMenu>
+#include <QToolButton>
#include <QtCore/QWeakPointer>
#include <QWidgetAction>
#include <QCloseEvent>
@@ -60,6 +60,9 @@
#include <KMenuBar>
#include <KStandardAction>
#include <KWindowSystem>
+#include <KLocalizedString>
+#include <KGlobal>
+#include <KIcon>
#include <kdeversion.h>
@@ -201,8 +204,7 @@ void MainWidget::showMessageToUser(const QString& text, const MainWidget::System
notification = new KNotification("telepathyInfo", this);
}
- KAboutData aboutData("ktelepathy",0,KLocalizedString(),0);
- notification->setComponentData(KComponentData(aboutData));
+ notification->setComponentName("ktelepathy");
notification->setText(text);
notification->sendEvent();
@@ -586,7 +588,7 @@ void MainWidget::setupActions(const KConfigGroup& guiConfigGroup)
m_addContactAction = createAction(i18n("Add New Contacts..."), this, SLOT(onAddContactRequest()), KIcon("list-add-user"));
m_searchContactAction = createAction(i18n("Find Contact"), this, SLOT(toggleSearchWidget(bool)),
guiConfigGroup.readEntry("pin_filterbar", true), KIcon("edit-find"));
- m_searchContactAction->setShortcut(KStandardShortcut::find());
+ m_searchContactAction->setShortcuts(KStandardShortcut::find());
m_startChatAction = createAction(i18n("Start a chat..."), this, SLOT(onStartChatRequest()), KIcon("telepathy-kde"));
// Dual actions
diff --git a/main-widget.h b/main-widget.h
index 38c963e..e64a103 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -24,13 +24,14 @@
#ifndef TELEPATHY_CONTACTSLIST_MAIN_WIDGET_H
#define TELEPATHY_CONTACTSLIST_MAIN_WIDGET_H
-#include <QtGui/QWidget>
-#include <QtGui/QStyledItemDelegate>
+#include <QWidget>
+#include <QStyledItemDelegate>
#include <TelepathyQt/Types>
#include <KXmlGuiWindow>
#include <KAction>
+#include <KIcon>
#include <KDualAction>
#include "ui_main-widget.h"
@@ -38,6 +39,7 @@ class ContextMenu;
class ContactDelegateCompact;
class GroupsModel;
class KMenu;
+class KMenuBar;
class KSelectAction;
class AccountsModel;
class AccountsFilterModel;
@@ -109,7 +111,7 @@ private:
void setupTelepathy();
KMenuBar *m_globalMenu;
- KAction *m_settingsDialog;
+ QAction *m_settingsDialog;
KAction *m_joinChatRoom;
KAction *m_makeCall;
KAction *m_mergeContacts;
@@ -126,7 +128,7 @@ private:
KAction *m_searchContactAction;
KAction *m_startChatAction;
KDualAction *m_sortByPresenceAction;
- KAction *m_quitAction;
+ QAction *m_quitAction;
Tp::AccountManagerPtr m_accountManager;
diff --git a/main.cpp b/main.cpp
index a5b6806..0e4459f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -21,7 +21,7 @@
#include "main-widget.h"
-#include <KAboutData>
+#include <k4aboutdata.h>
#include <KCmdLineArgs>
#include <KDebug>
#include <KUniqueApplication>
@@ -34,8 +34,8 @@
int main(int argc, char *argv[])
{
- KAboutData aboutData("ktp-contactlist", 0, ki18n("KDE Telepathy Contact List"), KTP_CONTACT_LIST_VERSION,
- ki18n("KDE Telepathy Contact List"), KAboutData::License_GPL,
+ K4AboutData aboutData("ktp-contactlist", 0, ki18n("KDE Telepathy Contact List"), KTP_CONTACT_LIST_VERSION,
+ ki18n("KDE Telepathy Contact List"), K4AboutData::License_GPL,
ki18n("(C) 2011, Martin Klapetek"));
aboutData.addAuthor(ki18nc("@info:credit", "Martin Klapetek"), ki18n("Developer"),
diff --git a/tooltips/contacttooltip.cpp b/tooltips/contacttooltip.cpp
index 67e6bc7..b738e3d 100644
--- a/tooltips/contacttooltip.cpp
+++ b/tooltips/contacttooltip.cpp
@@ -33,6 +33,9 @@
#include <KToolInvocation>
#include <KDebug>
+#include <KLocalizedString>
+#include <KIconLoader>
+#include <KIcon>
ContactToolTip::ContactToolTip(const QModelIndex &index) :
QWidget(0),
@@ -71,7 +74,7 @@ ContactToolTip::ContactToolTip(const QModelIndex &index) :
ui->presenceIcon->setPixmap(presence.icon().pixmap(smallIconSize, smallIconSize));
ui->presenceLabel->setText(presenceText);
ui->presenceMessageLabel->setText(getTextWithHyperlinks(presenceMessage));
- ui->blockedLabel->setShown(index.data(KTp::ContactIsBlockedRole).toBool());
+ ui->blockedLabel->setVisible(index.data(KTp::ContactIsBlockedRole).toBool());
const Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
if (!account.isNull()) {
diff --git a/tooltips/ktooltipwindow.cpp b/tooltips/ktooltipwindow.cpp
index 749b010..f321c24 100644
--- a/tooltips/ktooltipwindow.cpp
+++ b/tooltips/ktooltipwindow.cpp
@@ -91,4 +91,4 @@ void KToolTipWindow::arc(QPainterPath &path, qreal cx, qreal cy, qreal radius, q
path.arcTo(cx-radius, cy-radius, radius * 2, radius * 2, angle, sweeplength);
}
-#include "ktooltipwindow_p.moc"
+#include "ktooltipwindow.moc"
diff --git a/tooltips/persontooltip.cpp b/tooltips/persontooltip.cpp
index 24aa2af..39a49a9 100644
--- a/tooltips/persontooltip.cpp
+++ b/tooltips/persontooltip.cpp
@@ -31,7 +31,10 @@
#include <QDesktopServices>
#include <QTextDocument>
+#include <KIconLoader>
+#include <KLocalizedString>
#include <KToolInvocation>
+#include <KIcon>
bool contactLessThan(const QVariant &left, const QVariant &right)
{
@@ -95,7 +98,7 @@ PersonToolTip::PersonToolTip(const QModelIndex &index) :
connect(ui->presenceMessageLabel, SIGNAL(linkActivated(QString)), this, SLOT(openLink(QString)));
- ui->blockedLabel->setShown(index.data(KTp::ContactIsBlockedRole).toBool());
+ ui->blockedLabel->setVisible(index.data(KTp::ContactIsBlockedRole).toBool());
}
PersonToolTip::~PersonToolTip()
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list