[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:04:43 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=45bcbcd
The following commit has been merged in the master branch:
commit 45bcbcdb06f5c785993257a5fbb0c1572914cc83
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Thu Dec 8 16:11:56 2011 +0100
port-to-0.9: Rename relevant include paths and variables
---
KTelepathy/Models/accounts-model-item.cpp | 6 +-
KTelepathy/Models/accounts-model-item.h | 8 +-
KTelepathy/Models/accounts-model.cpp | 6 +-
KTelepathy/Models/accounts-model.h | 10 +-
KTelepathy/Models/contact-model-item.cpp | 10 +-
KTelepathy/Models/contact-model-item.h | 4 +-
KTelepathy/Models/groups-model-item.cpp | 6 +-
KTelepathy/Models/groups-model-item.h | 8 +-
KTelepathy/Models/groups-model.cpp | 8 +-
KTelepathy/Models/groups-model.h | 10 +-
KTelepathy/Models/proxy-tree-node.cpp | 2 +-
KTelepathy/Models/tree-node.cpp | 2 +-
KTelepathy/Models/tree-node.h | 2 +-
KTelepathy/error-dictionary.cpp | 198 +++++++++++++--------------
KTelepathy/global-presence.cpp | 4 +-
KTelepathy/global-presence.h | 4 +-
KTelepathy/presence.h | 2 +-
KTelepathy/telepathy-handler-application.cpp | 4 +-
KTelepathy/wallet-interface.h | 2 +-
19 files changed, 148 insertions(+), 148 deletions(-)
diff --git a/KTelepathy/Models/accounts-model-item.cpp b/KTelepathy/Models/accounts-model-item.cpp
index db1d98f..a057714 100644
--- a/KTelepathy/Models/accounts-model-item.cpp
+++ b/KTelepathy/Models/accounts-model-item.cpp
@@ -1,6 +1,6 @@
/*
* Accounts model item, represents an account in the contactlist tree
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -22,8 +22,8 @@
#include "accounts-model-item.h"
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/ContactManager>
#include "accounts-model.h"
#include "contact-model-item.h"
diff --git a/KTelepathy/Models/accounts-model-item.h b/KTelepathy/Models/accounts-model-item.h
index e3dc0f3..14692d7 100644
--- a/KTelepathy/Models/accounts-model-item.h
+++ b/KTelepathy/Models/accounts-model-item.h
@@ -1,6 +1,6 @@
/*
* Accounts model item, represents an account in the contactlist tree
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -23,9 +23,9 @@
#ifndef TELEPATHY_ACCOUNTS_MODEL_ITEM_H
#define TELEPATHY_ACCOUNTS_MODEL_ITEM_H
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/Types>
#include <QtCore/QVariant> //needed for declare metatype
diff --git a/KTelepathy/Models/accounts-model.cpp b/KTelepathy/Models/accounts-model.cpp
index 7086330..c2a78c3 100644
--- a/KTelepathy/Models/accounts-model.cpp
+++ b/KTelepathy/Models/accounts-model.cpp
@@ -1,6 +1,6 @@
/*
* Accounts and contacts model
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -22,8 +22,8 @@
#include "accounts-model.h"
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingReady>
#include "accounts-model-item.h"
#include "contact-model-item.h"
diff --git a/KTelepathy/Models/accounts-model.h b/KTelepathy/Models/accounts-model.h
index d96487b..09c6c7f 100644
--- a/KTelepathy/Models/accounts-model.h
+++ b/KTelepathy/Models/accounts-model.h
@@ -1,6 +1,6 @@
/*
* Accounts and contacts model
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -25,10 +25,10 @@
#include <QAbstractListModel>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/Types>
#include <KTelepathy/ktelepathy-export.h>
diff --git a/KTelepathy/Models/contact-model-item.cpp b/KTelepathy/Models/contact-model-item.cpp
index e66ae6b..5014568 100644
--- a/KTelepathy/Models/contact-model-item.cpp
+++ b/KTelepathy/Models/contact-model-item.cpp
@@ -1,6 +1,6 @@
/*
* Contacts model item, represents a contact in the contactlist tree
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -29,10 +29,10 @@
#include <KGlobal>
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/ContactCapabilities>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/RequestableChannelClassSpec>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/ContactCapabilities>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/RequestableChannelClassSpec>
diff --git a/KTelepathy/Models/contact-model-item.h b/KTelepathy/Models/contact-model-item.h
index 6526642..b22d059 100644
--- a/KTelepathy/Models/contact-model-item.h
+++ b/KTelepathy/Models/contact-model-item.h
@@ -1,6 +1,6 @@
/*
* Contacts model item, represents a contact in the contactlist tree
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -23,7 +23,7 @@
#ifndef TELEPATHY_CONTACT_MODEL_ITEM_H
#define TELEPATHY_CONTACT_MODEL_ITEM_H
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
#include <QtCore/QVariant> //needed for declare metatype
diff --git a/KTelepathy/Models/groups-model-item.cpp b/KTelepathy/Models/groups-model-item.cpp
index 9a88788..d4363b0 100644
--- a/KTelepathy/Models/groups-model-item.cpp
+++ b/KTelepathy/Models/groups-model-item.cpp
@@ -1,6 +1,6 @@
/*
* Contact groups model item, represents a group in the contactlist tree
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -22,8 +22,8 @@
#include "groups-model-item.h"
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/ContactManager>
#include "groups-model.h"
#include "accounts-model.h"
diff --git a/KTelepathy/Models/groups-model-item.h b/KTelepathy/Models/groups-model-item.h
index 1f2efab..fefcde0 100644
--- a/KTelepathy/Models/groups-model-item.h
+++ b/KTelepathy/Models/groups-model-item.h
@@ -1,6 +1,6 @@
/*
* Contact groups model item, represents a group in the contactlist tree
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -23,9 +23,9 @@
#ifndef TELEPATHY_GROUPS_MODEL_ITEM_H
#define TELEPATHY_GROUPS_MODEL_ITEM_H
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/Types>
#include <QtCore/QVariant> //needed for declare metatype
diff --git a/KTelepathy/Models/groups-model.cpp b/KTelepathy/Models/groups-model.cpp
index 2827e86..ad363d2 100644
--- a/KTelepathy/Models/groups-model.cpp
+++ b/KTelepathy/Models/groups-model.cpp
@@ -1,6 +1,6 @@
/*
* Contact groups model
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -22,9 +22,9 @@
#include "groups-model.h"
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/PendingReady>
#include "accounts-model-item.h"
#include "groups-model-item.h"
diff --git a/KTelepathy/Models/groups-model.h b/KTelepathy/Models/groups-model.h
index d3cd282..23f5c3f 100644
--- a/KTelepathy/Models/groups-model.h
+++ b/KTelepathy/Models/groups-model.h
@@ -1,6 +1,6 @@
/*
* Contact groups model
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
@@ -25,10 +25,10 @@
#include <QAbstractListModel>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/Types>
#include <KTelepathy/ktelepathy-export.h>
diff --git a/KTelepathy/Models/proxy-tree-node.cpp b/KTelepathy/Models/proxy-tree-node.cpp
index 966f7e0..fb5674b 100644
--- a/KTelepathy/Models/proxy-tree-node.cpp
+++ b/KTelepathy/Models/proxy-tree-node.cpp
@@ -20,7 +20,7 @@
#include "proxy-tree-node.h"
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/Contact>
#include "tree-node.h"
#include "contact-model-item.h"
diff --git a/KTelepathy/Models/tree-node.cpp b/KTelepathy/Models/tree-node.cpp
index bcecc6f..f9413ce 100644
--- a/KTelepathy/Models/tree-node.cpp
+++ b/KTelepathy/Models/tree-node.cpp
@@ -1,6 +1,6 @@
/*
* Tree model node
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
diff --git a/KTelepathy/Models/tree-node.h b/KTelepathy/Models/tree-node.h
index 68be7bb..7155b01 100644
--- a/KTelepathy/Models/tree-node.h
+++ b/KTelepathy/Models/tree-node.h
@@ -1,6 +1,6 @@
/* *
* Tree model node
- * This file is based on TelepathyQt4Yell Models
+ * This file is based on TelepathyQtYell Models
*
* Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
* Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
diff --git a/KTelepathy/error-dictionary.cpp b/KTelepathy/error-dictionary.cpp
index 17c29d7..d91bfe5 100644
--- a/KTelepathy/error-dictionary.cpp
+++ b/KTelepathy/error-dictionary.cpp
@@ -21,7 +21,7 @@
#include "error-dictionary.h"
-#include <TelepathyQt4/Constants>
+#include <TelepathyQt/Constants>
#include <KLocalizedString>
#include <KGlobal>
@@ -33,103 +33,103 @@ namespace KTp
QString ErrorDictionary::displayVerboseErrorMessage(const QString& dbusErrorName)
{
- if (dbusErrorName == QLatin1String(TP_QT4_ERROR_ALREADY_CONNECTED)) {
+ if (dbusErrorName == QLatin1String(TP_QT_ERROR_ALREADY_CONNECTED)) {
return i18nc("Verbose user visible error string", "Looks like you are already connected from other location and the server does not allow multiple connections");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_AUTHENTICATION_FAILED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_AUTHENTICATION_FAILED)) {
return i18nc("Verbose user visible error string", "Authentication of your account failed (is your password correct?)");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_BUSY)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_BUSY)) {
return i18nc("Verbose user visible error string", "The channel is too busy now to process your request. Try again in a few minutes");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CANCELLED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CANCELLED)) {
return i18nc("Verbose user visible error string", "The connection was canceled on your request");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_EXPIRED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_EXPIRED)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server is expired");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_FINGERPRINT_MISMATCH)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_FINGERPRINT_MISMATCH)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server has different fingerprint than expected");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_HOSTNAME_MISMATCH)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_HOSTNAME_MISMATCH)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server has different hostname than expected");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_INSECURE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_INSECURE)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server uses too weak encryption");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_INVALID)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_INVALID)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server is invalid");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_LIMIT_EXCEEDED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_LIMIT_EXCEEDED)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server has exceeded length limit");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_NOT_ACTIVATED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_NOT_ACTIVATED)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server has not been activated yet");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_NOT_PROVIDED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_NOT_PROVIDED)) {
return i18nc("Verbose user visible error string", "The server did not provide any SSL/TLS certificate");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_REVOKED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_REVOKED)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server has been revoked");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_SELF_SIGNED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_SELF_SIGNED)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server was self-signed by the server and is untrusted");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_UNTRUSTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_UNTRUSTED)) {
return i18nc("Verbose user visible error string", "The SSL/TLS certificate received from server was not signed by a trusted certificate authority");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CHANNEL_BANNED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CHANNEL_BANNED)) {
return i18nc("Verbose user visible error string", "You have been banned from the channel");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CHANNEL_FULL)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CHANNEL_FULL)) {
return i18nc("Verbose user visible error string", "The channel is full");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CHANNEL_INVITE_ONLY)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CHANNEL_INVITE_ONLY)) {
return i18nc("Verbose user visible error string", "The channel is invite-only");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CHANNEL_KICKED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CHANNEL_KICKED)) {
return i18nc("Verbose user visible error string", "You have been kicked from the channel");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONFUSED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONFUSED)) {
return i18nc("Verbose user visible error string", "Congratulate yourself - you just reached an impossible situation");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONNECTION_FAILED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_FAILED)) {
return i18nc("Verbose user visible error string", "Could not establish connection");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONNECTION_LOST)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_LOST)) {
return i18nc("Verbose user visible error string", "Connection to server was lost");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONNECTION_REFUSED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_REFUSED)) {
return i18nc("Verbose user visible error string", "Server refused your connection");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONNECTION_REPLACED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_REPLACED)) {
return i18nc("Verbose user visible error string", "Somewhere there is another client connecting with your account and your current connection is lost");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_DISCONNECTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_DISCONNECTED)) {
return i18nc("Verbose user visible error string", "You have been disconnected");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_DOES_NOT_EXIST)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_DOES_NOT_EXIST)) {
return i18nc("Verbose user visible error string", "You apparently do not exist ");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED)) {
return i18nc("Verbose user visible error string", "Sorry, emergency calls are not supported");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_ENCRYPTION_ERROR)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_ENCRYPTION_ERROR)) {
return i18nc("Verbose user visible error string", "An encryption error has occurred");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_ENCRYPTION_NOT_AVAILABLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_ENCRYPTION_NOT_AVAILABLE)) {
return i18nc("Verbose user visible error string", "Requested encryption is not available");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_INVALID_ARGUMENT)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_INVALID_ARGUMENT)) {
return i18nc("Verbose user visible error string", "An invalid argument was provided");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_INVALID_HANDLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_INVALID_HANDLE)) {
return i18nc("Verbose user visible error string", "The specified handle is unknown on this channel");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NETWORK_ERROR)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NETWORK_ERROR)) {
return i18nc("Verbose user visible error string", "There appears to be a problem with your network, check your connection");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NO_ANSWER)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NO_ANSWER)) {
return i18nc("Verbose user visible error string", "You were removed from the channel because you did not respond"); //FIXME: this sound bad
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_AVAILABLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_AVAILABLE)) {
return i18nc("Verbose user visible error string", "This capability is not available");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_CAPABLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_CAPABLE)) {
return i18nc("Verbose user visible error string", "The contact does not have the requested capabilities");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_IMPLEMENTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_IMPLEMENTED)) {
return i18nc("Verbose user visible error string", "This operation is not implemented");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_YET)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_YET)) {
return i18nc("Verbose user visible error string", "This operation is not yet implemented");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_YOURS)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_YOURS)) {
return i18nc("Verbose user visible error string", "The requested channel is already being handled by some other process");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_OFFLINE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_OFFLINE)) {
return i18nc("Verbose user visible error string", "This operation is unavailable as the contact is offline");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_PERMISSION_DENIED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_PERMISSION_DENIED)) {
return i18nc("Verbose user visible error string", "You are not permitted to perform this operation");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_PICKED_UP_ELSEWHERE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_PICKED_UP_ELSEWHERE)) {
return i18nc("Verbose user visible error string", "Current call was picked up by another resource");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_REGISTRATION_EXISTS)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_REGISTRATION_EXISTS)) {
return i18nc("Verbose user visible error string", "Account with this username already exists");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_REJECTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_REJECTED)) {
return i18nc("Verbose user visible error string", "The receiver rejected your call");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_RESOURCE_UNAVAILABLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_RESOURCE_UNAVAILABLE)) {
return i18nc("Verbose user visible error string", "There are insufficient resources (like free memory) to finish the operation at the moment");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_SERVICE_BUSY)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_SERVICE_BUSY)) {
return i18nc("Verbose user visible error string", "Your request hit a busy resource somewhere along the way and the operation was unable to finish");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_SERVICE_CONFUSED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_SERVICE_CONFUSED)) {
return i18nc("Verbose user visible error string", "An internal error has occurred (known as the 'Confused service error')");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_SOFTWARE_UPGRADE_REQUIRED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_SOFTWARE_UPGRADE_REQUIRED)) {
return i18nc("Verbose user visible error string", "You are using too old software. Please try updating all Telepathy packages to a newer version");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_TERMINATED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_TERMINATED)) {
return i18nc("Verbose user visible error string", "The channel was terminated for no apparent reason");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_WOULD_BREAK_ANONYMITY)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_WOULD_BREAK_ANONYMITY)) {
return i18nc("Verbose user visible error string", "This operation can not be finished as it would break your anonymity request");
} else if (dbusErrorName == QLatin1String("org.freedesktop.DBus.Error.NoReply")) {
return i18nc("Verbose user visible error string", "Some of the IM components are not working correctly (and your system does not tell us which one)");
@@ -140,103 +140,103 @@ QString ErrorDictionary::displayVerboseErrorMessage(const QString& dbusErrorName
QString ErrorDictionary::displayShortErrorMessage(const QString& dbusErrorName)
{
- if (dbusErrorName == QLatin1String(TP_QT4_ERROR_ALREADY_CONNECTED)) {
+ if (dbusErrorName == QLatin1String(TP_QT_ERROR_ALREADY_CONNECTED)) {
return i18nc("Short user visible error string", "Connected elsewhere");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_AUTHENTICATION_FAILED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_AUTHENTICATION_FAILED)) {
return i18nc("Short user visible error string", "Authentication failed");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_BUSY)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_BUSY)) {
return i18nc("Short user visible error string", "Channel too busy");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CANCELLED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CANCELLED)) {
return i18nc("Short user visible error string", "Cancelled by user");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_EXPIRED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_EXPIRED)) {
return i18nc("Short user visible error string", "Certificate is expired");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_FINGERPRINT_MISMATCH)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_FINGERPRINT_MISMATCH)) {
return i18nc("Short user visible error string", "Wrong certificate fingerprint");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_HOSTNAME_MISMATCH)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_HOSTNAME_MISMATCH)) {
return i18nc("Short user visible error string", "Wrong certificate hostname");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_INSECURE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_INSECURE)) {
return i18nc("Short user visible error string", "Too weak certificate encryption");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_INVALID)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_INVALID)) {
return i18nc("Short user visible error string", "Invalid certificate");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_LIMIT_EXCEEDED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_LIMIT_EXCEEDED)) {
return i18nc("Short user visible error string", "Certificate length limit exceeded");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_NOT_ACTIVATED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_NOT_ACTIVATED)) {
return i18nc("Short user visible error string", "Certificate not yet active");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_NOT_PROVIDED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_NOT_PROVIDED)) {
return i18nc("Short user visible error string", "No certificate from server");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_REVOKED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_REVOKED)) {
return i18nc("Short user visible error string", "Certificate revoked");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_SELF_SIGNED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_SELF_SIGNED)) {
return i18nc("Short user visible error string", "Untrusted self-signed certificate");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CERT_UNTRUSTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CERT_UNTRUSTED)) {
return i18nc("Short user visible error string", "Untrusted certificate");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CHANNEL_BANNED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CHANNEL_BANNED)) {
return i18nc("Short user visible error string", "Banned from channel");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CHANNEL_FULL)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CHANNEL_FULL)) {
return i18nc("Short user visible error string", "The channel is full");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CHANNEL_INVITE_ONLY)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CHANNEL_INVITE_ONLY)) {
return i18nc("Short user visible error string", "The channel is invite-only");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CHANNEL_KICKED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CHANNEL_KICKED)) {
return i18nc("Short user visible error string", "Kicked from channel");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONFUSED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONFUSED)) {
return i18nc("Short user visible error string", "Something's seriously wrong");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONNECTION_FAILED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_FAILED)) {
return i18nc("Short user visible error string", "Connection failed");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONNECTION_LOST)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_LOST)) {
return i18nc("Short user visible error string", "Connection lost");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONNECTION_REFUSED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_REFUSED)) {
return i18nc("Short user visible error string", "Connection refused");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_CONNECTION_REPLACED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_REPLACED)) {
return i18nc("Short user visible error string", "Connection stolen by other account");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_DISCONNECTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_DISCONNECTED)) {
return i18nc("Short user visible error string", "Disconnected");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_DOES_NOT_EXIST)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_DOES_NOT_EXIST)) {
return i18nc("Short user visible error string", "You apparently do not exist");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED)) {
return i18nc("Short user visible error string", "Emergency calls unsupported");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_ENCRYPTION_ERROR)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_ENCRYPTION_ERROR)) {
return i18nc("Short user visible error string", "Encryption error");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_ENCRYPTION_NOT_AVAILABLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_ENCRYPTION_NOT_AVAILABLE)) {
return i18nc("Short user visible error string", "Encryption not available");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_INVALID_ARGUMENT)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_INVALID_ARGUMENT)) {
return i18nc("Short user visible error string", "Invalid argument");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_INVALID_HANDLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_INVALID_HANDLE)) {
return i18nc("Short user visible error string", "Unknown handle");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NETWORK_ERROR)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NETWORK_ERROR)) {
return i18nc("Short user visible error string", "Network error");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NO_ANSWER)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NO_ANSWER)) {
return i18nc("Short user visible error string", "Removed from channel");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_AVAILABLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_AVAILABLE)) {
return i18nc("Short user visible error string", "Capability not available");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_CAPABLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_CAPABLE)) {
return i18nc("Short user visible error string", "Contact incapable");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_IMPLEMENTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_IMPLEMENTED)) {
return i18nc("Short user visible error string", "Operation not implemented");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_YET)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_YET)) {
return i18nc("Short user visible error string", "Operation not yet implemented");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_NOT_YOURS)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_YOURS)) {
return i18nc("Short user visible error string", "Channel already being handled");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_OFFLINE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_OFFLINE)) {
return i18nc("Short user visible error string", "Contact is offline");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_PERMISSION_DENIED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_PERMISSION_DENIED)) {
return i18nc("Short user visible error string", "Operation not permitted");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_PICKED_UP_ELSEWHERE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_PICKED_UP_ELSEWHERE)) {
return i18nc("Short user visible error string", "Call picked by other resource");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_REGISTRATION_EXISTS)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_REGISTRATION_EXISTS)) {
return i18nc("Short user visible error string", "Username already taken");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_REJECTED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_REJECTED)) {
return i18nc("Short user visible error string", "Call rejected");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_RESOURCE_UNAVAILABLE)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_RESOURCE_UNAVAILABLE)) {
return i18nc("Short user visible error string", "Insufficient resources");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_SERVICE_BUSY)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_SERVICE_BUSY)) {
return i18nc("Short user visible error string", "Service is busy");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_SERVICE_CONFUSED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_SERVICE_CONFUSED)) {
return i18nc("Short user visible error string", "Internal error");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_SOFTWARE_UPGRADE_REQUIRED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_SOFTWARE_UPGRADE_REQUIRED)) {
return i18nc("Short user visible error string", "Software upgrade required");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_TERMINATED)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_TERMINATED)) {
return i18nc("Short user visible error string", "Channel terminated");
- } else if (dbusErrorName == QLatin1String(TP_QT4_ERROR_WOULD_BREAK_ANONYMITY)) {
+ } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_WOULD_BREAK_ANONYMITY)) {
return i18nc("Short user visible error string", "Anonymity break possible");
} else if (dbusErrorName == QLatin1String("org.freedesktop.DBus.Error.NoReply")) {
return i18nc("Short user visible error string", "Internal component error");
diff --git a/KTelepathy/global-presence.cpp b/KTelepathy/global-presence.cpp
index 8d13d72..6d14d02 100644
--- a/KTelepathy/global-presence.cpp
+++ b/KTelepathy/global-presence.cpp
@@ -22,8 +22,8 @@
#include "presence.h"
-#include <TelepathyQt4/AccountSet>
-#include <TelepathyQt4/Account>
+#include <TelepathyQt/AccountSet>
+#include <TelepathyQt/Account>
#include <KDebug>
diff --git a/KTelepathy/global-presence.h b/KTelepathy/global-presence.h
index 19903d7..b7d7106 100644
--- a/KTelepathy/global-presence.h
+++ b/KTelepathy/global-presence.h
@@ -22,8 +22,8 @@
#define GLOBALPRESENCE_H
#include <QObject>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/AccountSet>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/AccountSet>
#include <KTelepathy/ktelepathy-export.h>
diff --git a/KTelepathy/presence.h b/KTelepathy/presence.h
index 7542b90..71e7c6e 100644
--- a/KTelepathy/presence.h
+++ b/KTelepathy/presence.h
@@ -21,7 +21,7 @@
#ifndef PRESENCE_H
#define PRESENCE_H
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/Presence>
#include <KIcon>
diff --git a/KTelepathy/telepathy-handler-application.cpp b/KTelepathy/telepathy-handler-application.cpp
index a27d524..2e45c0f 100644
--- a/KTelepathy/telepathy-handler-application.cpp
+++ b/KTelepathy/telepathy-handler-application.cpp
@@ -23,8 +23,8 @@
#include <KCmdLineArgs>
#include <KDebug>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Debug>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Debug>
extern bool kde_kdebug_enable_dbus_interface;
diff --git a/KTelepathy/wallet-interface.h b/KTelepathy/wallet-interface.h
index 941115a..9c4eb27 100644
--- a/KTelepathy/wallet-interface.h
+++ b/KTelepathy/wallet-interface.h
@@ -21,7 +21,7 @@
#ifndef WALLETINTERFACE_H
#define WALLETINTERFACE_H
-#include <TelepathyQt4/Account>
+#include <TelepathyQt/Account>
#include <KWallet/Wallet>
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list