[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:08:12 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=e8c7ddc
The following commit has been merged in the master branch:
commit e8c7ddcf4f1649c36f3626d0750b113002624958
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Thu Dec 8 16:22:29 2011 +0100
port-to-0.9: Rename include paths and variables
---
account-button.cpp | 4 ++--
account-button.h | 4 ++--
account-buttons-panel.cpp | 6 +++---
account-buttons-panel.h | 2 +-
avatar-button.h | 2 +-
dialogs/add-contact-dialog.cpp | 6 +++---
dialogs/add-contact-dialog.h | 2 +-
dialogs/contact-info.cpp | 4 ++--
dialogs/contact-info.h | 2 +-
dialogs/custom-presence-dialog.cpp | 2 +-
dialogs/join-chat-room-dialog.cpp | 2 +-
dialogs/join-chat-room-dialog.h | 2 +-
dialogs/remove-contact-dialog.cpp | 2 +-
dialogs/remove-contact-dialog.h | 2 +-
fetch-avatar-job.h | 2 +-
global-presence-chooser.cpp | 4 ++--
global-presence-chooser.h | 2 +-
main-widget.cpp | 12 ++++++------
main-widget.h | 2 +-
main.cpp | 4 ++--
20 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/account-button.cpp b/account-button.cpp
index f924bb7..1bcc93c 100644
--- a/account-button.cpp
+++ b/account-button.cpp
@@ -32,8 +32,8 @@
#include <KIconLoader>
#include <KLineEdit>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/PendingOperation>
AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent)
: QToolButton(parent),
diff --git a/account-button.h b/account-button.h
index 4e5e0c8..fb930c1 100644
--- a/account-button.h
+++ b/account-button.h
@@ -23,8 +23,8 @@
#include <QToolButton>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Presence>
class QAction;
class KPixmapSequenceOverlayPainter;
diff --git a/account-buttons-panel.cpp b/account-buttons-panel.cpp
index b499f32..7c6712e 100644
--- a/account-buttons-panel.cpp
+++ b/account-buttons-panel.cpp
@@ -20,9 +20,9 @@
#include "account-buttons-panel.h"
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountSet>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountSet>
#include <QHBoxLayout>
diff --git a/account-buttons-panel.h b/account-buttons-panel.h
index 0f18d40..3e7f9b6 100644
--- a/account-buttons-panel.h
+++ b/account-buttons-panel.h
@@ -23,7 +23,7 @@
#include <QWidget>
-#include <TelepathyQt4/AccountSet>
+#include <TelepathyQt/AccountSet>
class QHBoxLayout;
diff --git a/avatar-button.h b/avatar-button.h
index 6f1caa8..b49d5eb 100644
--- a/avatar-button.h
+++ b/avatar-button.h
@@ -22,7 +22,7 @@
#define AVATAR_BUTTON_H
#include <QtGui/QToolButton>
-#include <TelepathyQt4/Account>
+#include <TelepathyQt/Account>
namespace Tp {
class PendingOperation;
diff --git a/dialogs/add-contact-dialog.cpp b/dialogs/add-contact-dialog.cpp
index 257da2c..23ca649 100644
--- a/dialogs/add-contact-dialog.cpp
+++ b/dialogs/add-contact-dialog.cpp
@@ -29,9 +29,9 @@
#include <QDebug>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ContactManager>
/** A filter which only lists connections which accept adding contacts*/
class SubscribableAccountsModel : public QSortFilterProxyModel
diff --git a/dialogs/add-contact-dialog.h b/dialogs/add-contact-dialog.h
index d8c9e61..b6ff8a4 100644
--- a/dialogs/add-contact-dialog.h
+++ b/dialogs/add-contact-dialog.h
@@ -23,7 +23,7 @@
#include <KDialog>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
namespace Ui {
class AddContactDialog;
diff --git a/dialogs/contact-info.cpp b/dialogs/contact-info.cpp
index 7525bcf..c791ade 100644
--- a/dialogs/contact-info.cpp
+++ b/dialogs/contact-info.cpp
@@ -21,8 +21,8 @@
#include "contact-info.h"
#include "ui_contact-info.h"
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/Presence>
#include <QtGui/QPixmap>
diff --git a/dialogs/contact-info.h b/dialogs/contact-info.h
index 95add7d..ef81d03 100644
--- a/dialogs/contact-info.h
+++ b/dialogs/contact-info.h
@@ -23,7 +23,7 @@
#define CONTACTINFO_H
#include <KDialog>
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/Contact>
namespace Ui {
diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 88716c6..2c1ad4f 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -34,7 +34,7 @@
#include <KDE/KConfig>
#include <KDE/KSharedConfigPtr>
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/Presence>
#include <QLineEdit>
#include <QKeyEvent>
diff --git a/dialogs/join-chat-room-dialog.cpp b/dialogs/join-chat-room-dialog.cpp
index 5e9dcc3..f5c77a7 100644
--- a/dialogs/join-chat-room-dialog.cpp
+++ b/dialogs/join-chat-room-dialog.cpp
@@ -25,7 +25,7 @@
#include <KDE/KPushButton>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
JoinChatRoomDialog::JoinChatRoomDialog(Tp::AccountManagerPtr accountManager, QWidget* parent)
: KDialog(parent, Qt::Dialog)
diff --git a/dialogs/join-chat-room-dialog.h b/dialogs/join-chat-room-dialog.h
index 71f4704..d0aba22 100644
--- a/dialogs/join-chat-room-dialog.h
+++ b/dialogs/join-chat-room-dialog.h
@@ -22,7 +22,7 @@
#define JOINCHATROOMDIALOG_H
#include <KDialog>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
namespace Ui {
class JoinChatRoomDialog;
diff --git a/dialogs/remove-contact-dialog.cpp b/dialogs/remove-contact-dialog.cpp
index 2e40ca1..3aeb043 100644
--- a/dialogs/remove-contact-dialog.cpp
+++ b/dialogs/remove-contact-dialog.cpp
@@ -27,7 +27,7 @@
#include <QtGui/QCheckBox>
#include <QtGui/QLabel>
-#include <TelepathyQt4/AvatarData>
+#include <TelepathyQt/AvatarData>
RemoveContactDialog::RemoveContactDialog(Tp::ContactPtr contact, QWidget* parent)
: KDialog(parent, Qt::Dialog)
diff --git a/dialogs/remove-contact-dialog.h b/dialogs/remove-contact-dialog.h
index f225fc9..362f069 100644
--- a/dialogs/remove-contact-dialog.h
+++ b/dialogs/remove-contact-dialog.h
@@ -23,7 +23,7 @@
#include <KDialog>
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/Contact>
namespace Ui {
class RemoveContactDialog;
diff --git a/fetch-avatar-job.h b/fetch-avatar-job.h
index 633351e..f9841e2 100644
--- a/fetch-avatar-job.h
+++ b/fetch-avatar-job.h
@@ -24,7 +24,7 @@
#include <KJob>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
class KUrl;
class FetchAvatarJob : public KJob
diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index d9d0c1d..6f8117e 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -35,8 +35,8 @@
#include <KPixmapSequenceOverlayPainter>
#include <KMessageBox>
-#include <TelepathyQt4/Presence>
-#include <TelepathyQt4/Account>
+#include <TelepathyQt/Presence>
+#include <TelepathyQt/Account>
#include <QMouseEvent>
#include <QtGui/QToolTip>
diff --git a/global-presence-chooser.h b/global-presence-chooser.h
index 3fa0e1a..6549aaa 100644
--- a/global-presence-chooser.h
+++ b/global-presence-chooser.h
@@ -23,7 +23,7 @@
#include <KComboBox>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
class KPixmapSequenceOverlayPainter;
class PresenceModel;
diff --git a/main-widget.cpp b/main-widget.cpp
index 646dae4..65fd061 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -34,12 +34,12 @@
#include <QWidgetAction>
#include <QCloseEvent>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/PendingChannelRequest>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/ClientRegistrar>
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingChannelRequest>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/ContactManager>
#include <KDebug>
#include <KDialog>
diff --git a/main-widget.h b/main-widget.h
index 65ec9f9..037e4f4 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -27,7 +27,7 @@
#include <QtGui/QWidget>
#include <QtGui/QStyledItemDelegate>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
#include <KXmlGuiWindow>
#include <KAction>
diff --git a/main.cpp b/main.cpp
index 8f2ffa8..425a83b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,8 +26,8 @@
#include <KDebug>
#include <KUniqueApplication>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Debug>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Debug>
#include "contact-list-application.h"
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list