Rename a number of classes to enhance compatibility with KDE4

22 files changed, 164 insertions, 164 deletions

diff --git a/src/cdopener.cpp b/src/cdopener.cpp
index 56f8919..1105562 100755
--- a/src/cdopener.cpp
+++ b/src/cdopener.cpp
@@ -108,7 +108,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     albumBox->addWidget( cGenre );
 
     // generate the list view for the tracks
-    trackList = new KListView( this, "trackList" );
+    trackList = new TDEListView( this, "trackList" );
     gridLayout->addWidget( trackList, 1, 0 );
     // and fill in the headers
     trackList->addColumn( i18n("Track") );
@@ -291,7 +291,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
         if( year == 0 ) year = (*it)->year;
         if( genre == "" ) genre = (*it)->genre;
 
-        new KListViewItem( trackList, TQString().sprintf("%02i",(*it)->track), (*it)->artist, (*it)->composer, (*it)->title, TQString().sprintf("%i:%02i",(*it)->length/60,(*it)->length%60) );
+        new TDEListViewItem( trackList, TQString().sprintf("%02i",(*it)->track), (*it)->artist, (*it)->composer, (*it)->title, TQString().sprintf("%i:%02i",(*it)->length/60,(*it)->length%60) );
     }
     trackList->setSorting( -1 );
 
diff --git a/src/cdopener.h b/src/cdopener.h
index 379d54a..ea5c284 100755
--- a/src/cdopener.h
+++ b/src/cdopener.h
@@ -9,7 +9,7 @@ class CDManager;
 class TagEngine;
 class Config;
 class ComboButton;
-class KListView;
+class TDEListView;
 class KPushButton;
 class KLineEdit;
 class KComboBox;
@@ -53,7 +53,7 @@ public:
 
 private:
     /** A list of all tracks on the CD */
-    KListView *trackList;
+    TDEListView *trackList;
 
     /** A combobox for entering the artist or selecting VA of the whole CD */
     KComboBox *cArtist;
diff --git a/src/configenvironmentpage.cpp b/src/configenvironmentpage.cpp
index d67e2ad..98ae506 100755
--- a/src/configenvironmentpage.cpp
+++ b/src/configenvironmentpage.cpp
@@ -36,7 +36,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T
 //     box->addWidget( eDirectories );
 
     TQHBoxLayout* directoriesBox = new TQHBoxLayout( box );
