[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=dbc7cb3

The following commit has been merged in the master branch:
commit dbc7cb370e03e3f85bddef409cf9a6b6a68dfaa1
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Sat Oct 8 20:28:46 2011 +0530

    * Fix Formatting
    * String change : "Add/Remove Status" -> "Add/Remove Presence"
---
 dialogs/custom-presence-dialog.cpp | 39 ++++++++++++++++++--------------------
 dialogs/custom-presence-dialog.h   |  6 ++----
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 4f47923..1163540 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -59,17 +59,17 @@ bool FilteredModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourcePar
 }
 
 CustomPresenceDialog::CustomPresenceDialog(PresenceModel *model, QWidget *parent)
-  : KDialog(parent),
-    m_model(model)
+    : KDialog(parent),
+      m_model(model)
 {
     setupDialog();
 }
 
 void CustomPresenceDialog::setupDialog()
 {
-    setCaption(i18n("Edit Custom Messages"));
+    setCaption(i18n("Edit Custom Presences"));
     setButtons(KDialog::Close);
- 
+
     QWidget *mainDialogWidget = new QWidget(this);
 
     FilteredModel *filteredModel = new FilteredModel(this);
@@ -80,28 +80,28 @@ void CustomPresenceDialog::setupDialog()
 
     m_statusMessage = new KComboBox(true, mainDialogWidget);
     m_statusMessage->setTrapReturnKey(false);
- 
+
     m_statusMessage->addItem(KIcon("user-online"), i18n("Set custom available message ..."),qVariantFromValue(Tp::Presence::available()));
     m_statusMessage->addItem(KIcon("user-busy"), i18n("Set custom busy message ..."), qVariantFromValue(Tp::Presence::busy()));
     m_statusMessage->addItem(KIcon("user-away"), i18n("Set custom away message ..."), qVariantFromValue(Tp::Presence::away()));
- 
+
     m_statusMessage->setAutoCompletion(false);
     m_statusMessage->show();
- 
-    QPushButton *addStatus = new QPushButton(KIcon("list-add"), i18n("Add Status"), mainDialogWidget);
-    QPushButton *removeStatus = new QPushButton(KIcon("list-remove"), i18n("Remove Status"), mainDialogWidget);
- 
+
+    QPushButton *addStatus = new QPushButton(KIcon("list-add"), i18n("Add Presence"), mainDialogWidget);
+    QPushButton *removeStatus = new QPushButton(KIcon("list-remove"), i18n("Remove Presence"), mainDialogWidget);
+
     QVBoxLayout *vLayout = new QVBoxLayout(mainDialogWidget);
     vLayout->addWidget(m_statusMessage);
- 
+
     QHBoxLayout *hLayout = new QHBoxLayout();
     hLayout->addWidget(m_listView);
- 
+
     QVBoxLayout *vLayout2 = new QVBoxLayout();
     vLayout2->addWidget(addStatus);
     vLayout2->addWidget(removeStatus);
     vLayout2->addStretch(1);
- 
+
     hLayout->addLayout(vLayout2);
     vLayout->addLayout(hLayout);
 
@@ -123,13 +123,10 @@ void CustomPresenceDialog::addCustomPresence()
 
 void CustomPresenceDialog::removeCustomPresence()
 {
-   if (! m_listView->currentIndex().isValid()) {
-       return;
-   }
+    if (! m_listView->currentIndex().isValid()) {
+        return;
+    }
 
-   Tp::Presence presence = m_listView->currentIndex().data(PresenceModel::PresenceRole).value<Tp::Presence>();
-   m_model->removePresence(presence);
+    Tp::Presence presence = m_listView->currentIndex().data(PresenceModel::PresenceRole).value<Tp::Presence>();
+    m_model->removePresence(presence);
 }
-
-
-#include "custom-presence-dialog.moc"
diff --git a/dialogs/custom-presence-dialog.h b/dialogs/custom-presence-dialog.h
index b694130..4f689ea 100644
--- a/dialogs/custom-presence-dialog.h
+++ b/dialogs/custom-presence-dialog.h
@@ -32,7 +32,7 @@ class PresenceModel;
 
 class CustomPresenceDialog : public KDialog
 {
-  Q_OBJECT
+    Q_OBJECT
 
 public:
     explicit CustomPresenceDialog(PresenceModel *model, QWidget *parent = 0);
@@ -57,10 +57,8 @@ private:
     ///Combobox to type custom presence's
     KComboBox    *m_statusMessage;
 
-
-
     PresenceModel *m_model;
-  
+
 };
 
 #endif // CUSTOM_PRESENCE_DIALOG_H

-- 
ktp-contact-list packaging