diff options
Diffstat (limited to 'kopete/protocols')
97 files changed, 439 insertions, 439 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index f9a725ee..542211f5 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -70,12 +70,12 @@ public: KFileDialog* saveListDialog; KFileDialog* loadListDialog; - KActionMenu* actionMenu_; - KAction* searchAction; - KAction* listputAction; - KAction* listToFileAction; - KAction* listFromFileAction; - KAction* friendsModeAction; + TDEActionMenu* actionMenu_; + TDEAction* searchAction; + TDEAction* listputAction; + TDEAction* listToFileAction; + TDEAction* listFromFileAction; + TDEAction* friendsModeAction; bool connectWithSSL; int currentServer; @@ -183,19 +183,19 @@ GaduAccount::~GaduAccount() void GaduAccount::initActions() { - p->searchAction = new KAction( i18n( "&Search for Friends" ), "", 0, + p->searchAction = new TDEAction( i18n( "&Search for Friends" ), "", 0, this, TQT_SLOT( slotSearch() ), this, "actionSearch" ); - p->listputAction = new KAction( i18n( "Export Contacts to Server" ), "", 0, + p->listputAction = new TDEAction( i18n( "Export Contacts to Server" ), "", 0, this, TQT_SLOT( slotExportContactsList() ), this, "actionListput" ); - p->listToFileAction = new KAction( i18n( "Export Contacts to File..." ), "", 0, + p->listToFileAction = new TDEAction( i18n( "Export Contacts to File..." ), "", 0, this, TQT_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" ); - p->listFromFileAction = new KAction( i18n( "Import Contacts From File..." ), "", 0, + p->listFromFileAction = new TDEAction( i18n( "Import Contacts From File..." ), "", 0, this, TQT_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" ); - p->friendsModeAction = new KToggleAction( i18n( "Only for Friends" ), "", 0, + p->friendsModeAction = new TDEToggleAction( i18n( "Only for Friends" ), "", 0, this, TQT_SLOT( slotFriendsMode() ), this, "actionFriendsMode" ); - static_cast<KToggleAction*>(p->friendsModeAction)->setChecked( p->forFriends ); + static_cast<TDEToggleAction*>(p->friendsModeAction)->setChecked( p->forFriends ); } void @@ -246,12 +246,12 @@ GaduAccount::setAway( bool isAway, const TQString& awayMessage ) } -KActionMenu* +TDEActionMenu* GaduAccount::actionMenu() { kdDebug(14100) << "actionMenu() " << endl; - p->actionMenu_ = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); + p->actionMenu_ = new TDEActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); p->actionMenu_->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> " ). arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), accountId() ) ); @@ -286,23 +286,23 @@ GaduAccount::actionMenu() else { p->listFromFileAction->setEnabled( TRUE ); } - p->actionMenu_->insert( new KAction( i18n( "Go O&nline" ), + p->actionMenu_->insert( new TDEAction( i18n( "Go O&nline" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); - p->actionMenu_->insert( new KAction( i18n( "Set &Busy" ), + p->actionMenu_->insert( new TDEAction( i18n( "Set &Busy" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ), 0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); - p->actionMenu_->insert( new KAction( i18n( "Set &Invisible" ), + p->actionMenu_->insert( new TDEAction( i18n( "Set &Invisible" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ), 0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); - p->actionMenu_->insert( new KAction( i18n( "Go &Offline" ), + p->actionMenu_->insert( new TDEAction( i18n( "Go &Offline" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), 0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) ); - p->actionMenu_->insert( new KAction( i18n( "Set &Description..." ), "info", + p->actionMenu_->insert( new TDEAction( i18n( "Set &Description..." ), "info", 0, this, TQT_SLOT( slotDescription() ), this, "actionGaduDescription" ) ); p->actionMenu_->insert( p->friendsModeAction ); diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h index dd3f6c68..37e53a7b 100644 --- a/kopete/protocols/gadu/gaduaccount.h +++ b/kopete/protocols/gadu/gaduaccount.h @@ -47,7 +47,7 @@ namespace Kopete { class Protocol; } namespace Kopete { class Message; } class GaduCommand; class TQTimer; -class KActionMenu; +class TDEActionMenu; class GaduDCC; class GaduDCCTransaction; @@ -61,7 +61,7 @@ public: ~GaduAccount(); //{ void setAway( bool isAway, const TQString& awayMessage = TQString() ); - KActionMenu* actionMenu(); + TDEActionMenu* actionMenu(); void dccRequest( GaduContact* ); void sendFile( GaduContact* , TQString& ); //} diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index 9aea8fe5..e797ea40 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -190,18 +190,18 @@ GaduContact::isReachable() return account_->isConnected(); } -TQPtrList<KAction>* +TQPtrList<TDEAction>* GaduContact::customContextMenuActions() { - TQPtrList<KAction> *fakeCollection = new TQPtrList<KAction>(); + TQPtrList<TDEAction> *fakeCollection = new TQPtrList<TDEAction>(); //show profile - KAction* actionShowProfile = new KAction( i18n("Show Profile") , "info", 0, + TDEAction* actionShowProfile = new TDEAction( i18n("Show Profile") , "info", 0, this, TQT_SLOT( slotShowPublicProfile() ), this, "actionShowPublicProfile" ); fakeCollection->append( actionShowProfile ); - KAction* actionEditContact = new KAction( i18n("Edit...") , "edit", 0, + TDEAction* actionEditContact = new TDEAction( i18n("Edit...") , "edit", 0, this, TQT_SLOT( slotEditContact() ), this, "actionEditContact" ); diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h index 05d0f3b8..bcfc1b98 100644 --- a/kopete/protocols/gadu/gaducontact.h +++ b/kopete/protocols/gadu/gaducontact.h @@ -34,7 +34,7 @@ #include <libgadu.h> -class KAction; +class TDEAction; class GaduAccount; namespace Kopete { class Account; } namespace Kopete { class ChatSession; } @@ -52,7 +52,7 @@ public: virtual bool isReachable(); virtual void serialize( TQMap<TQString, TQString>&, TQMap<TQString, TQString>& ); - virtual TQPtrList<KAction>* customContextMenuActions(); + virtual TQPtrList<TDEAction>* customContextMenuActions(); virtual TQString identityId() const; GaduContactsList::ContactLine* contactDetails(); @@ -99,9 +99,9 @@ private: TQString parentIdentity_; GaduAccount* account_; - KAction* actionSendMessage_; - KAction* actionInfo_; - KAction* actionRemove_; + TDEAction* actionSendMessage_; + TDEAction* actionInfo_; + TDEAction* actionRemove_; TQPtrList<Kopete::Contact> thisContact_; diff --git a/kopete/protocols/gadu/gaduprotocol.h b/kopete/protocols/gadu/gaduprotocol.h index 0152d680..853ad5e7 100644 --- a/kopete/protocols/gadu/gaduprotocol.h +++ b/kopete/protocols/gadu/gaduprotocol.h @@ -31,8 +31,8 @@ #include "gaducommands.h" -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class TQWidget; class TQString; diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui index e747e952..5fe042ad 100644 --- a/kopete/protocols/gadu/ui/gadusearch.ui +++ b/kopete/protocols/gadu/ui/gadusearch.ui @@ -408,7 +408,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Status</string> diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index 51be07e1..c61f9dfc 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -79,11 +79,11 @@ GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& a TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); - m_actionAutoReply = new KAction ( i18n( "&Set Auto-Reply..." ), TQString(), 0, this, + m_actionAutoReply = new TDEAction ( i18n( "&Set Auto-Reply..." ), TQString(), 0, this, TQT_SLOT( slotSetAutoReply() ), this, "actionSetAutoReply"); - m_actionJoinChatRoom = new KAction ( i18n( "&Join Channel..." ), TQString(), 0, this, + m_actionJoinChatRoom = new TDEAction ( i18n( "&Join Channel..." ), TQString(), 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "actionJoinChatRoom"); - m_actionManagePrivacy = new KAction ( i18n( "&Manage Privacy..." ), TQString(), 0, this, + m_actionManagePrivacy = new TDEAction ( i18n( "&Manage Privacy..." ), TQString(), 0, this, TQT_SLOT( slotPrivacy() ), this, "actionPrivacy"); m_connector = 0; @@ -100,9 +100,9 @@ GroupWiseAccount::~GroupWiseAccount() cleanup(); } -KActionMenu* GroupWiseAccount::actionMenu() +TDEActionMenu* GroupWiseAccount::actionMenu() { - KActionMenu *m_actionMenu=Kopete::Account::actionMenu(); + TDEActionMenu *m_actionMenu=Kopete::Account::actionMenu(); m_actionAutoReply->setEnabled( isConnected() ); m_actionManagePrivacy->setEnabled( isConnected() ); @@ -112,7 +112,7 @@ KActionMenu* GroupWiseAccount::actionMenu() m_actionMenu->insert( m_actionJoinChatRoom ); /* Used for debugging */ /* - theActionMenu->insert( new KAction ( "Test rtfize()", TQString(), 0, this, + theActionMenu->insert( new TDEAction ( "Test rtfize()", TQString(), 0, this, TQT_SLOT( slotTestRTFize() ), this, "actionTestRTFize") ); */ diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h index df74cf66..abce33be 100644 --- a/kopete/protocols/groupwise/gwaccount.h +++ b/kopete/protocols/groupwise/gwaccount.h @@ -29,7 +29,7 @@ #include <managedconnectionaccount.h> -class KActionMenu; +class TDEActionMenu; namespace Kopete { class Contact; @@ -65,7 +65,7 @@ public: /** * Construct the context menu used for the status bar icon */ - virtual KActionMenu* actionMenu(); + virtual TDEActionMenu* actionMenu(); // DEBUG ONLY void dumpManagers(); @@ -322,10 +322,10 @@ protected: void cleanup(); private: // action menu and its actions - KActionMenu * m_actionMenu; - KAction * m_actionAutoReply; - KAction * m_actionManagePrivacy; - KAction * m_actionJoinChatRoom; + TDEActionMenu * m_actionMenu; + TDEAction * m_actionAutoReply; + TDEAction * m_actionManagePrivacy; + TDEAction * m_actionJoinChatRoom; // Network code KNetworkConnector * m_connector; TQCA::TLS * m_TQCATLS; @@ -344,7 +344,7 @@ private: * @internal * An action that selects an OnlineStatus and provides a status message, but not using Kopete::Away, because the status message relates only to this status. */ -/*class OnlineStatusMessageAction : public KAction +/*class OnlineStatusMessageAction : public TDEAction { Q_OBJECT diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 1aef7110..b225162a 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -158,15 +158,15 @@ Kopete::ChatSession * GroupWiseContact::manager( Kopete::Contact::CanCreateFlags return account()->chatSession( chatMembers, TQString(), canCreate ); } -TQPtrList<KAction> *GroupWiseContact::customContextMenuActions() +TQPtrList<TDEAction> *GroupWiseContact::customContextMenuActions() { - TQPtrList<KAction> *m_actionCollection = new TQPtrList<KAction>; + TQPtrList<TDEAction> *m_actionCollection = new TQPtrList<TDEAction>; // Block/unblock Contact TQString label = account()->isContactBlocked( m_dn ) ? i18n( "Unblock User" ) : i18n( "Block User" ); if( !m_actionBlock ) { - m_actionBlock = new KAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlock() ), + m_actionBlock = new TDEAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlock() ), this, "actionBlock" ); } else diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h index 7de4a61d..aa3d7a32 100644 --- a/kopete/protocols/groupwise/gwcontact.h +++ b/kopete/protocols/groupwise/gwcontact.h @@ -37,8 +37,8 @@ #include "gwfield.h" #include "gwmessagemanager.h" -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; namespace Kopete { class Account; } class GroupWiseAccount; class GroupWiseChatSession; @@ -100,7 +100,7 @@ public: /** * Return the actions for this contact */ - virtual TQPtrList<KAction> *customContextMenuActions(); + virtual TQPtrList<TDEAction> *customContextMenuActions(); /** * Returns a Kopete::ChatSession associated with this contact @@ -173,15 +173,15 @@ protected slots: */ void receivePrivacyChanged( const TQString &, bool ); protected: - KActionCollection* m_actionCollection; + TDEActionCollection* m_actionCollection; int m_objectId; int m_parentId; int m_sequence; TQString m_dn; TQString m_displayName; - KAction* m_actionPrefs; - KAction *m_actionBlock; + TDEAction* m_actionPrefs; + TDEAction *m_actionBlock; // Novell Messenger Properties, as received by the server. // Unfortunately we don't the domain of the set of keys, so they are not easily mappable to KopeteContactProperties TQMap< TQString, TQString > m_serverProperties; diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index 100bbfdf..eef88a7b 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -62,13 +62,13 @@ GroupWiseChatSession::GroupWiseChatSession(const Kopete::Contact* user, Kopete:: TQT_SLOT( slotGotNotTypingNotification( const ConferenceEvent & ) ) ); // Set up the Invite menu - m_actionInvite = new KActionMenu( i18n( "&Invite" ), actionCollection() , "gwInvite" ); + m_actionInvite = new TDEActionMenu( i18n( "&Invite" ), actionCollection() , "gwInvite" ); connect( m_actionInvite->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT(slotActionInviteAboutToShow() ) ) ; - m_secure = new KAction( i18n( "Security Status" ), "encrypted", KShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); + m_secure = new TDEAction( i18n( "Security Status" ), "encrypted", TDEShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); m_secure->setToolTip( i18n( "Conversation is secure" ) ); - m_logging = new KAction( i18n( "Archiving Status" ), "logchat", KShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); + m_logging = new TDEAction( i18n( "Archiving Status" ), "logchat", TDEShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); updateArchiving(); setXMLFile("gwchatui.rc"); @@ -295,7 +295,7 @@ void GroupWiseChatSession::dequeueMessagesAndInvites() void GroupWiseChatSession::slotActionInviteAboutToShow() { - // We can't simply insert KAction in this menu bebause we don't know when to delete them. + // We can't simply insert TDEAction in this menu bebause we don't know when to delete them. // items inserted with insert items are automatically deleted when we call clear m_inviteActions.setAutoDelete(true); @@ -309,14 +309,14 @@ void GroupWiseChatSession::slotActionInviteAboutToShow() { if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { - KAction *a=new KopeteContactAction( it.current(), this, + TDEAction *a=new KopeteContactAction( it.current(), this, TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); m_actionInvite->insert( a ); m_inviteActions.append( a ) ; } } // Invite someone off-list - KAction *b=new KAction( i18n ("&Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); + TDEAction *b=new TDEAction( i18n ("&Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); m_actionInvite->insert( b ); m_inviteActions.append( b ) ; } @@ -330,7 +330,7 @@ void GroupWiseChatSession::slotInviteContact( Kopete::Contact * contact ) } else { - TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; + TQWidget * w = view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; bool ok; TQRegExp rx( ".*" ); @@ -358,7 +358,7 @@ void GroupWiseChatSession::slotInviteOtherContact() if ( !m_searchDlg ) { // show search dialog - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); m_searchDlg = new KDialogBase( w, "invitesearchdialog", false, i18n( "Search for Contact to Invite" ), KDialogBase::Ok|KDialogBase::Cancel ); m_search = new GroupWiseContactSearch( account(), TQListView::Single, true, m_searchDlg, "invitesearchwidget" ); @@ -375,7 +375,7 @@ void GroupWiseChatSession::slotSearchedForUsers() TQValueList< ContactDetails > selected = m_search->selectedResults(); if ( selected.count() ) { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); ContactDetails cd = selected.first(); bool ok; @@ -501,14 +501,14 @@ void GroupWiseChatSession::updateArchiving() void GroupWiseChatSession::slotShowSecurity() { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) ); } void GroupWiseChatSession::slotShowArchiving() { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) ); } diff --git a/kopete/protocols/groupwise/gwmessagemanager.h b/kopete/protocols/groupwise/gwmessagemanager.h index 25f61b9a..931dbae6 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.h +++ b/kopete/protocols/groupwise/gwmessagemanager.h @@ -19,8 +19,8 @@ #include "gwerror.h" class TQLabel; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class KDialogBase; class GroupWiseAccount; class GroupWiseContact; @@ -153,11 +153,11 @@ private: TQValueList< Kopete::Message > m_pendingOutgoingMessages; // messages queued while we wait for the server to tell us the conference is created. Kopete::ContactPtrList m_pendingInvites; // people we wanted to invite to the conference, queued while waiting for the conference to be created. - KActionMenu *m_actionInvite; - TQPtrList<KAction> m_inviteActions; + TDEActionMenu *m_actionInvite; + TQPtrList<TDEAction> m_inviteActions; // labels showing secure and logging status - KAction *m_secure; - KAction *m_logging; + TDEAction *m_secure; + TDEAction *m_logging; // search widget and dialog used for inviting contacts GroupWiseContactSearch * m_search; KDialogBase * m_searchDlg; diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui index c4f9a9c6..7977ce04 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui @@ -331,7 +331,7 @@ <cstring>kListBox1</cstring> </property> </widget> - <widget class="KListBox"> + <widget class="TDEListBox"> <property name="name"> <cstring>m_acl</cstring> </property> diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index 1899a525..86fdd734 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Chatroom </string> diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 3b4670a0..27fe81fb 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -117,7 +117,7 @@ void GroupWiseContactProperties::setupProperties( TQMap< TQString, TQString > se else localised = key; - new KListViewItem( m_propsWidget->m_propsView, localised, it.data() ); + new TDEListViewItem( m_propsWidget->m_propsView, localised, it.data() ); } } diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.h b/kopete/protocols/groupwise/ui/gwcontactproperties.h index 213834bc..f6bbdc46 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.h +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.h @@ -25,7 +25,7 @@ class GroupWiseContactPropsWidget; class KDialogBase; class TQListViewItem; -class KAction; +class TDEAction; /** Logic, wrapping UI, for displaying contact properties @@ -54,7 +54,7 @@ protected slots: void slotCopy(); private: GroupWiseContactPropsWidget * m_propsWidget; - KAction * m_copyAction; + TDEAction * m_copyAction; KDialogBase * m_dialog; }; diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index 95481add..8113c238 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -163,7 +163,7 @@ <string>Additional properties:</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Property</string> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index 0c3efcac..9164d68d 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Name</string> diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 7daf2f8d..3c8c5b85 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -207,9 +207,9 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T setAccountLabel( TQString::fromLatin1("%1@%2").arg(mNickName,networkName) ); m_myServer = m_contactManager->myServer(); - m_joinChannelAction = new KAction ( i18n("Join Channel..."), TQString(), 0, this, + m_joinChannelAction = new TDEAction ( i18n("Join Channel..."), TQString(), 0, this, TQT_SLOT(slotJoinChannel()), this); - m_searchChannelAction = new KAction ( i18n("Search Channels..."), TQString(), 0, this, + m_searchChannelAction = new TDEAction ( i18n("Search Channels..."), TQString(), 0, this, TQT_SLOT(slotSearchChannels()), this); } @@ -414,11 +414,11 @@ void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages, m_errorMessages = (MessageDestination)errorMessages; } -KActionMenu *IRCAccount::actionMenu() +TDEActionMenu *IRCAccount::actionMenu() { TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).arg( accountId() ).arg( myself()->onlineStatus().description() ); - KActionMenu *mActionMenu = Kopete::Account::actionMenu(); + TDEActionMenu *mActionMenu = Kopete::Account::actionMenu(); m_joinChannelAction->setEnabled( isConnected() ); m_searchChannelAction->setEnabled( isConnected() ); @@ -426,11 +426,11 @@ KActionMenu *IRCAccount::actionMenu() mActionMenu->popupMenu()->insertSeparator(); mActionMenu->insert(m_joinChannelAction); mActionMenu->insert(m_searchChannelAction); - mActionMenu->insert( new KAction ( i18n("Show Server Window"), TQString(), 0, this, TQT_SLOT(slotShowServerWindow()), mActionMenu ) ); + mActionMenu->insert( new TDEAction ( i18n("Show Server Window"), TQString(), 0, this, TQT_SLOT(slotShowServerWindow()), mActionMenu ) ); if( m_engine->isConnected() && m_engine->useSSL() ) { - mActionMenu->insert( new KAction ( i18n("Show Security Information"), "", 0, m_engine, + mActionMenu->insert( new TDEAction ( i18n("Show Security Information"), "", 0, m_engine, TQT_SLOT(showInfoDialog()), mActionMenu ) ); } diff --git a/kopete/protocols/irc/ircaccount.h b/kopete/protocols/irc/ircaccount.h index 640fb678..f942000c 100644 --- a/kopete/protocols/irc/ircaccount.h +++ b/kopete/protocols/irc/ircaccount.h @@ -48,8 +48,8 @@ class ChatSession; class MetaContact; } -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; struct IRCHost { @@ -156,7 +156,7 @@ public: public slots: - virtual KActionMenu *actionMenu(); + virtual TDEActionMenu *actionMenu(); virtual void setAway( bool isAway, const TQString &awayMessage = TQString() ); @@ -239,8 +239,8 @@ private: TQMap< TQString, TQString > m_customCtcp; Kopete::ChatSession *commandSource; - KAction *m_joinChannelAction; - KAction *m_searchChannelAction; + TDEAction *m_joinChannelAction; + TDEAction *m_searchChannelAction; }; #endif diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index cab34817..71071610 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -59,11 +59,11 @@ IRCChannelContact::IRCChannelContact(IRCContactManager *contactManager, const TQ this, TQT_SLOT(slotChannelListed(const TQString &, uint, const TQString &))); actionJoin = 0L; - actionModeT = new KToggleAction(i18n("Only Operators Can Change &Topic"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeN = new KToggleAction(i18n("&No Outside Messages"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeS = new KToggleAction(i18n("&Secret"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeM = new KToggleAction(i18n("&Moderated"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeI = new KToggleAction(i18n("&Invite Only"), 0, this, TQT_SLOT(slotModeChanged()), this ); + actionModeT = new TDEToggleAction(i18n("Only Operators Can Change &Topic"), 0, this, TQT_SLOT(slotModeChanged()), this ); + actionModeN = new TDEToggleAction(i18n("&No Outside Messages"), 0, this, TQT_SLOT(slotModeChanged()), this ); + actionModeS = new TDEToggleAction(i18n("&Secret"), 0, this, TQT_SLOT(slotModeChanged()), this ); + actionModeM = new TDEToggleAction(i18n("&Moderated"), 0, this, TQT_SLOT(slotModeChanged()), this ); + actionModeI = new TDEToggleAction(i18n("&Invite Only"), 0, this, TQT_SLOT(slotModeChanged()), this ); actionHomePage = 0L; updateStatus(); @@ -653,19 +653,19 @@ bool IRCChannelContact::modeEnabled( TQChar mode, TQString *value ) return false; } -TQPtrList<KAction> *IRCChannelContact::customContextMenuActions() +TQPtrList<TDEAction> *IRCChannelContact::customContextMenuActions() { - TQPtrList<KAction> *mCustomActions = new TQPtrList<KAction>(); + TQPtrList<TDEAction> *mCustomActions = new TQPtrList<TDEAction>(); if( !actionJoin ) { - actionJoin = new KAction(i18n("&Join"), 0, this, TQT_SLOT(join()), this, "actionJoin"); - actionPart = new KAction(i18n("&Part"), 0, this, TQT_SLOT(partAction()), this, "actionPart"); - actionTopic = new KAction(i18n("Change &Topic..."), 0, this, TQT_SLOT(setTopic()), this, "actionTopic"); - actionModeMenu = new KActionMenu(i18n("Channel Modes"), 0, this, "actionModeMenu"); + actionJoin = new TDEAction(i18n("&Join"), 0, this, TQT_SLOT(join()), this, "actionJoin"); + actionPart = new TDEAction(i18n("&Part"), 0, this, TQT_SLOT(partAction()), this, "actionPart"); + actionTopic = new TDEAction(i18n("Change &Topic..."), 0, this, TQT_SLOT(setTopic()), this, "actionTopic"); + actionModeMenu = new TDEActionMenu(i18n("Channel Modes"), 0, this, "actionModeMenu"); if( !property(m_protocol->propHomepage).value().isNull() ) { - actionHomePage = new KAction( i18n("Visit &Homepage"), 0, this, + actionHomePage = new TDEAction( i18n("Visit &Homepage"), 0, this, TQT_SLOT(slotHomepage()), this, "actionHomepage"); } else if( actionHomePage ) diff --git a/kopete/protocols/irc/ircchannelcontact.h b/kopete/protocols/irc/ircchannelcontact.h index 853bd256..f78862b4 100644 --- a/kopete/protocols/irc/ircchannelcontact.h +++ b/kopete/protocols/irc/ircchannelcontact.h @@ -21,11 +21,11 @@ #include "irccontact.h" -class KActionCollection; -class KAction; -class KActionMenu; +class TDEActionCollection; +class TDEAction; +class TDEActionMenu; class KCodecAction; -class KToggleAction; +class TDEToggleAction; namespace Kopete { class MetaContact; } namespace Kopete { class ChatSession; } @@ -74,7 +74,7 @@ public: bool modeEnabled( TQChar mode, TQString *value = 0 ); // Kopete::Contact stuff - virtual TQPtrList<KAction> *customContextMenuActions(); + virtual TQPtrList<TDEAction> *customContextMenuActions(); virtual const TQString caption() const; //Methods handled by the signal mapper @@ -131,18 +131,18 @@ private slots: void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus); private: - KAction *actionJoin; - KAction *actionPart; - KAction *actionTopic; - KAction *actionHomePage; - KActionMenu *actionModeMenu; + TDEAction *actionJoin; + TDEAction *actionPart; + TDEAction *actionTopic; + TDEAction *actionHomePage; + TDEActionMenu *actionModeMenu; KCodecAction *codecAction; - KToggleAction *actionModeT; // Only Operators Can Change Topic - KToggleAction *actionModeN; // No Outside Messages - KToggleAction *actionModeS; // Secret - KToggleAction *actionModeI; // Invite Only - KToggleAction *actionModeM; // Moderated + TDEToggleAction *actionModeT; // Only Operators Can Change Topic + TDEToggleAction *actionModeN; // No Outside Messages + TDEToggleAction *actionModeS; // Secret + TDEToggleAction *actionModeI; // Invite Only + TDEToggleAction *actionModeM; // Moderated TQString mTopic; TQString mPassword; diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp index 43febda9..702aafa9 100644 --- a/kopete/protocols/irc/ircguiclient.cpp +++ b/kopete/protocols/irc/ircguiclient.cpp @@ -53,7 +53,7 @@ IRCGUIClient::IRCGUIClient( Kopete::ChatSession *parent ) : TQObject(parent) , K setXMLFile("ircchatui.rc"); unplugActionList( "irccontactactionlist" ); - TQPtrList<KAction> *actions = m_user->customContextMenuActions( parent ); + TQPtrList<TDEAction> *actions = m_user->customContextMenuActions( parent ); plugActionList( "irccontactactionlist", *actions ); delete actions; */ @@ -62,10 +62,10 @@ IRCGUIClient::IRCGUIClient( Kopete::ChatSession *parent ) : TQObject(parent) , K TQDomDocument doc = domDocument(); TQDomNode menu = doc.documentElement().firstChild().firstChild(); - TQPtrList<KAction> *actions = m_user->customContextMenuActions( parent ); + TQPtrList<TDEAction> *actions = m_user->customContextMenuActions( parent ); if( actions ) { - for( KAction *a = actions->first(); a; a = actions->next() ) + for( TDEAction *a = actions->first(); a; a = actions->next() ) { actionCollection()->insert( a ); TQDomElement newNode = doc.createElement( "Action" ); diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index e2d359dd..2f39a329 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -382,7 +382,7 @@ void IRCProtocol::slotMessageFilter( Kopete::Message &msg ) } } -TQPtrList<KAction> *IRCProtocol::customChatWindowPopupActions( const Kopete::Message &m, DOM::Node &n ) +TQPtrList<TDEAction> *IRCProtocol::customChatWindowPopupActions( const Kopete::Message &m, DOM::Node &n ) { DOM::HTMLElement e = n; diff --git a/kopete/protocols/irc/ircprotocol.h b/kopete/protocols/irc/ircprotocol.h index 7820da1f..fe3ee85a 100644 --- a/kopete/protocols/irc/ircprotocol.h +++ b/kopete/protocols/irc/ircprotocol.h @@ -98,7 +98,7 @@ public: virtual Kopete::Account* createNewAccount(const TQString &accountId); - virtual TQPtrList<KAction> *customChatWindowPopupActions( const Kopete::Message &, DOM::Node & ); + virtual TQPtrList<TDEAction> *customChatWindowPopupActions( const Kopete::Message &, DOM::Node & ); static IRCProtocol *protocol(); diff --git a/kopete/protocols/irc/ircservercontact.h b/kopete/protocols/irc/ircservercontact.h index 97f99d88..17f6d0aa 100644 --- a/kopete/protocols/irc/ircservercontact.h +++ b/kopete/protocols/irc/ircservercontact.h @@ -27,9 +27,9 @@ #include <tqvaluelist.h> #include <tqstringlist.h> -class KActionCollection; -class KAction; -class KActionMenu; +class TDEActionCollection; +class TDEAction; +class TDEActionMenu; class KopeteView; class IRCContactManager; diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index fa2ae7b5..03806208 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -524,45 +524,45 @@ void IRCUserContact::newWhoReply( const TQString &channel, const TQString &user, } } -TQPtrList<KAction> *IRCUserContact::customContextMenuActions( Kopete::ChatSession *manager ) +TQPtrList<TDEAction> *IRCUserContact::customContextMenuActions( Kopete::ChatSession *manager ) { if( manager ) { - TQPtrList<KAction> *mCustomActions = new TQPtrList<KAction> (); + TQPtrList<TDEAction> *mCustomActions = new TQPtrList<TDEAction> (); mActiveManager = manager; Kopete::ContactPtrList members = mActiveManager->members(); IRCChannelContact *isChannel = dynamic_cast<IRCChannelContact*>( members.first() ); if( !actionCtcpMenu ) { - actionCtcpMenu = new KActionMenu(i18n("C&TCP"), 0, this ); - actionCtcpMenu->insert( new KAction(i18n("&Version"), 0, this, + actionCtcpMenu = new TDEActionMenu(i18n("C&TCP"), 0, this ); + actionCtcpMenu->insert( new TDEAction(i18n("&Version"), 0, this, TQT_SLOT(slotCtcpVersion()), actionCtcpMenu) ); - actionCtcpMenu->insert( new KAction(i18n("&Ping"), 0, this, + actionCtcpMenu->insert( new TDEAction(i18n("&Ping"), 0, this, TQT_SLOT(slotCtcpPing()), actionCtcpMenu) ); - actionModeMenu = new KActionMenu(i18n("&Modes"), 0, this, "actionModeMenu"); - actionModeMenu->insert( new KAction(i18n("&Op"), 0, this, + actionModeMenu = new TDEActionMenu(i18n("&Modes"), 0, this, "actionModeMenu"); + actionModeMenu->insert( new TDEAction(i18n("&Op"), 0, this, TQT_SLOT(slotOp()), actionModeMenu, "actionOp") ); - actionModeMenu->insert( new KAction(i18n("&Deop"), 0, this, + actionModeMenu->insert( new TDEAction(i18n("&Deop"), 0, this, TQT_SLOT(slotDeop()), actionModeMenu, "actionDeop") ); - actionModeMenu->insert( new KAction(i18n("&Voice"), 0, this, + actionModeMenu->insert( new TDEAction(i18n("&Voice"), 0, this, TQT_SLOT(slotVoice()), actionModeMenu, "actionVoice") ); - actionModeMenu->insert( new KAction(i18n("Devoice"), 0, this, + actionModeMenu->insert( new TDEAction(i18n("Devoice"), 0, this, TQT_SLOT(slotDevoice()), actionModeMenu, "actionDevoice") ); actionModeMenu->setEnabled( false ); - actionKick = new KAction(i18n("&Kick"), 0, this, TQT_SLOT(slotKick()), this); + actionKick = new TDEAction(i18n("&Kick"), 0, this, TQT_SLOT(slotKick()), this); actionKick->setEnabled( false ); - actionBanMenu = new KActionMenu(i18n("&Ban"), 0, this, "actionBanMenu"); - actionBanMenu->insert( new KAction(i18n("Host (*!*@host.domain.net)"), 0, this, + actionBanMenu = new TDEActionMenu(i18n("&Ban"), 0, this, "actionBanMenu"); + actionBanMenu->insert( new TDEAction(i18n("Host (*!*@host.domain.net)"), 0, this, TQT_SLOT(slotBanHost()), actionBanMenu ) ); - actionBanMenu->insert( new KAction(i18n("Domain (*!*@*.domain.net)"), 0, this, + actionBanMenu->insert( new TDEAction(i18n("Domain (*!*@*.domain.net)"), 0, this, TQT_SLOT(slotBanDomain()), actionBanMenu ) ); - actionBanMenu->insert( new KAction(i18n("User@Host (*!*user@host.domain.net)"), 0, this, + actionBanMenu->insert( new TDEAction(i18n("User@Host (*!*user@host.domain.net)"), 0, this, TQT_SLOT(slotBanUserHost()), actionBanMenu ) ); - actionBanMenu->insert( new KAction(i18n("User@Domain (*!*user@*.domain.net)"), 0, this, + actionBanMenu->insert( new TDEAction(i18n("User@Domain (*!*user@*.domain.net)"), 0, this, TQT_SLOT(slotBanUserDomain()), actionBanMenu ) ); actionBanMenu->setEnabled( false ); diff --git a/kopete/protocols/irc/ircusercontact.h b/kopete/protocols/irc/ircusercontact.h index 25461b15..2ad420f5 100644 --- a/kopete/protocols/irc/ircusercontact.h +++ b/kopete/protocols/irc/ircusercontact.h @@ -25,9 +25,9 @@ class TQTimer; -class KActionCollection; -class KAction; -class KActionMenu; +class TDEActionCollection; +class TDEAction; +class TDEActionMenu; class KCodecAction; class IRCContactManager; @@ -68,7 +68,7 @@ public: IRCUserContact(IRCContactManager *, const TQString &nickname, Kopete::MetaContact *mc); // Kopete::Contact stuff - virtual TQPtrList<KAction> *customContextMenuActions( Kopete::ChatSession *manager ); + virtual TQPtrList<TDEAction> *customContextMenuActions( Kopete::ChatSession *manager ); virtual const TQString caption() const; void setAway(bool isAway); @@ -132,10 +132,10 @@ private: void contactMode(const TQString &mode); void updateInfo(); - KActionMenu *actionModeMenu; - KActionMenu *actionCtcpMenu; - KAction *actionKick; - KActionMenu *actionBanMenu; + TDEActionMenu *actionModeMenu; + TDEActionMenu *actionCtcpMenu; + TDEAction *actionKick; + TDEActionMenu *actionBanMenu; KCodecAction *codecAction; Kopete::ChatSession *mActiveManager; TQTimer *mOnlineTimer; diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 97964885..8d864078 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -20,8 +20,8 @@ #include "kcodecaction.h" -KCodecAction::KCodecAction( const TQString &text, const KShortcut &cut, - TQObject *parent, const char *name ) : KSelectAction( text, "", cut, parent, name ) +KCodecAction::KCodecAction( const TQString &text, const TDEShortcut &cut, + TQObject *parent, const char *name ) : TDESelectAction( text, "", cut, parent, name ) { TQObject::connect( this, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( slotActivated( const TQString & ) ) ); diff --git a/kopete/protocols/irc/kcodecaction.h b/kopete/protocols/irc/kcodecaction.h index 5689d751..e581e713 100644 --- a/kopete/protocols/irc/kcodecaction.h +++ b/kopete/protocols/irc/kcodecaction.h @@ -26,12 +26,12 @@ #include <kaction.h> #endif -class KCodecAction : public KSelectAction +class KCodecAction : public TDESelectAction { Q_OBJECT public: - KCodecAction( const TQString &text, const KShortcut &cut = KShortcut(), + KCodecAction( const TQString &text, const TDEShortcut &cut = TDEShortcut(), TQObject *parent = 0, const char *name = 0 ); void setCodec( const TQTextCodec *codec ); diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index d7ef0279..2d4e357b 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -38,19 +38,19 @@ #include <tqspinbox.h> #include <tqwhatsthis.h> -class ChannelListItem : public KListViewItem +class ChannelListItem : public TDEListViewItem { public: - ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ); + ChannelListItem( TDEListView *parent, TQString arg1, TQString arg2, TQString arg3 ); virtual int compare( TQListViewItem *i, int col, bool ascending ) const; virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); private: - KListView *parentList; + TDEListView *parentList; }; -ChannelListItem::ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ) : - KListViewItem( parent, parent->lastItem() ), parentList( parent ) +ChannelListItem::ChannelListItem( TDEListView *parent, TQString arg1, TQString arg2, TQString arg3 ) : + TDEListViewItem( parent, parent->lastItem() ), parentList( parent ) { setText(0, arg1); setText(1, arg2); @@ -76,15 +76,15 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum { TQPixmap back( width, height() ); TQPainter paint( &back ); - //KListViewItem::paintCell( &paint, cg, column, width, align ); + //TDEListViewItem::paintCell( &paint, cg, column, width, align ); // PASTED FROM KLISTVIEWITEM: // set the alternate cell background colour if necessary TQColorGroup _cg = cg; if (isAlternate()) if (listView()->viewport()->backgroundMode()==TQt::FixedColor) - _cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); + _cg.setColor(TQColorGroup::Background, static_cast< TDEListView* >(listView())->alternateBackground()); else - _cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); + _cg.setColor(TQColorGroup::Base, static_cast< TDEListView* >(listView())->alternateBackground()); // PASTED FROM TQLISTVIEWITEM { TQPainter *p = &paint; @@ -186,7 +186,7 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine ) layout72_2->addWidget( mSearchButton ); ChannelListLayout->addLayout( layout72_2 ); - mChannelList = new KListView( this, "mChannelList" ); + mChannelList = new TDEListView( this, "mChannelList" ); mChannelList->addColumn( i18n( "Channel" ) ); mChannelList->addColumn( i18n( "Users" ) ); mChannelList->header()->setResizeEnabled( FALSE, mChannelList->header()->count() - 1 ); diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h index 077372b0..84bf3464 100644 --- a/kopete/protocols/irc/ui/channellist.h +++ b/kopete/protocols/irc/ui/channellist.h @@ -30,7 +30,7 @@ class TQGridLayout; class TQLabel; class TQLineEdit; class TQPushButton; -class KListView; +class TDEListView; class TQSpinBox; class TQListViewItem; @@ -67,7 +67,7 @@ class ChannelList TQLineEdit* channelSearch; TQSpinBox* numUsers; TQPushButton* mSearchButton; - KListView* mChannelList; + TDEListView* mChannelList; TQVBoxLayout* ChannelListLayout; TQHBoxLayout* layout72_2; KIRC::Engine *m_engine; diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui index c184b92e..4b308655 100644 --- a/kopete/protocols/irc/ui/irceditaccount.ui +++ b/kopete/protocols/irc/ui/irceditaccount.ui @@ -757,7 +757,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>CTCP</string> @@ -915,7 +915,7 @@ </widget> </hbox> </widget> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Command</string> diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 430282fb..12784ae5 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -106,11 +106,11 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident } } - connect( commandList, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotCommandContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( commandList, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), + this, TQT_SLOT( slotCommandContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( ctcpList, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotCtcpContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( ctcpList, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), + this, TQT_SLOT( slotCtcpContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); connect( addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCommand() ) ); connect( editButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotEditNetworks() ) ); @@ -171,7 +171,7 @@ void IRCEditAccountWidget::slotUpdateNetworkDescription( const TQString &network ); } -void IRCEditAccountWidget::slotCommandContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) +void IRCEditAccountWidget::slotCommandContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) { TQPopupMenu popup; popup.insertItem( i18n("Remove Command"), 1 ); @@ -179,7 +179,7 @@ void IRCEditAccountWidget::slotCommandContextMenu( KListView *, TQListViewItem * delete item; } -void IRCEditAccountWidget::slotCtcpContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) +void IRCEditAccountWidget::slotCtcpContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) { TQPopupMenu popup; popup.insertItem( i18n("Remove CTCP Reply"), 1 ); diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.h b/kopete/protocols/irc/ui/irceditaccountwidget.h index b11f2424..9f54e71b 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.h +++ b/kopete/protocols/irc/ui/irceditaccountwidget.h @@ -23,7 +23,7 @@ class IRCProtocol; class IRCAccount; -class KListView; +class TDEListView; class TQListViewItem; class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccountWidget @@ -40,8 +40,8 @@ class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccount virtual Kopete::Account *apply(); private slots: - void slotCommandContextMenu( KListView*, TQListViewItem*, const TQPoint & ); - void slotCtcpContextMenu( KListView*, TQListViewItem*, const TQPoint & ); + void slotCommandContextMenu( TDEListView*, TQListViewItem*, const TQPoint & ); + void slotCtcpContextMenu( TDEListView*, TQListViewItem*, const TQPoint & ); void slotAddCommand(); void slotAddCtcp(); void slotEditNetworks(); diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 23f947fc..5d1caae1 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -170,15 +170,15 @@ void JabberAccount::setS5BServerPort ( int port ) } -KActionMenu *JabberAccount::actionMenu () +TDEActionMenu *JabberAccount::actionMenu () { - KActionMenu *m_actionMenu = Kopete::Account::actionMenu(); + TDEActionMenu *m_actionMenu = Kopete::Account::actionMenu(); m_actionMenu->popupMenu()->insertSeparator(); - KAction *action; + TDEAction *action; - action = new KAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat"); + action = new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat"); m_actionMenu->insert(action); action->setEnabled( isConnected() ); @@ -189,17 +189,17 @@ KActionMenu *JabberAccount::actionMenu () m_actionMenu->popupMenu()->insertSeparator(); - action = new KAction ( i18n ("Services..."), "jabber_serv_on", 0, + action = new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0, this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices"); action->setEnabled( isConnected() ); m_actionMenu->insert ( action ); - action = new KAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0, + action = new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0, this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ; action->setEnabled( isConnected() ); m_actionMenu->insert ( action ); - action = new KAction ( i18n ("Edit User Info..."), "identity", 0, + action = new TDEAction ( i18n ("Edit User Info..."), "identity", 0, this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ; action->setEnabled( isConnected() ); m_actionMenu->insert ( action ); diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h index 05bb5f42..ebd4bff5 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -35,7 +35,7 @@ class TQString; class TQStringList; -class KActionMenu; +class TDEActionMenu; class JabberResourcePool; class JabberContact; class JabberContactPool; @@ -64,7 +64,7 @@ public: ~JabberAccount (); /* Returns the action menu for this account. */ - virtual KActionMenu *actionMenu (); + virtual TDEActionMenu *actionMenu (); /* Return the resource of the client */ const TQString resource () const; diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h index bb430f11..494a479c 100644 --- a/kopete/protocols/jabber/jabberbasecontact.h +++ b/kopete/protocols/jabber/jabberbasecontact.h @@ -78,7 +78,7 @@ public: * Create custom context menu items for the contact * FIXME: implement manager version here? */ - virtual TQPtrList<KAction> *customContextMenuActions () = 0; + virtual TQPtrList<TDEAction> *customContextMenuActions () = 0; /** * Serialize contact diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 661f0974..54a17943 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -127,9 +127,9 @@ void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) m_conferencesJID += jid.full(); } -KAction * JabberBookmarks::bookmarksAction(TQObject *parent) +TDEAction * JabberBookmarks::bookmarksAction(TQObject *parent) { - KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); + TDESelectAction *groupchatBM = new TDESelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); groupchatBM->setItems(m_conferencesJID); TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&))); return groupchatBM; diff --git a/kopete/protocols/jabber/jabberbookmarks.h b/kopete/protocols/jabber/jabberbookmarks.h index f60f1ccf..16014e6d 100644 --- a/kopete/protocols/jabber/jabberbookmarks.h +++ b/kopete/protocols/jabber/jabberbookmarks.h @@ -26,7 +26,7 @@ namespace XMPP { class Jid; } class JabberAccount; class JabberProtocol; -class KAction; +class TDEAction; /** * This is a class that hanlde the bookmark collection (JEP-0048) @@ -53,7 +53,7 @@ class JabberBookmarks : public TQObject /** * return an action that will be added in the jabber popup menu */ - KAction *bookmarksAction(TQObject * parent); + TDEAction *bookmarksAction(TQObject * parent); private slots: void accountConnected(); void slotReceivedBookmarks(); diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index cbfc0eab..71b2c7d6 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -65,7 +65,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas slotUpdateDisplayName (); #ifdef SUPPORT_JINGLE - KAction *jabber_voicecall = new KAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQT_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" ); + TDEAction *jabber_voicecall = new TDEAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQT_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" ); setInstance(protocol->instance()); jabber_voicecall->setEnabled( false ); @@ -85,7 +85,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas #endif - new KAction( i18n( "Send File" ), "attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" ); + new TDEAction( i18n( "Send File" ), "attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" ); setXMLFile("jabberchatui.rc"); diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 1d7d2e3f..708d9f16 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -127,46 +127,46 @@ JabberContact::~JabberContact() kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << contactId() << " is destroyed - " << this << endl; } -TQPtrList<KAction> *JabberContact::customContextMenuActions () +TQPtrList<TDEAction> *JabberContact::customContextMenuActions () { - TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); + TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>(); - KActionMenu *actionAuthorization = new KActionMenu ( i18n ("Authorization"), "connect_established", this, "jabber_authorization"); + TDEActionMenu *actionAuthorization = new TDEActionMenu ( i18n ("Authorization"), "connect_established", this, "jabber_authorization"); - KAction *resendAuthAction, *requestAuthAction, *removeAuthAction; + TDEAction *resendAuthAction, *requestAuthAction, *removeAuthAction; - resendAuthAction = new KAction (i18n ("(Re)send Authorization To"), "mail_forward", 0, + resendAuthAction = new TDEAction (i18n ("(Re)send Authorization To"), "mail_forward", 0, this, TQT_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth"); resendAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::To || mRosterItem.subscription().type() == XMPP::Subscription::None ); actionAuthorization->insert(resendAuthAction); - requestAuthAction = new KAction (i18n ("(Re)request Authorization From"), "mail_reply", 0, + requestAuthAction = new TDEAction (i18n ("(Re)request Authorization From"), "mail_reply", 0, this, TQT_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth"); requestAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::From || mRosterItem.subscription().type() == XMPP::Subscription::None ); actionAuthorization->insert(requestAuthAction); - removeAuthAction = new KAction (i18n ("Remove Authorization From"), "mail_delete", 0, + removeAuthAction = new TDEAction (i18n ("Remove Authorization From"), "mail_delete", 0, this, TQT_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth"); removeAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::Both || mRosterItem.subscription().type() == XMPP::Subscription::From ); actionAuthorization->insert(removeAuthAction); - KActionMenu *actionSetAvailability = new KActionMenu (i18n ("Set Availability"), "kopeteavailable", this, "jabber_online"); + TDEActionMenu *actionSetAvailability = new TDEActionMenu (i18n ("Set Availability"), "kopeteavailable", this, "jabber_online"); - actionSetAvailability->insert(new KAction (i18n ("Online"), protocol()->JabberKOSOnline.iconFor(this), + actionSetAvailability->insert(new TDEAction (i18n ("Online"), protocol()->JabberKOSOnline.iconFor(this), 0, this, TQT_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline")); - actionSetAvailability->insert(new KAction (i18n ("Free to Chat"), protocol()->JabberKOSChatty.iconFor(this), + actionSetAvailability->insert(new TDEAction (i18n ("Free to Chat"), protocol()->JabberKOSChatty.iconFor(this), 0, this, TQT_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty")); - actionSetAvailability->insert(new KAction (i18n ("Away"), protocol()->JabberKOSAway.iconFor(this), + actionSetAvailability->insert(new TDEAction (i18n ("Away"), protocol()->JabberKOSAway.iconFor(this), 0, this, TQT_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway")); - actionSetAvailability->insert(new KAction (i18n ("Extended Away"), protocol()->JabberKOSXA.iconFor(this), + actionSetAvailability->insert(new TDEAction (i18n ("Extended Away"), protocol()->JabberKOSXA.iconFor(this), 0, this, TQT_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA")); - actionSetAvailability->insert(new KAction (i18n ("Do Not Disturb"), protocol()->JabberKOSDND.iconFor(this), + actionSetAvailability->insert(new TDEAction (i18n ("Do Not Disturb"), protocol()->JabberKOSDND.iconFor(this), 0, this, TQT_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND")); - actionSetAvailability->insert(new KAction (i18n ("Invisible"), protocol()->JabberKOSInvisible.iconFor(this), + actionSetAvailability->insert(new TDEAction (i18n ("Invisible"), protocol()->JabberKOSInvisible.iconFor(this), 0, this, TQT_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible")); - KActionMenu *actionSelectResource = new KActionMenu (i18n ("Select Resource"), "connect_no", this, "actionSelectResource"); + TDEActionMenu *actionSelectResource = new TDEActionMenu (i18n ("Select Resource"), "connect_no", this, "actionSelectResource"); // if the contact is online, display the resources we have for it, // otherwise disable the menu @@ -203,7 +203,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions () { if( i == activeItem ) { - actionSelectResource->insert ( new KAction( ( *it ), "button_ok", 0, this, TQT_SLOT( slotSelectResource() ), + actionSelectResource->insert ( new TDEAction( ( *it ), "button_ok", 0, this, TQT_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); } else @@ -215,7 +215,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions () TQIconSet iconSet ( !i ? protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () )); - actionSelectResource->insert ( new KAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ), + actionSelectResource->insert ( new TDEAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); } @@ -230,7 +230,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions () #ifdef SUPPORT_JINGLE - KAction *actionVoiceCall = new KAction (i18n ("Voice call"), "voicecall", 0, this, TQT_SLOT (voiceCall ()), this, "jabber_voicecall"); + TDEAction *actionVoiceCall = new TDEAction (i18n ("Voice call"), "voicecall", 0, this, TQT_SLOT (voiceCall ()), this, "jabber_voicecall"); actionVoiceCall->setEnabled( false ); actionCollection->append( actionVoiceCall ); @@ -1075,7 +1075,7 @@ void JabberContact::sendSubscription ( const TQString& subType ) void JabberContact::slotSelectResource () { - int currentItem = TQString ( static_cast<const KAction *>( sender() )->name () ).toUInt (); + int currentItem = TQString ( static_cast<const TDEAction *>( sender() )->name () ).toUInt (); /* * Warn the user if there is already an active chat window. @@ -1101,7 +1101,7 @@ void JabberContact::slotSelectResource () } else { - TQString selectedResource = static_cast<const KAction *>(sender())->text(); + TQString selectedResource = static_cast<const TDEAction *>(sender())->text(); kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Moving to resource " << selectedResource << endl; diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h index 4dcb6f8b..472360ab 100644 --- a/kopete/protocols/jabber/jabbercontact.h +++ b/kopete/protocols/jabber/jabbercontact.h @@ -47,7 +47,7 @@ public: * Create custom context menu items for the contact * FIXME: implement manager version here? */ - TQPtrList<KAction> *customContextMenuActions (); + TQPtrList<TDEAction> *customContextMenuActions (); /** * Start a rename request. diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index 96ab9bcd..b110b521 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -109,11 +109,11 @@ JabberGroupContact::~JabberGroupContact () } } -TQPtrList<KAction> *JabberGroupContact::customContextMenuActions () +TQPtrList<TDEAction> *JabberGroupContact::customContextMenuActions () { - TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); + TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>(); - KAction *actionSetNick = new KAction (i18n ("Change nick name"), 0, 0, this, TQT_SLOT (slotChangeNick()), this, "jabber_changenick"); + TDEAction *actionSetNick = new TDEAction (i18n ("Change nick name"), 0, 0, this, TQT_SLOT (slotChangeNick()), this, "jabber_changenick"); actionCollection->append( actionSetNick ); return actionCollection; diff --git a/kopete/protocols/jabber/jabbergroupcontact.h b/kopete/protocols/jabber/jabbergroupcontact.h index 07ae6f40..899ba96a 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.h +++ b/kopete/protocols/jabber/jabbergroupcontact.h @@ -40,7 +40,7 @@ public: * Create custom context menu items for the contact * FIXME: implement manager version here? */ - TQPtrList<KAction> *customContextMenuActions (); + TQPtrList<TDEAction> *customContextMenuActions (); /** * Deal with an incoming message for this contact. diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp index e1bbd04a..3bbc7a94 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp +++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp @@ -56,7 +56,7 @@ JabberGroupMemberContact::~JabberGroupMemberContact () } } -TQPtrList<KAction> *JabberGroupMemberContact::customContextMenuActions () +TQPtrList<TDEAction> *JabberGroupMemberContact::customContextMenuActions () { return 0; diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.h b/kopete/protocols/jabber/jabbergroupmembercontact.h index 49dd9417..1202f1f7 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.h +++ b/kopete/protocols/jabber/jabbergroupmembercontact.h @@ -41,7 +41,7 @@ public: * Create custom context menu items for the contact * FIXME: implement manager version here? */ - TQPtrList<KAction> *customContextMenuActions (); + TQPtrList<TDEAction> *customContextMenuActions (); /** * Return message manager for this instance. diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index adc53b01..6b658b2c 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -121,43 +121,43 @@ JabberTransport::~JabberTransport () m_account->removeTransport( myself()->contactId() ); } -KActionMenu *JabberTransport::actionMenu () +TDEActionMenu *JabberTransport::actionMenu () { - KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); + TDEActionMenu *menu = new TDEActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick ) ); - TQPtrList<KAction> *customActions = myself()->customContextMenuActions( ); + TQPtrList<TDEAction> *customActions = myself()->customContextMenuActions( ); if( customActions && !customActions->isEmpty() ) { menu->popupMenu()->insertSeparator(); - for( KAction *a = customActions->first(); a; a = customActions->next() ) + for( TDEAction *a = customActions->first(); a; a = customActions->next() ) a->plug( menu->popupMenu() ); } delete customActions; return menu; -/* KActionMenu *m_actionMenu = Kopete::Account::actionMenu(); +/* TDEActionMenu *m_actionMenu = Kopete::Account::actionMenu(); m_actionMenu->popupMenu()->insertSeparator(); - m_actionMenu->insert(new KAction (i18n ("Join Groupchat..."), "jabber_group", 0, + m_actionMenu->insert(new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat")); m_actionMenu->popupMenu()->insertSeparator(); - m_actionMenu->insert ( new KAction ( i18n ("Services..."), "jabber_serv_on", 0, + m_actionMenu->insert ( new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0, this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices") ); - m_actionMenu->insert ( new KAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0, + m_actionMenu->insert ( new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0, this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ); - m_actionMenu->insert ( new KAction ( i18n ("Edit User Info..."), "identity", 0, + m_actionMenu->insert ( new TDEAction ( i18n ("Edit User Info..."), "identity", 0, this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ); return m_actionMenu;*/ diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h index 8ed1360f..83f5e502 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -61,7 +61,7 @@ public: ~JabberTransport (); /** Returns the action menu for this account. */ - virtual KActionMenu *actionMenu (); + virtual TDEActionMenu *actionMenu (); /** the parent account */ JabberAccount *account() const diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index dc66a0cf..91635c91 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -131,14 +131,14 @@ void MeanwhileAccount::disconnect(Kopete::Account::DisconnectReason reason) m_session = 0L; } -KActionMenu * MeanwhileAccount::actionMenu() +TDEActionMenu * MeanwhileAccount::actionMenu() { - KActionMenu *menu = Kopete::Account::actionMenu(); + TDEActionMenu *menu = Kopete::Account::actionMenu(); menu->popupMenu()->insertSeparator(); #if 0 - menu->insert(new KAction(i18n("&Change Status Message"), TQString(), 0, + menu->insert(new TDEAction(i18n("&Change Status Message"), TQString(), 0, this, TQT_SLOT(meanwhileChangeStatus()), this, "meanwhileChangeStatus")); //infoPlugin->addCustomMenus(theMenu); diff --git a/kopete/protocols/meanwhile/meanwhileaccount.h b/kopete/protocols/meanwhile/meanwhileaccount.h index cb9ac083..2e476d78 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.h +++ b/kopete/protocols/meanwhile/meanwhileaccount.h @@ -52,7 +52,7 @@ public: virtual void disconnect(Kopete::Account::DisconnectReason reason); - virtual KActionMenu *actionMenu(); + virtual TDEActionMenu *actionMenu(); /** Get the server host name */ TQString getServerName(); diff --git a/kopete/protocols/meanwhile/meanwhilecontact.h b/kopete/protocols/meanwhile/meanwhilecontact.h index 5c92ebb8..6de9261e 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.h +++ b/kopete/protocols/meanwhile/meanwhilecontact.h @@ -22,8 +22,8 @@ #include "kopetemessage.h" #include "meanwhileaccount.h" -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; namespace Kopete { class Account; } namespace Kopete { class ChatSession; } namespace Kopete { class MetaContact; } diff --git a/kopete/protocols/meanwhile/meanwhileplugin.cpp b/kopete/protocols/meanwhile/meanwhileplugin.cpp index 4ee995dd..160a9d9f 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.cpp +++ b/kopete/protocols/meanwhile/meanwhileplugin.cpp @@ -32,6 +32,6 @@ void MeanwhilePlugin::showUserInfo(const TQString &/*userid*/) { } -void MeanwhilePlugin::addCustomMenus(KActionMenu *menu) +void MeanwhilePlugin::addCustomMenus(TDEActionMenu *menu) { } diff --git a/kopete/protocols/meanwhile/meanwhileplugin.h b/kopete/protocols/meanwhile/meanwhileplugin.h index 072ffc08..c11a2b2f 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.h +++ b/kopete/protocols/meanwhile/meanwhileplugin.h @@ -41,7 +41,7 @@ public: /* if you want to provide more functions on the rightclick dropdown * menu...implement this */ - virtual void addCustomMenus(KActionMenu *menu); + virtual void addCustomMenus(TDEActionMenu *menu); }; #endif diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 39033752..30f8d477 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -80,9 +80,9 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) )); - m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); - m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" ); - m_startChatAction = new KAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" ); + m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); + m_changeDNAction = new TDEAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" ); + m_startChatAction = new TDEAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" ); TDEConfigGroup *config=configGroup(); @@ -241,9 +241,9 @@ void MSNAccount::disconnect() m_notifySocket->disconnect(); } -KActionMenu * MSNAccount::actionMenu() +TDEActionMenu * MSNAccount::actionMenu() { - KActionMenu *m_actionMenu=Kopete::Account::actionMenu(); + TDEActionMenu *m_actionMenu=Kopete::Account::actionMenu(); if ( isConnected() ) { m_openInboxAction->setEnabled( true ); @@ -267,8 +267,8 @@ KActionMenu * MSNAccount::actionMenu() m_actionMenu->insert( m_openInboxAction ); #if !defined NDEBUG - KActionMenu *debugMenu = new KActionMenu( "Debug", m_actionMenu ); - debugMenu->insert( new KAction( i18n( "Send Raw C&ommand..." ), 0, + TDEActionMenu *debugMenu = new TDEActionMenu( "Debug", m_actionMenu ); + debugMenu->insert( new TDEAction( i18n( "Send Raw C&ommand..." ), 0, this, TQT_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) ); m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->insert( debugMenu ); diff --git a/kopete/protocols/msn/msnaccount.h b/kopete/protocols/msn/msnaccount.h index d5f12840..e7a80f4a 100644 --- a/kopete/protocols/msn/msnaccount.h +++ b/kopete/protocols/msn/msnaccount.h @@ -25,8 +25,8 @@ #include "msnprotocol.h" -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class MSNNotifySocket; class MSNContact; @@ -48,7 +48,7 @@ public: /* * return the menu for this account */ - virtual KActionMenu* actionMenu(); + virtual TDEActionMenu* actionMenu(); //------ internal functions /** @@ -205,9 +205,9 @@ private slots: private: MSNNotifySocket *m_notifySocket; - KAction *m_openInboxAction; - KAction *m_startChatAction; - KAction *m_changeDNAction; + TDEAction *m_openInboxAction; + TDEAction *m_startChatAction; + TDEAction *m_changeDNAction; // status which will be using for connecting Kopete::OnlineStatus m_connectstatus; diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 487f4aaa..e4ee3c06 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -75,27 +75,27 @@ MSNChatSession::MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contac protocol, TQT_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) ); - m_actionInvite = new KActionMenu( i18n( "&Invite" ), "kontact_contacts", actionCollection(), "msnInvite" ); + m_actionInvite = new TDEActionMenu( i18n( "&Invite" ), "kontact_contacts", actionCollection(), "msnInvite" ); connect ( m_actionInvite->popupMenu() , TQT_SIGNAL( aboutToShow() ) , this , TQT_SLOT(slotActionInviteAboutToShow() ) ) ; #if !defined NDEBUG - new KAction( i18n( "Send Raw C&ommand..." ), 0, this, TQT_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ; + new TDEAction( i18n( "Send Raw C&ommand..." ), 0, this, TQT_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ; #endif - m_actionNudge=new KAction( i18n( "Send Nudge" ), "bell", 0, this, TQT_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ; + m_actionNudge=new TDEAction( i18n( "Send Nudge" ), "bell", 0, this, TQT_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ; #if MSN_WEBCAM // Invite to receive webcam action - m_actionWebcamReceive=new KAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ; + m_actionWebcamReceive=new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ; //Send webcam action - m_actionWebcamSend=new KAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ; + m_actionWebcamSend=new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ; #endif - new KAction( i18n( "Send File" ),"attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" ); + new TDEAction( i18n( "Send File" ),"attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" ); MSNContact *c = static_cast<MSNContact*>( others.first() ); - (new KAction( i18n( "Request Display Picture" ), "image", 0, this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty()); + (new TDEAction( i18n( "Request Display Picture" ), "image", 0, this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty()); if ( !c->object().isEmpty() ) { @@ -304,7 +304,7 @@ void MSNChatSession::slotMessageReceived( Kopete::Message &msg ) void MSNChatSession::slotActionInviteAboutToShow() { - // We can't simply insert KAction in this menu bebause we don't know when to delete them. + // We can't simply insert TDEAction in this menu bebause we don't know when to delete them. // items inserted with insert items are automatically deleted when we call clear m_inviteactions.setAutoDelete(true); @@ -318,13 +318,13 @@ void MSNChatSession::slotActionInviteAboutToShow() { if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { - KAction *a=new KopeteContactAction( it.current(), this, + TDEAction *a=new KopeteContactAction( it.current(), this, TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); m_actionInvite->insert( a ); m_inviteactions.append( a ) ; } } - KAction *b=new KAction( i18n ("Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); + TDEAction *b=new TDEAction( i18n ("Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); m_actionInvite->insert( b ); m_inviteactions.append( b ) ; } @@ -548,17 +548,17 @@ void MSNChatSession::slotDisplayPictureChanged() int sz=22; // get the size of the toolbar were the aciton is plugged. // if you know a better way to get the toolbar, let me know - KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; + TDEMainWindow *w= view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; if(w) { //We connected that in the constructor. we don't need to keep this slot active. disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); - TQPtrListIterator<KToolBar> it=w->toolBarIterator() ; - KAction *imgAction=actionCollection()->action("msnDisplayPicture"); + TQPtrListIterator<TDEToolBar> it=w->toolBarIterator() ; + TDEAction *imgAction=actionCollection()->action("msnDisplayPicture"); if(imgAction) while(it) { - KToolBar *tb=*it; + TDEToolBar *tb=*it; if(imgAction->isPlugged(tb)) { sz=tb->iconSize(); diff --git a/kopete/protocols/msn/msnchatsession.h b/kopete/protocols/msn/msnchatsession.h index fb70c573..2fb92d2a 100644 --- a/kopete/protocols/msn/msnchatsession.h +++ b/kopete/protocols/msn/msnchatsession.h @@ -21,10 +21,10 @@ #include "kopetechatsession.h" class MSNSwitchBoardSocket; -class KActionCollection; +class TDEActionCollection; class MSNInvitation; class MSNContact; -class KActionMenu; +class TDEActionMenu; class TQLabel; @@ -101,11 +101,11 @@ private: MSNSwitchBoardSocket *m_chatService; TQString otherString; - KActionMenu *m_actionInvite; - TQPtrList<KAction> m_inviteactions; - KAction *m_actionNudge; - KAction *m_actionWebcamReceive; - KAction *m_actionWebcamSend; + TDEActionMenu *m_actionInvite; + TQPtrList<TDEAction> m_inviteactions; + TDEAction *m_actionNudge; + TDEAction *m_actionWebcamReceive; + TDEAction *m_actionWebcamSend; //Messages sent before the ending of the connection are queued TQValueList<Kopete::Message> m_messagesQueue; diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index c487f1df..dcfc8ce7 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -125,30 +125,30 @@ Kopete::ChatSession *MSNContact::manager( Kopete::Contact::CanCreateFlags canCre return manager; } -TQPtrList<KAction> *MSNContact::customContextMenuActions() +TQPtrList<TDEAction> *MSNContact::customContextMenuActions() { - TQPtrList<KAction> *m_actionCollection = new TQPtrList<KAction>; + TQPtrList<TDEAction> *m_actionCollection = new TQPtrList<TDEAction>; // Block/unblock Contact TQString label = isBlocked() ? i18n( "Unblock User" ) : i18n( "Block User" ); if( !actionBlock ) { - actionBlock = new KAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlockUser() ), + actionBlock = new TDEAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlockUser() ), this, "actionBlock" ); //show profile - actionShowProfile = new KAction( i18n("Show Profile") , 0, this, TQT_SLOT( slotShowProfile() ), + actionShowProfile = new TDEAction( i18n("Show Profile") , 0, this, TQT_SLOT( slotShowProfile() ), this, "actionShowProfile" ); // Send mail (only available if it is an hotmail account) - actionSendMail = new KAction( i18n("Send Email...") , "mail_generic",0, this, TQT_SLOT( slotSendMail() ), + actionSendMail = new TDEAction( i18n("Send Email...") , "mail_generic",0, this, TQT_SLOT( slotSendMail() ), this, "actionSendMail" ); // Invite to receive webcam - actionWebcamReceive = new KAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ; + actionWebcamReceive = new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ; //Send webcam action - actionWebcamSend = new KAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ; + actionWebcamSend = new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ; } else actionBlock->setText( label ); diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h index 2eec2494..759be403 100644 --- a/kopete/protocols/msn/msncontact.h +++ b/kopete/protocols/msn/msncontact.h @@ -34,8 +34,8 @@ class TQPixmap; class TQTimer; class MSNChatSession; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class KTempFile; namespace Kopete { class Protocol; } @@ -97,7 +97,7 @@ public: virtual bool isReachable(); - virtual TQPtrList<KAction> *customContextMenuActions(); + virtual TQPtrList<TDEAction> *customContextMenuActions(); /** * update the server group map @@ -176,11 +176,11 @@ private: TQString m_phoneMobile; - KAction *actionBlock; - KAction *actionShowProfile; - KAction *actionSendMail; - KAction *actionWebcamReceive; - KAction *actionWebcamSend; + TDEAction *actionBlock; + TDEAction *actionShowProfile; + TDEAction *actionSendMail; + TDEAction *actionWebcamReceive; + TDEAction *actionWebcamSend; TQString m_obj; //the MSNObject diff --git a/kopete/protocols/msn/msnprotocol.h b/kopete/protocols/msn/msnprotocol.h index 5decc1ec..52fb2800 100644 --- a/kopete/protocols/msn/msnprotocol.h +++ b/kopete/protocols/msn/msnprotocol.h @@ -33,8 +33,8 @@ class TQImage; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class MSNContact; class MSNAccount; diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index ba8d94b1..cd9e30a3 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -294,12 +294,12 @@ TQString AIMAccount::sanitizedMessage( const TQString& message ) return doc.toString(); } -KActionMenu* AIMAccount::actionMenu() +TDEActionMenu* AIMAccount::actionMenu() { // kdDebug(14152) << k_funcinfo << accountId() << ": Called." << endl; // mActionMenu is managed by Kopete::Account. It is deleted when // it is no longer shown, so we can (safely) just make a new one here. - KActionMenu *mActionMenu = new KActionMenu(accountId(), + TDEActionMenu *mActionMenu = new TDEActionMenu(accountId(), myself()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); AIMProtocol *p = AIMProtocol::protocol(); @@ -308,30 +308,30 @@ KActionMenu* AIMAccount::actionMenu() mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%2 <%1>" ).arg( accountId(), accountNick )); - mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, + mActionMenu->insert( new TDEAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); - KAction* mActionAway = new Kopete::AwayAction(i18n("Away"), p->statusAway.iconFor( this ), 0, this, + TDEAction* mActionAway = new Kopete::AwayAction(i18n("Away"), p->statusAway.iconFor( this ), 0, this, TQT_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" ); mActionAway->setEnabled( isConnected() ); mActionMenu->insert( mActionAway ); - KAction* mActionOffline = new KAction( i18n("Offline"), p->statusOffline.iconFor(this), 0, this, + TDEAction* mActionOffline = new TDEAction( i18n("Offline"), p->statusOffline.iconFor(this), 0, this, TQT_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline"); mActionMenu->insert( mActionOffline ); mActionMenu->popupMenu()->insertSeparator(); - KAction* m_joinChatAction = new KAction( i18n( "Join Chat..." ), TQString(), 0, this, + TDEAction* m_joinChatAction = new TDEAction( i18n( "Join Chat..." ), TQString(), 0, this, TQT_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" ); - mActionMenu->insert( new KToggleAction( i18n( "Set Visibility..." ), 0, 0, + mActionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0, this, TQT_SLOT( slotSetVisiblility() ), this, "AIMAccount::mActionSetVisibility") ); mActionMenu->insert( m_joinChatAction ); - KAction* m_editInfoAction = new KAction( i18n( "Edit User Info..." ), "identity", 0, + TDEAction* m_editInfoAction = new TDEAction( i18n( "Edit User Info..." ), "identity", 0, this, TQT_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo"); mActionMenu->insert( m_editInfoAction ); diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h index c7418e36..63adeac7 100644 --- a/kopete/protocols/oscar/aim/aimaccount.h +++ b/kopete/protocols/oscar/aim/aimaccount.h @@ -42,7 +42,7 @@ class Group; class ChatSession; } -class KAction; +class TDEAction; class OscarContact; class AIMContact; class AIMAccount; @@ -91,7 +91,7 @@ public: virtual ~AIMAccount(); // Accessor method for the action menu - virtual KActionMenu* actionMenu(); + virtual TDEActionMenu* actionMenu(); void setAway(bool away, const TQString &awayReason = TQString() ); diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index a92f620e..2a8b0320 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -84,17 +84,17 @@ bool AIMContact::isReachable() return true; } -TQPtrList<KAction> *AIMContact::customContextMenuActions() +TQPtrList<TDEAction> *AIMContact::customContextMenuActions() { - TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); + TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>(); if ( !m_warnUserAction ) { - m_warnUserAction = new KAction( i18n( "&Warn User" ), 0, this, TQT_SLOT( warnUser() ), this, "warnAction" ); + m_warnUserAction = new TDEAction( i18n( "&Warn User" ), 0, this, TQT_SLOT( warnUser() ), this, "warnAction" ); } - m_actionVisibleTo = new KToggleAction(i18n("Always &Visible To"), "", 0, + m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0, this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo"); - m_actionInvisibleTo = new KToggleAction(i18n("Always &Invisible To"), "", 0, + m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0, this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); bool on = account()->isConnected(); diff --git a/kopete/protocols/oscar/aim/aimcontact.h b/kopete/protocols/oscar/aim/aimcontact.h index d66c62c6..eea346ac 100644 --- a/kopete/protocols/oscar/aim/aimcontact.h +++ b/kopete/protocols/oscar/aim/aimcontact.h @@ -43,7 +43,7 @@ public: virtual ~AIMContact(); bool isReachable(); - TQPtrList<KAction> *customContextMenuActions(); + TQPtrList<TDEAction> *customContextMenuActions(); const TQString &userProfile() { return mUserProfile; } @@ -95,9 +95,9 @@ private: bool m_mobile; // Is this user mobile (i.e. do they have message forwarding on, or mobile AIM) TQDateTime m_lastAutoresponseTime; - KAction* m_warnUserAction; - KToggleAction *m_actionVisibleTo; - KToggleAction *m_actionInvisibleTo; + TDEAction* m_warnUserAction; + TDEToggleAction *m_actionVisibleTo; + TDEToggleAction *m_actionInvisibleTo; }; #endif //kate: tab-width 4; indent-mode csands; diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 9ca3baae..7627648c 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -120,24 +120,24 @@ ICQ::Presence ICQAccount::presence() } -KActionMenu* ICQAccount::actionMenu() +TDEActionMenu* ICQAccount::actionMenu() { - KActionMenu* actionMenu = Kopete::Account::actionMenu(); + TDEActionMenu* actionMenu = Kopete::Account::actionMenu(); actionMenu->popupMenu()->insertSeparator(); - KToggleAction* actionInvisible = - new KToggleAction( i18n( "In&visible" ), + TDEToggleAction* actionInvisible = + new TDEToggleAction( i18n( "In&visible" ), ICQ::Presence( presence().type(), ICQ::Presence::Invisible ).toOnlineStatus().iconFor( this ), 0, this, TQT_SLOT( slotToggleInvisible() ), this ); actionInvisible->setChecked( presence().visibility() == ICQ::Presence::Invisible ); actionMenu->insert( actionInvisible ); actionMenu->popupMenu()->insertSeparator(); - actionMenu->insert( new KToggleAction( i18n( "Set Visibility..." ), 0, 0, + actionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0, this, TQT_SLOT( slotSetVisiblility() ), this, "ICQAccount::mActionSetVisibility") ); - //actionMenu->insert( new KToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQT_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") ); + //actionMenu->insert( new TDEToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQT_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") ); return actionMenu; } diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h index 19069529..52ab6a9c 100644 --- a/kopete/protocols/oscar/icq/icqaccount.h +++ b/kopete/protocols/oscar/icq/icqaccount.h @@ -25,7 +25,7 @@ #include "icqpresence.h" #include "oscartypeclasses.h" -class KAction; +class TDEAction; namespace Kopete { class AwayAction; } class ICQProtocol; class ICQAccount; @@ -57,7 +57,7 @@ public: ICQProtocol *protocol(); // Accessor method for the action menu - virtual KActionMenu* actionMenu(); + virtual TDEActionMenu* actionMenu(); /** Reimplementation from Kopete::Account */ void setOnlineStatus( const Kopete::OnlineStatus&, const TQString& ); diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index c54e4ffb..19d2ee7f 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -649,9 +649,9 @@ bool ICQContact::isReachable() return account()->isConnected(); } -TQPtrList<KAction> *ICQContact::customContextMenuActions() +TQPtrList<TDEAction> *ICQContact::customContextMenuActions() { - TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); + TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>(); /* TQString awTxt; TQString awIcn; @@ -684,12 +684,12 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions() if(actionReadAwayMessage==0) { - actionReadAwayMessage = new KAction(awTxt, awIcn, 0, + actionReadAwayMessage = new TDEAction(awTxt, awIcn, 0, this, TQT_SLOT(slotReadAwayMessage()), this, "actionReadAwayMessage"); */ - actionRequestAuth = new KAction(i18n("&Request Authorization"), "mail_reply", 0, + actionRequestAuth = new TDEAction(i18n("&Request Authorization"), "mail_reply", 0, this, TQT_SLOT(slotRequestAuth()), this, "actionRequestAuth"); - actionSendAuth = new KAction(i18n("&Grant Authorization"), "mail_forward", 0, + actionSendAuth = new TDEAction(i18n("&Grant Authorization"), "mail_forward", 0, this, TQT_SLOT(slotSendAuth()), this, "actionSendAuth"); /* } @@ -700,11 +700,11 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions() } */ - m_actionIgnore = new KToggleAction(i18n("&Ignore"), "", 0, + m_actionIgnore = new TDEToggleAction(i18n("&Ignore"), "", 0, this, TQT_SLOT(slotIgnore()), this, "actionIgnore"); - m_actionVisibleTo = new KToggleAction(i18n("Always &Visible To"), "", 0, + m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0, this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo"); - m_actionInvisibleTo = new KToggleAction(i18n("Always &Invisible To"), "", 0, + m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0, this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); bool on = account()->isConnected(); @@ -716,7 +716,7 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions() actionSendAuth->setEnabled(on); - m_selectEncoding = new KAction( i18n( "Select Encoding..." ), "charset", 0, + m_selectEncoding = new TDEAction( i18n( "Select Encoding..." ), "charset", 0, this, TQT_SLOT( changeContactEncoding() ), this, "changeEncoding" ); /* diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h index be8e064f..c3176028 100644 --- a/kopete/protocols/oscar/icq/icqcontact.h +++ b/kopete/protocols/oscar/icq/icqcontact.h @@ -23,8 +23,8 @@ #include "userdetails.h" class OscarEncodingSelectionDialog; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; namespace Kopete { class ChatSession; } namespace Kopete { class OnlineStatus; } class ICQProtocol; @@ -60,7 +60,7 @@ public: * Returns a set of custom menu items for * the context menu */ - virtual TQPtrList<KAction> *customContextMenuActions(); + virtual TQPtrList<TDEAction> *customContextMenuActions(); /** Return whether or not this contact is reachable. */ virtual bool isReachable(); @@ -96,15 +96,15 @@ private: ICQUserInfoWidget* m_infoWidget; /* ICQReadAway *awayMessageDialog; - KAction *actionReadAwayMessage; + TDEAction *actionReadAwayMessage; */ - KAction *actionRequestAuth; - KAction *actionSendAuth; - KAction *m_selectEncoding; + TDEAction *actionRequestAuth; + TDEAction *actionSendAuth; + TDEAction *m_selectEncoding; - KToggleAction *m_actionIgnore; - KToggleAction *m_actionVisibleTo; - KToggleAction *m_actionInvisibleTo; + TDEToggleAction *m_actionIgnore; + TDEToggleAction *m_actionVisibleTo; + TDEToggleAction *m_actionInvisibleTo; /* bool mInvisible; diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui index 161444f6..a027985f 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui +++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui @@ -355,7 +355,7 @@ </grid> </widget> </widget> - <widget class="KListView" row="1" column="0" rowspan="7" colspan="1"> + <widget class="TDEListView" row="1" column="0" rowspan="7" colspan="1"> <column> <property name="text"> <string>UIN</string> diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h index a3290506..2a657d06 100644 --- a/kopete/protocols/oscar/oscaraccount.h +++ b/kopete/protocols/oscar/oscaraccount.h @@ -73,7 +73,7 @@ public: /** * Accessor method for the action menu */ - virtual KActionMenu* actionMenu() = 0; + virtual TDEActionMenu* actionMenu() = 0; /** Set the server address */ void setServerAddress( const TQString& server ); diff --git a/kopete/protocols/oscar/oscarcontact.h b/kopete/protocols/oscar/oscarcontact.h index b115f7a1..4245961a 100644 --- a/kopete/protocols/oscar/oscarcontact.h +++ b/kopete/protocols/oscar/oscarcontact.h @@ -35,7 +35,7 @@ class OnlineStatus; class OscarAccount; class TQTimer; class TQTextCodec; -class KToggleAction; +class TDEToggleAction; /** * Contact for oscar protocol diff --git a/kopete/protocols/oscar/oscarmyselfcontact.h b/kopete/protocols/oscar/oscarmyselfcontact.h index 3434d3e3..395c6e6c 100644 --- a/kopete/protocols/oscar/oscarmyselfcontact.h +++ b/kopete/protocols/oscar/oscarmyselfcontact.h @@ -28,7 +28,7 @@ class OnlineStatus; class OscarAccount; class TQTimer; -class KToggleAction; +class TDEToggleAction; /** * myself() contact for oscar protocol diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index f3b8c35b..6e09bd11 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -178,9 +178,9 @@ bool SMSAccount::createContact( const TQString &contactId, return false; } -KActionMenu* SMSAccount::actionMenu() +TDEActionMenu* SMSAccount::actionMenu() { - KActionMenu *theActionMenu = Kopete::Account::actionMenu(); + TDEActionMenu *theActionMenu = Kopete::Account::actionMenu(); return theActionMenu; } diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h index b543d191..ab5af0dc 100644 --- a/kopete/protocols/sms/smsaccount.h +++ b/kopete/protocols/sms/smsaccount.h @@ -19,7 +19,7 @@ #include "kopeteaccount.h" -class KActionMenu; +class TDEActionMenu; class SMSProtocol; class SMSContact; class SMSService; @@ -36,7 +36,7 @@ public: SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name = 0L ); ~SMSAccount(); - virtual KActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar + virtual TDEActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar virtual void setAway( bool away, const TQString & ); diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index d5980050..5e4c9cb4 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -119,11 +119,11 @@ void SMSContact::setPhoneNumber( const TQString phoneNumber ) new SMSContact(account(), phoneNumber, nickName(), metaContact()); } -TQPtrList<KAction>* SMSContact::customContextMenuActions() +TQPtrList<TDEAction>* SMSContact::customContextMenuActions() { - TQPtrList<KAction> *m_actionCollection = new TQPtrList<KAction>(); + TQPtrList<TDEAction> *m_actionCollection = new TQPtrList<TDEAction>(); if( !m_actionPrefs ) - m_actionPrefs = new KAction(i18n("&Contact Settings"), 0, this, TQT_SLOT(userPrefs()), this, "userPrefs"); + m_actionPrefs = new TDEAction(i18n("&Contact Settings"), 0, this, TQT_SLOT(userPrefs()), this, "userPrefs"); m_actionCollection->append( m_actionPrefs ); diff --git a/kopete/protocols/sms/smscontact.h b/kopete/protocols/sms/smscontact.h index 81d73bcd..4a3874fb 100644 --- a/kopete/protocols/sms/smscontact.h +++ b/kopete/protocols/sms/smscontact.h @@ -26,8 +26,8 @@ class SMSAccount; namespace Kopete { class ChatSession; } namespace Kopete { class MetaContact; } -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; class SMSContact : public Kopete::Contact { @@ -37,7 +37,7 @@ public: SMSContact( Kopete::Account* _account, const TQString &phoneNumber, const TQString &displayName, Kopete::MetaContact *parent ); - TQPtrList<KAction>* customContextMenuActions(); + TQPtrList<TDEAction>* customContextMenuActions(); const TQString &phoneNumber(); void setPhoneNumber( const TQString phoneNumber ); @@ -62,7 +62,7 @@ private slots: void slotChatSessionDestroyed(); private: - KAction* m_actionPrefs; + TDEAction* m_actionPrefs; TQString m_phoneNumber; diff --git a/kopete/protocols/sms/smsprotocol.h b/kopete/protocols/sms/smsprotocol.h index e25c0a24..89912174 100644 --- a/kopete/protocols/sms/smsprotocol.h +++ b/kopete/protocols/sms/smsprotocol.h @@ -28,8 +28,8 @@ #include "kopeteonlinestatus.h" #include "kopetecontact.h" -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; namespace Kopete { class Contact; } namespace Kopete { class MetaContact; } diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp index cc906447..eb601ffc 100644 --- a/kopete/protocols/testbed/testbedaccount.cpp +++ b/kopete/protocols/testbed/testbedaccount.cpp @@ -43,15 +43,15 @@ TestbedAccount::~TestbedAccount() delete m_server; } -KActionMenu* TestbedAccount::actionMenu() +TDEActionMenu* TestbedAccount::actionMenu() { - KActionMenu *mActionMenu = Kopete::Account::actionMenu(); + TDEActionMenu *mActionMenu = Kopete::Account::actionMenu(); mActionMenu->popupMenu()->insertSeparator(); - KAction *action; + TDEAction *action; - action = new KAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo"); + action = new TDEAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo"); mActionMenu->insert(action); action->setEnabled( isConnected() ); diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h index f57d41d1..7eb319b8 100644 --- a/kopete/protocols/testbed/testbedaccount.h +++ b/kopete/protocols/testbed/testbedaccount.h @@ -20,7 +20,7 @@ #include <kopeteaccount.h> #include "testbedwebcamdialog.h" -class KActionMenu; +class TDEActionMenu; namespace Kopete { class Contact; } namespace Kopete { class MetaContact; } @@ -42,7 +42,7 @@ public: /** * Construct the context menu used for the status bar icon */ - virtual KActionMenu* actionMenu(); + virtual TDEActionMenu* actionMenu(); /** * Creates a protocol specific Kopete::Contact subclass and adds it to the supplie @@ -85,19 +85,19 @@ protected: protected slots: /** - * Change the account's status. Called by KActions and internally. + * Change the account's status. Called by TDEActions and internally. */ void slotGoOnline(); /** - * Change the account's status. Called by KActions and internally. + * Change the account's status. Called by TDEActions and internally. */ void slotGoAway(); /** - * Change the account's status. Called by KActions and internally. + * Change the account's status. Called by TDEActions and internally. */ void slotGoOffline(); /** - * Show webcam. Called by KActions and internally. + * Show webcam. Called by TDEActions and internally. */ void slotShowVideo(); diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp index bf110872..d383c04c 100644 --- a/kopete/protocols/testbed/testbedcontact.cpp +++ b/kopete/protocols/testbed/testbedcontact.cpp @@ -82,11 +82,11 @@ Kopete::ChatSession* TestbedContact::manager( CanCreateFlags ) } -TQPtrList<KAction> *TestbedContact::customContextMenuActions() //OBSOLETE +TQPtrList<TDEAction> *TestbedContact::customContextMenuActions() //OBSOLETE { //FIXME!!! this function is obsolete, we should use XMLGUI instead - /*m_actionCollection = new KActionCollection( this, "userColl" ); - m_actionPrefs = new KAction(i18n( "&Contact Settings" ), 0, this, + /*m_actionCollection = new TDEActionCollection( this, "userColl" ); + m_actionPrefs = new TDEAction(i18n( "&Contact Settings" ), 0, this, TQT_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" ); return m_actionCollection;*/ diff --git a/kopete/protocols/testbed/testbedcontact.h b/kopete/protocols/testbed/testbedcontact.h index 3ad16124..c4fb17dd 100644 --- a/kopete/protocols/testbed/testbedcontact.h +++ b/kopete/protocols/testbed/testbedcontact.h @@ -21,8 +21,8 @@ #include "kopetecontact.h" #include "kopetemessage.h" -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; namespace Kopete { class Account; } namespace Kopete { class ChatSession; } namespace Kopete { class MetaContact; } @@ -56,7 +56,7 @@ public: /** * Return the actions for this contact */ - virtual TQPtrList<KAction> *customContextMenuActions(); + virtual TQPtrList<TDEAction> *customContextMenuActions(); /** * Returns a Kopete::ChatSession associated with this contact */ @@ -88,9 +88,9 @@ protected slots: protected: Kopete::ChatSession* m_msgManager; - KActionCollection* m_actionCollection; + TDEActionCollection* m_actionCollection; TestbedContactType m_type; - KAction* m_actionPrefs; + TDEAction* m_actionPrefs; }; #endif diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 994735cc..5d9d2a99 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -32,7 +32,7 @@ // Local Includes #include "wpaccount.h" -class KPopupMenu; +class TDEPopupMenu; WPAccount::WPAccount(WPProtocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name) @@ -153,23 +153,23 @@ void WPAccount::setAway(bool status, const TQString &awayMessage) myself()->setOnlineStatus(status ? mProtocol->WPAway : mProtocol->WPOnline); } -KActionMenu* WPAccount::actionMenu() +TDEActionMenu* WPAccount::actionMenu() { kdDebug(14170) << "WPAccount::actionMenu()" << endl; /// How to remove an action from Kopete::Account::actionMenu()? GF - KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this); + TDEActionMenu *theActionMenu = new TDEActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this); theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId())); if (mProtocol) { - KAction *goOnline = new KAction("Online", TQIconSet(mProtocol->WPOnline.iconFor(this)), 0, + TDEAction *goOnline = new TDEAction("Online", TQIconSet(mProtocol->WPOnline.iconFor(this)), 0, this, TQT_SLOT(connect()), theActionMenu, "actionGoAvailable"); goOnline->setEnabled(isConnected() && isAway()); theActionMenu->insert(goOnline); - KAction *goAway = new KAction("Away", TQIconSet(mProtocol->WPAway.iconFor(this)), 0, + TDEAction *goAway = new TDEAction("Away", TQIconSet(mProtocol->WPAway.iconFor(this)), 0, this, TQT_SLOT(goAway()), theActionMenu, "actionGoAway"); goAway->setEnabled(isConnected() && !isAway()); theActionMenu->insert(goAway); @@ -177,7 +177,7 @@ KActionMenu* WPAccount::actionMenu() /// One can not really go offline manually - appears online as long as samba server is running. GF theActionMenu->popupMenu()->insertSeparator(); - theActionMenu->insert(new KAction(i18n("Properties"), 0, + theActionMenu->insert(new TDEAction(i18n("Properties"), 0, this, TQT_SLOT(editAccount()), theActionMenu, "actionAccountProperties")); } diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h index 2eb258c3..ee237286 100644 --- a/kopete/protocols/winpopup/wpaccount.h +++ b/kopete/protocols/winpopup/wpaccount.h @@ -36,9 +36,9 @@ #include "wpcontact.h" #include "wpaddcontact.h" -class KPopupMenu; -class KActionMenu; -class KAction; +class TDEPopupMenu; +class TDEActionMenu; +class TDEAction; class WPProtocol; class KopeteWinPopup; @@ -55,7 +55,7 @@ public: WPAccount(WPProtocol *parent, const TQString& accountID, const char *name = 0); ~WPAccount(); - virtual KActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar + virtual TDEActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar virtual void setAway(bool status, const TQString &); // Set user away public slots: diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp index 103a2a85..a7e78db0 100644 --- a/kopete/protocols/winpopup/wpcontact.cpp +++ b/kopete/protocols/winpopup/wpcontact.cpp @@ -55,9 +55,9 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons checkStatus.start(1000, false); } -TQPtrList<KAction> * WPContact::customContextMenuActions() +TQPtrList<TDEAction> * WPContact::customContextMenuActions() { - //myActionCollection = new KActionCollection(parent); + //myActionCollection = new TDEActionCollection(parent); return 0; } diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h index 73e5808e..f478c3ff 100644 --- a/kopete/protocols/winpopup/wpcontact.h +++ b/kopete/protocols/winpopup/wpcontact.h @@ -42,8 +42,8 @@ class TQTimer; class TQListView; class TQListViewItem; -class KPopupMenu; -class KAction; +class TDEPopupMenu; +class TDEAction; namespace Kopete { class MetaContact; } class WPContact: public Kopete::Contact @@ -56,7 +56,7 @@ public: // virtual bool isOnline() const; virtual bool isReachable(); - virtual TQPtrList<KAction> *customContextMenuActions(); + virtual TQPtrList<TDEAction> *customContextMenuActions(); virtual Kopete::ChatSession *manager(Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate); virtual void serialize(TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData); @@ -74,7 +74,7 @@ private: bool myWasConnected; // true if protocol connected at last check TQTimer checkStatus; // checks the status of this contact every second or so -// KActionCollection *myActionCollection; +// TDEActionCollection *myActionCollection; // holds all the protocol specific actions (not many!) Kopete::ChatSession *m_manager; // holds the two message managers - one for email and one for chat diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 1c52f2ee..0e193c39 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -40,7 +40,7 @@ #include "wpaccount.h" #include "wpcontact.h" -class KPopupMenu; +class TDEPopupMenu; WPProtocol *WPProtocol::sProtocol = 0; diff --git a/kopete/protocols/winpopup/wpprotocol.h b/kopete/protocols/winpopup/wpprotocol.h index 7a5ef92c..20743bb4 100644 --- a/kopete/protocols/winpopup/wpprotocol.h +++ b/kopete/protocols/winpopup/wpprotocol.h @@ -36,9 +36,9 @@ #include "wpaddcontact.h" namespace Kopete { class Account; } -class KPopupMenu; -class KActionMenu; -class KAction; +class TDEPopupMenu; +class TDEActionMenu; +class TDEAction; class WPContact; class WPAccount; diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 7e36d04e..4edc14e6 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -81,23 +81,23 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con m_chatChatSession = 0; // FIXME - //m_openInboxAction = new KAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this ); + //m_openInboxAction = new TDEAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this ); //, "m_openInboxAction" ); //TQObject::connect(m_openInboxAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenInbox() ) ); - //m_openYABAction = new KAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this ); + //m_openYABAction = new TDEAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this ); //, "m_openYABAction" ); //TQObject::connect(m_openYABAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenYAB() ) ); - //m_editOwnYABEntry = new KAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this ); + //m_editOwnYABEntry = new TDEAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this ); //, "m_editOwnYABEntry" ); //TQObject::connect(m_editOwnYABEntry, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotEditOwnYABEntry() ) ); - //m_joinChatAction = new KAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this ); + //m_joinChatAction = new TDEAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this ); //, "m_joinChatAction" ); //TQObject::connect(m_joinChatAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotJoinChatRoom() ) ); - m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); - m_openYABAction = new KAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQT_SLOT( slotOpenYAB() ), this, "m_openYABAction" ); - m_editOwnYABEntry = new KAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQT_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" ); - m_joinChatAction = new KAction( i18n( "&Join chat room..."), "contents", 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction"); + m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); + m_openYABAction = new TDEAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQT_SLOT( slotOpenYAB() ), this, "m_openYABAction" ); + m_editOwnYABEntry = new TDEAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQT_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" ); + m_joinChatAction = new TDEAction( i18n( "&Join chat room..."), "contents", 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction"); YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() ); setMyself( _myself ); @@ -634,13 +634,13 @@ void YahooAccount::slotGoOffline() static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline ); } -KActionMenu* YahooAccount::actionMenu() +TDEActionMenu* YahooAccount::actionMenu() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; // FIXME (to check) //Kopete::Account::fillActionMenu( actionMenu ); - KActionMenu *theActionMenu = Kopete::Account::actionMenu(); + TDEActionMenu *theActionMenu = Kopete::Account::actionMenu(); // FIXME: (to check) //actionMenu->addSeparator(); diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index 9f8d1d22..92a1aa43 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -38,8 +38,8 @@ #include "yahootypes.h" class TQColor; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class YahooContact; class YahooAccount; class YahooProtocol; @@ -78,7 +78,7 @@ public: */ YahooContact *contact(const TQString &id); - virtual KActionMenu* actionMenu(); + virtual TDEActionMenu* actionMenu(); /** * Sets the yahoo away status @@ -292,10 +292,10 @@ private: YahooWebcam *m_webcam; - KAction *m_openInboxAction; // Menu item openInbox - KAction *m_openYABAction; // Menu item openYahooAddressbook - KAction *m_editOwnYABEntry; // Menu item editOwnYABEntry - KAction *m_joinChatAction; // Menu item joinChatAction + TDEAction *m_openInboxAction; // Menu item openInbox + TDEAction *m_openYABAction; // Menu item openYahooAddressbook + TDEAction *m_editOwnYABEntry; // Menu item editOwnYABEntry + TDEAction *m_joinChatAction; // Menu item joinChatAction Client *m_session; // The Connection object }; diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index 3bb8e717..c8eaf102 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -53,11 +53,11 @@ YahooChatSession::YahooChatSession( Kopete::Protocol *protocol, const Kopete::Co setInstance(protocol->instance()); // Add Actions - new KAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQT_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ; - new KAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQT_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ; - new KAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQT_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ; - new KAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQT_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ; - new KAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" ); + new TDEAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQT_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ; + new TDEAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQT_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ; + new TDEAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQT_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ; + new TDEAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQT_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ; + new TDEAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" ); YahooContact *c = static_cast<YahooContact*>( others.first() ); connect( c, TQT_SIGNAL( displayPictureChanged() ), this, TQT_SLOT( slotDisplayPictureChanged() ) ); @@ -127,17 +127,17 @@ void YahooChatSession::slotDisplayPictureChanged() int sz=22; // get the size of the toolbar were the aciton is plugged. // if you know a better way to get the toolbar, let me know - KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; + TDEMainWindow *w= view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; if(w) { //We connected that in the constructor. we don't need to keep this slot active. disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); - TQPtrListIterator<KToolBar> it=w->toolBarIterator() ; - KAction *imgAction=actionCollection()->action("yahooDisplayPicture"); + TQPtrListIterator<TDEToolBar> it=w->toolBarIterator() ; + TDEAction *imgAction=actionCollection()->action("yahooDisplayPicture"); if(imgAction) while(it) { - KToolBar *tb=*it; + TDEToolBar *tb=*it; if(imgAction->isPlugged(tb)) { sz=tb->iconSize(); diff --git a/kopete/protocols/yahoo/yahoochatsession.h b/kopete/protocols/yahoo/yahoochatsession.h index 7109d816..f56b1a08 100644 --- a/kopete/protocols/yahoo/yahoochatsession.h +++ b/kopete/protocols/yahoo/yahoochatsession.h @@ -18,9 +18,9 @@ #include "kopetechatsession.h" -class KActionCollection; +class TDEActionCollection; class YahooContact; -class KActionMenu; +class TDEActionMenu; class TQLabel; diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 8e6132b6..64656e75 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -47,7 +47,7 @@ YahooConferenceChatSession::YahooConferenceChatSession( const TQString & yahooRo m_yahooRoom = yahooRoom; - m_actionInvite = new KAction( i18n( "&Invite others" ), "kontact_contacts", this, TQT_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite"); + m_actionInvite = new TDEAction( i18n( "&Invite others" ), "kontact_contacts", this, TQT_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite"); setXMLFile("yahooconferenceui.rc"); } diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.h b/kopete/protocols/yahoo/yahooconferencemessagemanager.h index 363dc003..d09cee4f 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.h +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.h @@ -21,10 +21,10 @@ #include "kopetechatsession.h" -class KActionCollection; +class TDEActionCollection; class YahooContact; class YahooAccount; -class KActionMenu; +class TDEActionMenu; /** * @author Duncan Mac-Vicar Prett @@ -50,7 +50,7 @@ protected slots: private: TQString m_yahooRoom; - KAction *m_actionInvite; + TDEAction *m_actionInvite; }; #endif diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 62b7c6c9..fbc1718d 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -361,12 +361,12 @@ void YahooContact::slotChatSessionDestroyed() m_sessionActive = false; } -TQPtrList<KAction> *YahooContact::customContextMenuActions() +TQPtrList<TDEAction> *YahooContact::customContextMenuActions() { - TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); + TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>(); if ( !m_webcamAction ) { - m_webcamAction = new KAction( i18n( "View &Webcam" ), "webcamreceive", KShortcut(), + m_webcamAction = new TDEAction( i18n( "View &Webcam" ), "webcamreceive", TDEShortcut(), this, TQT_SLOT( requestWebcam() ), this, "view_webcam" ); } if ( isReachable() ) @@ -377,7 +377,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions() if( !m_inviteWebcamAction ) { - m_inviteWebcamAction = new KAction( i18n( "Invite to view your Webcam" ), "webcamsend", KShortcut(), + m_inviteWebcamAction = new TDEAction( i18n( "Invite to view your Webcam" ), "webcamsend", TDEShortcut(), this, TQT_SLOT( inviteWebcam() ), this, "invite_webcam" ); } if ( isReachable() ) @@ -388,7 +388,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions() if ( !m_buzzAction ) { - m_buzzAction = new KAction( i18n( "&Buzz Contact" ), "bell", KShortcut(), this, TQT_SLOT( buzzContact() ), this, "buzz_contact"); + m_buzzAction = new TDEAction( i18n( "&Buzz Contact" ), "bell", TDEShortcut(), this, TQT_SLOT( buzzContact() ), this, "buzz_contact"); } if ( isReachable() ) m_buzzAction->setEnabled( true ); @@ -398,7 +398,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions() if ( !m_stealthAction ) { - m_stealthAction = new KAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", KShortcut(), this, TQT_SLOT( stealthContact() ), this, "stealth_contact"); + m_stealthAction = new TDEAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", TDEShortcut(), this, TQT_SLOT( stealthContact() ), this, "stealth_contact"); } if ( isReachable() ) m_stealthAction->setEnabled( true ); @@ -408,7 +408,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions() if ( !m_inviteConferenceAction ) { - m_inviteConferenceAction = new KAction( i18n( "&Invite to Conference" ), "kontact_contacts", KShortcut(), this, TQT_SLOT( inviteConference() ), this, "invite_conference"); + m_inviteConferenceAction = new TDEAction( i18n( "&Invite to Conference" ), "kontact_contacts", TDEShortcut(), this, TQT_SLOT( inviteConference() ), this, "invite_conference"); } if ( isReachable() ) m_inviteConferenceAction->setEnabled( true ); @@ -418,7 +418,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions() if ( !m_profileAction ) { - m_profileAction = new KAction( i18n( "&View Yahoo Profile" ), "kontact_notes", KShortcut(), this, TQT_SLOT( slotUserProfile() ), this, "profile_contact"); + m_profileAction = new TDEAction( i18n( "&View Yahoo Profile" ), "kontact_notes", TDEShortcut(), this, TQT_SLOT( slotUserProfile() ), this, "profile_contact"); } m_profileAction->setEnabled( true ); actionCollection->append( m_profileAction ); diff --git a/kopete/protocols/yahoo/yahoocontact.h b/kopete/protocols/yahoo/yahoocontact.h index dd2f9f8b..eb8c0d1d 100644 --- a/kopete/protocols/yahoo/yahoocontact.h +++ b/kopete/protocols/yahoo/yahoocontact.h @@ -24,7 +24,7 @@ /* Kopete Includes */ #include "kopetecontact.h" -class KAction; +class TDEAction; class KTempFile; namespace Kopete { class ChatSession; } @@ -49,7 +49,7 @@ public: /** Base Class Reimplementations **/ virtual bool isOnline() const; virtual bool isReachable(); - virtual TQPtrList<KAction> *customContextMenuActions(); + virtual TQPtrList<TDEAction> *customContextMenuActions(); virtual Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate= Kopete::Contact::CanCreate ); virtual void serialize( TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData ); @@ -128,12 +128,12 @@ private: bool m_receivingWebcam; bool m_sessionActive; - KAction* m_stealthAction; - KAction* m_profileAction; - KAction* m_webcamAction; - KAction* m_inviteWebcamAction; - KAction* m_buzzAction; - KAction* m_inviteConferenceAction; + TDEAction* m_stealthAction; + TDEAction* m_profileAction; + TDEAction* m_webcamAction; + TDEAction* m_inviteWebcamAction; + TDEAction* m_buzzAction; + TDEAction* m_inviteConferenceAction; }; #endif diff --git a/kopete/protocols/yahoo/yahooprotocol.h b/kopete/protocols/yahoo/yahooprotocol.h index 7acbea7d..075b84db 100644 --- a/kopete/protocols/yahoo/yahooprotocol.h +++ b/kopete/protocols/yahoo/yahooprotocol.h @@ -31,9 +31,9 @@ #include "kopetecontactproperty.h" class YahooContact; -class KPopupMenu; -class KActionMenu; -class KAction; +class TDEPopupMenu; +class TDEActionMenu; +class TDEAction; namespace Kopete { class MetaContact; } namespace Kopete { class Message; } class YahooPreferences; |