-    lDirectories = new KListBox( parent, "lDirectories" );
+    lDirectories = new TDEListBox( parent, "lDirectories" );
     lDirectories->insertStringList( config->data.environment.directories );
     directoriesBox->addWidget( lDirectories );
     connect( lDirectories, TQT_SIGNAL(highlighted(int)),
@@ -86,7 +86,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T
     TQVBoxLayout* foundProgramsBox = new TQVBoxLayout( programsBox );
     TQLabel* lFoundProgramsLabel = new TQLabel( i18n("Programs found")+":", parent, "lFoundProgramsLabel" );
     foundProgramsBox->addWidget( lFoundProgramsLabel );
-    lFoundPrograms = new KListBox( parent, "lFoundPrograms" );
+    lFoundPrograms = new TDEListBox( parent, "lFoundPrograms" );
     lFoundPrograms->setSelectionMode( TQListBox::NoSelection );
     foundProgramsBox->addWidget( lFoundPrograms );
     //connect(lPrograms,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(programsSelectionChanged(int)));
@@ -95,7 +95,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T
     TQVBoxLayout* notFoundProgramsBox = new TQVBoxLayout( programsBox );
     TQLabel* lNotFoundProgramsLabel = new TQLabel( i18n("Programs not found")+":", parent, "lNotFoundProgramsLabel" );
     notFoundProgramsBox->addWidget( lNotFoundProgramsLabel );
-    lNotFoundPrograms = new KListBox( parent, "lNotFoundPrograms" );
+    lNotFoundPrograms = new TDEListBox( parent, "lNotFoundPrograms" );
     lNotFoundPrograms->setSelectionMode( TQListBox::NoSelection );
     notFoundProgramsBox->addWidget( lNotFoundPrograms );
     //connect(lPrograms,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(programsSelectionChanged(int)));
diff --git a/src/configenvironmentpage.h b/src/configenvironmentpage.h
index e1ea1f2..9b22f51 100755
--- a/src/configenvironmentpage.h
+++ b/src/configenvironmentpage.h
@@ -7,7 +7,7 @@
 
 class Config;
 class KPushButton;
-class KListBox;
+class TDEListBox;
 
 /**
 * @short The page for configuring the environment
@@ -30,13 +30,13 @@ public:
     virtual ~ConfigEnvironmentPage();
 
 private:
-    KListBox* lDirectories;
+    TDEListBox* lDirectories;
     KPushButton* pDirUp;
     KPushButton* pDirDown;
     KPushButton* pAddDirectory;
     KPushButton* pRemoveDirectory;
-    KListBox* lFoundPrograms;
-    KListBox* lNotFoundPrograms;
+    TDEListBox* lFoundPrograms;
+    TDEListBox* lNotFoundPrograms;
 
     Config* config;
 
diff --git a/src/configpluginspage.cpp b/src/configpluginspage.cpp
index 7781677..c051381 100755
--- a/src/configpluginspage.cpp
+++ b/src/configpluginspage.cpp
@@ -39,7 +39,7 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const c
     TQLabel* lPluginsLabel = new TQLabel( i18n("Installed plugins")+":", parent, "lPluginsLabel" );
     box->addWidget( lPluginsLabel );
     TQHBoxLayout* pluginsBox = new TQHBoxLayout( box );
-    lPlugins = new KListBox( parent, "lPlugins" );
+    lPlugins = new TDEListBox( parent, "lPlugins" );
     pluginsBox->addWidget(lPlugins);
     connect( lPlugins, TQT_SIGNAL(highlighted(int)),
                this, TQT_SLOT(pluginsSelectionChanged(int))
@@ -71,7 +71,7 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const c
     TQLabel* lOnlinePluginsLabel = new TQLabel( i18n("Available plugins")+":", parent, "lOnlinePluginsLabel" );
     box->addWidget( lOnlinePluginsLabel );
     TQHBoxLayout* onlinePluginsBox = new TQHBoxLayout( box );
-    lOnlinePlugins = new KListBox( parent, "lOnlinePlugins" );
+    lOnlinePlugins = new TDEListBox( parent, "lOnlinePlugins" );
     onlinePluginsBox->addWidget( lOnlinePlugins );
     connect( lOnlinePlugins, TQT_SIGNAL(highlighted(int)),
                this, TQT_SLOT(onlinePluginsSelectionChanged(int))
diff --git a/src/configpluginspage.h b/src/configpluginspage.h
index 70f77c9..4c0bd00 100755
--- a/src/configpluginspage.h
+++ b/src/configpluginspage.h
@@ -8,7 +8,7 @@
 
 class Config;
 class KPushButton;
-class KListBox;
+class TDEListBox;
 class TQCheckBox;
 
 /**
@@ -32,12 +32,12 @@ public:
     virtual ~ConfigPluginsPage();
 
 private:
-    KListBox* lPlugins;
+    TDEListBox* lPlugins;
     KPushButton* pAddPlugin;
     TDEIO::FileCopyJob* getPluginJob;
     KPushButton* pRemovePlugin;
     KPushButton* pAboutPlugin;
-    KListBox* lOnlinePlugins;
+    TDEListBox* lOnlinePlugins;
     KPushButton* pRefreshOnlinePlugins;
     TDEIO::FileCopyJob* refreshOnlinePluginsJob;
     KPushButton* pInstallOnlinePlugin;
diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp
index 6e68a6b..1e2521f 100755
--- a/src/dirdialog.cpp
+++ b/src/dirdialog.cpp
@@ -50,7 +50,7 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n
     TQHBoxLayout* fileTypesBox = new TQHBoxLayout();
     grid->addLayout( fileTypesBox, 1, 0 );
 
-    fileTypes = new KListBox( this, "fileTypes" );
+    fileTypes = new TDEListBox( this, "fileTypes" );
     if( mode == Convert ) fileTypes->insertStringList( config->fileTypes() );
     else if( mode == ReplayGain ) fileTypes->insertStringList( config->replayGainFileTypes() );
     fileTypes->setSelectionMode( TQListBox::Multi );
diff --git a/src/dirdialog.h b/src/dirdialog.h
index 7cb850a..4642fd6 100755
--- a/src/dirdialog.h
+++ b/src/dirdialog.h
@@ -11,7 +11,7 @@ class TQCheckBox;
 class KLineEdit;
 class KPushButton;
 // class KURLRequester;
-class KListBox;
+class TDEListBox;
 
 /**
  * @short The Replay Gain Tool
@@ -53,7 +53,7 @@ private:
 //     KURLRequester* uDirectory;
     KLineEdit* lDirectory;
     KPushButton* pDirectory;
-    KListBox* fileTypes;
+    TDEListBox* fileTypes;
     KPushButton* pSelectAll;
     KPushButton* pSelectNone;
     TQCheckBox* cRecursive;
diff --git a/src/filelist.cpp b/src/filelist.cpp
index f24a998..c99f203 100755
--- a/src/filelist.cpp
+++ b/src/filelist.cpp
@@ -38,8 +38,8 @@
 
 // ### soundkonverter 0.4: draw tooltip like bubble info box
 
-FileListItem::FileListItem( KListView* parent, FileListItem* after )
-    : KListViewItem( parent, after )
+FileListItem::FileListItem( TDEListView* parent, FileListItem* after )
+    : TDEListViewItem( parent, after )
 {
     tags = 0;
     converting = false;
@@ -47,8 +47,8 @@ FileListItem::FileListItem( KListView* parent, FileListItem* after )
     ripping = false;
 }
 
-FileListItem::FileListItem( KListView* parent )
-    : KListViewItem( parent )
+FileListItem::FileListItem( TDEListView* parent )
+    : TDEListViewItem( parent )
 {
     tags = 0;
     converting = false;
@@ -104,7 +104,7 @@ void FileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
         return;
     }
 
-    KListViewItem::paintCell( p, _cg, column, width, alignment );
+    TDEListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 /*void FileListItem::updateOutputCell()
@@ -118,7 +118,7 @@ void FileListItem::updateOptionsCell()
 }*/
 
 FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _config, Options* _options, Logger* _logger, TQWidget* parent, const char* name )
