diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 15:14:03 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 15:14:03 -0600 |
commit | 9c9412b30c54468adc9e506cc76c5d113fbf5056 (patch) | |
tree | 68a0c0d5bc770fc58596b8c5624cdf33d8625027 /kopete/protocols/groupwise | |
parent | 2e53bd0b77676f879fad7baeecea5879bf496a7d (diff) | |
download | tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.tar.gz tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kopete/protocols/groupwise')
-rw-r--r-- | kopete/protocols/groupwise/gwaccount.cpp | 12 | ||||
-rw-r--r-- | kopete/protocols/groupwise/gwaccount.h | 14 | ||||
-rw-r--r-- | kopete/protocols/groupwise/gwcontact.cpp | 6 | ||||
-rw-r--r-- | kopete/protocols/groupwise/gwcontact.h | 12 | ||||
-rw-r--r-- | kopete/protocols/groupwise/gwmessagemanager.cpp | 22 | ||||
-rw-r--r-- | kopete/protocols/groupwise/gwmessagemanager.h | 12 | ||||
-rw-r--r-- | kopete/protocols/groupwise/ui/gwchatpropswidget.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/groupwise/ui/gwchatsearchwidget.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/groupwise/ui/gwcontactproperties.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/groupwise/ui/gwcontactproperties.h | 4 | ||||
-rw-r--r-- | kopete/protocols/groupwise/ui/gwcontactpropswidget.ui | 2 | ||||
-rw-r--r-- | kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui | 2 |
12 files changed, 46 insertions, 46 deletions
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> |