[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=99cdeea

The following commit has been merged in the master branch:
commit 99cdeea64f75d5cfe62745969c188f1ac4082d85
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Jul 30 09:54:28 2012 +0200

    Move ContactGridWidget in KTp namespace
---
 KTp/Widgets/contact-grid-dialog.cpp | 12 ++++++------
 KTp/Widgets/contact-grid-dialog.h   | 10 ++++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/KTp/Widgets/contact-grid-dialog.cpp b/KTp/Widgets/contact-grid-dialog.cpp
index 3780bd0..6647c6b 100644
--- a/KTp/Widgets/contact-grid-dialog.cpp
+++ b/KTp/Widgets/contact-grid-dialog.cpp
@@ -39,7 +39,7 @@
 
 
 
-ContactGridDialog::ContactGridDialog(QWidget *parent) :
+KTp::ContactGridDialog::ContactGridDialog(QWidget *parent) :
     KDialog(parent),
     m_accountsModel(0),
     m_contact(0)
@@ -91,23 +91,23 @@ ContactGridDialog::ContactGridDialog(QWidget *parent) :
     connect(this, SIGNAL(rejected()), SLOT(close()));
 }
 
-Tp::AccountPtr ContactGridDialog::account()
+Tp::AccountPtr KTp::ContactGridDialog::account()
 {
     return m_account;
 }
 
-Tp::ContactPtr ContactGridDialog::contact()
+Tp::ContactPtr KTp::ContactGridDialog::contact()
 {
     return m_contact;
 }
 
-void ContactGridDialog::onAccountManagerReady()
+void KTp::ContactGridDialog::onAccountManagerReady()
 {
     kDebug() << "Account manager is ready";
     m_accountsModel->setAccountManager(m_accountManager);
 }
 
-void ContactGridDialog::onOkClicked()
+void KTp::ContactGridDialog::onOkClicked()
 {
     // don't do anytghing if no contact has been selected
     if (!m_contactGridWidget->hasSelection()) {
@@ -128,7 +128,7 @@ void ContactGridDialog::onOkClicked()
     }
 }
 
-void ContactGridDialog::onChanged()
+void KTp::ContactGridDialog::onChanged()
 {
     button(KDialog::Ok)->setEnabled(m_contactGridWidget->hasSelection());
 }
diff --git a/KTp/Widgets/contact-grid-dialog.h b/KTp/Widgets/contact-grid-dialog.h
index 2c26fb9..541b913 100644
--- a/KTp/Widgets/contact-grid-dialog.h
+++ b/KTp/Widgets/contact-grid-dialog.h
@@ -33,13 +33,13 @@ namespace Tp {
 class PendingOperation;
 }
 
-namespace KTp {
-class ContactGridWidget;
-}
-
 class AccountsModel;
 class QTcpSocket;
 
+
+namespace KTp {
+class ContactGridWidget;
+
 class ContactGridDialog : public KDialog
 {
     Q_OBJECT
@@ -65,4 +65,6 @@ private:
 
 };
 
+} // namespace KTp
+
 #endif // CONTACT_GRID_DIALOG_H

-- 
ktp-common-internals packaging