[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:00:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=772a7a1
The following commit has been merged in the master branch:
commit 772a7a1bb4d8beff4ffe6cd1a39a563f7facdaa4
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Sat Dec 10 14:48:08 2011 +0100
port-to-0.9: Rename relevant include paths and variables
---
.../abstract-account-parameters-widget.h | 2 +-
src/KCMTelepathyAccounts/abstract-account-ui.h | 2 +-
src/KCMTelepathyAccounts/account-edit-widget.cpp | 2 +-
src/KCMTelepathyAccounts/account-edit-widget.h | 2 +-
src/KCMTelepathyAccounts/parameter-edit-model.cpp | 4 ++--
src/KCMTelepathyAccounts/parameter-edit-model.h | 4 ++--
src/KCMTelepathyAccounts/parameter-edit-widget.h | 2 +-
src/KCMTelepathyAccounts/parameter-item.h | 4 ++--
src/KCMTelepathyAccounts/profile-item.cpp | 2 +-
src/KCMTelepathyAccounts/profile-item.h | 2 +-
src/KCMTelepathyAccounts/profile-list-model.cpp | 4 ++--
src/KCMTelepathyAccounts/profile-list-model.h | 4 ++--
src/KCMTelepathyAccounts/profile-select-widget.cpp | 6 +++---
src/account-item.cpp | 4 ++--
src/account-item.h | 2 +-
src/accounts-list-model.cpp | 2 +-
src/accounts-list-model.h | 2 +-
src/add-account-assistant.cpp | 6 +++---
src/add-account-assistant.h | 2 +-
src/edit-account-dialog.cpp | 4 ++--
src/kcm-telepathy-accounts.cpp | 12 ++++++------
src/kcm-telepathy-accounts.h | 2 +-
src/salut-details-dialog.cpp | 12 ++++++------
src/salut-details-dialog.h | 2 +-
src/salut-enabler.cpp | 12 ++++++------
src/salut-enabler.h | 2 +-
26 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
index 130047f..c692681 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
@@ -29,7 +29,7 @@
#include <QtCore/QVariant>
#include <QtGui/QWidget>
-#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt/ConnectionManager>
class ParameterEditModel;
class ParameterEditModel;
diff --git a/src/KCMTelepathyAccounts/abstract-account-ui.h b/src/KCMTelepathyAccounts/abstract-account-ui.h
index 3641442..9494e7a 100644
--- a/src/KCMTelepathyAccounts/abstract-account-ui.h
+++ b/src/KCMTelepathyAccounts/abstract-account-ui.h
@@ -28,7 +28,7 @@
#include <QtCore/QObject>
#include <QtCore/QVariant>
-#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt/ConnectionManager>
class AbstractAccountParametersWidget;
class ParameterEditModel;
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index cf3e45d..14f1b75 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -33,7 +33,7 @@
#include <KLocale>
#include <KTitleWidget>
-#include <TelepathyQt4/Profile>
+#include <TelepathyQt/Profile>
#include <QtCore/QList>
#include <QtGui/QCheckBox>
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.h b/src/KCMTelepathyAccounts/account-edit-widget.h
index 731c39a..52dc89d 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.h
+++ b/src/KCMTelepathyAccounts/account-edit-widget.h
@@ -27,7 +27,7 @@
#include <QWidget>
#include <KTitleWidget>
-#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt/ConnectionManager>
#include "parameter-edit-model.h"
enum ConnectOnLoadType{
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index 4b27cee..f461674 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -31,8 +31,8 @@
#include <QtGui/QValidator>
-#include <TelepathyQt4/Profile>
-#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt/Profile>
+#include <TelepathyQt/ConnectionManager>
ParameterEditModel::ParameterEditModel(QObject *parent)
: QAbstractListModel(parent)
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
index 0dd3d60..3b2b08b 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.h
@@ -27,8 +27,8 @@
#include <QtCore/QAbstractListModel>
-#include <TelepathyQt4/Profile>
-#include <TelepathyQt4/ProtocolParameter>
+#include <TelepathyQt/Profile>
+#include <TelepathyQt/ProtocolParameter>
#include <KTitleWidget>
diff --git a/src/KCMTelepathyAccounts/parameter-edit-widget.h b/src/KCMTelepathyAccounts/parameter-edit-widget.h
index e86dff4..eed77e0 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-widget.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-widget.h
@@ -26,7 +26,7 @@
#include "kcm_telepathy_accounts_export.h"
-#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt/ConnectionManager>
class KCM_TELEPATHY_ACCOUNTS_EXPORT ParameterEditWidget : public AbstractAccountParametersWidget
{
diff --git a/src/KCMTelepathyAccounts/parameter-item.h b/src/KCMTelepathyAccounts/parameter-item.h
index 7f9f6b7..b5648ee 100644
--- a/src/KCMTelepathyAccounts/parameter-item.h
+++ b/src/KCMTelepathyAccounts/parameter-item.h
@@ -25,8 +25,8 @@
#include <QtCore/QVariant>
#include <QtGui/QValidator>
-#include <TelepathyQt4/ConnectionManager>
-#include <TelepathyQt4/Profile>
+#include <TelepathyQt/ConnectionManager>
+#include <TelepathyQt/Profile>
class ParameterItem : public QObject
diff --git a/src/KCMTelepathyAccounts/profile-item.cpp b/src/KCMTelepathyAccounts/profile-item.cpp
index 8e42a36..6382e79 100644
--- a/src/KCMTelepathyAccounts/profile-item.cpp
+++ b/src/KCMTelepathyAccounts/profile-item.cpp
@@ -24,7 +24,7 @@
#include "profile-list-model.h"
#include "dictionary.h"
-#include <TelepathyQt4/Profile>
+#include <TelepathyQt/Profile>
#include <KDebug>
#include <KIcon>
diff --git a/src/KCMTelepathyAccounts/profile-item.h b/src/KCMTelepathyAccounts/profile-item.h
index 853c9ff..11e2eaf 100644
--- a/src/KCMTelepathyAccounts/profile-item.h
+++ b/src/KCMTelepathyAccounts/profile-item.h
@@ -26,7 +26,7 @@
#include <QtCore/QObject>
-#include <TelepathyQt4/Profile>
+#include <TelepathyQt/Profile>
class ProfileListModel;
class KIcon;
diff --git a/src/KCMTelepathyAccounts/profile-list-model.cpp b/src/KCMTelepathyAccounts/profile-list-model.cpp
index 2e1fcc7..dcffa68 100644
--- a/src/KCMTelepathyAccounts/profile-list-model.cpp
+++ b/src/KCMTelepathyAccounts/profile-list-model.cpp
@@ -23,8 +23,8 @@
#include "profile-item.h"
-#include <TelepathyQt4/ProfileManager>
-#include <TelepathyQt4/PendingStringList>
+#include <TelepathyQt/ProfileManager>
+#include <TelepathyQt/PendingStringList>
#include <KIcon>
#include <KDebug>
diff --git a/src/KCMTelepathyAccounts/profile-list-model.h b/src/KCMTelepathyAccounts/profile-list-model.h
index dbc2f19..9917555 100644
--- a/src/KCMTelepathyAccounts/profile-list-model.h
+++ b/src/KCMTelepathyAccounts/profile-list-model.h
@@ -24,9 +24,9 @@
#include <QtCore/QAbstractListModel>
-#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt/ConnectionManager>
-namespace TelepathyQt4 {
+namespace TelepathyQt {
class PendingOperation;
}
diff --git a/src/KCMTelepathyAccounts/profile-select-widget.cpp b/src/KCMTelepathyAccounts/profile-select-widget.cpp
index 8786dc9..d8f073a 100644
--- a/src/KCMTelepathyAccounts/profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/profile-select-widget.cpp
@@ -28,9 +28,9 @@
#include <KDebug>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/ProfileManager>
-#include <TelepathyQt4/Feature>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/ProfileManager>
+#include <TelepathyQt/Feature>
#include <QSortFilterProxyModel>
#include <QItemSelectionModel>
diff --git a/src/account-item.cpp b/src/account-item.cpp
index 417fad7..b560cdf 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -33,8 +33,8 @@
#include <QtCore/QTimer>
#include <QtGui/QPainter>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
#include <KPixmapSequence>
AccountItem::AccountItem(const Tp::AccountPtr &account, AccountsListModel *parent)
diff --git a/src/account-item.h b/src/account-item.h
index 28adfd5..6e2afd7 100644
--- a/src/account-item.h
+++ b/src/account-item.h
@@ -23,7 +23,7 @@
#include <QtCore/QObject>
-#include <TelepathyQt4/Account>
+#include <TelepathyQt/Account>
class KIcon;
diff --git a/src/accounts-list-model.cpp b/src/accounts-list-model.cpp
index d8f9906..a77ff56 100644
--- a/src/accounts-list-model.cpp
+++ b/src/accounts-list-model.cpp
@@ -25,7 +25,7 @@
#include <KDebug>
#include <KIcon>
-#include <TelepathyQt4/Account>
+#include <TelepathyQt/Account>
AccountsListModel::AccountsListModel(QObject *parent)
diff --git a/src/accounts-list-model.h b/src/accounts-list-model.h
index 1480191..e0a8461 100644
--- a/src/accounts-list-model.h
+++ b/src/accounts-list-model.h
@@ -23,7 +23,7 @@
#include <QtCore/QAbstractListModel>
-#include <TelepathyQt4/Account>
+#include <TelepathyQt/Account>
class AccountItem;
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index e4c5036..1c2e90d 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -40,9 +40,9 @@
#include <QtGui/QHBoxLayout>
#include <QtGui/QCheckBox>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/PendingAccount>
-#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingAccount>
+#include <TelepathyQt/PendingOperation>
class AddAccountAssistant::Private
{
diff --git a/src/add-account-assistant.h b/src/add-account-assistant.h
index 3647912..b85d44e 100644
--- a/src/add-account-assistant.h
+++ b/src/add-account-assistant.h
@@ -25,7 +25,7 @@
#include <KAssistantDialog>
#include <KTitleWidget>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
namespace Tp {
class PendingOperation;
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 6419ffe..82cf59e 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -37,8 +37,8 @@
#include <QtCore/QList>
-#include <TelepathyQt4/ConnectionManager>
-#include <TelepathyQt4/PendingStringList>
+#include <TelepathyQt/ConnectionManager>
+#include <TelepathyQt/PendingStringList>
class EditAccountDialog::Private
{
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index aa9f0a1..b23e02e 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -41,12 +41,12 @@
#include <KMessageWidget>
#include <KPixmapSequenceOverlayPainter>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/ConnectionManager>
#include "salut-enabler.h"
#include <KPixmapSequence>
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index c1698a9..a752065 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -24,7 +24,7 @@
#include <KCModule>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
class QFrame;
class KPixmapSequenceOverlayPainter;
diff --git a/src/salut-details-dialog.cpp b/src/salut-details-dialog.cpp
index 2bb322a..46fb94c 100644
--- a/src/salut-details-dialog.cpp
+++ b/src/salut-details-dialog.cpp
@@ -30,12 +30,12 @@
#include <KLocalizedString>
#include <KDebug>
-#include <TelepathyQt4/ConnectionManager>
-#include <TelepathyQt4/ProfileManager>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/PendingAccount>
+#include <TelepathyQt/ConnectionManager>
+#include <TelepathyQt/ProfileManager>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingAccount>
class SalutDetailsDialog::Private
{
diff --git a/src/salut-details-dialog.h b/src/salut-details-dialog.h
index 727fed2..5a36adc 100644
--- a/src/salut-details-dialog.h
+++ b/src/salut-details-dialog.h
@@ -27,7 +27,7 @@
#include <KDialog>
#include <KTitleWidget>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
class SalutDetailsDialog : public KDialog
{
diff --git a/src/salut-enabler.cpp b/src/salut-enabler.cpp
index 69f7212..ca7a46e 100644
--- a/src/salut-enabler.cpp
+++ b/src/salut-enabler.cpp
@@ -20,12 +20,12 @@
#include "salut-enabler.h"
-#include <TelepathyQt4/ConnectionManager>
-#include <TelepathyQt4/ProfileManager>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/PendingAccount>
+#include <TelepathyQt/ConnectionManager>
+#include <TelepathyQt/ProfileManager>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingAccount>
#include <KDebug>
#include <KUser>
diff --git a/src/salut-enabler.h b/src/salut-enabler.h
index e47dd14..8a86133 100644
--- a/src/salut-enabler.h
+++ b/src/salut-enabler.h
@@ -23,7 +23,7 @@
#include <QObject>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
#include <KTitleWidget>
class QFrame;
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list