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

The following commit has been merged in the master branch:
commit e3e9154e8c85d8c21f973a5d58f0709fc370fedc
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Fri Apr 22 14:20:47 2011 +0200

    Cast properly: never use static_cast unless strictly required, and use qobject_cast wherever possible
---
 contact-delegate-overlay.cpp | 2 +-
 contact-overlays.cpp         | 2 +-
 main-widget.cpp              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contact-delegate-overlay.cpp b/contact-delegate-overlay.cpp
index d56b36d..9346e21 100644
--- a/contact-delegate-overlay.cpp
+++ b/contact-delegate-overlay.cpp
@@ -270,7 +270,7 @@ HoverButtonDelegateOverlay::HoverButtonDelegateOverlay(QObject* parent)
 
 ContactViewHoverButton* HoverButtonDelegateOverlay::button() const
 {
-    return static_cast<ContactViewHoverButton*>(m_widget);
+    return qobject_cast<ContactViewHoverButton*>(m_widget);
 }
 
 void HoverButtonDelegateOverlay::setActive(bool active)
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index 0869ef8..7965961 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -76,7 +76,7 @@ TextChannelContactOverlay::TextChannelContactOverlay(QObject* parent)
 
 TextChannelContactOverlay::Button *TextChannelContactOverlay::button() const
 {
-    return static_cast<Button*>(HoverButtonDelegateOverlay::button());
+    return dynamic_cast<Button*>(HoverButtonDelegateOverlay::button());
 }
 
 void TextChannelContactOverlay::setActive(bool active)
diff --git a/main-widget.cpp b/main-widget.cpp
index ff8406e..70d1877 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -394,7 +394,7 @@ void MainWidget::onContactManagerStateChanged(const Tp::ContactManagerPtr &conta
 
 void MainWidget::onAccountStateChanged(bool enabled)
 {
-    Tp::AccountPtr account(static_cast<Tp::Account*>(sender()));
+    Tp::AccountPtr account(qobject_cast<Tp::Account*>(sender()));
 
     if(enabled) {
         findChild<AccountButton *>(account->uniqueIdentifier())->show();
@@ -407,7 +407,7 @@ void MainWidget::onAccountStateChanged(bool enabled)
 
 void MainWidget::onAccountRemoved()
 {
-    Tp::AccountPtr account(static_cast<Tp::Account*>(sender()));
+    Tp::AccountPtr account(qobject_cast<Tp::Account*>(sender()));
     delete findChild<AccountButton *>(account->uniqueIdentifier());
 
     showMessageToUser(i18n("Account %1 was removed!").arg(account->displayName()),

-- 
ktp-contact-list packaging