diff options
-rw-r--r-- | src/borrowerdialog.h | 2 | ||||
-rw-r--r-- | src/collectionfieldsdialog.cpp | 2 | ||||
-rw-r--r-- | src/configdialog.cpp | 4 | ||||
-rw-r--r-- | src/configdialog.h | 2 | ||||
-rw-r--r-- | src/controller.cpp | 4 | ||||
-rw-r--r-- | src/detailedlistview.cpp | 4 | ||||
-rw-r--r-- | src/entryeditdialog.cpp | 4 | ||||
-rw-r--r-- | src/entryiconview.cpp | 2 | ||||
-rw-r--r-- | src/entryupdater.cpp | 2 | ||||
-rw-r--r-- | src/fetch/amazonfetcher.cpp | 2 | ||||
-rw-r--r-- | src/fetch/configwidget.cpp | 2 | ||||
-rw-r--r-- | src/fetch/execexternalfetcher.cpp | 2 | ||||
-rw-r--r-- | src/fetch/gcstarpluginfetcher.cpp | 2 | ||||
-rw-r--r-- | src/fetch/srufetcher.cpp | 2 | ||||
-rw-r--r-- | src/fetch/z3950fetcher.cpp | 2 | ||||
-rw-r--r-- | src/fetchdialog.cpp | 2 | ||||
-rw-r--r-- | src/filterview.cpp | 2 | ||||
-rw-r--r-- | src/groupview.cpp | 4 | ||||
-rw-r--r-- | src/gui/lineedit.cpp | 2 | ||||
-rw-r--r-- | src/gui/listview.cpp | 2 | ||||
-rw-r--r-- | src/gui/listview.h | 2 | ||||
-rw-r--r-- | src/gui/stringmapdialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/tablefieldwidget.cpp | 2 | ||||
-rw-r--r-- | src/loanview.cpp | 2 | ||||
-rw-r--r-- | src/mainwindow.cpp | 6 | ||||
-rw-r--r-- | src/mainwindow.h | 2 | ||||
-rw-r--r-- | src/newstuff/dialog.cpp | 2 | ||||
-rw-r--r-- | xslt/discogs2tellico.xsl | 2 |
28 files changed, 35 insertions, 35 deletions
diff --git a/src/borrowerdialog.h b/src/borrowerdialog.h index afe08d2..4d520ef 100644 --- a/src/borrowerdialog.h +++ b/src/borrowerdialog.h @@ -20,7 +20,7 @@ class KLineEdit; #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqdict.h> namespace KABC { diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp index 1044b4f..fbbe1c9 100644 --- a/src/collectionfieldsdialog.cpp +++ b/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> diff --git a/src/configdialog.cpp b/src/configdialog.cpp index c19d939..9d82463 100644 --- a/src/configdialog.cpp +++ b/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> diff --git a/src/configdialog.h b/src/configdialog.h index 40b9f42..7d65578 100644 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -17,7 +17,7 @@ #include "fetch/fetcher.h" #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> class TDEConfig; class KLineEdit; diff --git a/src/controller.cpp b/src/controller.cpp index bf8e7fe..60166bc 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -41,8 +41,8 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kaction.h> -#include <ktoolbarbutton.h> +#include <tdeaction.h> +#include <tdetoolbarbutton.h> #include <tqpopupmenu.h> diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp index 8151d56..8782305 100644 --- a/src/detailedlistview.cpp +++ b/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> diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp index 5d29160..57a9977 100644 --- a/src/entryeditdialog.cpp +++ b/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> diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp index f08aa58..9bec26a 100644 --- a/src/entryiconview.cpp +++ b/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> diff --git a/src/entryupdater.cpp b/src/entryupdater.cpp index c30a97c..02213a7 100644 --- a/src/entryupdater.cpp +++ b/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> diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp index 754842f..7f0bb56 100644 --- a/src/fetch/amazonfetcher.cpp +++ b/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> diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp index 9c68578..78a385b 100644 --- a/src/fetch/configwidget.cpp +++ b/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> diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp index 5c95610..8e87f43 100644 --- a/src/fetch/execexternalfetcher.cpp +++ b/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> diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp index 59d2386..336cccd 100644 --- a/src/fetch/gcstarpluginfetcher.cpp +++ b/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> diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp index 482efa2..6cc932a 100644 --- a/src/fetch/srufetcher.cpp +++ b/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> diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp index 2a63fe9..acd7024 100644 --- a/src/fetch/z3950fetcher.cpp +++ b/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> diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp index 7b47dd8..996fb83 100644 --- a/src/fetchdialog.cpp +++ b/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> diff --git a/src/filterview.cpp b/src/filterview.cpp index 055d16e..7869355 100644 --- a/src/filterview.cpp +++ b/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> diff --git a/src/groupview.cpp b/src/groupview.cpp index 0724d39..25b248b 100644 --- a/src/groupview.cpp +++ b/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> diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp index b71667e..1da38ca 100644 --- a/src/gui/lineedit.cpp +++ b/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> diff --git a/src/gui/listview.cpp b/src/gui/listview.cpp index 5c1a38c..53048cc 100644 --- a/src/gui/listview.cpp +++ b/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_; diff --git a/src/gui/listview.h b/src/gui/listview.h index 8e0be06..ccb0867 100644 --- a/src/gui/listview.h +++ b/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> diff --git a/src/gui/stringmapdialog.cpp b/src/gui/stringmapdialog.cpp index fb3878d..7425e3b 100644 --- a/src/gui/stringmapdialog.cpp +++ b/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> diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp index fb5afe5..9df2880 100644 --- a/src/gui/tablefieldwidget.cpp +++ b/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> diff --git a/src/loanview.cpp b/src/loanview.cpp index 9744d74..a9305ef 100644 --- a/src/loanview.cpp +++ b/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> diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 318bc51..1798d3c 100644 --- a/src/mainwindow.cpp +++ b/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> diff --git a/src/mainwindow.h b/src/mainwindow.h index 087869e..6b790e1 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -20,7 +20,7 @@ #include "translators/translators.h" #include "datavectors.h" -#include <kmainwindow.h> +#include <tdemainwindow.h> class TDEToolBar; class KURL; diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index d29b557..5fd7ff0 100644 --- a/src/newstuff/dialog.cpp +++ b/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> diff --git a/xslt/discogs2tellico.xsl b/xslt/discogs2tellico.xsl index 3f5539e..32077f5 100644 --- a/xslt/discogs2tellico.xsl +++ b/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> |