diff --git a/src/otrguiclient.cpp b/src/otrguiclient.cpp index 0460551..3182898 100644 --- a/src/otrguiclient.cpp +++ b/src/otrguiclient.cpp @@ -58,11 +58,11 @@ OtrGUIClient::OtrGUIClient( Kopete::ChatSession *parent, const char *name ) connect( this, TQT_SIGNAL( signalVerifyFingerprint( Kopete::ChatSession * ) ), OTRPlugin::plugin(), TQT_SLOT(slotVerifyFingerprint( Kopete::ChatSession * )) ); m_manager = parent; - otrActionMenu = new KActionMenu(i18n("OTR Settings"),"otr_disabled", actionCollection(), "otr_settings"); + otrActionMenu = new TDEActionMenu(i18n("OTR Settings"),"otr_disabled", actionCollection(), "otr_settings"); otrActionMenu->setDelayed( false ); - actionEnableOtr = new KAction(i18n( "Start OTR session" ), "otr_private", 0,this,TQT_SLOT(slotEnableOtr()),actionCollection(), "enable_otr"); - actionDisableOtr = new KAction(i18n("End OTR session"), "otr_disabled",0, this,TQT_SLOT(slotDisableOtr()), actionCollection(), "disable_otr"); - actionVerifyFingerprint = new KAction(i18n("Authenticate Contact"), "signature",0, this,TQT_SLOT(slotVerifyFingerprint()), actionCollection(), "verify_fingerprint"); + actionEnableOtr = new TDEAction(i18n( "Start OTR session" ), "otr_private", 0,this,TQT_SLOT(slotEnableOtr()),actionCollection(), "enable_otr"); + actionDisableOtr = new TDEAction(i18n("End OTR session"), "otr_disabled",0, this,TQT_SLOT(slotDisableOtr()), actionCollection(), "disable_otr"); + actionVerifyFingerprint = new TDEAction(i18n("Authenticate Contact"), "signature",0, this,TQT_SLOT(slotVerifyFingerprint()), actionCollection(), "verify_fingerprint"); otrActionMenu->insert(actionEnableOtr); otrActionMenu->insert(actionDisableOtr); diff --git a/src/otrguiclient.h b/src/otrguiclient.h index e6e1e28..462338f 100644 --- a/src/otrguiclient.h +++ b/src/otrguiclient.h @@ -35,8 +35,8 @@ #include -class KActionMenu; -class KAction; +class TDEActionMenu; +class TDEAction; namespace Kopete { class ChatSession; } @@ -60,10 +60,10 @@ public: private: Kopete::ChatSession *m_manager; - KActionMenu *otrActionMenu; - KAction *actionEnableOtr; - KAction *actionDisableOtr; - KAction *actionVerifyFingerprint; + TDEActionMenu *otrActionMenu; + TDEAction *actionEnableOtr; + TDEAction *actionDisableOtr; + TDEAction *actionVerifyFingerprint; private slots: void slotEnableOtr(); diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp index 47fdcb0..ab8da0a 100644 --- a/src/otrplugin.cpp +++ b/src/otrplugin.cpp @@ -143,7 +143,7 @@ OTRPlugin::OTRPlugin( TQObject *parent, const char *name, const TQStringList & / //adding menu to contaclists menubar and contacts popup menu TQStringList policies; policies << i18n("&Default") << i18n("Al&ways") << i18n("&Opportunistic") << i18n("&Manual") << i18n("Ne&ver"); - otrPolicyMenu = new KSelectAction( i18n( "&OTR Policy" ), TQString::fromLatin1("kopete_otr"), 0, actionCollection(), "otr_policy" ); + otrPolicyMenu = new TDESelectAction( i18n( "&OTR Policy" ), TQString::fromLatin1("kopete_otr"), 0, actionCollection(), "otr_policy" ); otrPolicyMenu->setItems( policies ); otrPolicyMenu->popupMenu()->insertSeparator( 1 ); otrPolicyMenu->setEnabled( false ); diff --git a/src/otrplugin.h b/src/otrplugin.h index f13c802..da6b320 100644 --- a/src/otrplugin.h +++ b/src/otrplugin.h @@ -32,7 +32,7 @@ */ class OTRPlugin; -class KSelectAction; +class TDESelectAction; class OtrMessageHandler : public Kopete::MessageHandler { @@ -98,15 +98,15 @@ private: OtrMessageHandlerFactory *m_inboundHandler; OtrlChatInterface *otrlChatInterface; TQMap messageCache; - KSelectAction* otrPolicyMenu; - -/* KActionMenu *otrPolicyMenuBar; - KActionMenu *otrPolicyPopup; - KAction *otrPolicyDefault; - KAction *otrPolicyAlways; - KAction *otrPolicyOpportunistic; - KAction *otrPolicyManual; - KAction *otrPolicyNever; + TDESelectAction* otrPolicyMenu; + +/* TDEActionMenu *otrPolicyMenuBar; + TDEActionMenu *otrPolicyPopup; + TDEAction *otrPolicyDefault; + TDEAction *otrPolicyAlways; + TDEAction *otrPolicyOpportunistic; + TDEAction *otrPolicyManual; + TDEAction *otrPolicyNever; // SessionManager manager */