Rename a number of classes to enhance compatibility with KDE4

4 files changed, 18 insertions, 18 deletions

diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index a80cd674..bb25cf4e 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -50,7 +50,7 @@
  * Constructor. Connect all of the object and the job control.
  */
 KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
-       KMainWindow(parent, name)
+       TDEMainWindow(parent, name)
 {
     janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed);
     setCentralWidget(janusWidget);
@@ -66,20 +66,20 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
 
     resize(500, 440);
 
-    /*KAction *eject = */new KAction( i18n("&Eject CD"), 0, TQT_TQOBJECT(tracks),
+    /*TDEAction *eject = */new TDEAction( i18n("&Eject CD"), 0, TQT_TQOBJECT(tracks),
                                   TQT_SLOT( eject() ), actionCollection(), "eject" );
 
-    (void)new KAction( i18n("&Configure KAudioCreator..."), 0, TQT_TQOBJECT(this),
+    (void)new TDEAction( i18n("&Configure KAudioCreator..."), 0, TQT_TQOBJECT(this),
                        TQT_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" );
 
-    KAction *selectAll   = new KAction( i18n( "Select &All Tracks"), 0, TQT_TQOBJECT(tracks),
+    TDEAction *selectAll   = new TDEAction( i18n( "Select &All Tracks"), 0, TQT_TQOBJECT(tracks),
                                         TQT_SLOT( selectAllTracks()   ), actionCollection(), "select_all" ) ;
-    KAction *deselectAll = new KAction( i18n( "Deselect &All Tracks"), 0, TQT_TQOBJECT(tracks),
+    TDEAction *deselectAll = new TDEAction( i18n( "Deselect &All Tracks"), 0, TQT_TQOBJECT(tracks),
                                         TQT_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" );
     selectAll->setEnabled( false );
     deselectAll->setEnabled( false );
 
-    KActionMenu *actActionMenu = new KActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" );
+    TDEActionMenu *actActionMenu = new TDEActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" );
     actActionMenu->setDelayed(true); //needed for checking "all accounts"
     actActionMenu->setEnabled( false );   
     connect( actActionMenu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(tracks), TQT_SLOT( startSession() ) );
@@ -88,7 +88,7 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
     connect( ripMenu, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( slotRipSelection(int)) );
     connect( ripMenu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( getRipMenu()) );
 
-    KAction *rip = new KAction( i18n( "Rip &Selection" ), 0, TQT_TQOBJECT(tracks),
+    TDEAction *rip = new TDEAction( i18n( "Rip &Selection" ), 0, TQT_TQOBJECT(tracks),
                                 TQT_SLOT( startSession() ), actionCollection(), "rip_selected" );
     rip->setEnabled( false );
 
@@ -113,18 +113,18 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
     connect( tracks, TQT_SIGNAL( hasTracks(bool) ), deselectAll,   TQT_SLOT( setEnabled(bool)) );
     connect( tracks, TQT_SIGNAL( hasTracks(bool) ), selectAll,     TQT_SLOT( setEnabled(bool)) );
 
-    (void)new KAction(i18n("Remove &Completed Jobs"), 0, TQT_TQOBJECT(jobQue),
+    (void)new TDEAction(i18n("Remove &Completed Jobs"), 0, TQT_TQOBJECT(jobQue),
           TQT_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" );
 
-    KAction *edit = new KAction(i18n("&Edit Album..."), 0, TQT_TQOBJECT(tracks),
+    TDEAction *edit = new TDEAction(i18n("&Edit Album..."), 0, TQT_TQOBJECT(tracks),
           TQT_SLOT(editInformation()), actionCollection(), "edit_cd");
     connect(tracks, TQT_SIGNAL(hasCD(bool)), edit, TQT_SLOT(setEnabled(bool)));
     edit->setEnabled( false );
 
-    (void)new KAction(i18n("Encode &File..."), 0, TQT_TQOBJECT(this),
+    (void)new TDEAction(i18n("Encode &File..."), 0, TQT_TQOBJECT(this),
           TQT_SLOT(encodeFile()), actionCollection(), "encode_file");
 
-    KAction *cddb = new KAction(i18n("&CDDB Lookup"), 0, TQT_TQOBJECT(tracks),
+    TDEAction *cddb = new TDEAction(i18n("&CDDB Lookup"), 0, TQT_TQOBJECT(tracks),
           TQT_SLOT(performCDDB()), actionCollection(), "cddb_now");
     connect(tracks, TQT_SIGNAL(hasCD(bool)), cddb, TQT_SLOT(setEnabled(bool)));
     cddb->setEnabled( false );
diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h
index 5624c563..02693150 100644
--- a/kaudiocreator/kaudiocreator.h
+++ b/kaudiocreator/kaudiocreator.h
@@ -31,9 +31,9 @@ class Ripper;
 class Encoder;
 class TDECModule;
 class EncoderConfigImp;
-class KPopupMenu;
+class TDEPopupMenu;
 
-class KAudioCreator : public KMainWindow {
+class KAudioCreator : public TDEMainWindow {
 
 Q_OBJECT
   
@@ -62,7 +62,7 @@ private:
   JobQueImp    *jobQue;
   Ripper       *ripper;
   Encoder      *encoder;
-  KPopupMenu   *ripMenu;
+  TDEPopupMenu   *ripMenu;
 
 };
 
diff --git a/kaudiocreator/tracks.ui b/kaudiocreator/tracks.ui
index 0f9a5743..702be247 100644
--- a/kaudiocreator/tracks.ui
+++ b/kaudiocreator/tracks.ui
@@ -41,7 +41,7 @@
             <property name="hAlign" stdset="0">
             </property>
         </widget>
-        <widget class="KListView" row="2" column="0">
+        <widget class="TDEListView" row="2" column="0">
             <column>
                 <property name="text">
                     <string>Rip</string>
diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h
index 3cc2a09e..3e4134a1 100644
--- a/kaudiocreator/tracksimp.h
+++ b/kaudiocreator/tracksimp.h
@@ -41,11 +41,11 @@ class Job;
 class TDEProcess;
 class KCompactDisc;
 
-class TracksItem : public KListViewItem
+class TracksItem : public TDEListViewItem
 {
 public:
-    TracksItem( KListView *parent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c )
-        : KListViewItem( parent, after, TQString()/*rip*/, TQString::number(tr), l, t )
+    TracksItem( TDEListView *parent, TDEListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c )
+        : TDEListViewItem( parent, after, TQString()/*rip*/, TQString::number(tr), l, t )
     {
         m_title = t;
         m_artist = a;