-    : KListView( parent, name )
+    : TDEListView( parent, name )
 {
     cdManager = _cdManager;
     tagEngine = _tagEngine;
@@ -159,19 +159,19 @@ FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _confi
     grid->addWidget( pScanStatus, 1, 1 );
     grid->setColStretch( 1, 2 );
 
-    contextMenu = new KPopupMenu( this );
+    contextMenu = new TDEPopupMenu( this );
     connect( TQT_TQOBJECT(this), TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
                TQT_TQOBJECT(this), TQT_SLOT(showContextMenu( TQListViewItem*, const TQPoint&, int ))
              );
 
     // we haven't got access to the action collection of soundKonverter, so let's create a new one
-    actionCollection = new KActionCollection( this );
+    actionCollection = new TDEActionCollection( this );
 
-    edit = new KAction( i18n("Edit options ..."), "view_text", 0, TQT_TQOBJECT(this), TQT_SLOT(showOptionsEditorDialog()), actionCollection, "edit_options" );
-    start = new KAction( i18n("Start conversion"), "run", 0, TQT_TQOBJECT(this), TQT_SLOT(convertSelectedItems()), actionCollection, "start_conversion" );
-    stop = new KAction( i18n("Stop conversion"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(stopSelectedItems()), actionCollection, "stop_conversion" );
-    remove = new KAction( i18n("Remove"), "edittrash", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItems()), actionCollection, "remove" );
-    paste = new KAction( i18n("Paste"), "editpaste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" );  // TODO paste
+    edit = new TDEAction( i18n("Edit options ..."), "view_text", 0, TQT_TQOBJECT(this), TQT_SLOT(showOptionsEditorDialog()), actionCollection, "edit_options" );
+    start = new TDEAction( i18n("Start conversion"), "run", 0, TQT_TQOBJECT(this), TQT_SLOT(convertSelectedItems()), actionCollection, "start_conversion" );
+    stop = new TDEAction( i18n("Stop conversion"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(stopSelectedItems()), actionCollection, "stop_conversion" );
+    remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItems()), actionCollection, "remove" );
+    paste = new TDEAction( i18n("Paste"), "editpaste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" );  // TODO paste
 
     connect( TQT_TQOBJECT(this), TQT_SIGNAL(selectionChanged()),
                TQT_TQOBJECT(this), TQT_SLOT(itemsSelected())
@@ -215,7 +215,7 @@ int FileList::columnByName( const TQString& name )
 
 void FileList::viewportPaintEvent( TQPaintEvent* e )
 {
-    KListView::viewportPaintEvent( e );
+    TDEListView::viewportPaintEvent( e );
 
     // the bubble help
     if( childCount() == 0 ) {
diff --git a/src/filelist.h b/src/filelist.h
index 70e2772..bd13d4c 100755
--- a/src/filelist.h
+++ b/src/filelist.h
@@ -20,30 +20,30 @@ class TQPainter;
 class TQColorGroup;
 class TQSimpleRichText;
 class KProgress;
-class KPopupMenu;
-class KAction;
-class KActionCollection;
+class TDEPopupMenu;
+class TDEAction;
+class TDEActionCollection;
 
 /**
  * @short The items for the file list
  * @author Daniel Faust <hessijames@gmail.com>
  * @version 0.3
  */
-class FileListItem : public KListViewItem
+class FileListItem : public TDEListViewItem
 {
 public:
     /**
      * Constructor
      * @param parent The parent list view
      */
-    FileListItem( KListView* parent );
+    FileListItem( TDEListView* parent );
 
     /**
      * Constructor
      * @param parent The parent list view
      * @param after The item, the new item should be placed after
      */
-    FileListItem( KListView* parent, FileListItem* after );
+    FileListItem( TDEListView* parent, FileListItem* after );
 
     /**
      * Destructor
@@ -55,10 +55,10 @@ public:
     //void updateOutputCell();
     //void updateOptionsCell();
 
-    FileListItem* nextSibling() const { return static_cast<FileListItem*>( KListViewItem::nextSibling() ); }
-    FileListItem* itemAbove() { return static_cast<FileListItem*>( KListViewItem::itemAbove() ); }
-    FileListItem* itemBelow() { return static_cast<FileListItem*>( KListViewItem::itemBelow() ); }
-    //FileList* listView() const { return static_cast<FileList*>( KListViewItem::listView() ); }
+    FileListItem* nextSibling() const { return static_cast<FileListItem*>( TDEListViewItem::nextSibling() ); }
+    FileListItem* itemAbove() { return static_cast<FileListItem*>( TDEListViewItem::itemAbove() ); }
+    FileListItem* itemBelow() { return static_cast<FileListItem*>( TDEListViewItem::itemBelow() ); }
+    //FileList* listView() const { return static_cast<FileList*>( TDEListViewItem::listView() ); }
 
     ConversionOptions options;  // the information we get from the options class for creating the item
     TagData* tags;              // we need to instruct the tagengine to read the tags from the file!
@@ -83,7 +83,7 @@ public:
  * @author Daniel Faust <hessijames@gmail.com>
  * @version 0.3
  */
-class FileList : public KListView
+class FileList : public TDEListView
 {
     Q_OBJECT
   
@@ -100,8 +100,8 @@ public:
      */
     virtual ~FileList();
 
-    FileListItem* firstChild() const { return static_cast<FileListItem*>( KListView::firstChild() ); }
-    FileListItem* lastItem() const { return static_cast<FileListItem*>( KListView::lastItem() ); }
+    FileListItem* firstChild() const { return static_cast<FileListItem*>( TDEListView::firstChild() ); }
+    FileListItem* lastItem() const { return static_cast<FileListItem*>( TDEListView::lastItem() ); }
 
     int columnByName( const TQString& name );
     void updateItem( FileListItem* item );
@@ -131,14 +131,14 @@ private:
     TQSimpleRichText* bubble;
 
     /** The context menu for editing or starting the files */
-    KPopupMenu* contextMenu;
-
-    KActionCollection* actionCollection;
-    KAction* edit;
-    KAction* start;
-    KAction* stop;
-    KAction* remove;
-    KAction* paste;
+    TDEPopupMenu* contextMenu;
+
+    TDEActionCollection* actionCollection;
+    TDEAction* edit;
+    TDEAction* start;
+    TDEAction* stop;
+    TDEAction* remove;
+    TDEAction* paste;
 
     CDManager* cdManager;
     TagEngine* tagEngine;
diff --git a/src/logviewer.cpp b/src/logviewer.cpp
index 765acf8..611b1fb 100755
--- a/src/logviewer.cpp
+++ b/src/logviewer.cpp
@@ -16,14 +16,14 @@
 
 // ### soundkonverter 0.4: make sub items for the output
 
-LogViewerItem::LogViewerItem( KListView* parent, LogViewerItem* after, TQString label1 )
-    : KListViewItem( parent, after, label1 )
+LogViewerItem::LogViewerItem( TDEListView* parent, LogViewerItem* after, TQString label1 )
+    : TDEListViewItem( parent, after, label1 )
 {
     converting = false;
 }
 
 LogViewerItem::LogViewerItem( LogViewerItem* parent, LogViewerItem* after, TQString label1 )
-    : KListViewItem( parent, after, label1 )
+    : TDEListViewItem( parent, after, label1 )
 {
     converting = false;
 }
@@ -54,12 +54,12 @@ void LogViewerItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
         return;
     }
 
-    KListViewItem::paintCell( p, _cg, column, width, alignment );
+    TDEListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 
 LogViewerList::LogViewerList( TQWidget* parent, const char* name )
-    : KListView( parent, name )
+    : TDEListView( parent, name )
 {}
 
 LogViewerList::~LogViewerList()
diff --git a/src/logviewer.h b/src/logviewer.h
index 4ba7ab8..0665e0d 100755
--- a/src/logviewer.h
+++ b/src/logviewer.h
@@ -15,7 +15,7 @@ class Logger;
  * @author Daniel Faust <hessijames@gmail.com>
  * @version 0.3
  */
-class LogViewerItem : public KListViewItem
+class LogViewerItem : public TDEListViewItem
 {
 public:
     /**
@@ -24,7 +24,7 @@ public:
      * @param after The item, the new item should be placed after
      * @param label1 The text for the first column
      */
-    LogViewerItem( KListView* parent, LogViewerItem* after, TQString label1 );
+    LogViewerItem( TDEListView* parent, LogViewerItem* after, TQString label1 );
 
     /**
      * Constructor
@@ -41,8 +41,8 @@ public:
 
     virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int alignment );
 
-    LogViewerItem* nextSibling() const { return static_cast<LogViewerItem*>( KListViewItem::nextSibling() ); }
-    LogViewerItem* firstChild() const { return static_cast<LogViewerItem*>( KListViewItem::firstChild() ); }
+    LogViewerItem* nextSibling() const { return static_cast<LogViewerItem*>( TDEListViewItem::nextSibling() ); }
+    LogViewerItem* firstChild() const { return static_cast<LogViewerItem*>( TDEListViewItem::firstChild() ); }
 
     bool converting;
 };
@@ -53,7 +53,7 @@ public:
  * @author Daniel Faust <hessijames@gmail.com>
  * @version 0.3
  */
-class LogViewerList : public KListView
+class LogViewerList : public TDEListView
 {
     Q_OBJECT
   
@@ -70,7 +70,7 @@ public:
      */
     virtual ~LogViewerList();
 
-    LogViewerItem* firstChild() const { return static_cast<LogViewerItem*>( KListView::firstChild() ); }
+    LogViewerItem* firstChild() const { return static_cast<LogViewerItem*>( TDEListView::firstChild() ); }
 };
 
 
diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp
index efb5af9..d26747a 100755
--- a/src/optionsdetailed.cpp
+++ b/src/optionsdetailed.cpp
@@ -188,7 +188,7 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char
              );
     normalBottomBox->addSpacing( 18 );
 
-    pProfileSave = new KToolBarButton( "filesave", 1003, normalOptions, "pProfileSave" );
+    pProfileSave = new TDEToolBarButton( "filesave", 1003, normalOptions, "pProfileSave" );
     TQToolTip::add( pProfileSave, i18n("Save current options as a profile") );
     normalBottomBox->addWidget( pProfileSave, 0, TQt::AlignVCenter );
     connect( pProfileSave, TQT_SIGNAL(clicked()),
diff --git a/src/optionsdetailed.h b/src/optionsdetailed.h
index 4a5de22..a5af0d9 100755
--- a/src/optionsdetailed.h
+++ b/src/optionsdetailed.h
@@ -17,7 +17,7 @@ class KIntSpinBox;
 class TQCheckBox;
 class KComboBox;
 class KLineEdit;
-class KToolBarButton;
+class TDEToolBarButton;
 
 /**
  * @short The options widget for setting up the output options more detailed
@@ -73,7 +73,7 @@ private:
     KComboBox* cChannels;
     TQCheckBox* cReplayGain;
 
-    KToolBarButton* pProfileSave;
+    TDEToolBarButton* pProfileSave;
 
     KLineEdit* lUserOptions;
 
diff --git a/src/optionssimple.cpp b/src/optionssimple.cpp
index 839da1b..21cb257 100755
--- a/src/optionssimple.cpp
+++ b/src/optionssimple.cpp
@@ -58,7 +58,7 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed
                this, TQT_SLOT(somethingChanged())
              );
     topBox->addSpacing( 3 );
-    //pProfileRemove = new KToolBarButton( "editdelete", 1002, this, "pProfileRemove" );
+    //pProfileRemove = new TDEToolBarButton( "editdelete", 1002, this, "pProfileRemove" );
     pProfileRemove = new KPushButton( iconLoader->loadIcon("editdelete",KIcon::Small), i18n("Remove"), this, "pProfileRemove" );
     pProfileRemove->hide();
     TQToolTip::add( pProfileRemove, i18n("Remove the selected profile") );
@@ -66,7 +66,7 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed
     connect( pProfileRemove, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(profileRemove())
              );
-    //pProfileInfo = new KToolBarButton( "messagebox_info", 1110, this, "pProfileInfo" );
+    //pProfileInfo = new TDEToolBarButton( "messagebox_info", 1110, this, "pProfileInfo" );
     pProfileInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("Info"), this, "pProfileInfo" );
     TQToolTip::add( pProfileInfo, i18n("Information about the selected profile") );
     topBox->addWidget( pProfileInfo, 0, TQt::AlignVCenter );
@@ -86,7 +86,7 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed
                this, TQT_SLOT(somethingChanged())
              );
     topBox->addSpacing( 3 );
-    //pFormatInfo = new KToolBarButton( "messagebox_info", 1111, this, "pFormatInfo" );
+    //pFormatInfo = new TDEToolBarButton( "messagebox_info", 1111, this, "pFormatInfo" );
     pFormatInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("Info"), this, "pFormatInfo" );
     TQToolTip::add( pFormatInfo, i18n("Information about the selected file format") );
     topBox->addWidget( pFormatInfo, 0, TQt::AlignVCenter );
diff --git a/src/optionssimple.h b/src/optionssimple.h
index 11262da..08719c5 100755
--- a/src/optionssimple.h
+++ b/src/optionssimple.h
@@ -13,7 +13,7 @@ class ConversionOptions;
 class OptionsDetailed;
 
 class KComboBox;
-class KToolBarButton;
+class TDEToolBarButton;
 class KPushButton;
 
 /**
diff --git a/src/outputdirectory.cpp b/src/outputdirectory.cpp
index 6a1dda0..0a9270f 100755
--- a/src/outputdirectory.cpp
+++ b/src/outputdirectory.cpp
@@ -53,13 +53,13 @@ OutputDirectory::OutputDirectory( Config* _config, TQWidget* parent, const char*
                this, TQT_SLOT(modeChangedSlot(int))
              );
     modeJustChanged = false;
-    /*pModeInfo = new KToolBarButton( "messagebox_info", 1010, this, "pModeInfo" );
+    /*pModeInfo = new TDEToolBarButton( "messagebox_info", 1010, this, "pModeInfo" );
     TQToolTip::add( pModeInfo, i18n("Information about the output mode") );
     box->addWidget( pModeInfo );
     connect( pModeInfo, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(modeInfo())
              );*/
-    pClear = new KToolBarButton( "locationbar_erase", 1001, this, "pClear" );
+    pClear = new TDEToolBarButton( "locationbar_erase", 1001, this, "pClear" );
     TQToolTip::add( pClear, i18n("Clear the directory input field") );
     box->addWidget( pClear );
     lDir = new KLineEdit( this, "lDir" );
@@ -73,19 +73,19 @@ OutputDirectory::OutputDirectory( Config* _config, TQWidget* parent, const char*
     connect( pClear, TQT_SIGNAL(clicked()),
                lDir, TQT_SLOT(clear())
              );
-    /*pDirInfo = new KToolBarButton( "messagebox_info", 1011, this, "pDirInfo" );
+    /*pDirInfo = new TDEToolBarButton( "messagebox_info", 1011, this, "pDirInfo" );
     TQToolTip::add( pDirInfo, i18n("Information about the wildcards") );
     box->addWidget( pDirInfo );
     connect( pDirInfo, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(dirInfo())
              );*/
-    pDirSelect = new KToolBarButton( "folder", 1012, this, "pDirSelect" );
+    pDirSelect = new TDEToolBarButton( "folder", 1012, this, "pDirSelect" );
     TQToolTip::add( pDirSelect, i18n("Choose an output directory") );
     box->addWidget( pDirSelect );
     connect( pDirSelect, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(selectDir())
              );
-    pDirGoto = new KToolBarButton( "konqueror", 1013, this, "pDirGoto" );
+    pDirGoto = new TDEToolBarButton( "konqueror", 1013, this, "pDirGoto" );
     TQToolTip::add( pDirGoto, i18n("Open Konqueror with the output directory") );
     box->addWidget( pDirGoto );
     connect( pDirGoto, TQT_SIGNAL(clicked()),
diff --git a/src/outputdirectory.h b/src/outputdirectory.h
index dfe391b..20b5aa3 100755
--- a/src/outputdirectory.h
+++ b/src/outputdirectory.h
@@ -11,7 +11,7 @@ class FileListItem;
 class Config;
 class KComboBox;
 class KLineEdit;
-class KToolBarButton;
+class TDEToolBarButton;
 
 /**
  * @short The input area for the output directory
@@ -68,12 +68,12 @@ private slots:
 
 private:
     KComboBox* cMode;
-    //KToolBarButton* pModeInfo;
+    //TDEToolBarButton* pModeInfo;
     KLineEdit* lDir;
-    KToolBarButton* pDirSelect;
-    KToolBarButton* pDirGoto;
-    //KToolBarButton* pDirInfo;
-    KToolBarButton* pClear;
+    TDEToolBarButton* pDirSelect;
+    TDEToolBarButton* pDirGoto;
+    //TDEToolBarButton* pDirInfo;
+    TDEToolBarButton* pClear;
 
     bool modeJustChanged;
 
diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp
index 8d7f4cc..1abbb89 100755
--- a/src/replaygainfilelist.cpp
+++ b/src/replaygainfilelist.cpp
@@ -34,7 +34,7 @@
 
 
 ReplayGainFileListItem::ReplayGainFileListItem( TQListView* parent )
-    : KListViewItem( parent )
+    : TDEListViewItem( parent )
 {
     m_type = File;
     mimeType = "application/octet-stream";
@@ -43,7 +43,7 @@ ReplayGainFileListItem::ReplayGainFileListItem( TQListView* parent )
 }
 
 // ReplayGainFileListItem::ReplayGainFileListItem( TQListView* parent, TQListViewItem* after )
-//     : KListViewItem( parent, after )
+//     : TDEListViewItem( parent, after )
 // {
 //     m_type = File;
 //     mimeType = "application/octet-stream";
@@ -52,7 +52,7 @@ ReplayGainFileListItem::ReplayGainFileListItem( TQListView* parent )
 // }
 
 ReplayGainFileListItem::ReplayGainFileListItem( ReplayGainFileListItem* parent )
-    : KListViewItem( parent )
+    : TDEListViewItem( parent )
 {
     m_type = File;
     mimeType = "application/octet-stream";
@@ -115,7 +115,7 @@ void ReplayGainFileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, in
         return;
     }
 
-    KListViewItem::paintCell( p, _cg, column, width, alignment );
+    TDEListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 void ReplayGainFileListItem::setType( Type type )
@@ -157,11 +157,11 @@ int ReplayGainFileListItem::compare( TQListViewItem* item, int column, bool asce
     // NOTE looking at the types, not the strings would be better
     if( text(1) == "" && item->text(1) != "" ) return -1;
     else if( text(1) != "" && item->text(1) == "" ) return 1;
-    else return KListViewItem::compare( item, column, ascending );
+    else return TDEListViewItem::compare( item, column, ascending );
 }
 
 ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config, Logger* _logger, TQWidget *parent, const char *name )
-    : KListView( parent, name )
+    : TDEListView( parent, name )
 {
     tagEngine = _tagEngine;
     config = _config;
@@ -202,21 +202,21 @@ ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config,
     grid->addWidget( pScanStatus, 1, 1 );
     grid->setColStretch( 1, 2 );
 
-    contextMenu = new KPopupMenu( this );
+    contextMenu = new TDEPopupMenu( this );
     connect( TQT_TQOBJECT(this), TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),
                TQT_TQOBJECT(this), TQT_SLOT(showContextMenu(TQListViewItem*,const TQPoint&,int))
              );
 
     // we haven't got access to the action collection of soundKonverter, so let's create a new one
-    actionCollection = new KActionCollection( this );
+    actionCollection = new TDEActionCollection( this );
 
-    calc_gain = new KAction( i18n("Calculate Replay Gain tags"), "apply", 0, TQT_TQOBJECT(this), TQT_SLOT(calcSelectedItemsGain()), actionCollection, "calc_album" );
-    remove_gain = new KAction( i18n("Remove Replay Gain tags"), "cancel", 0, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItemsGain()), actionCollection, "remove_gain" );
-    remove = new KAction( i18n("Remove"), "edittrash", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItems()), actionCollection, "remove" );
-    paste = new KAction( i18n("Paste"), "editpaste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" );
-    newalbum = new KAction( i18n("New album"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(createNewAlbum()), actionCollection, "newalbum" );
-    open_albums = new KAction( i18n("Open all albums"), "view_tree", 0, TQT_TQOBJECT(this), TQT_SLOT(openAlbums()), actionCollection, "open_albums" );
-    close_albums = new KAction( i18n("Cloase all albums"), "view_text", 0, TQT_TQOBJECT(this), TQT_SLOT(closeAlbums()), actionCollection, "close_albums" );
+    calc_gain = new TDEAction( i18n("Calculate Replay Gain tags"), "apply", 0, TQT_TQOBJECT(this), TQT_SLOT(calcSelectedItemsGain()), actionCollection, "calc_album" );
+    remove_gain = new TDEAction( i18n("Remove Replay Gain tags"), "cancel", 0, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItemsGain()), actionCollection, "remove_gain" );
+    remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItems()), actionCollection, "remove" );
+    paste = new TDEAction( i18n("Paste"), "editpaste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" );
+    newalbum = new TDEAction( i18n("New album"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(createNewAlbum()), actionCollection, "newalbum" );
+    open_albums = new TDEAction( i18n("Open all albums"), "view_tree", 0, TQT_TQOBJECT(this), TQT_SLOT(openAlbums()), actionCollection, "open_albums" );
+    close_albums = new TDEAction( i18n("Cloase all albums"), "view_text", 0, TQT_TQOBJECT(this), TQT_SLOT(closeAlbums()), actionCollection, "close_albums" );
 
     replayGain = new ReplayGain( config, logger );
 
@@ -268,7 +268,7 @@ int ReplayGainFileList::columnByName( const TQString& name )
 
 void ReplayGainFileList::viewportPaintEvent( TQPaintEvent* e )
 {
-    KListView::viewportPaintEvent( e );
+    TDEListView::viewportPaintEvent( e );
 
     // the bubble help
     if( childCount() == 0 ) {
@@ -340,8 +340,8 @@ void ReplayGainFileList::contentsDragMoveEvent( TQDragMoveEvent *e )
         cleanItemHighlighter();
         cleanDropVisualizer();
 
-        // the rest is handled by KListView
-        KListView::contentsDragMoveEvent( e );
+        // the rest is handled by TDEListView
+        TDEListView::contentsDragMoveEvent( e );
 
         return;
     }
@@ -364,8 +364,8 @@ void ReplayGainFileList::contentsDragMoveEvent( TQDragMoveEvent *e )
         cleanItemHighlighter();
     }
 
-    // the rest is handled by KListView
-    KListView::contentsDragMoveEvent( e );
+    // the rest is handled by TDEListView
+    TDEListView::contentsDragMoveEvent( e );
 }
 
 void ReplayGainFileList::contentsDropEvent( TQDropEvent *e )
diff --git a/src/replaygainfilelist.h b/src/replaygainfilelist.h
index 0813663..7a0e118 100755
--- a/src/replaygainfilelist.h
+++ b/src/replaygainfilelist.h
@@ -17,9 +17,9 @@ class Logger;
 class TQSimpleRichText;
 class KProgress;
 
-class KPopupMenu;
-class KAction;
-class KActionCollection;
+class TDEPopupMenu;
+class TDEAction;
+class TDEActionCollection;
 class TDEProcess;
 
 // FIXME differ diffrent sampling rates, too!
@@ -29,7 +29,7 @@ class TDEProcess;
  * @author Daniel Faust <hessijames@gmail.com>
  * @version 0.3
  */
-class ReplayGainFileListItem : public KListViewItem
+class ReplayGainFileListItem : public TDEListViewItem
 {
 public:
     enum Type {
@@ -72,10 +72,10 @@ public:
 
     void updateReplayGainCells( TagData* );
 
-    ReplayGainFileListItem* firstChild() const { return static_cast<ReplayGainFileListItem*>( KListViewItem::firstChild() ); }
-    ReplayGainFileListItem* nextSibling() const { return static_cast<ReplayGainFileListItem*>( KListViewItem::nextSibling() ); }
-    //ReplayGainFileListItem* itemBelow() { return static_cast<ReplayGainFileListItem*>( KListViewItem::itemBelow() ); }
-    ReplayGainFileListItem* parent() const { return static_cast<ReplayGainFileListItem*>( KListViewItem::parent() ); }
+    ReplayGainFileListItem* firstChild() const { return static_cast<ReplayGainFileListItem*>( TDEListViewItem::firstChild() ); }
+    ReplayGainFileListItem* nextSibling() const { return static_cast<ReplayGainFileListItem*>( TDEListViewItem::nextSibling() ); }
+    //ReplayGainFileListItem* itemBelow() { return static_cast<ReplayGainFileListItem*>( TDEListViewItem::itemBelow() ); }
+    ReplayGainFileListItem* parent() const { return static_cast<ReplayGainFileListItem*>( TDEListViewItem::parent() ); }
 
     Type type() { return m_type; }
     void setType( Type );
@@ -106,7 +106,7 @@ private:
  * @author Daniel Faust <hessijames@gmail.com>
  * @version 0.3
  */
-class ReplayGainFileList : public KListView
+class ReplayGainFileList : public TDEListView
 {
     Q_OBJECT
   
@@ -123,8 +123,8 @@ public:
      */
     virtual ~ReplayGainFileList();
 
-    ReplayGainFileListItem* firstChild() const { return static_cast<ReplayGainFileListItem*>( KListView::firstChild() ); }
-    ReplayGainFileListItem* itemAt( const TQPoint& point ) const { return static_cast<ReplayGainFileListItem*>( KListView::itemAt(point) ); }
+    ReplayGainFileListItem* firstChild() const { return static_cast<ReplayGainFileListItem*>( TDEListView::firstChild() ); }
+    ReplayGainFileListItem* itemAt( const TQPoint& point ) const { return static_cast<ReplayGainFileListItem*>( TDEListView::itemAt(point) ); }
 
     int columnByName( const TQString& name );
 
@@ -190,16 +190,16 @@ private:
     float timeCount;        // the sum of all track lengths in the current album / the track length of the current file
 
     /** The context menu for editing or starting the files */
-    KPopupMenu* contextMenu;
-
-    KActionCollection* actionCollection;
-    KAction* calc_gain;
-    KAction* remove_gain;
-    KAction* newalbum;
-    KAction* remove;
-    KAction* paste;
-    KAction* open_albums;
-    KAction* close_albums;
+    TDEPopupMenu* contextMenu;
+
+    TDEActionCollection* actionCollection;
+    TDEAction* calc_gain;
+    TDEAction* remove_gain;
+    TDEAction* newalbum;
+    TDEAction* remove;
+    TDEAction* paste;
+    TDEAction* open_albums;
+    TDEAction* close_albums;
 
 private slots:
     void showContextMenu( TQListViewItem*, const TQPoint&, int );
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp
index c48645b..49dc23c 100755
--- a/src/soundkonverter.cpp
+++ b/src/soundkonverter.cpp
@@ -47,7 +47,7 @@
 // ### soundkonverter 0.4: save file list when kde session gets terminated
 
 soundKonverter::soundKonverter()
-    : KMainWindow( 0, "soundkonverter-mainwindow", WType_TopLevel | WDestructiveClose | WStyle_ContextHelp ),
+    : TDEMainWindow( 0, "soundkonverter-mainwindow", WType_TopLevel | WDestructiveClose | WStyle_ContextHelp ),
       DCOPObject( "soundkonverter-app" )
 {
     // this is our first startup, set instances to zero
@@ -113,36 +113,36 @@ soundKonverter::soundKonverter()
     options = new Options( config, i18n("Choose your prefered output options and click on \"Add files ...\"!"), widget, "options" );
     fileList = new FileList( cdManager, tagEngine, config, options, logger, widget, "fileList" );
 
-    startAction = new KAction( i18n("&Start conversion"), "run", 0, TQT_TQOBJECT(fileList), TQT_SLOT(startConversion()), actionCollection(), "start" );
+    startAction = new TDEAction( i18n("&Start conversion"), "run", 0, TQT_TQOBJECT(fileList), TQT_SLOT(startConversion()), actionCollection(), "start" );
     startAction->setEnabled( false );
-    new KAction( i18n("&Replay Gain Tool ..."), "soundkonverter_replaygain", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(showReplayGainScanner()), actionCollection(), "replaygainscanner" );
-    //new KAction( i18n("R&epair Tool ..."), "soundkonverter_repair", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(showRepairTool()), actionCollection(), "repairtool" );
-    new KAction( i18n("C&uesheet Editor ..."), "kwrite", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showCuesheetEditor()), actionCollection(), "cuesheeteditor" );
-    new KAction( i18n("Show &Log ..."), "view_text", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showLogViewer()), actionCollection(), "log" );
-//     new KAction( i18n("About &Plugins ..."), "connect_creating", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SLOT(showAboutPlugins()), actionCollection(), "about_plugins" );
-
-    stopAction = new KAction( i18n("S&top after current file is complete"), "stop", CTRL+Key_O, TQT_TQOBJECT(fileList), TQT_SLOT(stopConversion()), actionCollection(), "stop" );
-    continueAction = new KAction( i18n("&Continue after current file is complete"), "run", CTRL+Key_T, TQT_TQOBJECT(fileList), TQT_SLOT(continueConversion()), actionCollection(), "continue" );
-    killAction = new KAction( i18n("Stop &immediately"), "exit", CTRL+Key_K, TQT_TQOBJECT(fileList), TQT_SLOT(killConversion()), actionCollection(), "kill" );
-    stopActionMenu = new KActionMenu( i18n("Stop"), "stop", actionCollection(), "stopMenu" );
+    new TDEAction( i18n("&Replay Gain Tool ..."), "soundkonverter_replaygain", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(showReplayGainScanner()), actionCollection(), "replaygainscanner" );
+    //new TDEAction( i18n("R&epair Tool ..."), "soundkonverter_repair", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(showRepairTool()), actionCollection(), "repairtool" );
+    new TDEAction( i18n("C&uesheet Editor ..."), "kwrite", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showCuesheetEditor()), actionCollection(), "cuesheeteditor" );
+    new TDEAction( i18n("Show &Log ..."), "view_text", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showLogViewer()), actionCollection(), "log" );
+//     new TDEAction( i18n("About &Plugins ..."), "connect_creating", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SLOT(showAboutPlugins()), actionCollection(), "about_plugins" );
+
+    stopAction = new TDEAction( i18n("S&top after current file is complete"), "stop", CTRL+Key_O, TQT_TQOBJECT(fileList), TQT_SLOT(stopConversion()), actionCollection(), "stop" );
+    continueAction = new TDEAction( i18n("&Continue after current file is complete"), "run", CTRL+Key_T, TQT_TQOBJECT(fileList), TQT_SLOT(continueConversion()), actionCollection(), "continue" );
+    killAction = new TDEAction( i18n("Stop &immediately"), "exit", CTRL+Key_K, TQT_TQOBJECT(fileList), TQT_SLOT(killConversion()), actionCollection(), "kill" );
+    stopActionMenu = new TDEActionMenu( i18n("Stop"), "stop", actionCollection(), "stopMenu" );
     stopActionMenu->setDelayed( false );
     stopActionMenu->setEnabled( false );
 //     stopActionMenu->insert( stopAction );
 //     stopActionMenu->insert( continueAction );
 //     stopActionMenu->insert( killAction );
 
-/*    veryHighPriorityAction = new KToggleAction( i18n("Very hi&gh"), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "veryhigh" );
+/*    veryHighPriorityAction = new TDEToggleAction( i18n("Very hi&gh"), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "veryhigh" );
     veryHighPriorityAction->setExclusiveGroup("priorityActionMenu");
-    highPriorityAction = new KToggleAction( i18n("&High"), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "high" );
+    highPriorityAction = new TDEToggleAction( i18n("&High"), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "high" );
     highPriorityAction->setExclusiveGroup("priorityActionMenu");
-    normalPriorityAction = new KToggleAction( i18n("&Normal"), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "nomal" );
+    normalPriorityAction = new TDEToggleAction( i18n("&Normal"), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "nomal" );
     normalPriorityAction->setExclusiveGroup("priorityActionMenu");
     normalPriorityAction->setChecked(true);
-    lowPriorityAction = new KToggleAction( i18n("&Low"), CTRL+Key_4, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "low" );
+    lowPriorityAction = new TDEToggleAction( i18n("&Low"), CTRL+Key_4, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "low" );
     lowPriorityAction->setExclusiveGroup("priorityActionMenu");
-    veryLowPriorityAction = new KToggleAction( i18n("Very lo&w"), CTRL+Key_5, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "verylow" );
+    veryLowPriorityAction = new TDEToggleAction( i18n("Very lo&w"), CTRL+Key_5, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "verylow" );
     veryLowPriorityAction->setExclusiveGroup("priorityActionMenu");
-    priorityActionMenu = new KActionMenu( i18n("En-/Decoder priority"), "ksysguard", actionCollection(), "priorityMenu" );
+    priorityActionMenu = new TDEActionMenu( i18n("En-/Decoder priority"), "ksysguard", actionCollection(), "priorityMenu" );
     priorityActionMenu->setDelayed( false );
     priorityActionMenu->insert(veryHighPriorityAction);
     priorityActionMenu->insert(highPriorityAction);
@@ -151,14 +151,14 @@ soundKonverter::soundKonverter()
     priorityActionMenu->insert(veryLowPriorityAction);*/
     //priorityChanged();
 
-    new KAction( i18n("A&dd Files ..."), "sound", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(showFileDialog()), actionCollection(), "add_files" );
-    new KAction( i18n("Add &Folder ..."), "folder", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" );
-    new KAction( i18n("Add CD &tracks ..."), "cdaudio_unmount", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(showCdDialog()), actionCollection(), "add_audiocd" );
-    new KAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" );
+    new TDEAction( i18n("A&dd Files ..."), "sound", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(showFileDialog()), actionCollection(), "add_files" );
+    new TDEAction( i18n("Add &Folder ..."), "folder", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" );
+    new TDEAction( i18n("Add CD &tracks ..."), "cdaudio_unmount", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(showCdDialog()), actionCollection(), "add_audiocd" );
+    new TDEAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" );
     KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
-    new KAction( i18n("L&oad file list"), "fileopen", 0, TQT_TQOBJECT(fileList), TQT_SLOT(load()), actionCollection(), "load" );
-    new KAction( i18n("Sa&ve file list"), "filesave", 0, TQT_TQOBJECT(fileList), TQT_SLOT(save()), actionCollection(), "save" );
+    new TDEAction( i18n("L&oad file list"), "fileopen", 0, TQT_TQOBJECT(fileList), TQT_SLOT(load()), actionCollection(), "load" );
+    new TDEAction( i18n("Sa&ve file list"), "filesave", 0, TQT_TQOBJECT(fileList), TQT_SLOT(save()), actionCollection(), "save" );
 
     // TODO //KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteFiles()), actionCollection() );
 
diff --git a/src/soundkonverter.h b/src/soundkonverter.h
index bc2dbbb..b2f95bd 100755
--- a/src/soundkonverter.h
+++ b/src/soundkonverter.h
@@ -22,9 +22,9 @@ class LogViewer;
 
 class TQProgressBar;
 class KPushButton;
-class KAction;
-class KToggleAction;
-class KActionMenu;
+class TDEAction;
+class TDEToggleAction;
+class TDEActionMenu;
 class KSystemTray;
 
 /**
@@ -32,7 +32,7 @@ class KSystemTray;
  * @author Daniel Faust <hessijames@gmail.com>
  * @version 0.3
  */
-class soundKonverter : public KMainWindow, virtual public DCOPInterface
+class soundKonverter : public TDEMainWindow, virtual public DCOPInterface
 {
     Q_OBJECT
   
@@ -138,18 +138,18 @@ private:
     /** The button to stop the conversion */
     KPushButton* pStop;
 
-    KAction* startAction;
-    KAction* stopAction;
-    KAction* continueAction;
-    KAction* killAction;
-    KActionMenu* stopActionMenu;
-    KToggleAction* showToolBarAction;
-//     KToggleAction* veryHighPriorityAction;
-//     KToggleAction* highPriorityAction;
-//     KToggleAction* normalPriorityAction;
-//     KToggleAction* lowPriorityAction;
-//     KToggleAction* veryLowPriorityAction;
-//     KActionMenu* priorityActionMenu;
+    TDEAction* startAction;
+    TDEAction* stopAction;
+    TDEAction* continueAction;
+    TDEAction* killAction;
+    TDEActionMenu* stopActionMenu;
+    TDEToggleAction* showToolBarAction;
+//     TDEToggleAction* veryHighPriorityAction;
+//     TDEToggleAction* highPriorityAction;
+//     TDEToggleAction* normalPriorityAction;
+//     TDEToggleAction* lowPriorityAction;
+//     TDEToggleAction* veryLowPriorityAction;
+//     TDEActionMenu* priorityActionMenu;
 
     int configStartPage;