[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=31c1056

The following commit has been merged in the master branch:
commit 31c10564bd39fe134cb8d1de2f0ee062211926af
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Dec 23 15:28:43 2011 +0100

    Rename class PasswordPrompt to XTelepathyPasswordPrompt
---
 CMakeLists.txt                                         |  4 ++--
 x-telepathy-password-auth-operation.cpp                |  6 ++++--
 password-prompt.cpp => x-telepathy-password-prompt.cpp | 16 ++++++++--------
 password-prompt.h => x-telepathy-password-prompt.h     | 10 +++++-----
 password-prompt.ui => x-telepathy-password-prompt.ui   |  4 ++--
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 413f14f..9e92de5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,17 +24,17 @@ include_directories (${KDE4_INCLUDES}
 
 set(ktp_auth_handler_SRCS
     main.cpp
-    password-prompt.cpp
     sasl-handler.cpp
     sasl-auth-op.cpp
     tls-cert-verifier-op.cpp
     tls-handler.cpp
     types.cpp
     x-telepathy-password-auth-operation.cpp
+    x-telepathy-password-prompt.cpp
     ${ktp_common_internals_SRCS}
 )
 
-kde4_add_ui_files(ktp_auth_handler_SRCS password-prompt.ui)
+kde4_add_ui_files(ktp_auth_handler_SRCS x-telepathy-password-prompt.ui)
 kde4_add_executable(ktp-auth-handler ${ktp_auth_handler_SRCS})
 
 target_link_libraries(ktp-auth-handler
diff --git a/x-telepathy-password-auth-operation.cpp b/x-telepathy-password-auth-operation.cpp
index b56a900..f4b517f 100644
--- a/x-telepathy-password-auth-operation.cpp
+++ b/x-telepathy-password-auth-operation.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "x-telepathy-password-auth-operation.h"
-#include "password-prompt.h"
+#include "x-telepathy-password-prompt.h"
 
 #include <KDebug>
 #include <KLocalizedString>
@@ -94,7 +94,7 @@ void XTelepathyPasswordAuthOperation::promptUser(bool isFirstRun)
     if (wallet.hasPassword(m_account) && isFirstRun) {
         password = wallet.password(m_account);
     } else {
-        QWeakPointer<PasswordPrompt> dialog = new PasswordPrompt(m_account);
+        QWeakPointer<XTelepathyPasswordPrompt> dialog = new XTelepathyPasswordPrompt(m_account);
         if (dialog.data()->exec() == QDialog::Rejected) {
             kDebug() << "Authentication cancelled";
             m_saslIface->AbortSASL(Tp::SASLAbortReasonUserAbort, "User cancelled auth");
@@ -118,3 +118,5 @@ void XTelepathyPasswordAuthOperation::promptUser(bool isFirstRun)
 
     m_saslIface->StartMechanismWithData(QLatin1String("X-TELEPATHY-PASSWORD"), password.toUtf8());
 }
+
+#include "x-telepathy-password-auth-operation.moc"
diff --git a/password-prompt.cpp b/x-telepathy-password-prompt.cpp
similarity index 79%
rename from password-prompt.cpp
rename to x-telepathy-password-prompt.cpp
index 7dfff55..328d2dd 100644
--- a/password-prompt.cpp
+++ b/x-telepathy-password-prompt.cpp
@@ -16,17 +16,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "password-prompt.h"
-#include "ui_password-prompt.h"
+#include "x-telepathy-password-prompt.h"
+#include "ui_x-telepathy-password-prompt.h"
 
 #include <KTp/wallet-interface.h>
 
 #include <KIcon>
 #include <KDebug>
 
-PasswordPrompt::PasswordPrompt(const Tp::AccountPtr &account, QWidget *parent)
+XTelepathyPasswordPrompt::XTelepathyPasswordPrompt(const Tp::AccountPtr &account, QWidget *parent)
     : KDialog(parent),
-      ui(new Ui::PasswordPrompt)
+      ui(new Ui::XTelepathyPasswordPrompt)
 {
     ui->setupUi(mainWidget());
 
@@ -48,19 +48,19 @@ PasswordPrompt::PasswordPrompt(const Tp::AccountPtr &account, QWidget *parent)
     }
 }
 
-PasswordPrompt::~PasswordPrompt()
+XTelepathyPasswordPrompt::~XTelepathyPasswordPrompt()
 {
     delete ui;
 }
 
-QString PasswordPrompt::password() const
+QString XTelepathyPasswordPrompt::password() const
 {
     return ui->passwordLineEdit->text();
 }
 
-bool PasswordPrompt::savePassword() const
+bool XTelepathyPasswordPrompt::savePassword() const
 {
     return ui->savePassword->isChecked();
 }
 
-#include "password-prompt.moc"
+#include "x-telepathy-password-prompt.moc"
diff --git a/password-prompt.h b/x-telepathy-password-prompt.h
similarity index 81%
rename from password-prompt.h
rename to x-telepathy-password-prompt.h
index fc686ca..4200cc3 100644
--- a/password-prompt.h
+++ b/x-telepathy-password-prompt.h
@@ -25,22 +25,22 @@
 
 namespace Ui
 {
-    class PasswordPrompt;
+    class XTelepathyPasswordPrompt;
 }
 
-class PasswordPrompt : public KDialog
+class XTelepathyPasswordPrompt : public KDialog
 {
     Q_OBJECT
 
 public:
-    explicit PasswordPrompt(const Tp::AccountPtr &account, QWidget *parent = 0);
-    ~PasswordPrompt();
+    explicit XTelepathyPasswordPrompt(const Tp::AccountPtr &account, QWidget *parent = 0);
+    ~XTelepathyPasswordPrompt();
 
     QString password() const;
     bool savePassword() const;
 
 private:
-    Ui::PasswordPrompt *ui;
+    Ui::XTelepathyPasswordPrompt *ui;
 };
 
 #endif // PASSWORDPROMPT_H
diff --git a/password-prompt.ui b/x-telepathy-password-prompt.ui
similarity index 96%
rename from password-prompt.ui
rename to x-telepathy-password-prompt.ui
index 7f5009e..54c01a4 100644
--- a/password-prompt.ui
+++ b/x-telepathy-password-prompt.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>PasswordPrompt</class>
- <widget class="QWidget" name="PasswordPrompt">
+ <class>XTelepathyPasswordPrompt</class>
+ <widget class="QWidget" name="XTelepathyPasswordPrompt">
   <property name="geometry">
    <rect>
     <x>0</x>

-- 
ktp-auth-handler packaging