diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:33 -0600 |
| commit | 5b28c57424294aa30218a9c11cd6ed1a929409b6 (patch) | |
| tree | aaa8c9380d183dfa87857abd34b3ef42bb0de1b5 /juk | |
| parent | 120dff5f18d13aab7d2731de84e64c898728dc60 (diff) | |
| download | tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.tar.gz tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'juk')
36 files changed, 43 insertions, 43 deletions
diff --git a/juk/actioncollection.cpp b/juk/actioncollection.cpp index 6ec753fd..4940f556 100644 --- a/juk/actioncollection.cpp +++ b/juk/actioncollection.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kdebug.h> #include "actioncollection.h" diff --git a/juk/cache.cpp b/juk/cache.cpp index 4bd917f8..d80cafa0 100644 --- a/juk/cache.cpp +++ b/juk/cache.cpp @@ -17,7 +17,7 @@ #include <kmessagebox.h> #include <tdeconfig.h> #include <klocale.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <kdebug.h> #include <tqdir.h> diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index d55d80c1..2386f63e 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -17,10 +17,10 @@ #include <klocale.h> #include <kmessagebox.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <tdeconfig.h> -#include <kaction.h> +#include <tdeaction.h> #include <kurl.h> #include "collectionlist.h" diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp index 8c2ae390..77354862 100644 --- a/juk/coverdialog.cpp +++ b/juk/coverdialog.cpp @@ -13,12 +13,12 @@ * * ***************************************************************************/ -#include <klistview.h> +#include <tdelistview.h> #include <kiconview.h> #include <kiconviewsearchline.h> #include <kiconloader.h> #include <kapplication.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <tqtimer.h> diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui index 0cad4e4f..848d36c6 100644 --- a/juk/coverdialogbase.ui +++ b/juk/coverdialogbase.ui @@ -204,7 +204,7 @@ <forward>class TQListViewItem;</forward> </forwards> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kiconviewsearchline.h</includehint> <includehint>covericonview.h</includehint> </includehints> diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui index c1fbc200..527581c6 100644 --- a/juk/deletedialogbase.ui +++ b/juk/deletedialogbase.ui @@ -138,6 +138,6 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index 8dfdc27e..edc0806d 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -15,7 +15,7 @@ #include <tdefiledialog.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kpushbutton.h> #include <tqcheckbox.h> diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui index 281aa6fd..330ed44e 100644 --- a/juk/directorylistbase.ui +++ b/juk/directorylistbase.ui @@ -105,7 +105,7 @@ <layoutdefaults spacing="6" margin="0"/> <layoutfunctions spacing="KDialog::spacingHint"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> @@ -16,7 +16,7 @@ #ifndef JUK_H #define JUK_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "playermanager.h" diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp index aa89b005..ac066119 100644 --- a/juk/k3bexporter.cpp +++ b/juk/k3bexporter.cpp @@ -17,8 +17,8 @@ #include <kmessagebox.h> #include <kurl.h> #include <klocale.h> -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp index 3337ff81..c63bf22c 100644 --- a/juk/musicbrainzquery.cpp +++ b/juk/musicbrainzquery.cpp @@ -22,7 +22,7 @@ #include "collectionlist.h" #include "tagtransactionmanager.h" -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kapplication.h> #include <kstatusbar.h> #include <klocale.h> diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 94d41a04..dec88839 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -18,8 +18,8 @@ #include <kurldrag.h> #include <kiconloader.h> #include <klineedit.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/juk/playlist.h b/juk/playlist.h index 348dda24..fec38044 100644 --- a/juk/playlist.h +++ b/juk/playlist.h @@ -16,7 +16,7 @@ #ifndef PLAYLIST_H #define PLAYLIST_H -#include <klistview.h> +#include <tdelistview.h> #include <kurldrag.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index 71329ae1..6502d4d5 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -16,8 +16,8 @@ #include <kiconloader.h> #include <kurldrag.h> #include <kmessagebox.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <kdebug.h> #include <tqheader.h> diff --git a/juk/playlistbox.h b/juk/playlistbox.h index de06dbc8..d8169714 100644 --- a/juk/playlistbox.h +++ b/juk/playlistbox.h @@ -18,7 +18,7 @@ #include "playlistcollection.h" -#include <klistview.h> +#include <tdelistview.h> #include <tqptrdict.h> diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index c2b2d80b..3c8da448 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -35,7 +35,7 @@ #include "tracksequencemanager.h" #include <kiconloader.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <kapplication.h> #include <kinputdialog.h> #include <kmessagebox.h> diff --git a/juk/playlistcollection.h b/juk/playlistcollection.h index 2105b9cf..b1ac9203 100644 --- a/juk/playlistcollection.h +++ b/juk/playlistcollection.h @@ -19,7 +19,7 @@ #include "stringhash.h" #include "jukIface.h" -#include <kshortcut.h> +#include <tdeshortcut.h> #include <klocale.h> #include <kdirlister.h> diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp index 67ba4034..085464cb 100644 --- a/juk/playlistitem.cpp +++ b/juk/playlistitem.cpp @@ -16,7 +16,7 @@ #include <config.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include "playlistitem.h" diff --git a/juk/playlistitem.h b/juk/playlistitem.h index 343a3c7c..db7170b8 100644 --- a/juk/playlistitem.h +++ b/juk/playlistitem.h @@ -16,7 +16,7 @@ #ifndef PLAYLISTITEM_H #define PLAYLISTITEM_H -#include <klistview.h> +#include <tdelistview.h> #include <ksharedptr.h> #include <kdebug.h> diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index e4042ae8..08cecf18 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <tqlayout.h> diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index 13766ed0..49296511 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -21,7 +21,7 @@ #include <kiconloader.h> #include <kcombobox.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/juk/searchwidget.h b/juk/searchwidget.h index b8990107..47354dae 100644 --- a/juk/searchwidget.h +++ b/juk/searchwidget.h @@ -19,7 +19,7 @@ #ifndef SEARCHWIDGET_H #define SEARCHWIDGET_H -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <tqhbox.h> diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index c62aba90..d8306e00 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <klocale.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/juk/slideraction.h b/juk/slideraction.h index 5ce19eb3..1c38c0a5 100644 --- a/juk/slideraction.h +++ b/juk/slideraction.h @@ -16,7 +16,7 @@ #ifndef SLIDERACTION_H #define SLIDERACTION_H -#include <kaction.h> +#include <tdeaction.h> #include <tqslider.h> class TQBoxLayout; diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index d94a3247..00690b07 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <kaction.h> +#include <tdeaction.h> #include <kpushbutton.h> #include <kiconloader.h> #include <ksqueezedtextlabel.h> diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index 045b00f0..e71fc37d 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -19,8 +19,8 @@ #include <kiconloader.h> #include <kpassivepopup.h> #include <kiconeffect.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kglobalsettings.h> #include <kdebug.h> diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index 7ac38fcd..04064ded 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <tqlabel.h> #include <tqcheckbox.h> diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp index 5ee2b6aa..ba9e984d 100644 --- a/juk/tagguesserconfigdlg.cpp +++ b/juk/tagguesserconfigdlg.cpp @@ -11,7 +11,7 @@ #include "tagguesserconfigdlgwidget.h" #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kpushbutton.h> #include <klineedit.h> diff --git a/juk/tagguesserconfigdlgwidget.ui b/juk/tagguesserconfigdlgwidget.ui index 1a17cffe..5c355993 100644 --- a/juk/tagguesserconfigdlgwidget.ui +++ b/juk/tagguesserconfigdlgwidget.ui @@ -151,7 +151,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <layoutdefaults spacing="6" margin="0"/> <layoutfunctions spacing="KDialog::spacingHint"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp index bf12bf98..048e8962 100644 --- a/juk/tagtransactionmanager.cpp +++ b/juk/tagtransactionmanager.cpp @@ -16,7 +16,7 @@ #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tqfileinfo.h> diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp index af9c01c0..c9930354 100644 --- a/juk/trackpickerdialog.cpp +++ b/juk/trackpickerdialog.cpp @@ -19,7 +19,7 @@ #include <tqlabel.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include "trackpickerdialog.h" diff --git a/juk/trackpickerdialogbase.ui b/juk/trackpickerdialogbase.ui index 5b029b00..6a72d027 100644 --- a/juk/trackpickerdialogbase.ui +++ b/juk/trackpickerdialogbase.ui @@ -174,6 +174,6 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/juk/tracksequenceiterator.cpp b/juk/tracksequenceiterator.cpp index 4f9a0313..ae9a3001 100644 --- a/juk/tracksequenceiterator.cpp +++ b/juk/tracksequenceiterator.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> diff --git a/juk/tracksequencemanager.cpp b/juk/tracksequencemanager.cpp index 4f7ae64f..9a4f81e8 100644 --- a/juk/tracksequencemanager.cpp +++ b/juk/tracksequencemanager.cpp @@ -15,8 +15,8 @@ #include <tdeconfig.h> #include <klocale.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include "actioncollection.h" #include "tracksequencemanager.h" diff --git a/juk/upcomingplaylist.cpp b/juk/upcomingplaylist.cpp index df286166..6c04106a 100644 --- a/juk/upcomingplaylist.cpp +++ b/juk/upcomingplaylist.cpp @@ -15,7 +15,7 @@ #include <kdebug.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include "upcomingplaylist.h" #include "playlistitem.h" diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp index 7815afff..4a4e8621 100644 --- a/juk/webimagefetcher.cpp +++ b/juk/webimagefetcher.cpp @@ -19,7 +19,7 @@ #include <kapplication.h> #include <kstatusbar.h> #include <kdebug.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <klocale.h> #include <kinputdialog.h> #include <kurl.h> |