Rename a number of classes to enhance compatibility with KDE4

6 files changed, 10 insertions, 10 deletions

diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 623d26cf3..c8a1bf51e 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -66,7 +66,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
   TQBoxLayout *listLayout = new TQVBoxLayout;
   topLayout->addLayout( listLayout );
 
-  mAddresseeList = new KListView( topWidget );
+  mAddresseeList = new TDEListView( topWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
   mAddresseeList->setAllColumnsShowFocus( true );
@@ -96,7 +96,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
                                               topWidget );
     selectedLayout->addWidget( selectedGroup );
 
-    mSelectedList = new KListView( selectedGroup );
+    mSelectedList = new TDEListView( selectedGroup );
     mSelectedList->addColumn( i18n("Name") );
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index ebb4bbfcd..83166b50b 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -143,10 +143,10 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase
 
     bool mMultiple;
 
-    KListView *mAddresseeList;
+    TDEListView *mAddresseeList;
     KLineEdit *mAddresseeEdit;
 
-    KListView *mSelectedList;
+    TDEListView *mSelectedList;
 
     AddressBook *mAddressBook;
 
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index efb0738aa..1affd0997 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -156,12 +156,12 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
 {
     bool accept = false;
 
-    if (KStdAccel::shortcut(KStdAccel::SubstringCompletion).contains(KKey(e)))
+    if (TDEStdAccel::shortcut(TDEStdAccel::SubstringCompletion).contains(KKey(e)))
     {
         doCompletion(true);
         accept = true;
     }
-    else if (KStdAccel::shortcut(KStdAccel::TextCompletion).contains(KKey(e)))
+    else if (TDEStdAccel::shortcut(TDEStdAccel::TextCompletion).contains(KKey(e)))
     {
         int len = text().length();
         
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index a8060c17a..15efa5ba6 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -293,7 +293,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
     }
   }
 
-  KAcceleratorManager::manage( this );
+  TDEAcceleratorManager::manage( this );
 }
 
 AttributesDialog::~AttributesDialog()
diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp
index 256125cd2..e840e027e 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/kabc/resourceselectdialog.cpp
@@ -45,7 +45,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
   TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal,  this );
   groupBox->setTitle( i18n( "Resources" ) );
 
-  mResourceId = new KListBox( groupBox );
+  mResourceId = new TDEListBox( groupBox );
 
   mainLayout->addWidget( groupBox );
 
diff --git a/kabc/resourceselectdialog.h b/kabc/resourceselectdialog.h
index 6441dc247..f5f2d6984 100644
--- a/kabc/resourceselectdialog.h
+++ b/kabc/resourceselectdialog.h
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 #include <kdemacros.h>
 
-class KListBox;
+class TDEListBox;
 
 namespace KABC {
 
@@ -48,7 +48,7 @@ class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog
     static Resource *getResource( AddressBook *ab, TQWidget *parent = 0 );
 
   private:
-    KListBox *mResourceId;
+    TDEListBox *mResourceId;
     TQMap<int, Resource*> mResourceMap;
 };