Rename a number of classes to enhance compatibility with KDE4

1 files changed, 21 insertions, 21 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index f88be3c3c..a6f8a20b8 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -190,7 +190,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
 
   setModified( false );
 
-  KAcceleratorManager::manage( mWidget );
+  TDEAcceleratorManager::manage( mWidget );
 
   mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() );
 }
@@ -255,7 +255,7 @@ TDEConfig *KABCore::config() const
   return KABPrefs::instance()->config();
 }
 
-KActionCollection *KABCore::actionCollection() const
+TDEActionCollection *KABCore::actionCollection() const
 {
   return guiClient()->actionCollection();
 }
@@ -1195,7 +1195,7 @@ void KABCore::slotEditorDestroyed( const TQString &uid )
 void KABCore::initGUI()
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( mWidget, 0, 0 );
-  KToolBar* searchTB = new KToolBar( mWidget, "search toolbar");
+  TDEToolBar* searchTB = new TDEToolBar( mWidget, "search toolbar");
   searchTB->boxLayout()->setSpacing( KDialog::spacingHint() );
   mIncSearchWidget = new IncSearchWidget( searchTB, "kde toolbar widget");
   searchTB->setStretchableWidget( mIncSearchWidget );
@@ -1314,10 +1314,10 @@ void KABCore::initActions()
   connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
            TQT_SLOT( clipboardDataChanged() ) );
 
-  KAction *action;
+  TDEAction *action;
 
   // file menu
-  mActionMail = new KAction( i18n( "&Send Email to Contact..." ), "mail_send", 0,
+  mActionMail = new TDEAction( i18n( "&Send Email to Contact..." ), "mail_send", 0,
                              this, TQT_SLOT( sendMail() ), actionCollection(), "file_mail" );
   action = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() );
   mActionMail->setWhatsThis( i18n( "Send a mail to all selected contacts." ) );
@@ -1327,30 +1327,30 @@ void KABCore::initActions()
                              TQT_SLOT( save() ), actionCollection(), "file_sync" );
   mActionSave->setWhatsThis( i18n( "Save all changes of the address book to the storage backend." ) );
 
