From aca844682f86c04f6b67b23de2a820fb0c63a32e Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 24 Feb 2011 07:08:32 +0000 Subject: Fix a number of runtime object identification problems which led to an even larger array of minor glitches NOTE: kdevelop and kdewebdev still need to be fully repaired git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/kopete/chatwindow/emoticonselector.cpp | 2 +- kopete/kopete/chatwindow/kopeteemoticonaction.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kopete/kopete') diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp index 47dd1a59..719068d0 100644 --- a/kopete/kopete/chatwindow/emoticonselector.cpp +++ b/kopete/kopete/chatwindow/emoticonselector.cpp @@ -109,7 +109,7 @@ void EmoticonSelector::emoticonClicked(const TQString &str) // KDE4/Qt TODO: use qobject_cast instead. emit ItemSelected ( str ); if ( isVisible() && parentWidget() && - parentWidget()->inherits("TQPopupMenu") ) + parentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { parentWidget()->close(); } diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index bb440ef2..fd9053ec 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -136,7 +136,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) // kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl; // KDE4/Qt TODO: Use qobject_cast instead. - if ( widget->inherits("TQPopupMenu") ) + if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { TQPopupMenu* menu = static_cast( widget ); int id; @@ -202,7 +202,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) return containerCount() - 1; } // KDE4/Qt TODO: Use qobject_cast instead. - else if ( widget->inherits( "TQMenuBar" ) ) + else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) { TQMenuBar *bar = static_cast( widget ); -- cgit v1.2.3