Rename many classes and header files to avoid conflicts with KDE4

src/borrowerdialog.h

@@ -20,7 +20,7 @@ class KLineEdit;
 
 #include <kdialogbase.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqdict.h>
 
 namespace KABC {

src/collectionfieldsdialog.cpp

@@ -27,7 +27,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 #include <tqgroupbox.h>
 #include <tqlayout.h>

src/configdialog.cpp

@@ -38,11 +38,11 @@
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <ksortablevaluelist.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <tdehtmlview.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <kcolorcombo.h>
 
 #include <tqsize.h>

src/configdialog.h

@@ -17,7 +17,7 @@
 #include "fetch/fetcher.h"
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TDEConfig;
 class KLineEdit;

src/controller.cpp

@@ -41,8 +41,8 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 #include <tqpopupmenu.h>
 

src/detailedlistview.cpp

@@ -26,9 +26,9 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
 #include <tqstringlist.h>

src/entryeditdialog.cpp

@@ -24,11 +24,11 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kpushbutton.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 
 #include <tqlayout.h>
 #include <tqstringlist.h>

src/entryiconview.cpp

@@ -22,7 +22,7 @@
 #include "tellico_debug.h"
 #include "listviewcomparison.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <kiconloader.h>
 #include <kwordwrap.h>

src/entryupdater.cpp

@@ -23,7 +23,7 @@
 
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 #include <tqvbox.h>

src/fetch/amazonfetcher.cpp

@@ -34,7 +34,7 @@
 #include <klineedit.h>
 #include <kseparator.h>
 #include <kcombobox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 #include <tqdom.h>
 #include <tqlayout.h>

src/fetch/configwidget.cpp

@@ -15,7 +15,7 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 #include <tqvgroupbox.h>
 #include <tqlayout.h>

src/fetch/execexternalfetcher.cpp

@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kprocess.h>
 #include <kurlrequester.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>

src/fetch/gcstarpluginfetcher.cpp

@@ -29,7 +29,7 @@
 #include <kprocess.h>
 #include <kprocio.h>
 #include <kstandarddirs.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 #include <tqdir.h>
 #include <tqlayout.h>

src/fetch/srufetcher.cpp

@@ -32,7 +32,7 @@
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <knuminput.h>
 
 #include <tqlabel.h>

src/fetch/z3950fetcher.cpp

@@ -43,7 +43,7 @@
 #include <knuminput.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kseparator.h>
 
 #include <tqfile.h>

src/fetchdialog.cpp

@@ -38,7 +38,7 @@
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <ktextedit.h>
 
 #include <tqlayout.h>

src/filterview.cpp

@@ -22,7 +22,7 @@
 #include "../tellico_debug.h"
 
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include <tqheader.h>

src/groupview.cpp

@@ -26,10 +26,10 @@
 #include "listviewcomparison.h"
 #include "../tellico_debug.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqstringlist.h>
 #include <tqcolor.h>

src/gui/lineedit.cpp

@@ -14,7 +14,7 @@
 #include "lineedit.h"
 
 #include <kstdaction.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <tdespell.h>
 
 #include <tqapplication.h>

src/gui/listview.cpp

@@ -306,7 +306,7 @@ TQColor ListViewItem::backgroundColor(int column_) {
 
 void ListViewItem::paintCell(TQPainter* p_, const TQColorGroup& cg_,
                              int column_, int width_, int align_) {
-  // taken from klistview.cpp
+  // taken from tdelistview.cpp
   // I can't call TDEListViewItem::paintCell since TDEListViewItem::backgroundCOlor(int) is
   // not virtual. I need to be sure to call ListViewItem::backgroundColor(int);
   TQColorGroup cg = cg_;

src/gui/listview.h

@@ -17,7 +17,7 @@
 #include "../datavectors.h"
 #include "../listviewcomparison.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeversion.h>
 
 #include <tqdict.h>

src/gui/stringmapdialog.cpp

@@ -13,7 +13,7 @@
 
 #include "stringmapdialog.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kbuttonbox.h>

src/gui/tablefieldwidget.cpp

@@ -17,7 +17,7 @@
 #include "../tellico_kernel.h"
 
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 

src/loanview.cpp

@@ -22,7 +22,7 @@
 #include "listviewcomparison.h"
 
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include <tqheader.h>

src/mainwindow.cpp

@@ -59,7 +59,7 @@
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
@@ -71,12 +71,12 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <ktip.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <tdeio/netaccess.h>
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqsplitter.h>
 //#include <tqpainter.h>

src/mainwindow.h

@@ -20,7 +20,7 @@
 #include "translators/translators.h"
 #include "datavectors.h"
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEToolBar;
 class KURL;

src/newstuff/dialog.cpp

@@ -25,7 +25,7 @@
 #include <kstatusbar.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <knewstuff/entry.h>
 #include <knewstuff/provider.h>
 #include <ktempfile.h>

xslt/discogs2tellico.xsl

@@ -165,7 +165,7 @@
   </year>
   
   <tracks>
-   <xsl:for-each select="tracklist/track">
+   <xsl:for-each select="tractdelist/track">
     <xsl:sort select="position" data-type="number"/>
     <track>
      <column><xsl:value-of select="title"/></column>