diff options
124 files changed, 185 insertions, 185 deletions
diff --git a/doc/kommander/widgets.docbook b/doc/kommander/widgets.docbook index 1596d25e..45504ee4 100644 --- a/doc/kommander/widgets.docbook +++ b/doc/kommander/widgets.docbook @@ -548,7 +548,7 @@ when the <emphasis>execute</emphasis> function is called. <varlistentry> <term> <inlinemediaobject><imageobject> -<imagedata fileref="kfontcombo.png" format="PNG" /> +<imagedata fileref="tdefontcombo.png" format="PNG" /> </imageobject></inlinemediaobject> FontDialog </term> diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp index 3739114a..4dceda41 100644 --- a/kimagemapeditor/arealistview.cpp +++ b/kimagemapeditor/arealistview.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ // QT -#include <klistview.h> +#include <tdelistview.h> #include <tqpushbutton.h> #include <tqhbox.h> #include <tqwhatsthis.h> diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h index 1a118d2f..24bac7a0 100644 --- a/kimagemapeditor/imageslistview.h +++ b/kimagemapeditor/imageslistview.h @@ -18,7 +18,7 @@ #ifndef _IMAGESLISTVIEW_H_ #define _IMAGESLISTVIEW_H_ -#include <klistview.h> +#include <tdelistview.h> #include <kurl.h> #include "kimagemapeditor.h" diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index bccccc7c..84756747 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -42,8 +42,8 @@ #include <kcommand.h> #include <kdebug.h> #include <klocale.h> -#include <kaction.h> -#include <kaccel.h> +#include <tdeaction.h> +#include <tdeaccel.h> #include <kstdaction.h> #include <kiconloader.h> #include <tdefiledialog.h> diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 3914ac50..f27b475c 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -18,7 +18,7 @@ #include <iostream> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kstandarddirs.h> #include <tdefiledialog.h> diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp index 399ad2b5..fee8f147 100644 --- a/kimagemapeditor/mapslistview.cpp +++ b/kimagemapeditor/mapslistview.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ // KDE -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kdebug.h> diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index 7034c840..e60f2503 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ #include "actionmanager.h" -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kxmlguifactory.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kguiitem.h> #include <tqbuttongroup.h> diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index b344e95d..cf8abf2b 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -25,14 +25,14 @@ #include <tdeconfig.h> #include <kurl.h> #include <kedittoolbar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <klibloader.h> #include <kmessagebox.h> #include <kstatusbar.h> #include <klocale.h> #include <kdebug.h> -#include <kaccel.h> +#include <tdeaccel.h> KLinkStatus::KLinkStatus() diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index be6f9f76..2d233666 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -21,7 +21,7 @@ #include <kaboutdata.h> #include <klocale.h> #include <kinstance.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> #include <tdeparts/genericfactory.h> @@ -31,8 +31,8 @@ #include <kbugreport.h> #include <tdeconfigdialog.h> #include <kglobalsettings.h> -#include <kshortcut.h> -#include <kaccel.h> +#include <tdeshortcut.h> +#include <tdeaccel.h> #include <kkeydialog.h> #include <tqbuttongroup.h> diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index d1bbf780..3a4c7787 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -16,7 +16,7 @@ #include <tdeconfig.h> #include <kcompletionbox.h> #include <kdebug.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kurldrag.h> #include <kglobalsettings.h> diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 6567b7db..49fa9759 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -29,7 +29,7 @@ #include <kglobal.h> #include <kpushbutton.h> #include <tdefiledialog.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <ktempfile.h> #include <ksavefile.h> #include <kstandarddirs.h> diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index bc7f1492..7c369d4d 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -38,7 +38,7 @@ #include <kstringhandler.h> #include <kcharsets.h> #include <kmimetype.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h index 3481108d..55366e0d 100644 --- a/klinkstatus/src/ui/treeview.h +++ b/klinkstatus/src/ui/treeview.h @@ -12,7 +12,7 @@ #ifndef TREEVIEW_H #define TREEVIEW_H -#include <klistview.h> +#include <tdelistview.h> #include "resultview.h" class TreeViewItem; diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index f02b779c..4ee27476 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -24,8 +24,8 @@ #include <kpushbutton.h> #include <ktextedit.h> #include <kdebug.h> -#include <kpopupmenu.h> -#include <kactioncollection.h> +#include <tdepopupmenu.h> +#include <tdeactioncollection.h> #include <kdebug.h> #include <tdetexteditor/view.h> diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui index 782a2b22..60b4ff69 100644 --- a/kommander/editor/choosewidget.ui +++ b/kommander/editor/choosewidget.ui @@ -145,6 +145,6 @@ </connections> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp index c5b1bbb7..3debb9ba 100644 --- a/kommander/editor/choosewidgetimpl.cpp +++ b/kommander/editor/choosewidgetimpl.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ /** KDE INCLUDES */ -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> /** QT INCLUDES */ diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui index 29a33a56..90824b2d 100644 --- a/kommander/editor/connectioneditor.ui +++ b/kommander/editor/connectioneditor.ui @@ -405,9 +405,9 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistbox.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 7dc7978d..78560f8f 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -27,8 +27,8 @@ #include <tqlabel.h> #include <tqregexp.h> -#include <klistbox.h> -#include <klistview.h> +#include <tdelistbox.h> +#include <tdelistview.h> #include <kpushbutton.h> #include <kcombobox.h> #include <klocale.h> diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui index 5e9686ff..005d2261 100644 --- a/kommander/editor/functions.ui +++ b/kommander/editor/functions.ui @@ -699,7 +699,7 @@ <includehints> <includehint>ktextbrowser.h</includehint> <includehint>kcombobox.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index f4dc7f38..c37116c5 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kglobal.h> #include <kiconloader.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klineedit.h> #include <klocale.h> #include <kpushbutton.h> diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index dcd1b393..fe9be401 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -71,7 +71,7 @@ #include "assistproc.h" #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcmdlineargs.h> #include <tdeconfig.h> @@ -83,7 +83,7 @@ #include <kommanderwidget.h> #include <kprocess.h> #include <kstatusbar.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kurl.h> #include <tdeparts/partmanager.h> #include <tdeio/netaccess.h> diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index 9f4a0ca8..be1d1590 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -58,7 +58,7 @@ #include "command.h" -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdefiledialog.h> #include <kglobal.h> @@ -67,7 +67,7 @@ #include <klocale.h> #include <kmenubar.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include <kstandarddirs.h> #include <kstatusbar.h> diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index e89e04f3..c180c61c 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -19,9 +19,9 @@ #include <kapplication.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include <tqclipboard.h> diff --git a/kommander/editor/pics/Makefile.am b/kommander/editor/pics/Makefile.am index 2306b047..463e1f05 100644 --- a/kommander/editor/pics/Makefile.am +++ b/kommander/editor/pics/Makefile.am @@ -1,5 +1,5 @@ kmdr_editordir = ${kde_datadir}/kommander/pics -kmdr_editor_DATA = kommandersplash.png toolbox.png kfontcombo.png +kmdr_editor_DATA = kommandersplash.png toolbox.png tdefontcombo.png diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp index d4a17ea4..bc85f2ff 100644 --- a/kommander/pluginmanager/mainwindow.cpp +++ b/kommander/pluginmanager/mainwindow.cpp @@ -18,8 +18,8 @@ #include "mainwindow.h" #include "pluginmanager.h" -#include <ktoolbar.h> -#include <klistbox.h> +#include <tdetoolbar.h> +#include <tdelistbox.h> #include <tdeconfig.h> #include <tdefiledialog.h> #include <klibloader.h> diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h index 9f891d2c..b49c4e21 100644 --- a/kommander/pluginmanager/mainwindow.h +++ b/kommander/pluginmanager/mainwindow.h @@ -18,7 +18,7 @@ #ifndef HAVE_MAINWINDOW_H #define HAVE_MAINWINDOW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> class TDEListBox; class PluginManager; diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h index f768552d..35ba1c85 100644 --- a/kommander/widget/kmdrmainwindow.h +++ b/kommander/widget/kmdrmainwindow.h @@ -12,7 +12,7 @@ #ifndef KmdrMainWindow_H #define KmdrMainWindow_H -#include <kmainwindow.h> +#include <tdemainwindow.h> /** @author Andras Mantia <amantia@tdewebdev.org> diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index 739fb0e0..ba5b23ac 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -14,7 +14,7 @@ #include "kommanderplugin.h" #include "specials.h" -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kiconloader.h> #include <klocale.h> @@ -37,7 +37,7 @@ FontDialog::FontDialog(TQWidget *parent, const char *name) setDisplayStates(states); if (KommanderWidget::inEditor) { - setPixmap(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium)); setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h index b970c280..8f8c2a39 100644 --- a/kommander/widgets/listbox.h +++ b/kommander/widgets/listbox.h @@ -26,7 +26,7 @@ /* OTHER INCLUDES */ #include <kommanderwidget.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kommander_export.h> class TQWidget; diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp index aef6821e..721ad120 100644 --- a/kommander/widgets/plugin.cpp +++ b/kommander/widgets/plugin.cpp @@ -93,7 +93,7 @@ KomStdPlugin::KomStdPlugin() addWidget("Table", group, "", 0); addWidget("DatePicker", group, "", 0); addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium))); - addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium))); addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium))); } diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index ba6c3781..1320ce8b 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -17,7 +17,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kommanderplugin.h> #define INSERTMENUITEM 100 diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index 7c1c989a..e54077dd 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kglobal.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> /* QT INCLUDES */ #include <tqstring.h> diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h index 19cbcea6..173866d6 100644 --- a/kommander/widgets/treewidget.h +++ b/kommander/widgets/treewidget.h @@ -18,7 +18,7 @@ #define _HAVE_TREEWIDGET_H_ /* KDE INCLUDES */ -#include <klistview.h> +#include <tdelistview.h> /* QT INCLUDES */ #include <tqstring.h> diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index 34a82b28..f0f7c4d8 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -11,7 +11,7 @@ #include <kedittoolbar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <klibloader.h> diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index edac344b..7e8244e2 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -3,7 +3,7 @@ #include "libxsldbg/xsldbg.h" #include <kinstance.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> #include <tdeparts/genericfactory.h> @@ -17,7 +17,7 @@ #include <tqtextstream.h> #include "../kxsldbg.h" -#include <kaction.h> +#include <tdeaction.h> #include <kcmdlineargs.h> #include <kinstance.h> #include <kiconloader.h> diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp index 670d989e..54d82d6e 100644 --- a/lib/compatibility/knewstuff/downloaddialog.cpp +++ b/lib/compatibility/knewstuff/downloaddialog.cpp @@ -23,7 +23,7 @@ #include <klocale.h> #include <ktabctl.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp index d36a1ef1..7727783b 100644 --- a/lib/compatibility/knewstuff/knewstuff.cpp +++ b/lib/compatibility/knewstuff/knewstuff.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <klocale.h> diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp index 23aa9438..ddc0b2ef 100644 --- a/lib/compatibility/knewstuff/providerdialog.cpp +++ b/lib/compatibility/knewstuff/providerdialog.cpp @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqlabel.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp index 08940d0a..998e9a72 100644 --- a/lib/compatibility/knewstuff/uploaddialog.cpp +++ b/lib/compatibility/knewstuff/uploaddialog.cpp @@ -26,7 +26,7 @@ #include <tqstring.h> #include <ktextedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kdebug.h> #include <kurlrequester.h> diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index 64f5848f..f6bed90c 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -36,8 +36,8 @@ #include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> -#include <ktoolbar.h> -#include <kpopupmenu.h> +#include <tdetoolbar.h> +#include <tdepopupmenu.h> #include <twin.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h index 69e5f7dc..bf54a5c0 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h @@ -55,13 +55,13 @@ #include <tqtabwidget.h> #ifndef NO_KDE2 -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <netwm_def.h> #else #include <tqmainwindow.h> #include "exportdockclass.h" -#include "dummykmainwindow.h" +#include "dummytdemainwindow.h" #endif #include <tdelibs_export.h> diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp index 575fa2b2..fe60b25f 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp @@ -8,7 +8,7 @@ //---------------------------------------------------------------------------- #include <ktabbar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include "tdemdidocumentviewtabwidget.h" KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name ) diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp index 4c9930be..142213ad 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp @@ -1,6 +1,6 @@ /* This file is part of the KDE libraries Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org> - based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> + based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -23,10 +23,10 @@ #include <tqpopupmenu.h> #include <kapplication.h> #include <tdeconfig.h> -#include <ktoolbar.h> -#include <kmainwindow.h> +#include <tdetoolbar.h> +#include <tdemainwindow.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqstring.h> #include <assert.h> #include <kdebug.h> @@ -134,7 +134,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c setXML( completeDescription, false /*merge*/ ); } - if ( actionCollection() ->kaccel() == 0 ) + if ( actionCollection() ->tdeaccel() == 0 ) actionCollection() ->setWidget( mdiMainFrm ); m_toolMenu = new TDEActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" ); if ( showMDIModeAction ) diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h index 98c606ce..f55207b2 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include <tqguardedptr.h> #include <kxmlguiclient.h> -#include <kaction.h> +#include <tdeaction.h> #include "tdemdidefines.h" class TDEMainWindow; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h index 220875fc..db464c9c 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h @@ -33,7 +33,7 @@ #include <tdeparts/dockmainwindow.h> #include <kmenubar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqptrlist.h> #include <tqrect.h> diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h index 9d0267bb..8ff55a74 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h @@ -28,7 +28,7 @@ #ifndef _KMDITASKBAR_H_ #define _KMDITASKBAR_H_ -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <tqptrlist.h> #include <tqpixmap.h> #include <tqlabel.h> diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h index c3812792..ec19b862 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <kdockwidget.h> #include <tqguardedptr.h> -#include <kaction.h> +#include <tdeaction.h> class KMDI_EXPORT KMdiToolViewAccessorPrivate { public: diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp index 53b9d344..cac2c059 100644 --- a/lib/ksavealldialog.cpp +++ b/lib/ksavealldialog.cpp @@ -23,8 +23,8 @@ #include <klocale.h> #include <kpushbutton.h> -#include <klistbox.h> -#include <klistview.h> +#include <tdelistbox.h> +#include <tdelistview.h> #include <kstdguiitem.h> #include "ksavealldialog.h" diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index 004f4c74..043e3470 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -22,7 +22,7 @@ #include <tqiconset.h> #include <kiconloader.h> #include <klocale.h> -#include <kaccel.h> +#include <tdeaccel.h> #include "propertysetter.h" diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui index 6f79a85e..f63b910e 100644 --- a/quanta/components/cvsservice/cvscommitdlgs.ui +++ b/quanta/components/cvsservice/cvscommitdlgs.ui @@ -145,6 +145,6 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index e423a221..6681d390 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -22,16 +22,16 @@ #include <tqtimer.h> //kde includes -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcombobox.h> #include <tdeversion.h> #include <kiconloader.h> #include <klineedit.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> // CvsService #include <repository_stub.h> diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index a5925c26..0c0afdc7 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdeversion.h> -#include <klistview.h> +#include <tdelistview.h> // Quanta includes #include "backtracelistview.h" diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h index 4203cf70..01c34c45 100644 --- a/quanta/components/debugger/backtracelistview.h +++ b/quanta/components/debugger/backtracelistview.h @@ -19,8 +19,8 @@ #ifndef BACKTRACELISTVIEW_H #define BACKTRACELISTVIEW_H -#include <klistview.h> -#include <kpopupmenu.h> +#include <tdelistview.h> +#include <tdepopupmenu.h> #include <tqptrlist.h> class BacktraceListview; diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index c1074e9d..e32c0de8 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -21,7 +21,7 @@ #include <kiconloader.h> #include <tdeversion.h> #include <kinputdialog.h> -#include <klistview.h> +#include <tdelistview.h> // Quanta includes #include "debuggerbreakpointview.h" diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h index e6abcfcd..074de811 100644 --- a/quanta/components/debugger/debuggerbreakpointview.h +++ b/quanta/components/debugger/debuggerbreakpointview.h @@ -19,8 +19,8 @@ #ifndef DEBUGGERBREAKPOINTVIEW_H #define DEBUGGERBREAKPOINTVIEW_H -#include <klistview.h> -#include <kpopupmenu.h> +#include <tdelistview.h> +#include <tdepopupmenu.h> #include <tqptrlist.h> #include "debuggerbreakpoint.h" diff --git a/quanta/components/debugger/debuggervariable.h b/quanta/components/debugger/debuggervariable.h index af78fde6..8bc8ad0f 100644 --- a/quanta/components/debugger/debuggervariable.h +++ b/quanta/components/debugger/debuggervariable.h @@ -21,7 +21,7 @@ #include <tqstring.h> #include <tqptrlist.h> -#include <klistview.h> +#include <tdelistview.h> namespace DebuggerVariableTypes { diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h index de837241..69b27852 100644 --- a/quanta/components/debugger/variableslistview.h +++ b/quanta/components/debugger/variableslistview.h @@ -19,8 +19,8 @@ #ifndef VARIABLESLISTVIEW_H #define VARIABLESLISTVIEW_H -#include <klistview.h> -#include <kpopupmenu.h> +#include <tdelistview.h> +#include <tdepopupmenu.h> #include <tqptrlist.h> class DebuggerVariable; diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index c53d87b1..9d97c7eb 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -19,7 +19,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <tdeparts/componentfactory.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpushbutton.h> #include <tdetexteditor/document.h> #include <tdetexteditor/editinterface.h> diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index 4346be52..623b69c1 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -31,16 +31,16 @@ #include <kicondialog.h> #include <kiconloader.h> #include <kkeybutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpushbutton.h> #include <kstandarddirs.h> #include <tdeversion.h> #include <kinputdialog.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> //app includes #include "resource.h" diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index 9ed82302..1f803770 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -992,10 +992,10 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kicondialog.h</includehint> <includehint>kkeybutton.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>filecombo.h</includehint> </includehints> </UI> diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index 79247f40..13be01e7 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -27,7 +27,7 @@ #include <tdeconfig.h> #include <tdefiledialog.h> #include <kicondialog.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klineedit.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 90e098b8..6524beb9 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -27,8 +27,8 @@ #include <kdialogbase.h> #include <kglobal.h> #include <kinputdialog.h> -#include <klistbox.h> -#include <klistview.h> +#include <tdelistbox.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index f283a092..fc53fe16 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -351,7 +351,7 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index 23c372e1..aff627ef 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klineedit.h> #include "specialchardialog.h" diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index caaf3848..c10bc62e 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -148,6 +148,6 @@ <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/quanta/dialogs/tagdialogs/CMakeLists.txt b/quanta/dialogs/tagdialogs/CMakeLists.txt index 7d478f6d..6f29cb43 100644 --- a/quanta/dialogs/tagdialogs/CMakeLists.txt +++ b/quanta/dialogs/tagdialogs/CMakeLists.txt @@ -28,7 +28,7 @@ include_directories( tde_add_library( tagdialogs STATIC_PIC AUTOMOC SOURCES tagmisc.ui listdlg.cpp tagmaildlg.cpp - tagquicklistdlg.cpp tagquicklistdlgdata.cpp + tagquictdelistdlg.cpp tagquictdelistdlgdata.cpp tagdialog.cpp tagattr.cpp pictureview.cpp tagimgdlg.cpp tagxml.cpp tagwidget.cpp colorcombo.cpp tagimgdlgdata.cpp tagmiscdlg.cpp diff --git a/quanta/dialogs/tagdialogs/Makefile.am b/quanta/dialogs/tagdialogs/Makefile.am index ac7fd23f..8093e35e 100644 --- a/quanta/dialogs/tagdialogs/Makefile.am +++ b/quanta/dialogs/tagdialogs/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libtagdialogs.la libtagdialogs_la_SOURCES = tagmisc.ui listdlg.cpp tagmaildlg.cpp \ - tagquicklistdlg.cpp tagquicklistdlgdata.cpp tagdialog.cpp tagattr.cpp pictureview.cpp \ + tagquictdelistdlg.cpp tagquictdelistdlgdata.cpp tagdialog.cpp tagattr.cpp pictureview.cpp \ tagimgdlg.cpp tagxml.cpp tagwidget.cpp colorcombo.cpp tagimgdlgdata.cpp \ tagmiscdlg.cpp tagmail.ui diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index ebe9a7fd..188f2ca0 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -49,7 +49,7 @@ #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <kmessagebox.h> #include <kseparator.h> diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index f26bf9dd..0c05dc5a 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -31,7 +31,7 @@ #include <tqframe.h> #include <tqpixmap.h> #include <kcolordialog.h> -#include "kselect.h" +#include "tdeselect.h" /** diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index ba583b99..c9b20d5a 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -16,7 +16,7 @@ #include "listdlg.h" //kde include -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> //qt includes diff --git a/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp b/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp index 7a9edbdb..163abcc6 100644 --- a/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - tagquicklistdlg.cpp - description + tagquictdelistdlg.cpp - description ------------------- begin : Sun Nov 28 1999 copyright : (C) 1999 by Yacovlev Alexander & Dmitry Poplavsky @@ -14,8 +14,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "tagquicklistdlg.h" -#include "tagquicklistdlg.moc" +#include "tagquictdelistdlg.h" +#include "tagquictdelistdlg.moc" #include <tqbuttongroup.h> #include <tqlabel.h> #include <tqspinbox.h> diff --git a/quanta/dialogs/tagdialogs/tagquictdelistdlg.h b/quanta/dialogs/tagdialogs/tagquictdelistdlg.h index 946efb67..5d242673 100644 --- a/quanta/dialogs/tagdialogs/tagquictdelistdlg.h +++ b/quanta/dialogs/tagdialogs/tagquictdelistdlg.h @@ -1,5 +1,5 @@ /*************************************************************************** - tagquicklistdlg.h - description + tagquictdelistdlg.h - description ------------------- begin : Sun Nov 28 1999 copyright : (C) 1999 by Yacovlev Alexander & Dmitry Poplavsky diff --git a/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp index 7f499c14..79522618 100644 --- a/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp @@ -10,7 +10,7 @@ #include <kapplication.h> #include <klocale.h> #include <tqbuttongroup.h> -#include "tagquicklistdlg.h" +#include "tagquictdelistdlg.h" #include <tqspinbox.h> #include <tqlabel.h> #include <kpushbutton.h> diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 7ded7062..69da8c4d 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <tdeio/netaccess.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kurl.h> diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index fe1a5230..17333aee 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -21,7 +21,7 @@ #include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> // TQt includes diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h index 1621fd61..bd67d9fd 100644 --- a/quanta/parts/kafka/domtreeview.h +++ b/quanta/parts/kafka/domtreeview.h @@ -21,7 +21,7 @@ #include "kafkacommon.h" #ifdef HEAVY_DEBUG -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include <tqlistview.h> #include <tqptrdict.h> diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index 21d614dc..3895ef12 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -18,7 +18,7 @@ #include <kiconloader.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kpushbutton.h> #include <kurlrequester.h> #include <kurl.h> diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 6560191b..66edea90 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -26,7 +26,7 @@ #include <tdehtml_settings.h> #include <tdehtmlview.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <ktempfile.h> //app includes diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index 252ac07c..99b3d03c 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -19,7 +19,7 @@ #include <kstandarddirs.h> #include <klocale.h> #include <kiconloader.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeparts/componentfactory.h> #include <tdeparts/part.h> #include <klocale.h> diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index b2ce2713..0c937d8f 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -16,10 +16,10 @@ ***************************************************************************/ /* KDE INCLUDES */ -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp index d3c84d26..0e20506c 100644 --- a/quanta/project/eventconfigurationdlg.cpp +++ b/quanta/project/eventconfigurationdlg.cpp @@ -20,7 +20,7 @@ //kde includes #include <kcombobox.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index f60d8f6d..73bb8666 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -218,6 +218,6 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp index d98c5ce3..6210e1cd 100644 --- a/quanta/project/eventeditordlg.cpp +++ b/quanta/project/eventeditordlg.cpp @@ -20,7 +20,7 @@ #include <tqtooltip.h> //kde includes -#include <kaction.h> +#include <tdeaction.h> #include <kcombobox.h> #include <klocale.h> diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index c4da3a3c..30982a8b 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -27,14 +27,14 @@ #include <tqlayout.h> // include files for KDE -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <kapplication.h> #include <kcharsets.h> #include <kdirwatch.h> #include <tdeio/netaccess.h> #include <klineedit.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> #include <tdeparts/componentfactory.h> #include <kprogress.h> diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 1df99466..bbf543ad 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -27,7 +27,7 @@ #include <tqeventloop.h> //kde includes -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcharsets.h> #include <tdeconfig.h> @@ -37,7 +37,7 @@ #include <tdeio/netaccess.h> #include <klineedit.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> #include <tdeparts/componentfactory.h> #include <kprogress.h> diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp index da902bf1..fe13a530 100644 --- a/quanta/project/teammembersdlg.cpp +++ b/quanta/project/teammembersdlg.cpp @@ -20,7 +20,7 @@ #include <kcombobox.h> #include <kdialogbase.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index dc8f0328..512c02ca 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -242,7 +242,7 @@ <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 22430940..8365b59d 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -35,8 +35,8 @@ #include <kapplication.h> #include <twin.h> #include <klocale.h> -#include <kaction.h> -#include <kactionclasses.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> #include <kdialogbase.h> #include <kiconloader.h> #include <kmdcodec.h> diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 9bbd2e1c..67a88532 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -51,7 +51,7 @@ // include files for KDE #include <kapplication.h> #include <kaboutdata.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kbugreport.h> #include <kcolordialog.h> #include <kcombobox.h> @@ -70,7 +70,7 @@ #include <klibloader.h> #include <kdockwidget.h> #include <kstatusbar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpushbutton.h> #include <kprocess.h> #include <kprogress.h> @@ -80,7 +80,7 @@ #include <kdebug.h> #include <ktar.h> #include <kedittoolbar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcharsets.h> #include <kdirwatch.h> #include <kstandarddirs.h> @@ -157,7 +157,7 @@ #include "tagdialog.h" #include "tagmaildlg.h" #include "tagmisc.h" -#include "tagquicklistdlg.h" +#include "tagquictdelistdlg.h" #include "tableeditor.h" #include "csseditor.h" diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 155a376b..17d5d15c 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -35,7 +35,7 @@ // include files for KDE #include <dcopclient.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> @@ -48,9 +48,9 @@ #include <tdehtmlview.h> #include <kstandarddirs.h> #include <kstatusbar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include <kprogress.h> #include <ktip.h> diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 61a6db43..fdf9497c 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -28,9 +28,9 @@ // include files for KDE #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <kdirwatch.h> #include <tdeversion.h> diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index d214bab6..e8d6c6a0 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -32,7 +32,7 @@ #include <tqscrollview.h> // include files for KDE -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kdirwatch.h> #include <tdehtmlview.h> diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index ae22d25e..7c73f093 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <tdemdimainfrm.h> #include <kurl.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdetexteditor/view.h> #include <tdetexteditor/encodinginterface.h> #include <tdetexteditor/highlightinginterface.h> diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 603249c0..dc9644e0 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -32,7 +32,7 @@ #include <tqptrstack.h> // KDE includes -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <krun.h> #include <kinputdialog.h> diff --git a/quanta/treeviews/docfolder.h b/quanta/treeviews/docfolder.h index c6d02fe0..ea182ade 100644 --- a/quanta/treeviews/docfolder.h +++ b/quanta/treeviews/docfolder.h @@ -20,7 +20,7 @@ #include <tqwidget.h> -#include <klistview.h> +#include <tdelistview.h> /** Class for forlder for diff --git a/quanta/treeviews/docitem.h b/quanta/treeviews/docitem.h index 5a245828..f037c213 100644 --- a/quanta/treeviews/docitem.h +++ b/quanta/treeviews/docitem.h @@ -20,7 +20,7 @@ #include <tqwidget.h> -#include <klistview.h> +#include <tdelistview.h> class TDEConfig; diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index a9859858..288bf4cc 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <kapplication.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kurl.h> diff --git a/quanta/treeviews/doctreeview.h b/quanta/treeviews/doctreeview.h index 3168899c..6e963de2 100644 --- a/quanta/treeviews/doctreeview.h +++ b/quanta/treeviews/doctreeview.h @@ -23,7 +23,7 @@ #include <tqvaluelist.h> //kde includes -#include <klistview.h> +#include <tdelistview.h> class DocFolder; class TDEPopupMenu; diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index 7d82961f..e560b61b 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -23,7 +23,7 @@ #include <kinputdialog.h> #include <kopenwith.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdefiledialog.h> #include <kprogress.h> #include <kurl.h> diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index fa3a0ed8..24b802e3 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -27,7 +27,7 @@ #include <kinputdialog.h> #include <kmessagebox.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpropertiesdialog.h> #include <ktempfile.h> #include <kapplication.h> diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 768b7416..5154ceee 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -17,7 +17,7 @@ #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index bfb6ad23..a0ed5238 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -24,7 +24,7 @@ #include <kiconloader.h> #include <kopenwith.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdefiledialog.h> #include <kprogress.h> #include <kurl.h> diff --git a/quanta/treeviews/structtreetag.h b/quanta/treeviews/structtreetag.h index b7ba1585..da210556 100644 --- a/quanta/treeviews/structtreetag.h +++ b/quanta/treeviews/structtreetag.h @@ -18,7 +18,7 @@ #ifndef STRUCTTREETAG_H #define STRUCTTREETAG_H -#include <klistview.h> +#include <tdelistview.h> class Tag; class Node; diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index ccf3caef..cccc885f 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -29,7 +29,7 @@ // KDE headers #include <kapplication.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kmessagebox.h> #include <tdeconfig.h> diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index d6158431..2a0f8ed4 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -21,7 +21,7 @@ #include <tqmap.h> #include <tqvaluelist.h> -#include <klistview.h> +#include <tdelistview.h> /**view class of document structure *@author Andras Mantia & Paulo Moura Guedes & Yacovlev Alexander & Dmitry Poplavsky diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 4a21ec27..54423ba5 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -24,7 +24,7 @@ #include <dcopref.h> #include <kapplication.h> #include <kcolorcombo.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kurlrequester.h> #include <kdebug.h> diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index a125405e..4383986b 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -22,7 +22,7 @@ #include <tqtooltip.h> //kde includes -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kpushbutton.h> #include <kstringhandler.h> diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h index c3e7decf..1ecae329 100644 --- a/quanta/treeviews/tagattributetree.h +++ b/quanta/treeviews/tagattributetree.h @@ -19,7 +19,7 @@ #include <tqwidget.h> //kde includes -#include <klistview.h> +#include <tdelistview.h> //app includes diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index f6bbce38..5f28847e 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -38,11 +38,11 @@ #include <klocale.h> #include <kiconloader.h> #include <kstandarddirs.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmimetype.h> #include <kmessagebox.h> #include <kcombobox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpropertiesdialog.h> #include <kurlrequester.h> #include <kurlrequesterdlg.h> diff --git a/quanta/treeviews/uploadtreefile.h b/quanta/treeviews/uploadtreefile.h index aaa31b21..5f3c2de8 100644 --- a/quanta/treeviews/uploadtreefile.h +++ b/quanta/treeviews/uploadtreefile.h @@ -16,7 +16,7 @@ #ifndef UPLOADTREEFILE_H #define UPLOADTREEFILE_H -#include <klistview.h> +#include <tdelistview.h> #include "uploadtreefolder.h" diff --git a/quanta/treeviews/uploadtreefolder.h b/quanta/treeviews/uploadtreefolder.h index 96b45771..c0339d03 100644 --- a/quanta/treeviews/uploadtreefolder.h +++ b/quanta/treeviews/uploadtreefolder.h @@ -21,7 +21,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurl.h> /** diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 09529616..873c2843 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -23,9 +23,9 @@ #include <kapplication.h> #include <tdeconfig.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstringhandler.h> #include <tdetexteditor/markinterface.h> #include <tdetexteditor/editinterface.h> diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index db1ce345..5235d5ce 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -44,9 +44,9 @@ //remove the below ones when KTQPasteAction is removed #include <dcopclient.h> #include <kdebug.h> -#include <kpopupmenu.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> #include <kstringhandler.h> #include <tqwhatsthis.h> #include <tqtimer.h> diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index c4c3b870..1c06b9c1 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -32,7 +32,7 @@ #include <kprocess.h> #include <klocale.h> #include <kmessagebox.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kstandarddirs.h> #include <ktempfile.h> #include <tdetexteditor/document.h> diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h index 84e01465..97111a36 100644 --- a/quanta/utility/tagaction.h +++ b/quanta/utility/tagaction.h @@ -19,8 +19,8 @@ #define TAGACTION_H #include <tdeversion.h> -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> #include <tqstring.h> #include <tqdom.h> diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp index 63df0010..2fda25f7 100644 --- a/quanta/utility/tagactionmanager.cpp +++ b/quanta/utility/tagactionmanager.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ #include <kstaticdeleter.h> -#include <kactioncollection.h> -#include <kaction.h> +#include <tdeactioncollection.h> +#include <tdeaction.h> #include <tdehtmlview.h> #include <klocale.h> #include <dom/dom_node.h> diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 31f246ec..71a737aa 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -17,8 +17,8 @@ #include <kapplication.h> #include <tdeconfig.h> -#include <kactioncollection.h> -#include <kactionclasses.h> +#include <tdeactioncollection.h> +#include <tdeactionclasses.h> #include <dom/dom_node.h> #include <dom/dom_string.h> #include <klocale.h> diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 6d715d64..5f95cdc6 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -23,15 +23,15 @@ #include <tqfontmetrics.h> //kde includes -#include <kaction.h> -#include <kaccelmanager.h> +#include <tdeaction.h> +#include <tdeaccelmanager.h> #include <tdeversion.h> #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/tdefilereplace/ChangeLog b/tdefilereplace/ChangeLog index b94d65f5..6f5d74f7 100644 --- a/tdefilereplace/ChangeLog +++ b/tdefilereplace/ChangeLog @@ -207,5 +207,5 @@ * The file containing the results of the operations is now a XHTML file. * Two new files UI added: now KOptionDlg inherits from KOptionDlgS and KAddstringDlg inherits from KAddstringDlgS. - * The klistviewstring.(h,cpp) were removed. + * The tdelistviewstring.(h,cpp) were removed. * A lot of clean up has been made in all files. diff --git a/tdefilereplace/report.cpp b/tdefilereplace/report.cpp index 6d485eba..48e64031 100644 --- a/tdefilereplace/report.cpp +++ b/tdefilereplace/report.cpp @@ -20,7 +20,7 @@ #include <tqfile.h> // KDE -#include <klistview.h> +#include <tdelistview.h> #include <kmessagebox.h> #include <kuser.h> diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp index 0d2246a1..d638272b 100644 --- a/tdefilereplace/tdefilereplacelib.cpp +++ b/tdefilereplace/tdefilereplacelib.cpp @@ -28,7 +28,7 @@ //KDE #include <kdebug.h> #include <kmessagebox.h> -#include <klistview.h> +#include <tdelistview.h> #include <kiconloader.h> //needed for malloc/free diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp index 39126044..36f41cb8 100644 --- a/tdefilereplace/tdefilereplacepart.cpp +++ b/tdefilereplace/tdefilereplacepart.cpp @@ -24,7 +24,7 @@ #include <dcopref.h> #include <kaboutapplication.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <kbugreport.h> #include <tdeconfig.h> #include <tdefiledialog.h> @@ -37,7 +37,7 @@ #include <kiconloader.h> #include <kglobal.h> #include <kiconeffect.h> -#include <klistview.h> +#include <tdelistview.h> #include <kuser.h> #include <kcombobox.h> #include <kguiitem.h> diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp index ffefd154..84ec2744 100644 --- a/tdefilereplace/tdefilereplaceview.cpp +++ b/tdefilereplace/tdefilereplaceview.cpp @@ -21,10 +21,10 @@ #include <tqfileinfo.h> // KDE -#include <klistview.h> +#include <tdelistview.h> #include <kmessagebox.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <krun.h> #include <kpropertiesdialog.h> #include <kapplication.h> diff --git a/tdefilereplace/tdefilereplaceviewwdg.ui b/tdefilereplace/tdefilereplaceviewwdg.ui index 4bd2ee37..e823993b 100644 --- a/tdefilereplace/tdefilereplaceviewwdg.ui +++ b/tdefilereplace/tdefilereplaceviewwdg.ui @@ -544,10 +544,10 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kled.h</includehint> <includehint>kled.h</includehint> <includehint>kled.h</includehint> |