Rename a number of classes to enhance compatibility with KDE4

6 files changed, 10 insertions, 10 deletions

diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index f91142e8..6dda79de 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -44,7 +44,7 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 
-KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : KListBox( parent )
+KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : TDEListBox( parent )
 {
     setAcceptDrops( true );
 }
@@ -62,7 +62,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event )
 
 void KAB::DistributionListNg::ListBox::dragEnterEvent( TQDragEnterEvent *event )
 {
-    KListBox::dragEnterEvent( event );
+    TDEListBox::dragEnterEvent( event );
 }
 
 void KAB::DistributionListNg::ListBox::dropEvent( TQDropEvent *event )
@@ -170,7 +170,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
 
 void KAB::DistributionListNg::MainWidget::contextMenuRequested( TQListBoxItem *item, const TQPoint &point )
 {
-    TQGuardedPtr<KPopupMenu> menu = new KPopupMenu( this );
+    TQGuardedPtr<TDEPopupMenu> menu = new TDEPopupMenu( this );
     menu->insertItem( i18n( "New Distribution List..." ), core(), TQT_SLOT( newDistributionList() ) );
     if ( item && ( item->text() !=i18n( "All Contacts" ) ) )
     {
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index 1121af45..dc4b036d 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -44,7 +44,7 @@ namespace KABC {
 namespace KAB {
 namespace DistributionListNg {
 
-class ListBox : public KListBox
+class ListBox : public TDEListBox
 {
     Q_OBJECT
   
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index f48b5e96..e77e3fc3 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -223,7 +223,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
 
   mContactView->restoreLayout( TDEGlobal::config(), "DistributionListViewColumns" );
 
-  KAcceleratorManager::manage( this );
+  TDEAcceleratorManager::manage( this );
 }
 
 DistributionListWidget::~DistributionListWidget()
@@ -591,7 +591,7 @@ void DistributionListWidget::changed()
 #endif
 
 DistributionListView::DistributionListView( TQWidget *parent, const char* name )
-  : KListView( parent, name )
+  : TDEListView( parent, name )
 {
   setDragEnabled( true );
   setAcceptDrops( true );
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 5d0a5097..59a5d88b 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -105,7 +105,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
 /**
   @short Helper class
 */
-class DistributionListView : public KListView
+class DistributionListView : public TDEListView
 {
   Q_OBJECT
   
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 82d81de4..3534bcdb 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -57,7 +57,7 @@ class AddressBookWrapper : public KABC::AddressBook
 class ResourceItem : public TQCheckListItem
 {
   public:
-    ResourceItem( KListView *parent, KABC::Resource *resource )
+    ResourceItem( TDEListView *parent, KABC::Resource *resource )
       : TQCheckListItem( parent, resource->resourceName(), CheckBox ),
         mResource( resource ), mChecked( false ),
         mIsSubresource( false ), mSubItemsCreated( false ),
@@ -510,7 +510,7 @@ void ResourceSelection::initGUI()
   TQToolTip::add( mRemoveButton, i18n( "Remove addressbook" ) );
   buttonLayout->addWidget( mRemoveButton );
 
-  mListView = new KListView( this );
+  mListView = new TDEListView( this );
   mListView->header()->hide();
   mListView->addColumn( i18n( "Address Books" ) );
   mListView->setFullWidth( true );
diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h
index 4d2f513e..c986c5fc 100644
--- a/kaddressbook/features/resourceselection.h
+++ b/kaddressbook/features/resourceselection.h
@@ -80,7 +80,7 @@ class ResourceSelection : public KAB::ExtensionWidget
     ResourceItem* selectedItem() const;
     ResourceItem* findSubResourceItem( KPIM::ResourceABC *resource, const TQString &subResource );
 
-    KListView *mListView;
+    TDEListView *mListView;
     TQPushButton *mAddButton;
     TQPushButton *mEditButton;
     TQPushButton *mRemoveButton;