diff options
Diffstat (limited to 'kopete/kopete/chatwindow/kopeteemoticonaction.cpp')
| -rw-r--r-- | kopete/kopete/chatwindow/kopeteemoticonaction.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index 4be23dd4..8c2811c9 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -1,7 +1,7 @@ /* kopeteemoticonaction.cpp - KAction to show the emoticon selector + TDEAction to show the emoticon selector Copyright (c) 2002 by Stefan Gehn <metz AT gehn.net> Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> @@ -42,7 +42,7 @@ public: { m_delayed = true; m_stickyMenu = true; - m_popup = new KPopupMenu(0L,"KopeteEmoticonActionPrivate::m_popup"); + m_popup = new TDEPopupMenu(0L,"KopeteEmoticonActionPrivate::m_popup"); emoticonSelector = new EmoticonSelector( m_popup, "KopeteEmoticonActionPrivate::emoticonSelector"); m_popup->insertItem( emoticonSelector ); // TODO: Maybe connect to kopeteprefs and redo list only on config changes @@ -55,14 +55,14 @@ public: m_popup = 0; } - KPopupMenu *m_popup; + TDEPopupMenu *m_popup; EmoticonSelector *emoticonSelector; bool m_delayed; bool m_stickyMenu; }; KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name ) - : KAction( i18n( "Add Smiley" ), 0, parent, name ) + : TDEAction( i18n( "Add Smiley" ), 0, parent, name ) { d = new KopeteEmoticonActionPrivate; @@ -103,7 +103,7 @@ void KopeteEmoticonAction::popup( const TQPoint& global ) popupMenu()->popup( global ); } -KPopupMenu* KopeteEmoticonAction::popupMenu() const +TDEPopupMenu* KopeteEmoticonAction::popupMenu() const { return d->m_popup; } @@ -130,7 +130,7 @@ void KopeteEmoticonAction::setStickyMenu(bool sticky) int KopeteEmoticonAction::plug( TQWidget* widget, int index ) { - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; // kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl; @@ -157,11 +157,11 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) return containerCount() - 1; } // KDE4/TQt TODO: Use qobject_cast instead. - else if ( widget->inherits( "KToolBar" ) ) + else if ( widget->inherits( "TDEToolBar" ) ) { - KToolBar *bar = static_cast<KToolBar *>( widget ); + TDEToolBar *bar = static_cast<TDEToolBar *>( widget ); - int id_ = KAction::getToolButtonID(); + int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet(KIcon::Small).isNull() ) { |