[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=d4aea51

The following commit has been merged in the master branch:
commit d4aea5168bf8867c14e5772cccc41d3d96d05b81
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 22 13:10:24 2009 +0000

    In KDE we have Assistants, not Wizards.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1001014
---
 src/CMakeLists.txt                                     |  2 +-
 ...dd-account-wizard.cpp => add-account-assistant.cpp} | 18 +++++++++---------
 src/{add-account-wizard.h => add-account-assistant.h}  | 10 +++++-----
 src/kcm-telepathy-accounts.cpp                         | 16 ++++++++--------
 src/kcm-telepathy-accounts.h                           |  4 ++--
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c26a572..a752aca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ set (telepathy_accounts_kcm_SRCS
      kcm-telepathy-accounts.cpp
      accounts-list-model.cpp
      account-item.cpp
-     add-account-wizard.cpp
+     add-account-assistant.cpp
      protocol-select-widget.cpp
 )
 
diff --git a/src/add-account-wizard.cpp b/src/add-account-assistant.cpp
similarity index 82%
rename from src/add-account-wizard.cpp
rename to src/add-account-assistant.cpp
index e851263..05bc797 100644
--- a/src/add-account-wizard.cpp
+++ b/src/add-account-assistant.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "add-account-wizard.h"
+#include "add-account-assistant.h"
 
 #include "protocol-select-widget.h"
 
@@ -26,7 +26,7 @@
 #include <KLocale>
 #include <KPageWidgetItem>
 
-class AddAccountWizard::Private
+class AddAccountAssistant::Private
 {
 public:
     Private()
@@ -39,13 +39,13 @@ public:
     KPageWidgetItem *pageOne;
 };
 
-AddAccountWizard::AddAccountWizard(QWidget *parent)
+AddAccountAssistant::AddAccountAssistant(QWidget *parent)
  : KAssistantDialog(parent),
    d(new Private)
 {
     kDebug();
 
-    // Set up the pages of the Wizard.
+    // Set up the pages of the Assistant.
     d->widgetOne = new ProtocolSelectWidget(this);
     d->pageOne = new KPageWidgetItem(d->widgetOne);
     d->pageOne->setHeader(i18n("Step 1: Select an Instant Messaging Network."));
@@ -53,35 +53,35 @@ AddAccountWizard::AddAccountWizard(QWidget *parent)
     addPage(d->pageOne);
 }
 
-AddAccountWizard::~AddAccountWizard()
+AddAccountAssistant::~AddAccountAssistant()
 {
     kDebug();
 
     delete d;
 }
 
-void AddAccountWizard::back()
+void AddAccountAssistant::back()
 {
     kDebug();
 
     // TODO: Implement me!
 }
 
-void AddAccountWizard::next()
+void AddAccountAssistant::next()
 {
     kDebug();
 
     // TODO: Implement me!
 }
 
-void AddAccountWizard::accept()
+void AddAccountAssistant::accept()
 {
     kDebug();
 
     // TODO: Implement me!
 }
 
-void AddAccountWizard::reject()
+void AddAccountAssistant::reject()
 {
     kDebug();
 
diff --git a/src/add-account-wizard.h b/src/add-account-assistant.h
similarity index 82%
rename from src/add-account-wizard.h
rename to src/add-account-assistant.h
index 8b65da8..2d5705e 100644
--- a/src/add-account-wizard.h
+++ b/src/add-account-assistant.h
@@ -18,18 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_WIZARD_H
-#define TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_WIZARD_H
+#ifndef TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_ASSISTANT_H
+#define TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_ASSISTANT_H
 
 #include <KAssistantDialog>
 
-class AddAccountWizard : public KAssistantDialog
+class AddAccountAssistant : public KAssistantDialog
 {
     Q_OBJECT
 
 public:
-    explicit AddAccountWizard(QWidget *parent = 0);
-    ~AddAccountWizard();
+    explicit AddAccountAssistant(QWidget *parent = 0);
+    ~AddAccountAssistant();
 
 protected Q_SLOTS:
     virtual void back();
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 14a3f2f..fc1f541 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -21,7 +21,7 @@
 #include "kcm-telepathy-accounts.h"
 
 #include "accounts-list-model.h"
-#include "add-account-wizard.h"
+#include "add-account-assistant.h"
 
 #include <KCategorizedSortFilterProxyModel>
 #include <KCategoryDrawer>
@@ -40,7 +40,7 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
  : KCModule(KCMTelepathyAccountsFactory::componentData(), parent, args),
    m_accountsListProxyModel(0),
    m_accountsListModel(0),
-   m_addAccountWizard(0)
+   m_addAccountAssistant(0)
 {
     kDebug();
 
@@ -106,15 +106,15 @@ void KCMTelepathyAccounts::onAddAccountClicked()
 {
     kDebug();
 
-    // Ensure that there is not already an instance of the AddAccountWizard before we create one.";
-    if (!m_addAccountWizard) {
-        // Create an AddAccountWizard instance and show it.
-        m_addAccountWizard = new AddAccountWizard(this);
-        m_addAccountWizard->show();
+    // Ensure that there is not already an instance of the AddAccountAssistant before we create one.";
+    if (!m_addAccountAssistant) {
+        // Create an AddAccountAssistant instance and show it.
+        m_addAccountAssistant = new AddAccountAssistant(this);
+        m_addAccountAssistant->show();
         return;
     }
 
-    kWarning() << "Cannot create a new AddAccountWizard. One already exists.";
+    kWarning() << "Cannot create a new AddAccountAssistant. One already exists.";
 }
 
 
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index 1cefef7..659af2d 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -28,7 +28,7 @@
 #include <TelepathyQt4/AccountManager>
 
 class AccountsListModel;
-class AddAccountWizard;
+class AddAccountAssistant;
 
 class KCategorizedSortFilterProxyModel;
 
@@ -57,7 +57,7 @@ private:
     KCategorizedSortFilterProxyModel *m_accountsListProxyModel;
     Tp::AccountManagerPtr m_accountManager;
     AccountsListModel *m_accountsListModel;
-    AddAccountWizard *m_addAccountWizard;
+    AddAccountAssistant *m_addAccountAssistant;
 };
 
 

-- 
ktp-accounts-kcm packaging