[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=6361057

The following commit has been merged in the master branch:
commit 636105768f92a529647e0d6bee20bd3621c34ccc
Author: Nicolas Lécureuil <neoclust.kde at free.fr>
Date:   Thu Apr 14 16:27:20 2011 +0200

    Fix variables names
---
 main-widget.cpp | 48 ++++++++++++++++++++++++------------------------
 main-widget.h   |  8 ++++----
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 482b4b2..5fa5490 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -115,33 +115,33 @@ MainWidget::MainWidget(QWidget *parent)
     m_toolBar->addSeparator();
     m_toolBar->addWidget(settingsButton);
 
-    m_actionAdd_contact = new KAction(KIcon("list-add-user"), QString(), this);
-    m_actionAdd_contact->setToolTip(i18n("Add new contacts.."));
+    m_addContactAction = new KAction(KIcon("list-add-user"), QString(), this);
+    m_addContactAction->setToolTip(i18n("Add new contacts.."));
 
-    m_toolBar->addAction(m_actionAdd_contact);
+    m_toolBar->addAction(m_addContactAction);
 
-    m_actionGroup_contacts = new KAction(KIcon("user-group-properties"), QString(), this);
-    m_actionGroup_contacts->setCheckable(true);
-    m_actionGroup_contacts->setChecked(true);
+    m_groupContactsAction = new KAction(KIcon("user-group-properties"), QString(), this);
+    m_groupContactsAction->setCheckable(true);
+    m_groupContactsAction->setChecked(true);
     //TODO: Toggle the tooltip with the button? eg. once its Show, after click its Hide .. ?
-    m_actionGroup_contacts->setToolTip(i18n("Show/Hide groups"));
+    m_groupContactsAction->setToolTip(i18n("Show/Hide groups"));
 
-    m_toolBar->addAction(m_actionGroup_contacts);
+    m_toolBar->addAction(m_groupContactsAction);
 
-    m_actionHide_offline = new KAction(KIcon("meeting-attending-tentative"), QString(), this);
-    m_actionHide_offline->setCheckable(true);
-    m_actionHide_offline->setChecked(true);
-    m_actionHide_offline->setToolTip(i18n("Show/Hide offline users"));
+    m_hideOfflineAction = new KAction(KIcon("meeting-attending-tentative"), QString(), this);
+    m_hideOfflineAction->setCheckable(true);
+    m_hideOfflineAction->setChecked(true);
+    m_hideOfflineAction->setToolTip(i18n("Show/Hide offline users"));
 
-    m_toolBar->addAction(m_actionHide_offline);
+    m_toolBar->addAction(m_hideOfflineAction);
 
-    m_actionSearch_contact = new KAction(KIcon("edit-find-user"), QString(), this );
-    m_actionSearch_contact->setShortcut(KStandardShortcut::find());
-    m_actionSearch_contact->setCheckable(true);
-    m_actionSearch_contact->setChecked(false);
-    m_actionSearch_contact->setToolTip(i18n("Find contact"));
+    m_searchContactAction = new KAction(KIcon("edit-find-user"), QString(), this );
+    m_searchContactAction->setShortcut(KStandardShortcut::find());
+    m_searchContactAction->setCheckable(true);
+    m_searchContactAction->setChecked(false);
+    m_searchContactAction->setToolTip(i18n("Find contact"));
 
-    m_toolBar->addAction(m_actionSearch_contact);
+    m_toolBar->addAction(m_searchContactAction);
 
     // Start setting up the Telepathy AccountManager.
     Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
@@ -198,13 +198,13 @@ MainWidget::MainWidget(QWidget *parent)
     connect(m_delegate, SIGNAL(repaintItem(QModelIndex)),
             m_contactsListView->viewport(), SLOT(repaint())); //update(QModelIndex)
 
-    connect(m_actionAdd_contact, SIGNAL(triggered(bool)),
+    connect(m_addContactAction, SIGNAL(triggered(bool)),
             this, SLOT(onAddContactRequest()));
 
-    connect(m_actionGroup_contacts, SIGNAL(triggered(bool)),
+    connect(m_groupContactsAction, SIGNAL(triggered(bool)),
             this, SLOT(onGroupContacts(bool)));
 
-    connect(m_actionSearch_contact, SIGNAL(triggered(bool)),
+    connect(m_searchContactAction, SIGNAL(triggered(bool)),
             this, SLOT(toggleSearchWidget(bool)));
 
     connect(m_presenceMessageEdit, SIGNAL(returnPressed(QString)),
@@ -233,7 +233,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     m_contactsListView->setSortingEnabled(true);
     m_contactsListView->sortByColumn(0, Qt::AscendingOrder);
 
-    connect(m_actionHide_offline, SIGNAL(toggled(bool)),
+    connect(m_hideOfflineAction, SIGNAL(toggled(bool)),
             m_modelFilter, SLOT(filterOfflineUsers(bool)));
 
     connect(m_filterBar, SIGNAL(filterChanged(QString)),
@@ -246,7 +246,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
             m_filterBar, SLOT(hide()));
 
     connect(m_filterBar, SIGNAL(closeRequest()),
-            m_actionSearch_contact, SLOT(toggle()));
+            m_searchContactAction, SLOT(toggle()));
 
     connect(m_modelFilter, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
         m_delegate, SLOT(contactRemoved(QModelIndex,int,int)));
diff --git a/main-widget.h b/main-widget.h
index cc97b12..310dfb6 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -103,10 +103,10 @@ private:
     KMenu                  *m_avatarButtonMenu;
     KSelectAction          *m_setStatusAction;
     ContactDelegate        *m_delegate;
-    KAction                *m_actionAdd_contact;
-    KAction                *m_actionGroup_contacts;
-    KAction                *m_actionHide_offline;
-    KAction                *m_actionSearch_contact;
+    KAction                *m_addContactAction;
+    KAction                *m_groupContactsAction;
+    KAction                *m_hideOfflineAction;
+    KAction                *m_searchContactAction;
 };
 
 

-- 
ktp-contact-list packaging