diff options
124 files changed, 173 insertions, 173 deletions
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index f33d360a..62dcdb43 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -41,13 +41,13 @@ #include <kdebug.h> #include <arts/debug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kapplication.h> #include <kcmdlineargs.h> #include <klocale.h> #include <kinputdialog.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <tdefiledialog.h> #include <ksavefile.h> #include <kmessagebox.h> diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h index f1368d73..fa3c0c20 100644 --- a/arts/builder/menumaker.h +++ b/arts/builder/menumaker.h @@ -1,7 +1,7 @@ #ifndef __MENUMAKER_H__ #define __MENUMAKER_H__ -#include <kaction.h> +#include <tdeaction.h> #include <tqobject.h> #include <string> #include <list> diff --git a/arts/gui/kde/Makefile.am b/arts/gui/kde/Makefile.am index d772e884..c61e1db3 100644 --- a/arts/gui/kde/Makefile.am +++ b/arts/gui/kde/Makefile.am @@ -10,7 +10,7 @@ libartsgui_kde_la_SOURCES = kwidget_impl.cpp kbutton_impl.cpp \ kpoti_impl.cpp kpoti.cpp kwidgetrepo.cpp kartswidget.cpp \ klineedit_impl.cpp khbox_impl.cpp kvbox_impl.cpp kspinbox_impl.cpp \ kcombobox_impl.cpp kfader.cpp kfader_impl.cpp kgraph_impl.cpp kgraph.cpp \ - kgraphline_impl.cpp kframe_impl.cpp klayoutbox_impl.cpp kpopupbox_impl.cpp \ + kgraphline_impl.cpp kframe_impl.cpp klayoutbox_impl.cpp tdepopupbox_impl.cpp \ klevelmeter_impl.cpp klevelmeter_small.cpp klevelmeter_linebars.cpp \ klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \ ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp index 12e88df6..38ef5f7e 100644 --- a/arts/gui/kde/dbtest.cpp +++ b/arts/gui/kde/dbtest.cpp @@ -4,7 +4,7 @@ #include <kaboutdata.h> #include <klocale.h> #include <kstdaction.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kdebug.h> #include <dbtest.h> diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index a6621155..15fc8c8a 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -27,8 +27,8 @@ #include <tqfontmetrics.h> #include <kglobalsettings.h> #include <klocale.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <kinputdialog.h> KVolumeFader_impl::KVolumeFader_impl( TQFrame* w ) diff --git a/arts/gui/kde/tdepopupbox_impl.cpp b/arts/gui/kde/tdepopupbox_impl.cpp index a4ac6fa2..2e8803df 100644 --- a/arts/gui/kde/tdepopupbox_impl.cpp +++ b/arts/gui/kde/tdepopupbox_impl.cpp @@ -19,8 +19,8 @@ */ -#include "kpopupbox_impl.h" -#include "kpopupbox_private.h" +#include "tdepopupbox_impl.h" +#include "tdepopupbox_private.h" #include <tqlayout.h> @@ -128,7 +128,7 @@ void TDEPopupBox_widget::name( std::string n ) { REGISTER_IMPLEMENTATION( TDEPopupBox_impl ); -#include "kpopupbox_private.moc" +#include "tdepopupbox_private.moc" // vim: sw=4 ts=4 diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h index 9750625b..9e22ae15 100644 --- a/arts/gui/kde/tdepopupbox_private.h +++ b/arts/gui/kde/tdepopupbox_private.h @@ -62,7 +62,7 @@ private: OwnWidget *_artswidget; }; -// See kpopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future... +// See tdepopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future... /*class TDEPopupBoxEventMapper : public TQObject { Q_OBJECT diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index 4dd331b8..f0dee6fd 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -20,9 +20,9 @@ #include "artsactions.h" -#include <kaction.h> -#include <kactioncollection.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kglobal.h> //#include <kdebug.h> diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 08959f16..0cb5e140 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <tqslider.h> #include <tqpushbutton.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <tqfont.h> #include <kartsserver.h> diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index 25acaf5a..9bca14b1 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -28,7 +28,7 @@ #include <tqlayout.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kiconloader.h> using namespace std; diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index d8c21224..8c84e8d2 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -26,7 +26,7 @@ #include <tqfile.h> #include <tqpushbutton.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kartswidget.h> #include <klocale.h> #include <kiconloader.h> diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp index 9eb1c019..c8124c0b 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -25,8 +25,8 @@ #include <tqlayout.h> #include <tqcursor.h> #include <tqtimer.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kartswidget.h> #include <kdebug.h> #include <klocale.h> diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 4f508d98..3f22e53a 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -38,7 +38,7 @@ #include <tqlabel.h> #include <tqslider.h> #include <tqpushbutton.h> -#include <kaction.h> +#include <tdeaction.h> #include <kled.h> #include <kmessagebox.h> #include <kdebug.h> diff --git a/arts/tools/main.h b/arts/tools/main.h index a92c4061..ae2819b7 100644 --- a/arts/tools/main.h +++ b/arts/tools/main.h @@ -27,7 +27,7 @@ #include <tqmessagebox.h> #include <kapplication.h> #include <tqframe.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kcmdlineargs.h> #include <kaboutdata.h> #include <klocale.h> diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp index 683e8152..6091461d 100644 --- a/arts/tools/mediatypesview.cpp +++ b/arts/tools/mediatypesview.cpp @@ -22,7 +22,7 @@ */ #include <tqlayout.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kartsserver.h> #include <map> diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index ae729347..62d54da0 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -32,7 +32,7 @@ #include <tqlayout.h> #include <tqpainter.h> #include <stdio.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kiconloader.h> #include <soundserver.h> diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h index 5b05936d..e5cd1467 100644 --- a/arts/tools/midimanagerview.h +++ b/arts/tools/midimanagerview.h @@ -26,7 +26,7 @@ #ifndef ARTS_TOOLS_MIDIMANAGERVIEW_H #define ARTS_TOOLS_MIDIMANAGERVIEW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "artsmidi.h" #include <map> 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> diff --git a/kaboodle/controls.h b/kaboodle/controls.h index 9b6d97aa..307281e4 100644 --- a/kaboodle/controls.h +++ b/kaboodle/controls.h @@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqguardedptr.h> -#include <kaction.h> -#include <ktoolbar.h> +#include <tdeaction.h> +#include <tdetoolbar.h> #include <tqslider.h> #include <tqstringlist.h> diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp index 798cf782..cebab8cd 100644 --- a/kaboodle/player.cpp +++ b/kaboodle/player.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> #include <kurl.h> diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h index 62395098..d82186a4 100644 --- a/kaboodle/userinterface.h +++ b/kaboodle/userinterface.h @@ -26,7 +26,7 @@ #define USERINTERFACE_H #include "kaboodleapp.h" -#include <kaction.h> +#include <tdeaction.h> #include <tdeparts/mainwindow.h> #include <kurl.h> diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index bb25cf4e..b05af4b2 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -24,8 +24,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <kstatusbar.h> #include <knotifydialog.h> #include <kcombobox.h> diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index 02693150..e85ec4ab 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -21,7 +21,7 @@ #ifndef KAUDIOCREATOR_H #define KAUDIOCREATOR_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdeconfigdialog.h> class KJanusWidget; diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 73656e07..fd247499 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -27,7 +27,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kinputdialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <kprocess.h> #include <kmessagebox.h> #include <kurl.h> diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h index 3e4134a1..111f474a 100644 --- a/kaudiocreator/tracksimp.h +++ b/kaudiocreator/tracksimp.h @@ -23,7 +23,7 @@ #include "tracks.h" #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> // CDDB support via libkcddb diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index c0643331..4ba34863 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -36,17 +36,17 @@ #include <klineeditdlg.h> #include <klocale.h> #include <tdeconfig.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kstdaction.h> #include <kpanelapplet.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <khelpmenu.h> #include <kdebug.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kglobalaccel.h> #include <kkeydialog.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> // application specific includes #include "mixertoolbox.h" diff --git a/kmix/kmix.h b/kmix/kmix.h index 3b2786c3..e04aee43 100644 --- a/kmix/kmix.h +++ b/kmix/kmix.h @@ -35,7 +35,7 @@ class TQHBox; class TQWidgetStack; // include files for KDE -#include <kmainwindow.h> +#include <tdemainwindow.h> class TDEAccel; class TDEGlobalAccel; diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index d72d4eb5..db2d1cc9 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -37,7 +37,7 @@ // KDE #include <kaboutapplication.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kbugreport.h> #include <kcolorbutton.h> diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp index e4f30b05..7743392f 100644 --- a/kmix/kmixdockwidget.cpp +++ b/kmix/kmixdockwidget.cpp @@ -22,11 +22,11 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kapplication.h> #include <kpanelapplet.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kglobalsettings.h> #include <kdialog.h> #include <kaudioplayer.h> diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index b4b803e1..eae521e2 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -28,8 +28,8 @@ #include <klocale.h> #include <tdeconfig.h> #include <kcombobox.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kglobalaccel.h> #include <kkeydialog.h> diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index 3bfb6bdf..87bad20a 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -23,8 +23,8 @@ #include <kled.h> #include <kiconloader.h> #include <tdeconfig.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index 709a6d8c..b002469e 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -28,8 +28,8 @@ #include <klocale.h> #include <tdeconfig.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index 979708ea..6173fdf5 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -23,8 +23,8 @@ #include <kled.h> #include <kiconloader.h> #include <tdeconfig.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index 1d4de379..87020b95 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -26,7 +26,7 @@ #include <tqsize.h> // KDE -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kdebug.h> #include <kpanelapplet.h> #include <kstdaction.h> diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp index 01e1b9cf..948e8d7d 100644 --- a/kmix/viewbase.cpp +++ b/kmix/viewbase.cpp @@ -26,8 +26,8 @@ #include <tqcursor.h> // KDE -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kiconloader.h> diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp index 4fac6d81..d84a36e5 100644 --- a/kmix/viewdockareapopup.cpp +++ b/kmix/viewdockareapopup.cpp @@ -31,7 +31,7 @@ // KDE #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <klocale.h> diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp index eabd63ef..4472a3c6 100644 --- a/krec/krecfileviewhelpers.cpp +++ b/krec/krecfileviewhelpers.cpp @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqpointarray.h> #include <tqpopupmenu.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> KRecTimeBar::KRecTimeBar( TQWidget* p, const char* n ) : TQFrame( p,n ) ,_size(10), _pos(0) diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index 255eebd2..69c7a5ca 100644 --- a/krec/krecfilewidgets.cpp +++ b/krec/krecfilewidgets.cpp @@ -29,9 +29,9 @@ #include <tqrect.h> #include <tqfont.h> #include <tqfontmetrics.h> -#include <kpopupmenu.h> -#include <kactionclasses.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeactionclasses.h> +#include <tdeaction.h> KRecFileWidget::KRecFileWidget( KRecFile* file, TQWidget* p, const char* n ) : TQFrame( p,n ) diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 66737d32..30d029b6 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -30,7 +30,7 @@ #include <klocale.h> #include <kdebug.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> #include <tqlayout.h> #include <tqtimer.h> diff --git a/krec/krecord.h b/krec/krecord.h index 96173238..6b9dc438 100644 --- a/krec/krecord.h +++ b/krec/krecord.h @@ -15,7 +15,7 @@ #ifndef KRECORD_H #define KRECORD_H -#include <kmainwindow.h> +#include <tdemainwindow.h> class KRecPrivate; diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp index 2faa6cdf..f5d1111a 100644 --- a/kscd/cddbdlg.cpp +++ b/kscd/cddbdlg.cpp @@ -8,7 +8,7 @@ #include <tqfile.h> #include <tqdir.h> #include <tqfileinfo.h> -#include <klistview.h> +#include <tdelistview.h> #include <klineedit.h> #include <knuminput.h> diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui index 7631bfde..a78ff4f0 100644 --- a/kscd/configWidgetUI.ui +++ b/kscd/configWidgetUI.ui @@ -452,7 +452,7 @@ <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> - <includehint>kfontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> <includehint>knuminput.h</includehint> <includehint>kurlrequester.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kscd/docking.cpp b/kscd/docking.cpp index d3c0964f..9c21f1de 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -28,12 +28,12 @@ #include <tqtooltip.h> #include <kaboutdata.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kapplication.h> #include <klocale.h> #include <kglobal.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpassivepopup.h> #include <kdebug.h> diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index 581c71e9..b5728c0a 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -34,8 +34,8 @@ #include <dcopclient.h> #include <kaboutdata.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include <dcopref.h> #include <kcharsets.h> #include <kcmdlineargs.h> @@ -49,9 +49,9 @@ #include <kiconloader.h> #include <kinputdialog.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprotocolmanager.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/kscd/libwm/database.c b/kscd/libwm/database.c index 62d66a32..52ca419a 100644 --- a/kscd/libwm/database.c +++ b/kscd/libwm/database.c @@ -1101,7 +1101,7 @@ load( void ) FILE *fp; char **dbfile; int locked = 0; - int dbfound = 0, *trklist, i; + int dbfound = 0, *trtdelist, i; unsigned long dbpos; /* This is some kind of profiling code. I don't change it @@ -1121,12 +1121,12 @@ load( void ) found_in_db = 0; /* Turn the cd->trk array into a simple array of ints. */ - trklist = (int *)malloc(sizeof(int) * cd->ntracks); + trtdelist = (int *)malloc(sizeof(int) * cd->ntracks); for (i = 0; i < cd->ntracks; i++) - trklist[i] = cd->trk[i].start; + trtdelist[i] = cd->trk[i].start; do { - if (*dbfile && idx_find_entry(*dbfile, cd->ntracks, trklist, + if (*dbfile && idx_find_entry(*dbfile, cd->ntracks, trtdelist, cd->length * 75, 0, &dbpos) == 0) dbfound = 1; @@ -1183,7 +1183,7 @@ load( void ) fclose(fp); } - free(trklist); + free(trtdelist); if (cur_playnew == -1) cur_playnew = 0; diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui index 9b232ecd..2c9f8921 100644 --- a/libkcddb/cdinfodialogbase.ui +++ b/libkcddb/cdinfodialogbase.ui @@ -425,6 +425,6 @@ <includehint>klineedit.h</includehint> <includehint>kcombobox.h</includehint> <includehint>knuminput.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/noatun/FILES b/noatun/FILES index d3cb385a..4a1fe545 100644 --- a/noatun/FILES +++ b/noatun/FILES @@ -2,7 +2,7 @@ cmodule: Each panel in the settings window controls: those widgets that appear in the toolbars TODOLATER downloader: unused broken class for getting files engine: the only class that communicates to aRts -klistview_t: like a TDEListView, but with more functionality, especially DnD TODOSLOWLY +tdelistview_t: like a TDEListView, but with more functionality, especially DnD TODOSLOWLY noatun: all the actions, makes toolbars, e.g., main window noatunpref: the main settings box (semi-unused) TODOLATER noatunview.cpp: The main view within the main view, which only contains the videoframe diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 1f05502a..afccd7aa 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -26,10 +26,10 @@ #include <kglobal.h> #include <klibloader.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> #include <knotifyclient.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqfile.h> #include <tqimage.h> #include <qiomanager.h> diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 9c3d3232..1820e441 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -10,7 +10,7 @@ #include <tqlayout.h> #include <klocale.h> #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqsplitter.h> #include <tqlabel.h> #include <tqdragobject.h> diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h index 52682084..54fbc19e 100644 --- a/noatun/library/cmodule.h +++ b/noatun/library/cmodule.h @@ -2,7 +2,7 @@ #define CMODULE_H #include <tqframe.h> -#include <klistview.h> +#include <tdelistview.h> #include "noatun/pref.h" class TDEListView; diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h index 5c45fa40..3434ae92 100644 --- a/noatun/library/effectview.h +++ b/noatun/library/effectview.h @@ -26,7 +26,7 @@ #define EFFECTVIEW_H #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> class EffectList; class Effect; diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h index ed495a23..0cec05a9 100644 --- a/noatun/library/equalizerview.h +++ b/noatun/library/equalizerview.h @@ -3,7 +3,7 @@ #include <tqwidget.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> class VBand; class TQSlider; diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h index 67135c57..c6619293 100644 --- a/noatun/library/mimetypetree.h +++ b/noatun/library/mimetypetree.h @@ -14,7 +14,7 @@ #ifndef MIMETYPETREE_H #define MIMETYPETREE_H -#include <klistview.h> +#include <tdelistview.h> class MimeTypeTree : public TDEListView { diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index dbe249ba..37617183 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -3,8 +3,8 @@ #include <tqguardedptr.h> -#include <kaction.h> -#include <ktoolbar.h> +#include <tdeaction.h> +#include <tdetoolbar.h> #include <tqslider.h> #include <tqstringlist.h> #include <kdemacros.h> diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index 2a5ad401..31f5d20c 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -1,8 +1,8 @@ #ifndef _NOATUNSTDACTION_H_ #define _NOATUNSTDACTION_H_ -#include <kaction.h> -#include <kactionclasses.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> #include <kdemacros.h> class TDEPopupMenu; diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h index d3bad3f9..5ff9e904 100644 --- a/noatun/library/noatun/stereobuttonaction.h +++ b/noatun/library/noatun/stereobuttonaction.h @@ -1,7 +1,7 @@ #ifndef STEREOBUTTONACTION_H #define STEREOBUTTONACTION_H -#include <kaction.h> +#include <tdeaction.h> namespace NoatunStdAction { diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index b99c8ef5..767a3cc9 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -7,7 +7,7 @@ #include <khelpmenu.h> #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> #include <tqcursor.h> #include <tqmap.h> diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h index 52113f62..47519d66 100644 --- a/noatun/library/pluginmodule.h +++ b/noatun/library/pluginmodule.h @@ -24,7 +24,7 @@ #include "noatun/pref.h" #include "noatun/pluginloader.h" -#include <klistview.h> +#include <tdelistview.h> #include <tqframe.h> #include <tqstringlist.h> diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index d227c949..2588a811 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -9,7 +9,7 @@ #include <noatun/engine.h> #include <tqpopupmenu.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include "globalvideo.h" diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 7d6c4bfd..612807ab 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -45,7 +45,7 @@ #include <kmenubar.h> #include <kmessagebox.h> #include <kpixmapeffect.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstatusbar.h> #include <kstdaction.h> #include <twin.h> diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h index c47f05f1..a5aca1a1 100644 --- a/noatun/modules/excellent/userinterface.h +++ b/noatun/modules/excellent/userinterface.h @@ -30,7 +30,7 @@ #include <noatun/plugin.h> #include <noatun/app.h> #include <noatun/stdaction.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class TDEAction; class TDEPopupMenu; diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index 27746b69..60792eea 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -1,7 +1,7 @@ #include <klocale.h> #include <tqregexp.h> #include <tqtextcodec.h> -#include <kaction.h> +#include <tdeaction.h> #include <noatun/stdaction.h> #include "htmlexport.h" diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h index 0c3de125..d9acd313 100644 --- a/noatun/modules/htmlexport/htmlexport.h +++ b/noatun/modules/htmlexport/htmlexport.h @@ -14,7 +14,7 @@ #include <tqwhatsthis.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdefiledialog.h> #include <ktempfile.h> #include <kcolorbutton.h> diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index a504b977..c3c2c89d 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -7,7 +7,7 @@ #include <kdialog.h> #include <klocale.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <kcombobox.h> #include <knuminput.h> diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 4d74d858..08af1b28 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -19,7 +19,7 @@ #include <klocale.h> #include <tqlayout.h> #include <tqlabel.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <tqdir.h> #include <tqfileinfo.h> #include <kglobal.h> diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index ef6d30ce..b174a287 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -45,7 +45,7 @@ #include <kglobal.h> #include <klocale.h> #include <tdeconfig.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <tdeio/netaccess.h> diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h index aa681c3c..f4f712a4 100644 --- a/noatun/modules/kaiman/userinterface.h +++ b/noatun/modules/kaiman/userinterface.h @@ -21,7 +21,7 @@ #include <noatun/plugin.h> #include <noatun/app.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "style.h" diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index f6c60256..d027217c 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -24,7 +24,7 @@ #include <kurl.h> #include <tdefiledialog.h> #include <khelpmenu.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> /******************************************* * KJButton diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui index 244e67a2..6088732e 100644 --- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui +++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui @@ -459,7 +459,7 @@ <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> <includehint>kcolorcombo.h</includehint> - <includehint>kfontcombo.h</includehint> + <includehint>tdefontcombo.h</includehint> <includehint>klineedit.h</includehint> </includehints> </UI> diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index ee8ca247..67bf516c 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -52,12 +52,12 @@ #include <tqvbox.h> #include <tqlabel.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> #include <khelpmenu.h> #include <kstdaction.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kglobalsettings.h> #include <kglobal.h> diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index 590d2f1a..20ff7750 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -40,7 +40,7 @@ #include <kprocess.h> #include <kstandarddirs.h> #include <kglobalsettings.h> -#include <kfontcombo.h> +#include <tdefontcombo.h> #include <kcolorcombo.h> static TQString expand(TQString s); diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index 71612174..f1f46ae8 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -35,7 +35,7 @@ #include "marquis.h" #include <noatun/player.h> #include <noatun/engine.h> -#include <kaction.h> +#include <tdeaction.h> static int getPlayStatus( Player *player ) { diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h index 276ebc9a..00789b43 100644 --- a/noatun/modules/marquis/marquis.h +++ b/noatun/modules/marquis/marquis.h @@ -28,7 +28,7 @@ #include <noatun/plugin.h> #include <noatun/app.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class Player; diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp index db71f715..c6fc8f92 100644 --- a/noatun/modules/metatag/metatag.cpp +++ b/noatun/modules/metatag/metatag.cpp @@ -13,13 +13,13 @@ #include <tqregexp.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kglobal.h> #include <klineedit.h> #include <tdeconfig.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdefilemetainfo.h> extern "C" diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp index f7e35778..a66cbbde 100644 --- a/noatun/modules/monoscope/monoscope.cpp +++ b/noatun/modules/monoscope/monoscope.cpp @@ -3,7 +3,7 @@ #include <noatun/app.h> #include <math.h> #include <tqpainter.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <noatun/stdaction.h> #include <klocale.h> diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 9173867e..07d3ec7b 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -19,7 +19,7 @@ #include <tqobjectlist.h> #include <tqobjectdict.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstatusbar.h> #include <kglobal.h> #include <klocale.h> diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 52552be8..ebac7ce7 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <kurldrag.h> #include <kmenubar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstatusbar.h> #include <kstdaction.h> #include <kstdguiitem.h> diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h index 7265fa4e..a218f574 100644 --- a/noatun/modules/simple/userinterface.h +++ b/noatun/modules/simple/userinterface.h @@ -14,8 +14,8 @@ #include <noatun/controls.h> #include <noatun/plugin.h> #include <noatun/video.h> -#include <kaction.h> -#include <kmainwindow.h> +#include <tdeaction.h> +#include <tdemainwindow.h> #include <kmedia2.h> #include <tqevent.h> #include <tqlabel.h> diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 8e150cc1..8c34e254 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -18,7 +18,7 @@ #include <tqtextstream.h> #include <tqpainter.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> #include <tdefileitem.h> diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h index 9bff4335..4eef4e9b 100644 --- a/noatun/modules/splitplaylist/view.h +++ b/noatun/modules/splitplaylist/view.h @@ -3,8 +3,8 @@ #include <tqevent.h> #include <tqptrlist.h> -#include <klistview.h> -#include <kmainwindow.h> +#include <tdelistview.h> +#include <tdemainwindow.h> #include <tqrect.h> #include <tqdict.h> #include <tdeio/global.h> diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 63a467b6..963a9c69 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -36,8 +36,8 @@ #include <tqdragobject.h> #include "kitsystemtray.h" -#include <kmainwindow.h> -#include <kpopupmenu.h> +#include <tdemainwindow.h> +#include <tdepopupmenu.h> #include <kxmlguifactory.h> #include <kiconloader.h> #include <kurldrag.h> diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 0cfde28e..3ef8841c 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -38,7 +38,7 @@ #include <noatun/player.h> #include <noatun/stdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> #include <tqfile.h> #include <kglobal.h> diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h index b1dd7aad..80592b07 100644 --- a/noatun/modules/systray/systray.h +++ b/noatun/modules/systray/systray.h @@ -32,7 +32,7 @@ #include <tqtimer.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class KitSystemTray; class TQTimer; diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index 06b9c010..845773b0 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -17,10 +17,10 @@ #include <klocale.h> #include <kiconloader.h> #include <khelpmenu.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kurldrag.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqdragobject.h> #include <kstandarddirs.h> #include <twin.h> diff --git a/tdemid/channelview.h b/tdemid/channelview.h index a7d6e32d..b54015ce 100644 --- a/tdemid/channelview.h +++ b/tdemid/channelview.h @@ -25,7 +25,7 @@ #ifndef CHANNELVIEW_H #define CHANNELVIEW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqscrollbar.h> #include "channel.h" diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp index e85281e1..ee82529f 100644 --- a/tdemid/tdemid_part.cpp +++ b/tdemid/tdemid_part.cpp @@ -4,7 +4,7 @@ #include <kiconloader.h> #include <klocale.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqiconset.h> #include <tdeparts/partmanager.h> diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp index 3450dbf2..5c0ff444 100644 --- a/tdemid/tdemidclient.cpp +++ b/tdemid/tdemidclient.cpp @@ -45,7 +45,7 @@ #include <kmessagebox.h> #include <kstandarddirs.h> #include <kurl.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <libtdemid/midimapper.h> diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp index 2b340131..452e4ac2 100644 --- a/tdemid/tdemidframe.cpp +++ b/tdemid/tdemidframe.cpp @@ -31,20 +31,20 @@ #include <tqkeycode.h> #include <tqstring.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kapplication.h> #include <tdeconfig.h> #include <kcmdlineargs.h> #include <tdefiledialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kurl.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kurldrag.h> #include <kedittoolbar.h> diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h index e181b96d..2ce5226e 100644 --- a/tdemid/tdemidframe.h +++ b/tdemid/tdemidframe.h @@ -24,7 +24,7 @@ #ifndef _KMIDFRAME_H #define _KMIDFRAME_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmenubar.h> #include <libtdemid/midiout.h> #include <libtdemid/player.h> |