Rename many classes and header files to avoid conflicts with KDE4

k3bsetup/base_k3bsetup2.ui

@@ -372,8 +372,8 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>

k3bsetup/k3bsetup2.cpp

@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kgenericfactory.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <keditlistbox.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>

libk3b/cddb/k3bcddbmultientriesdialog.cpp

@@ -20,7 +20,7 @@
 #include <tqframe.h>
 #include <tqlabel.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 
 

libk3b/tools/k3blistview.h

@@ -18,7 +18,7 @@
 #define K3BLISTVIEW_H
 
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include "k3b_export.h"
 #include <tqptrvector.h>
 #include <tqptrlist.h>

libk3b/tools/k3bradioaction.cpp

@@ -15,7 +15,7 @@
 
 #include "k3bradioaction.h"
 
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 K3bRadioAction::K3bRadioAction( const TQString& text, const TDEShortcut& cut,
 				TQObject* parent, const char* name )

libk3b/tools/k3bradioaction.h

@@ -16,7 +16,7 @@
 #ifndef _K3B_RADIO_ACTION_H_
 #define _K3B_RADIO_ACTION_H_
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include "k3b_export.h"
 
 /**

libk3b/tools/k3btoolbox.cpp

@@ -15,9 +15,9 @@
 
 #include "k3btoolbox.h"
 
-#include <kaction.h>
-#include <kpopupmenu.h>
-#include <ktoolbarbutton.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbarbutton.h>
 #include <kiconloader.h>
 
 #include <tqtoolbutton.h>

libk3b/tools/k3btoolbutton.cpp

@@ -57,7 +57,7 @@ void K3bToolButton::drawButton( TQPainter* p )
   TQToolButton::drawButton( p );
 
   //
-  // code below comes from ktoolbarbutton.cpp from the tdelibs sources
+  // code below comes from tdetoolbarbutton.cpp from the tdelibs sources
   // see the file for copyright information
   //
   if( TQToolButton::popup() ) {

plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp

@@ -32,7 +32,7 @@
 #include <k3bpluginfactory.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>

src/k3b.cpp

@@ -48,7 +48,7 @@
 #include <kprocess.h>
 #include <kurl.h>
 #include <kurllabel.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <kglobalsettings.h>
 #include <kdialog.h>
@@ -60,7 +60,7 @@
 #include <kstdguiitem.h>
 #include <tdeio/global.h>
 #include <tdeio/netaccess.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 
 #include <stdlib.h>
 

src/k3b.h

@@ -32,7 +32,7 @@
 #include <kapplication.h>
 #include <tdeparts/dockmainwindow.h>
 #include <kdockwidget.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 
 class TQVBox;

src/k3bappdevicemanager.cpp

@@ -21,14 +21,14 @@
 #include <k3bapplication.h>
 #include <k3bmediacache.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
 #include <tdeio/job.h>
 #include <klocale.h>
 #include <tdeio/global.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 
 K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name )

src/k3baudioplayer.cpp

@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <string.h>
 

src/k3baudioplayer.h

@@ -17,7 +17,7 @@
 #ifndef K3BAUDIOPLAYER_H
 #define K3BAUDIOPLAYER_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <config.h>
 

src/k3bdiroperator.cpp

@@ -23,10 +23,10 @@
 
 #include <kcombiview.h>
 #include <tdefilepreview.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbookmarkmenu.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqdir.h>
 

src/k3bdirview.cpp

@@ -61,7 +61,7 @@
 #include <kmimetype.h>
 #include <kcursor.h>
 #include <tdefiledetailview.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kurl.h>
 #include <klocale.h>
@@ -77,7 +77,7 @@
 #include <kmessagebox.h>
 #include <kstdaction.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 
 

src/k3bdiskinfoview.cpp

@@ -40,7 +40,7 @@
 
 #include <kdialog.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>

src/k3bfiletreeview.cpp

@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeio/global.h>
 #include <tdefileitem.h>
 #include <kapplication.h>

src/k3bfileview.cpp

@@ -29,10 +29,10 @@
 #include <tqtoolbutton.h>
 
 #include <tdefiledetailview.h>
-#include <klistview.h>
-#include <kaction.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdelistview.h>
+#include <tdeaction.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <tdefilefiltercombo.h>

src/k3bflatbutton.cpp

@@ -17,7 +17,7 @@
 #include "k3bthememanager.h"
 #include "k3bapplication.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 

src/k3bjobprogressdialog.cpp

@@ -55,7 +55,7 @@
 #include <kprogress.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -63,7 +63,7 @@
 #include <knotifyclient.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
 

src/k3bjobprogressosd.cpp

@@ -24,7 +24,7 @@
 #include <kcursor.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqpixmap.h>
 #include <tqpainter.h>

src/k3bprojecttabwidget.cpp

@@ -22,7 +22,7 @@
 #include <k3bview.h>
 #include <k3bdoc.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kurldrag.h>

src/k3bstatusbarmanager.cpp

@@ -35,7 +35,7 @@
 #include <tdeio/global.h>
 #include <kstatusbar.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqlabel.h>
 #include <tqhbox.h>

src/k3bwelcomewidget.cpp

@@ -41,9 +41,9 @@
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kaboutdata.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 
 static const char* s_allActions[] = {

src/k3bwelcomewidget.h

@@ -23,7 +23,7 @@
 #include <tqimage.h>
 
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class K3bMainWindow;
 class TQDropEvent;

src/misc/k3bblankingdialog.cpp

@@ -28,7 +28,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>

src/option/base_k3bcddboptiontab.ui

@@ -553,8 +553,8 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>knuminput.h</includehint>
 </includehints>
 </UI>

src/option/base_k3bthemeoptiontab.ui

@@ -203,6 +203,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>

src/option/k3bcddboptiontab.cpp

@@ -32,7 +32,7 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <krun.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <knuminput.h>

src/option/k3bexternalbinoptiontab.cpp

@@ -22,7 +22,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>

src/option/k3bexternalbinwidget.cpp

@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <keditlistbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kglobalsettings.h>
 #include <tdeversion.h>
 

src/option/k3bthemeoptiontab.cpp

@@ -23,7 +23,7 @@
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeio/global.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>

src/projects/base_k3badvanceddataimagesettings.ui

@@ -186,7 +186,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>

src/projects/base_k3bbootimageview.ui

@@ -389,6 +389,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>

src/projects/k3baudiotrackplayer.cpp

@@ -18,7 +18,7 @@
 #include <k3baudiotrack.h>
 #include <k3baudioserver.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 
 #include <tqslider.h>

src/projects/k3baudiotracksplitdialog.cpp

@@ -21,9 +21,9 @@
 #include <k3bmsfedit.h>
 
 #include <klocale.h>
-#include <kactioncollection.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 #include <tqlabel.h>
 #include <tqframe.h>

src/projects/k3baudiotrackview.cpp

@@ -53,8 +53,8 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kmessagebox.h>

src/projects/k3baudioview.cpp

@@ -34,7 +34,7 @@
 #include <k3bfillstatusdisplay.h>
 #include <k3bmsf.h>
 #include <k3btoolbox.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <k3bprojectplugin.h>
 
 // QT-includes

src/projects/k3bbootimageview.cpp

@@ -20,7 +20,7 @@
 #include <k3bintvalidator.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kmessagebox.h>

src/projects/k3bdataadvancedimagesettingswidget.cpp

@@ -28,7 +28,7 @@
 #include <tqvalidator.h>
 #include <tqregexp.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kdebug.h>

src/projects/k3bdatadirtreeview.cpp

@@ -31,11 +31,11 @@
 #include <tqtimer.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #include <kdebug.h>
 

src/projects/k3bdatafileview.cpp

@@ -38,11 +38,11 @@
 #include <tqfileinfo.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <krun.h>
 #include <tdeversion.h>
 

src/projects/k3bdataview.cpp

@@ -34,8 +34,8 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>

src/projects/k3bfillstatusdisplay.cpp

@@ -39,8 +39,8 @@
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
 
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <tdeconfig.h>

src/projects/k3bmixedview.cpp

@@ -41,7 +41,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 
 K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* parent, const char* name )

src/projects/k3bmovixview.cpp

@@ -27,8 +27,8 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kurl.h>

src/projects/k3bvcdlistview.cpp

@@ -27,8 +27,8 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kdialog.h>
 
 // K3b Includes

src/projects/k3bvideodvdview.cpp

@@ -26,7 +26,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 #include <tqsplitter.h>
 

src/projects/k3bview.cpp

@@ -22,7 +22,7 @@
 #include <tqptrlist.h>
 #include <tqtoolbutton.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>

src/rip/k3baudiocdview.cpp

@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>

src/rip/k3baudioprojectconvertingdialog.cpp

@@ -34,7 +34,7 @@
 #include <kcombobox.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <tdeio/global.h>

src/rip/k3baudiorippingdialog.cpp

@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <tdeio/global.h>

src/rip/k3bvideocdview.cpp

@@ -14,7 +14,7 @@
 */
 
 // kde includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcutlabel.h>
 #include <kdebug.h>
 #include <kdialogbase.h>

src/rip/videodvd/base_k3bvideodvdrippingwidget.ui

@@ -708,7 +708,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>

src/rip/videodvd/k3bvideodvdrippingdialog.cpp

@@ -24,7 +24,7 @@
 #include <k3bfilesysteminfo.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kurlrequester.h>

src/rip/videodvd/k3bvideodvdrippingview.cpp

@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 
 

src/rip/videodvd/k3bvideodvdrippingwidget.cpp

@@ -20,7 +20,7 @@
 #include <k3brichtextlabel.h>
 #include <k3bintmapcombobox.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <tdeio/global.h>