-  action = new KAction( i18n( "&New Contact..." ), "identity", CTRL+Key_N, this,
+  action = new TDEAction( i18n( "&New Contact..." ), "identity", CTRL+Key_N, this,
                TQT_SLOT( newContact() ), actionCollection(), "file_new_contact" );
   action->setWhatsThis( i18n( "Create a new contact<p>You will be presented with a dialog where you can add all data about a person, including addresses and phone numbers." ) );
 
-  action = new KAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this,
+  action = new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this,
                TQT_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" );
   action->setWhatsThis( i18n( "Create a new distribution list<p>You will be presented with a dialog where you can create a new distribution list." ) );
 
-  mActionMailVCard = new KAction( i18n("Send &Contact..."), "mail_post_to", 0,
+  mActionMailVCard = new TDEAction( i18n("Send &Contact..."), "mail_post_to", 0,
                                   this, TQT_SLOT( mailVCard() ),
                                   actionCollection(), "file_mail_vcard" );
   mActionMailVCard->setWhatsThis( i18n( "Send a mail with the selected contact as attachment." ) );
 
-  mActionChat = new KAction( i18n("Chat &With..."), 0,
+  mActionChat = new TDEAction( i18n("Chat &With..."), 0,
                                   this, TQT_SLOT( startChat() ),
                                   actionCollection(), "file_chat" );
   mActionChat->setWhatsThis( i18n( "Start a chat with the selected contact." ) );
 
-  mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
+  mActionEditAddressee = new TDEAction( i18n( "&Edit Contact..." ), "edit", 0,
                                       this, TQT_SLOT( editContact() ),
                                       actionCollection(), "file_properties" );
   mActionEditAddressee->setWhatsThis( i18n( "Edit a contact<p>You will be presented with a dialog where you can change all data about a person, including addresses and phone numbers." ) );
 
-  mActionMerge = new KAction( i18n( "&Merge Contacts" ), "", 0,
+  mActionMerge = new TDEAction( i18n( "&Merge Contacts" ), "", 0,
                               this, TQT_SLOT( mergeContacts() ),
                               actionCollection(), "edit_merge" );
 
@@ -1366,38 +1366,38 @@ void KABCore::initActions()
 //  mActionUndo->setWhatsThis( i18n( "Undoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) );
 //  mActionRedo->setWhatsThis( i18n( "Redoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) );
 
-  mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
+  mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "editdelete",
                                Key_Delete, this, TQT_SLOT( deleteContacts() ),
                                actionCollection(), "edit_delete" );
   mActionDelete->setWhatsThis( i18n( "Delete all selected contacts." ) );
 
 
-  mActionCopyAddresseeTo = new KAction( i18n( "&Copy Contact To..." ), "", 0,
+  mActionCopyAddresseeTo = new TDEAction( i18n( "&Copy Contact To..." ), "", 0,
                                       this, TQT_SLOT( copySelectedContactToResource() ),
                                       actionCollection(), "copy_contact_to" );
   const TQString copyMoveWhatsThis = i18n( "Store a contact in a different Addressbook<p>You will be presented with a dialog where you can select a new storage place for this contact." );
   mActionCopyAddresseeTo->setWhatsThis( copyMoveWhatsThis );
 
-  mActionMoveAddresseeTo = new KAction( i18n( "M&ove Contact To..." ), "", 0,
+  mActionMoveAddresseeTo = new TDEAction( i18n( "M&ove Contact To..." ), "", 0,
                                       this, TQT_SLOT( moveSelectedContactToResource() ),
                                       actionCollection(), "move_contact_to" );
   mActionMoveAddresseeTo->setWhatsThis( copyMoveWhatsThis );
 
   // settings menu
-  mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), "next", 0,
+  mActionJumpBar = new TDEToggleAction( i18n( "Show Jump Bar" ), "next", 0,
                                       actionCollection(), "options_show_jump_bar" );
   mActionJumpBar->setWhatsThis( i18n( "Toggle whether the jump button bar shall be visible." ) );
   mActionJumpBar->setCheckedState( i18n( "Hide Jump Bar") );
   connect( mActionJumpBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setJumpButtonBarVisible( bool ) ) );
 
-  mActionDetails = new KToggleAction( i18n( "Show Details" ), 0, 0,
+  mActionDetails = new TDEToggleAction( i18n( "Show Details" ), 0, 0,
                                       actionCollection(), "options_show_details" );
   mActionDetails->setWhatsThis( i18n( "Toggle whether the details page shall be visible." ) );
   mActionDetails->setCheckedState( i18n( "Hide Details") );
   connect( mActionDetails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setDetailsVisible( bool ) ) );
 
   if ( mIsPart )
-    action = new KAction( i18n( "&Configure Address Book..." ), "configure", 0,
+    action = new TDEAction( i18n( "&Configure Address Book..." ), "configure", 0,
                           this, TQT_SLOT( configure() ), actionCollection(),
                           "kaddressbook_configure" );
   else
@@ -1406,21 +1406,21 @@ void KABCore::initActions()
   action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) );
 
   // misc
-  action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "find", 0,
+  action = new TDEAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "find", 0,
                         this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" );
   action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) );
 
-  mActionWhoAmI = new KAction( i18n( "Set as Personal Contact Data" ), "personal", 0, this,
+  mActionWhoAmI = new TDEAction( i18n( "Set as Personal Contact Data" ), "personal", 0, this,
                                TQT_SLOT( setWhoAmI() ), actionCollection(),
                                "edit_set_personal" );
   mActionWhoAmI->setWhatsThis( i18n( "Set the personal contact<p>The data of this contact will be used in many other TDE applications, so you do not have to input your personal data several times." ) );
 
-  mActionCategories = new KAction( i18n( "Select Categories..." ), 0, this,
+  mActionCategories = new TDEAction( i18n( "Select Categories..." ), 0, this,
                                    TQT_SLOT( setCategories() ), actionCollection(),
                                    "edit_set_categories" );
   mActionCategories->setWhatsThis( i18n( "Set the categories for all selected contacts." ) );
 
-  KAction *clearLocation = new KAction( i18n( "Clear Search Bar" ),
+  TDEAction *clearLocation = new TDEAction( i18n( "Clear Search Bar" ),
 					TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
 					CTRL+Key_L, this, TQT_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" );
   clearLocation->setWhatsThis( i18n( "Clear Search Bar<p>"