From fd5d099065a748cac49e20a13481f85666c53c71 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 15:14:12 -0600
Subject: Rename a number of classes to enhance compatibility with KDE4

---
 certmanager/lib/ui/backendconfigwidget.cpp |  6 +++---
 certmanager/lib/ui/cryptoconfigdialog.cpp  |  2 +-
 certmanager/lib/ui/keylistview.cpp         | 18 +++++++++---------
 certmanager/lib/ui/keylistview.h           |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'certmanager/lib/ui')

diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 47ca25d40..d2312c725 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -73,11 +73,11 @@ namespace Kleo {
   class ProtocolCheckListItem;
 }
 
-class Kleo::BackendListView : public KListView
+class Kleo::BackendListView : public TDEListView
 {
 public:
   BackendListView( BackendConfigWidget* parent, const char* name = 0 )
-    : KListView( parent, name ) {}
+    : TDEListView( parent, name ) {}
 
   /// return backend for currently selected (/current) item. Used by Configure button.
   const Kleo::CryptoBackend* currentBackend() const;
@@ -95,7 +95,7 @@ public:
 class Kleo::BackendListViewItem : public TQListViewItem
 {
 public:
-  BackendListViewItem( KListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend )
+  BackendListViewItem( TDEListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend )
     : TQListViewItem( lv, prev, cryptoBackend->displayName() ), mCryptoBackend( cryptoBackend )
     {}
 
diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp
index 65edb93ef..d6dc823e7 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.cpp
+++ b/certmanager/lib/ui/cryptoconfigdialog.cpp
@@ -54,7 +54,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg
   }
 
   // Automatically assign accelerators
-  KAcceleratorManager::manage( this );
+  TDEAcceleratorManager::manage( this );
 }
 
 void Kleo::CryptoConfigDialog::slotOk()
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 100334f20..8e81b9768 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -129,14 +129,14 @@ static const struct {
     TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) },
   { TQT_SIGNAL(selectionChanged(TQListViewItem*)),
     TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) },
-  { TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*,const TQPoint&)),
-    TQT_SLOT(slotEmitContextMenu(KListView*, TQListViewItem*,const TQPoint&)) },
+  { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)),
+    TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) },
 };
 static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements;
 
 
 Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * parent, const char * name, WFlags f )
-  : KListView( parent, name ),
+  : TDEListView( parent, name ),
     mColumnStrategy( columnStrategy ),
     mDisplayStrategy ( displayStrategy  ),
     mHierarchical( false )
@@ -187,7 +187,7 @@ Kleo::KeyListView::~KeyListView() {
 
 void Kleo::KeyListView::insertItem( TQListViewItem * qlvi ) {
   //kdDebug() << "Kleo::KeyListView::insertItem( " << qlvi << " )" << endl;
-  KListView::insertItem( qlvi );
+  TDEListView::insertItem( qlvi );
   if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) )
     registerItem( item );
 }
@@ -196,7 +196,7 @@ void Kleo::KeyListView::takeItem( TQListViewItem * qlvi ) {
   //kdDebug() << "Kleo::KeyListView::takeItem( " << qlvi << " )" << endl;
   if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) )
     deregisterItem( item );
-  KListView::takeItem( qlvi );
+  TDEListView::takeItem( qlvi );
 }
 
 
@@ -244,7 +244,7 @@ void Kleo::KeyListView::slotUpdateTimeout() {
 void Kleo::KeyListView::clear() {
   d->updateTimer->stop();
   d->keyBuffer.clear();
-  KListView::clear();
+  TDEListView::clear();
 }
 
 void Kleo::KeyListView::registerItem( KeyListViewItem * item ) {
@@ -359,7 +359,7 @@ void Kleo::KeyListView::slotEmitSelectionChanged( TQListViewItem * item ) {
     emit selectionChanged( static_cast<KeyListViewItem*>( item ) );
 }
 
-void Kleo::KeyListView::slotEmitContextMenu( KListView*, TQListViewItem * item, const TQPoint & p ) {
+void Kleo::KeyListView::slotEmitContextMenu( TDEListView*, TQListViewItem * item, const TQPoint & p ) {
   if ( !item || lvi_cast<KeyListViewItem>( item ) )
     emit contextMenu( static_cast<KeyListViewItem*>( item ), p );
 }
@@ -833,11 +833,11 @@ Kleo::KeyListViewItem * Kleo::KeyListViewItem::nextSibling() const {
 }
 
 Kleo::KeyListViewItem * Kleo::KeyListView::firstChild() const {
-  return static_cast<Kleo::KeyListViewItem*>( KListView::firstChild() );
+  return static_cast<Kleo::KeyListViewItem*>( TDEListView::firstChild() );
 }
 
 Kleo::KeyListViewItem * Kleo::KeyListView::selectedItem() const {
-  return static_cast<Kleo::KeyListViewItem*>( KListView::selectedItem() );
+  return static_cast<Kleo::KeyListViewItem*>( TDEListView::selectedItem() );
 }
 
 static void selectedItems( TQPtrList<Kleo::KeyListViewItem> & result, TQListViewItem * start ) {
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 5c711a77c..2f383cc53 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -198,7 +198,7 @@ namespace Kleo {
   };
 
 
-  class KDE_EXPORT KeyListView : public KListView {
+  class KDE_EXPORT KeyListView : public TDEListView {
     Q_OBJECT
   
     friend class KeyListViewItem;
@@ -287,7 +287,7 @@ namespace Kleo {
     void slotEmitDoubleClicked( TQListViewItem*, const TQPoint&, int );
     void slotEmitReturnPressed( TQListViewItem* );
     void slotEmitSelectionChanged( TQListViewItem* );
-    void slotEmitContextMenu( KListView*, TQListViewItem*, const TQPoint& );
+    void slotEmitContextMenu( TDEListView*, TQListViewItem*, const TQPoint& );
     void slotUpdateTimeout();
 
   public:
-- 
cgit v1.2.1