[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:58:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=188f2b7
The following commit has been merged in the master branch:
commit 188f2b78cf700caa3413a7f03badbfcc922beda0
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Sat Dec 10 14:59:47 2011 +0100
port-to-0.9: Rename relevant include paths and variables
---
main.cpp | 26 +++++++++++++-------------
password-prompt.h | 2 +-
sasl-auth-op.cpp | 4 ++--
sasl-auth-op.h | 10 +++++-----
sasl-handler.cpp | 6 +++---
sasl-handler.h | 2 +-
tls-cert-verifier-op.cpp | 8 ++++----
tls-cert-verifier-op.h | 12 ++++++------
tls-handler.cpp | 6 +++---
tls-handler.h | 2 +-
10 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/main.cpp b/main.cpp
index 4b91b9c..eb3eeb5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -22,15 +22,15 @@
#include <KApplication>
#include <KDebug>
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/ConnectionFactory>
-#include <TelepathyQt4/ChannelClassSpec>
-#include <TelepathyQt4/ChannelFactory>
-#include <TelepathyQt4/ClientRegistrar>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/ConnectionFactory>
+#include <TelepathyQt/ChannelClassSpec>
+#include <TelepathyQt/ChannelFactory>
+#include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/Types>
#include "sasl-handler.h"
#include "tls-handler.h"
@@ -70,9 +70,9 @@ int main(int argc, char *argv[])
Tp::ChannelClassSpecList saslFilter;
QVariantMap saslOtherProperties;
saslOtherProperties.insert(
- QLatin1String(TELEPATHY_INTERFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION ".AuthenticationMethod"),
- TP_QT4_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION);
- saslFilter.append(Tp::ChannelClassSpec(TP_QT4_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
+ TP_QT_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION + QLatin1String(".AuthenticationMethod"),
+ TP_QT_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION);
+ saslFilter.append(Tp::ChannelClassSpec(TP_QT_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
Tp::HandleTypeNone, false, saslOtherProperties));
Tp::SharedPtr<SaslHandler> saslHandler = Tp::SharedPtr<SaslHandler>(new SaslHandler(saslFilter));
if (!clientRegistrar->registerClient(
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
}
Tp::ChannelClassSpecList tlsFilter;
- tlsFilter.append(Tp::ChannelClassSpec(TP_QT4_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
+ tlsFilter.append(Tp::ChannelClassSpec(TP_QT_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
Tp::HandleTypeNone, false));
Tp::SharedPtr<TlsHandler> tlsHandler = Tp::SharedPtr<TlsHandler>(new TlsHandler(tlsFilter));
if (!clientRegistrar->registerClient(
diff --git a/password-prompt.h b/password-prompt.h
index 3945fb4..fc686ca 100644
--- a/password-prompt.h
+++ b/password-prompt.h
@@ -21,7 +21,7 @@
#include <KDialog>
-#include <TelepathyQt4/Account>
+#include <TelepathyQt/Account>
namespace Ui
{
diff --git a/sasl-auth-op.cpp b/sasl-auth-op.cpp
index 1174196..092ee75 100644
--- a/sasl-auth-op.cpp
+++ b/sasl-auth-op.cpp
@@ -20,7 +20,7 @@
#include "sasl-auth-op.h"
-#include <TelepathyQt4/PendingVariantMap>
+#include <TelepathyQt/PendingVariantMap>
#include <KDebug>
#include <KLocalizedString>
@@ -65,7 +65,7 @@ void SaslAuthOp::gotProperties(Tp::PendingOperation *op)
kWarning() << "X-TELEPATHY-PASSWORD is the only supported SASL mechanism and "
"is not available";
m_channel->requestClose();
- setFinishedWithError(TP_QT4_ERROR_NOT_IMPLEMENTED,
+ setFinishedWithError(TP_QT_ERROR_NOT_IMPLEMENTED,
QLatin1String("X-TELEPATHY-PASSWORD is the only supported SASL mechanism and "
" is not available"));
return;
diff --git a/sasl-auth-op.h b/sasl-auth-op.h
index c85178d..e58543b 100644
--- a/sasl-auth-op.h
+++ b/sasl-auth-op.h
@@ -21,11 +21,11 @@
#ifndef SASLAUTHOP_H
#define SASLAUTHOP_H
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/Types>
class SaslAuthOp : public Tp::PendingOperation
{
diff --git a/sasl-handler.cpp b/sasl-handler.cpp
index 8121e6f..c57c0d5 100644
--- a/sasl-handler.cpp
+++ b/sasl-handler.cpp
@@ -26,9 +26,9 @@
#include <QDBusConnection>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/ChannelDispatchOperation>
-#include <TelepathyQt4/MethodInvocationContext>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/ChannelDispatchOperation>
+#include <TelepathyQt/MethodInvocationContext>
#include <KDebug>
diff --git a/sasl-handler.h b/sasl-handler.h
index 3f4bb25..dcb34e4 100644
--- a/sasl-handler.h
+++ b/sasl-handler.h
@@ -23,7 +23,7 @@
#include <QObject>
-#include <TelepathyQt4/AbstractClientHandler>
+#include <TelepathyQt/AbstractClientHandler>
namespace Tp
{
diff --git a/tls-cert-verifier-op.cpp b/tls-cert-verifier-op.cpp
index 45ce183..dbf28b5 100644
--- a/tls-cert-verifier-op.cpp
+++ b/tls-cert-verifier-op.cpp
@@ -19,7 +19,7 @@
#include "tls-cert-verifier-op.h"
-#include <TelepathyQt4/PendingVariantMap>
+#include <TelepathyQt/PendingVariantMap>
#include <KDebug>
@@ -32,11 +32,11 @@ TlsCertVerifierOp::TlsCertVerifierOp(const Tp::AccountPtr &account,
m_channel(channel)
{
QString certificatePath = qdbus_cast<QString>(channel->immutableProperties().value(
- TP_QT4_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION + ".ServerCertificate"));
+ TP_QT_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION + ".ServerCertificate"));
m_hostname = qdbus_cast<QString>(channel->immutableProperties().value(
- TP_QT4_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION + ".Hostname"));
+ TP_QT_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION + ".Hostname"));
m_referenceIdentities = qdbus_cast<QStringList>(channel->immutableProperties().value(
- TP_QT4_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION + ".ReferenceIdentities"));
+ TP_QT_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION + ".ReferenceIdentities"));
m_authTLSCertificateIface = new Tp::Client::AuthenticationTLSCertificateInterface(
channel->dbusConnection(), channel->busName(), certificatePath);
diff --git a/tls-cert-verifier-op.h b/tls-cert-verifier-op.h
index 4cd9a12..121cf41 100644
--- a/tls-cert-verifier-op.h
+++ b/tls-cert-verifier-op.h
@@ -21,12 +21,12 @@
#ifndef TLSCERTVERIFIEROP_H
#define TLSCERTVERIFIEROP_H
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AuthenticationTLSCertificateInterface>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AuthenticationTLSCertificateInterface>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/Types>
// FIXME: Move this to tp-qt4 itself
#include "types.h"
diff --git a/tls-handler.cpp b/tls-handler.cpp
index 62fda8f..d45bdb8 100644
--- a/tls-handler.cpp
+++ b/tls-handler.cpp
@@ -25,9 +25,9 @@
#include <QDBusConnection>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/ChannelDispatchOperation>
-#include <TelepathyQt4/MethodInvocationContext>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/ChannelDispatchOperation>
+#include <TelepathyQt/MethodInvocationContext>
#include <KDebug>
diff --git a/tls-handler.h b/tls-handler.h
index 4d88315..0e036b1 100644
--- a/tls-handler.h
+++ b/tls-handler.h
@@ -22,7 +22,7 @@
#include <QObject>
-#include <TelepathyQt4/AbstractClientHandler>
+#include <TelepathyQt/AbstractClientHandler>
namespace Tp
{
--
ktp-auth-handler packaging
More information about the pkg-kde-commits
mailing list