diff options
108 files changed, 174 insertions, 174 deletions
@@ -11,7 +11,7 @@ kdf Michael Kropfberger <michael.kropfberger@gmx.net> kedit Bernd Johannes Wuebben <wuebben@kde.org> kfind Carsten Pfeiffer <pfeiffer@kde.org> kfloppy Bernd Johannes Wuebben <wuebben@kde.org> -kfontmanager Hans Petter Bieker <bieker@kde.org> +tdefontmanager Hans Petter Bieker <bieker@kde.org> kgpg Jean-Baptiste Mardelle <bj@alter.org> khexedit Espen Sand <espensa@online.no> kjots Christoph Neerfeld <chris@kde.org> diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 062d1a3..f2e6f01 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -29,7 +29,7 @@ #include "searchbar.h" #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <kaboutdata.h> #include <kxmlguifactory.h> diff --git a/ark/ark_part.h b/ark/ark_part.h index 3ea711e..49af555 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -27,7 +27,7 @@ #include <tdeparts/browserextension.h> #include <tdeparts/statusbarextension.h> #include <tdeparts/factory.h> -#include <kaction.h> +#include <tdeaction.h> #include <kprogress.h> #include <tqlabel.h> diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 9c5eec8..5f29b97 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -55,8 +55,8 @@ #include <tdefiledialog.h> #include <kdirselectdialog.h> #include <kurldrag.h> -#include <klistviewsearchline.h> -#include <ktoolbar.h> +#include <tdelistviewsearchline.h> +#include <tdetoolbar.h> #include <tdeconfigdialog.h> #include <ktrader.h> #include <kurl.h> @@ -66,7 +66,7 @@ #include "general.h" #include "addition.h" #include "extraction.h" -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdialog.h> // ark includes diff --git a/ark/filelistview.h b/ark/filelistview.h index 8cc5140..82ce86d 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -32,7 +32,7 @@ #include <tqpair.h> #include <tqvaluelist.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdeio/global.h> class TQString; diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 40ccdae..f89a573 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -31,13 +31,13 @@ #include <kstatusbar.h> #include <tdefiledialog.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeparts/componentfactory.h> #include <tdeparts/browserextension.h> #include <kkeydialog.h> #include <kcombobox.h> #include <tdeio/netaccess.h> -#include <kaccel.h> +#include <tdeaccel.h> // ark includes #include "arkapp.h" diff --git a/ark/mainwindow.h b/ark/mainwindow.h index 21952fd..b77dec5 100644 --- a/ark/mainwindow.h +++ b/ark/mainwindow.h @@ -30,7 +30,7 @@ #include <tqtimer.h> // KDE includes -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdeparts/mainwindow.h> #include <tdeparts/part.h> #include <kprogress.h> diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp index 1d13a58..a1fee6f 100644 --- a/ark/searchbar.cpp +++ b/ark/searchbar.cpp @@ -21,12 +21,12 @@ #include "searchbar.h" -#include <klistviewsearchline.h> -#include <klistview.h> +#include <tdelistviewsearchline.h> +#include <tdelistview.h> #include <kcombobox.h> #include <klocale.h> -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> #include <tqlabel.h> #include <tqapplication.h> diff --git a/ark/searchbar.h b/ark/searchbar.h index 52a6d56..c4a1396 100644 --- a/ark/searchbar.h +++ b/ark/searchbar.h @@ -21,7 +21,7 @@ * */ -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include <tqwidget.h> diff --git a/kcalc/dlabel.cpp b/kcalc/dlabel.cpp index f2e476c..f478b99 100644 --- a/kcalc/dlabel.cpp +++ b/kcalc/dlabel.cpp @@ -24,7 +24,7 @@ */ #include <tqglobal.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kstdaction.h> #include "kcalc_settings.h" diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index b18882d..63d8e81 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -41,8 +41,8 @@ #include <kaboutdata.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcmdlineargs.h> #include <kcolorbutton.h> @@ -50,14 +50,14 @@ #include <tdeconfig.h> #include <tdeconfigdialog.h> #include <kdialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kkeydialog.h> #include <kmenubar.h> #include <knotifyclient.h> #include <knumvalidator.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpushbutton.h> #include <kstatusbar.h> #include <kstdaction.h> @@ -69,7 +69,7 @@ #include "general.h" #include "colors.h" #include "constants.h" -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include "kcalc_settings.h" diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h index d19e141..e596d9e 100644 --- a/kcalc/kcalc.h +++ b/kcalc/kcalc.h @@ -31,7 +31,7 @@ class TQHButtonGroup; class TQWidget; class DispLogic; class Constants; -#include <kmainwindow.h> +#include <tdemainwindow.h> /* Kcalc basically consist of a class for the GUI (here), a class for diff --git a/kcalc/kcalc_const_button.cpp b/kcalc/kcalc_const_button.cpp index 8294526..fa137f5 100644 --- a/kcalc/kcalc_const_button.cpp +++ b/kcalc/kcalc_const_button.cpp @@ -24,7 +24,7 @@ #include <kcmenumngr.h> #include <kinputdialog.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include "kcalc_const_button.h" #include "kcalc_const_menu.h" diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc index dd24702..49ea862 100644 --- a/kcharselect/kcharselectdia.cc +++ b/kcharselect/kcharselectdia.cc @@ -11,10 +11,10 @@ #include <kdialog.h> #include <kapplication.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeconfig.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> /******************************************************************/ /* class KCharSelectDia */ diff --git a/kcharselect/kcharselectdia.h b/kcharselect/kcharselectdia.h index 5fddec4..62f07c2 100644 --- a/kcharselect/kcharselectdia.h +++ b/kcharselect/kcharselectdia.h @@ -14,7 +14,7 @@ #include <kpushbutton.h> #include <kcharselect.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> static const char *version = "v1.1"; diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp index b90c74b..b595066 100644 --- a/kdelirc/irkick/irkick.cpp +++ b/kdelirc/irkick/irkick.cpp @@ -16,16 +16,16 @@ #include <tdeversion.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #if !(TDE_VERSION_MINOR<=1 && TDE_VERSION_RELEASE<=5) -#include <kactioncollection.h> +#include <tdeactioncollection.h> #endif #include <ksimpleconfig.h> #include <ksystemtray.h> #include <kiconloader.h> #include <kpassivepopup.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <klocale.h> #include <kaboutdialog.h> diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp index 4d2089f..a9373f9 100644 --- a/kdelirc/irkick/klircclient.cpp +++ b/kdelirc/irkick/klircclient.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <kpassivepopup.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <klocale.h> #include <kaboutdialog.h> diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp index 9e4f21d..5e7fd1c 100644 --- a/kdelirc/kcmlirc/addaction.cpp +++ b/kdelirc/kcmlirc/addaction.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kapplication.h> #include <kmessagebox.h> #include <knuminput.h> diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui index 57f3c38..dfb6f12 100644 --- a/kdelirc/kcmlirc/addactionbase.ui +++ b/kdelirc/kcmlirc/addactionbase.ui @@ -1590,12 +1590,12 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> - <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>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> @@ -1603,6 +1603,6 @@ <includehint>knuminput.h</includehint> <includehint>keditlistbox.h</includehint> <includehint>klineedit.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp index 3b38b0c..9b65e19 100644 --- a/kdelirc/kcmlirc/editaction.cpp +++ b/kdelirc/kcmlirc/editaction.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kapplication.h> #include <kmessagebox.h> #include <knuminput.h> diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index 49bc252..fc42db5 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <ksimpleconfig.h> #include <kgenericfactory.h> -#include <klistview.h> +#include <tdelistview.h> #include <kmessagebox.h> #include <kpushbutton.h> diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui index 760f4e0..b5b21bf 100644 --- a/kdelirc/kcmlirc/kcmlircbase.ui +++ b/kdelirc/kcmlirc/kcmlircbase.ui @@ -492,15 +492,15 @@ </functions> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.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> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kdelirc/kcmlirc/modeslist.h b/kdelirc/kcmlirc/modeslist.h index d81b928..d6a4b25 100644 --- a/kdelirc/kcmlirc/modeslist.h +++ b/kdelirc/kcmlirc/modeslist.h @@ -13,9 +13,9 @@ #ifndef MODESLIST_H #define MODESLIST_H -#include <klistview.h> +#include <tdelistview.h> -#include <klistview.h> +#include <tdelistview.h> /** diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui index 649cb88..811b493 100644 --- a/kdelirc/kcmlirc/newmode.ui +++ b/kdelirc/kcmlirc/newmode.ui @@ -151,7 +151,7 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui index a045921..911deb4 100644 --- a/kdelirc/kcmlirc/selectprofile.ui +++ b/kdelirc/kcmlirc/selectprofile.ui @@ -121,7 +121,7 @@ </connections> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kdf/CMakeLists.txt b/kdf/CMakeLists.txt index 43725af..22267af 100644 --- a/kdf/CMakeLists.txt +++ b/kdf/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_library( kdf_common STATIC_PIC AUTOMOC SOURCES kdfwidget.cpp kdfconfig.cpp - mntconfig.cpp disklist.cpp disks.cpp + mntconfig.cpp distdelist.cpp disks.cpp listview.cpp optiondialog.cpp stdoption.cpp LINK tdeui-shared tdeio-shared ) diff --git a/kdf/Makefile.am b/kdf/Makefile.am index 530aca1..0878bc9 100644 --- a/kdf/Makefile.am +++ b/kdf/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= $(all_includes) bin_PROGRAMS = kdf kwikdisk noinst_LTLIBRARIES = libkdf_common.la -libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cpp \ +libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp distdelist.cpp \ disks.cpp listview.cpp optiondialog.cpp stdoption.cpp kdf_SOURCES = kdf.cpp @@ -23,7 +23,7 @@ kcm_kdf_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_kdf_la_LIBADD = libkdf_common.la $(LIB_TDEFILE) noinst_HEADERS = kdfwidget.h kcmdf.h kdfconfig.h mntconfig.h \ -disks.h kdf.h disklist.h kwikdisk.h listview.h optiondialog.h stdoption.h +disks.h kdf.h distdelist.h kwikdisk.h listview.h optiondialog.h stdoption.h METASOURCES = AUTO diff --git a/kdf/distdelist.cpp b/kdf/distdelist.cpp index de0d213..27e26a6 100644 --- a/kdf/distdelist.cpp +++ b/kdf/distdelist.cpp @@ -1,5 +1,5 @@ /* - * disklist.cpp + * distdelist.cpp * * Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net> * @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kapplication.h> -#include "disklist.h" +#include "distdelist.h" #define BLANK ' ' #define DELIMITER '#' @@ -497,7 +497,7 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk) } -#include "disklist.moc" +#include "distdelist.moc" diff --git a/kdf/distdelist.h b/kdf/distdelist.h index cee71b9..81871b2 100644 --- a/kdf/distdelist.h +++ b/kdf/distdelist.h @@ -1,5 +1,5 @@ /* - * disklist.h + * distdelist.h * * Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net> * diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp index 26e4fbb..4b816e4 100644 --- a/kdf/kdf.cpp +++ b/kdf/kdf.cpp @@ -20,14 +20,14 @@ */ #include <kapplication.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kcmdlineargs.h> #include <kaboutdata.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include "kdf.h" -#include <kpopupmenu.h> +#include <tdepopupmenu.h> static const char description[] = I18N_NOOP("TDE free disk space utility"); @@ -22,7 +22,7 @@ #ifndef __KDF_H__ #define __KDF_H__ -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmenubar.h> #include "kdfwidget.h" diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index d9aaffd..2698038 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -38,7 +38,7 @@ #include <kapplication.h> #include <kcmenumngr.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include "listview.h" diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h index 872379f..e7bdef5 100644 --- a/kdf/kdfwidget.h +++ b/kdf/kdfwidget.h @@ -31,7 +31,7 @@ #include <tqlistview.h> #include "disks.h" -#include "disklist.h" +#include "distdelist.h" #include "mntconfig.h" #include "kdfconfig.h" #include "stdoption.h" diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp index 1bf7096..94559d1 100644 --- a/kdf/kwikdisk.cpp +++ b/kdf/kwikdisk.cpp @@ -35,13 +35,13 @@ #include <tqbitmap.h> #include <tqpainter.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <klocale.h> #include <kapplication.h> #include <kaboutdata.h> #include <kcmdlineargs.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <krun.h> static const char description[] = diff --git a/kdf/kwikdisk.h b/kdf/kwikdisk.h index 5ce0d23..354de45 100644 --- a/kdf/kwikdisk.h +++ b/kdf/kwikdisk.h @@ -28,11 +28,11 @@ #include <config.h> #endif -#include "disklist.h" +#include "distdelist.h" #include "stdoption.h" #include "optiondialog.h" -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <ksystemtray.h> /** diff --git a/kdf/listview.h b/kdf/listview.h index 196fc17..f8a8424 100644 --- a/kdf/listview.h +++ b/kdf/listview.h @@ -23,7 +23,7 @@ #include <tqdict.h> #include <tqpixmap.h> -#include <klistview.h> +#include <tdelistview.h> class CListView : public TDEListView { diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp index 27249aa..aa2b566 100644 --- a/kdf/mntconfig.cpp +++ b/kdf/mntconfig.cpp @@ -55,7 +55,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) GUI = !init; if (GUI) { - //tabList fillup waits until disklist.readDF() is done... + //tabList fillup waits until distdelist.readDF() is done... mDiskList.readFSTAB(); mDiskList.readDF(); mInitializing = true; diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h index f0b910a..3ae0c1a 100644 --- a/kdf/mntconfig.h +++ b/kdf/mntconfig.h @@ -30,7 +30,7 @@ #include <kiconloader.h> #include "disks.h" -#include "disklist.h" +#include "distdelist.h" class TQGroupBox; class TQPushButton; diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index b2b3e79..b666d1c 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -31,14 +31,14 @@ #include <tqpainter.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcmdlineargs.h> #include <tdeconfigdialog.h> #include <kcursor.h> #include <keditcl.h> #include <tdefileitem.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <tdeio/netaccess.h> #include <kmessagebox.h> #include <kprinter.h> diff --git a/kedit/kedit.h b/kedit/kedit.h index 30791c3..9751b57 100644 --- a/kedit/kedit.h +++ b/kedit/kedit.h @@ -29,7 +29,7 @@ #include "version.h" -#include <kmainwindow.h> +#include <tdemainwindow.h> class KEdit; class KSpell; diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp index 3e1c4fe..41dd04e 100644 --- a/kedit/ktextfiledlg.cpp +++ b/kedit/ktextfiledlg.cpp @@ -24,8 +24,8 @@ #include <klocale.h> #include <kcharsets.h> #include <kdiroperator.h> -#include <krecentdocument.h> -#include <ktoolbar.h> +#include <tderecentdocument.h> +#include <tdetoolbar.h> #include <kpushbutton.h> #include "ktextfiledlg.h" diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp index d29bf11..dcc9d27 100644 --- a/kfloppy/floppy.cpp +++ b/kfloppy/floppy.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <khelpmenu.h> #include <kpushbutton.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kapplication.h> #include <kprogress.h> #include <klocale.h> diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui index 121f468..677f561 100644 --- a/kgpg/conf_servers.ui +++ b/kgpg/conf_servers.ui @@ -113,6 +113,6 @@ all others will be stored for use by KGpg only.</string> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp index 30a5ca0..2fe2ce3 100644 --- a/kgpg/detailedconsole.cpp +++ b/kgpg/detailedconsole.cpp @@ -23,7 +23,7 @@ #include <kmessagebox.h> #include <klocale.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kglobal.h> #include "kgpgoptions.h" diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index ba7b641..15a6e67 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -21,7 +21,7 @@ #include <tqfile.h> #include <kprocio.h> #include <kpassivepopup.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqregexp.h> #include <ktempfile.h> #include <tqimage.h> diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index c731fbe..8f05a83 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -38,12 +38,12 @@ #include <klocale.h> #include <kprocess.h> #include <kprocio.h> -#include <klistview.h> +#include <tdelistview.h> #include <kstatusbar.h> #include <tdeconfig.h> #include <klineedit.h> #include <ksimpleconfig.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index d3eecbc..776c60f 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -58,7 +58,7 @@ #include <dcopclient.h> #include <kstandarddirs.h> #include <tdefiledialog.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqcursor.h> #include <kdesktopfile.h> diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index c39ca0e..e797d28 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -22,11 +22,11 @@ #include <config.h> #endif -#include <kaction.h> +#include <tdeaction.h> #include <ksystemtray.h> #include <kuniqueapplication.h> #include <kurl.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <tqlabel.h> #include <tqstringlist.h> diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index 1351933..212d9a3 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -17,7 +17,7 @@ #include <stdlib.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdefiledialog.h> #include <klocale.h> #include <dcopclient.h> @@ -470,7 +470,7 @@ void KgpgApp::slotCheckMd5() Md5Widget *mdwidget=new Md5Widget(this,0,url); mdwidget->exec(); delete mdwidget; - // KMessageBox::information(this,TQString("MD5 sum for "+url.fileName()+" is:\n"+chectdefile.hexDigest().data())); + // KMessageBox::information(this,TQString("MD5 sum for "+url.fileName()+" is:\n"+checkfile.hexDigest().data())); } } diff --git a/kgpg/kgpgeditor.h b/kgpg/kgpgeditor.h index e480207..4f8a9fb 100644 --- a/kgpg/kgpgeditor.h +++ b/kgpg/kgpgeditor.h @@ -22,7 +22,7 @@ #include <config.h> #endif -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqstringlist.h> #include <kurl.h> diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 28ce7d0..965a9d9 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -35,7 +35,7 @@ #include <kcharsets.h> #include <kpassivepopup.h> #include <kiconloader.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqtextcodec.h> #include <kprocess.h> #include <kprocio.h> @@ -617,10 +617,10 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p mdSum=TQString(); TQFile f(url.path()); f.open( IO_ReadOnly); - KMD5 chectdefile; - chectdefile.reset(); - chectdefile.update(*TQT_TQIODEVICE(&f)); - mdSum=chectdefile.hexDigest().data(); + KMD5 checkfile; + checkfile.reset(); + checkfile.update(*TQT_TQIODEVICE(&f)); + mdSum=checkfile.hexDigest().data(); f.close(); TQWidget *page = new TQWidget(this); diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h index 0785945..267b7f6 100644 --- a/kgpg/kgpglibrary.h +++ b/kgpg/kgpglibrary.h @@ -21,7 +21,7 @@ #include <tqobject.h> #include <kurl.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <tdeio/job.h> class KPassivePopup; diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 9a4d6ed..7113b4e 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -31,7 +31,7 @@ #include <tqradiobutton.h> #include <tqpushbutton.h> #include <tqfont.h> -#include <kaction.h> +#include <tdeaction.h> #include <kmessagebox.h> #include <klineedit.h> #include <kcombobox.h> @@ -39,7 +39,7 @@ #include <kiconloader.h> #include <tdefiledialog.h> #include <kinputdialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kdesktopfile.h> #include <kstandarddirs.h> #include <kcolorbutton.h> diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index 1f1e166..aafa0fb 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -35,7 +35,7 @@ #include <tqlayout.h> #include <kbuttonbox.h> #include <unistd.h> -#include <kaction.h> +#include <tdeaction.h> #include <klineedit.h> #include <tqtextcodec.h> diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index acfe42e..5804280 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -41,7 +41,7 @@ #include <kprocess.h> #include <kprocio.h> #include <tqwidget.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <tqtoolbutton.h> @@ -52,8 +52,8 @@ #include <tdeio/netaccess.h> #include <kurl.h> #include <tdefiledialog.h> -#include <kshortcut.h> -#include <kstdaccel.h> +#include <tdeshortcut.h> +#include <tdestdaccel.h> #include <klocale.h> #include <ktip.h> #include <krun.h> @@ -1559,15 +1559,15 @@ void listKeys::slotexport() } } else { - TQStringList klist; + TQStringList tdelist; for ( uint i = 0; i < exportList.count(); ++i ) if ( exportList.at(i) ) - klist.append(exportList.at(i)->text(6).stripWhiteSpace()); + tdelist.append(exportList.at(i)->text(6).stripWhiteSpace()); KgpgInterface *kexp=new KgpgInterface(); - TQString result=kexp->getKey(klist,exportAttr); + TQString result=kexp->getKey(tdelist,exportAttr); if (page->checkClipboard->isChecked()) slotProcessExportClip(result); //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessExportClip(TQString))); diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h index 73e9818..55af3b5 100644 --- a/kgpg/listkeys.h +++ b/kgpg/listkeys.h @@ -19,11 +19,11 @@ #define LISTKEYS_H #include <kdialogbase.h> -#include <klistview.h> -#include <kmainwindow.h> -#include <klistviewsearchline.h> +#include <tdelistview.h> +#include <tdemainwindow.h> +#include <tdelistviewsearchline.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <tqclipboard.h> #include "dcopiface.h" @@ -33,7 +33,7 @@ #include <kurl.h> #include <tqcheckbox.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class TQPushButton; class TQPopupMenu; diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 46a9f61..fd7343b 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -29,16 +29,16 @@ #include <tqtextcodec.h> #include <tdeversion.h> -#include <klistview.h> +#include <tdelistview.h> #include <kprocess.h> #include <kprocio.h> #include <klocale.h> -#include <kaccel.h> +#include <tdeaccel.h> #if KDE_IS_VERSION( 3, 2, 90 ) -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #endif #include <kactivelabel.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kiconloader.h> #include <klineedit.h> @@ -49,7 +49,7 @@ #include "kgpgview.h" #include "kgpg.h" -///////////////// klistviewitem special +///////////////// tdelistviewitem special class UpdateViewItem2 : public TDEListViewItem { diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h index 9bf910c..8f9e418 100644 --- a/kgpg/popuppublic.h +++ b/kgpg/popuppublic.h @@ -20,7 +20,7 @@ #include <kdialogbase.h> //#include <kiconloader.h> -#include <kshortcut.h> +#include <tdeshortcut.h> class TQPushButton; diff --git a/kgpg/searchres.ui b/kgpg/searchres.ui index 8fd7379..3a9a325 100644 --- a/kgpg/searchres.ui +++ b/kgpg/searchres.ui @@ -119,6 +119,6 @@ <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc index 50ce5cc..7e50919 100644 --- a/khexedit/hexviewwidget.cc +++ b/khexedit/hexviewwidget.cc @@ -26,7 +26,7 @@ #include <kglobalsettings.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <kurldrag.h> diff --git a/khexedit/lib/Makefile.am b/khexedit/lib/Makefile.am index e2f9b3c..6b124d3 100644 --- a/khexedit/lib/Makefile.am +++ b/khexedit/lib/Makefile.am @@ -26,7 +26,7 @@ noinst_HEADERS = kcolumn.h kbordercolumn.h koffsetcolumn.h \ kbuffercolumn.h kvaluecolumn.h kcharcolumn.h \ kbytecodec.h koffsetformat.h khexedit_export.h \ kbuffercursor.h kbufferlayout.h kbufferranges.h \ - kbuffercoord.h kselection.h \ + kbuffercoord.h tdeselection.h \ kcursor.h kbufferdrag.h \ kcoordrange.h ksectionlist.h kcoordrangelist.h \ khechar.h kcharcodec.h \ diff --git a/khexedit/lib/kbufferranges.h b/khexedit/lib/kbufferranges.h index 622ff4a..28e9f80 100644 --- a/khexedit/lib/kbufferranges.h +++ b/khexedit/lib/kbufferranges.h @@ -20,7 +20,7 @@ // lib specific #include "kbufferlayout.h" -#include "kselection.h" +#include "tdeselection.h" #include "ksectionlist.h" #include "kcoordrangelist.h" diff --git a/khexedit/listview.h b/khexedit/listview.h index acb020d..6fe963c 100644 --- a/khexedit/listview.h +++ b/khexedit/listview.h @@ -21,7 +21,7 @@ #ifndef _LISTVIEW_H_ #define _LISTVIEW_H_ -#include <klistview.h> +#include <tdelistview.h> class CListView : public TDEListView { diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc index 94c18d1..05a86ca 100644 --- a/khexedit/optiondialog.cc +++ b/khexedit/optiondialog.cc @@ -33,7 +33,7 @@ #include <kcolordialog.h> #include <kcolordrag.h> -#include <kfontdialog.h> // For TDEFontChooser +#include <tdefontdialog.h> // For TDEFontChooser #include <kiconloader.h> #include <klocale.h> #include <kglobalsettings.h> diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h index 31debab..9cf9e1e 100644 --- a/khexedit/optiondialog.h +++ b/khexedit/optiondialog.h @@ -35,7 +35,7 @@ class TDEFontChooser; #include <kdialogbase.h> -#include <klistbox.h> +#include <tdelistbox.h> #include "hexeditstate.h" diff --git a/khexedit/parts/kpart/khebrowserextension.cpp b/khexedit/parts/kpart/khebrowserextension.cpp index 5c6a192..6adebaa 100644 --- a/khexedit/parts/kpart/khebrowserextension.cpp +++ b/khexedit/parts/kpart/khebrowserextension.cpp @@ -16,7 +16,7 @@ // qt specific -#include <kaction.h> +#include <tdeaction.h> // app specific #include "khexedit.h" #include "khepart.h" diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp index 7fb6a33..f7afb56 100644 --- a/khexedit/parts/kpart/khepart.cpp +++ b/khexedit/parts/kpart/khepart.cpp @@ -18,7 +18,7 @@ // kde specific #include <klocale.h> //#include <kinstance.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> //#include <kglobalsettings.h> // app specific diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc index ded9e20..13d70fb 100644 --- a/khexedit/toplevel.cc +++ b/khexedit/toplevel.cc @@ -25,14 +25,14 @@ #include <tqtimer.h> #include <tqtooltip.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> #include <kstatusbar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> #include <kdebug.h> #include <kurl.h> #include <kurldrag.h> @@ -376,7 +376,7 @@ void KHexEdit::initialize( bool openFiles ) if ( openFiles && editor()->openFile() != SDisplayMisc::none ) { - // Code modified from tdelibs/tdeui/kactionclasses.cpp TDERecentFilesAction::loadEntries + // Code modified from tdelibs/tdeui/tdeactionclasses.cpp TDERecentFilesAction::loadEntries TDEConfig* config = kapp->config(); diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h index e92503d..a31871c 100644 --- a/khexedit/toplevel.h +++ b/khexedit/toplevel.h @@ -27,8 +27,8 @@ #include <tqptrlist.h> #include <kapplication.h> -#include <kstdaccel.h> -#include <kmainwindow.h> +#include <tdestdaccel.h> +#include <tdemainwindow.h> #include "hexbuffer.h" #include "hexmanagerwidget.h" diff --git a/kjots/CHANGES b/kjots/CHANGES index 9815d90..e2da856 100644 --- a/kjots/CHANGES +++ b/kjots/CHANGES @@ -37,7 +37,7 @@ new in version 0.2.5 - more kde conforming due to the use of KTopLevelWidget new in version 0.2.4 -- uses kfontdialog to set the font of the editor widget +- uses tdefontdialog to set the font of the editor widget - you may select an URL in your text and press the right mouse button to execute a program with this URL. The program to execute is configurable for http and ftp URLs. diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 95fe7d7..4d42209 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -24,7 +24,7 @@ #include <tdeio/netaccess.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kbookmarkmenu.h> #include <tdeconfigdialog.h> @@ -34,10 +34,10 @@ #include <kglobalsettings.h> #include <kinputdialog.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <krun.h> #include <kstandarddirs.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <ktextbrowser.h> #include "KJotsMain.h" diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h index 565ab32..0f24e5a 100644 --- a/kjots/KJotsMain.h +++ b/kjots/KJotsMain.h @@ -27,7 +27,7 @@ #include <tqpushbutton.h> #include <kdialogbase.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class TQGroupBox; class TQWidgetStack; diff --git a/kjots/confpagefont.ui b/kjots/confpagefont.ui index c82914e..75bfcb8 100644 --- a/kjots/confpagefont.ui +++ b/kjots/confpagefont.ui @@ -33,6 +33,6 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>kfontdialog.h</includehint> + <includehint>tdefontdialog.h</includehint> </includehints> </UI> diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp index f6be76f..29fe021 100644 --- a/kjots/kjotsedit.cpp +++ b/kjots/kjotsedit.cpp @@ -24,7 +24,7 @@ #include <tqpaintdevicemetrics.h> #include <tqcursor.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <keditcl.h> #include <klocale.h> #include <kopenwith.h> diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h index d80a219..45c165d 100644 --- a/kjots/kjotsentry.h +++ b/kjots/kjotsentry.h @@ -23,7 +23,7 @@ #ifndef __KJOTSENTRY_H #define __KJOTSENTRY_H -#include <klistview.h> +#include <tdelistview.h> #include <kprinter.h> // diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index f1e901d..d18702e 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -28,7 +28,7 @@ #include <tqslider.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <dcopclient.h> #include <dcopref.h> #include "kpcmciainfo.h" diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h index 8649e03..7730a58 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -25,7 +25,7 @@ #ifndef _GENERICMONITOR_H_ #define _GENERICMONITOR_H_ -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kglobalaccel.h> #include <dcopref.h> #include <kapplication.h> diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h index 7104845..1d4f3a9 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.h +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h @@ -22,7 +22,7 @@ #ifndef _KMILO_KVAIO_H_ #define _KMILO_KVAIO_H_ -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kglobalaccel.h> #include <dcopref.h> #include <kapplication.h> diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 1129586..cfdd231 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -35,7 +35,7 @@ #include <tqcstring.h> #include <tqevent.h> #include <tqdatastream.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <klocale.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index cafea4c..5f6170b 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -30,7 +30,7 @@ #include <dcopclient.h> #include <dcopref.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "kvaiodriverinterface.h" #include "monitor.h" #include "kmilo_kvaio.h" diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h index 9e7c38d..2b3a555 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h @@ -22,7 +22,7 @@ #include "compat.h" #include <tqlistbox.h> #else - #include <klistbox.h> + #include <tdelistbox.h> #endif #include "tdemultiformlistboxfactory.h" diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.h b/kregexpeditor/KMultiFormListBox/widgetwindow.h index e8998ec..5fc68f9 100644 --- a/kregexpeditor/KMultiFormListBox/widgetwindow.h +++ b/kregexpeditor/KMultiFormListBox/widgetwindow.h @@ -23,7 +23,7 @@ #include <tqlistbox.h> #else #include <kdialogbase.h> - #include <klistbox.h> + #include <tdelistbox.h> #endif #include "tdemultiformlistbox-windowed.h" diff --git a/ksim/monitorprefs.h b/ksim/monitorprefs.h index 64342a3..477210d 100644 --- a/ksim/monitorprefs.h +++ b/ksim/monitorprefs.h @@ -20,7 +20,7 @@ #ifndef MONITORPREFS_H #define MONITORPREFS_H -#include <klistview.h> +#include <tdelistview.h> #include <tqstringlist.h> namespace KSim diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index ecd19f5..e3e148c 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -30,7 +30,7 @@ #include <tqglobal.h> #include <tqpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include <kaboutapplication.h> #include <kaboutdata.h> diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index cb19b99..6aa54cd 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -33,7 +33,7 @@ #include <kaboutdata.h> #include <klocale.h> #include <kapplication.h> -#include <klistview.h> +#include <tdelistview.h> #include <kinputdialog.h> #include <tdeconfig.h> diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp index 0987237..9d85bb0 100644 --- a/ksim/monitors/filesystem/fsystemconfig.cpp +++ b/ksim/monitors/filesystem/fsystemconfig.cpp @@ -23,7 +23,7 @@ #include <tdeconfig.h> #include <klocale.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <kapplication.h> #include <knuminput.h> #include <kdebug.h> diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 873d6ac..4ecbe59 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -23,7 +23,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <knuminput.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index 6757977..a960574 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -21,12 +21,12 @@ #include <tqlayout.h> #include <tqcursor.h> -#include <klistview.h> +#include <tdelistview.h> #include <ksimpleconfig.h> #include <klocale.h> #include <kiconloader.h> #include <kapplication.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp index 6480bf5..ec02173 100644 --- a/ksim/monitors/snmp/browsedialog.cpp +++ b/ksim/monitors/snmp/browsedialog.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> -#include <klistview.h> +#include <tdelistview.h> #include <kguiitem.h> #include <klocale.h> #include <kpushbutton.h> diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui index 6cc8f72..3f5057b 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -260,6 +260,6 @@ <includehints> <includehint>kdialog.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index 1227af1..02ac2ba 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -29,7 +29,7 @@ #include <tqpushbutton.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <kmessagebox.h> #include <klocale.h> diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h index d7508ae..b0d1331 100644 --- a/ksim/monitors/snmp/configpage.h +++ b/ksim/monitors/snmp/configpage.h @@ -21,7 +21,7 @@ #define CONFIGPAGE_H #include <pluginmodule.h> -#include <klistview.h> +#include <tdelistview.h> #include "monitorconfig.h" #include "hostconfig.h" diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui index 5c6ff93..0ae6457 100644 --- a/ksim/monitors/snmp/configwidget.ui +++ b/ksim/monitors/snmp/configwidget.ui @@ -209,7 +209,7 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp index bed1e21..854b848 100644 --- a/ksim/monitors/snmp/proberesultdialog.cpp +++ b/ksim/monitors/snmp/proberesultdialog.cpp @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> using namespace KSim::Snmp; diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui index 3b950b1..e81a9f3 100644 --- a/ksim/monitors/snmp/proberesultdialogbase.ui +++ b/ksim/monitors/snmp/proberesultdialogbase.ui @@ -119,6 +119,6 @@ </connections> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index b54d761..f275b0e 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -32,9 +32,9 @@ #include <kstandarddirs.h> #include <kurllabel.h> #include <kapplication.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kcombobox.h> -#include <klistview.h> +#include <tdelistview.h> #include <ksqueezedtextlabel.h> #include <knuminput.h> #include <kseparator.h> diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h index 870423a..9036844 100644 --- a/superkaramba/src/karamba.h +++ b/superkaramba/src/karamba.h @@ -37,7 +37,7 @@ #include <tqfile.h> #include <tdefile.h> #include <tqfileinfo.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqtimer.h> #include <tqpixmap.h> #include <tqpainter.h> @@ -52,7 +52,7 @@ #include <ksharedpixmap.h> #include <tqvaluestack.h> #include <dcopclient.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqcursor.h> #include <netwm.h> #include <kiconloader.h> diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp index 05809e5..f4215f0 100644 --- a/superkaramba/src/main.cpp +++ b/superkaramba/src/main.cpp @@ -27,7 +27,7 @@ #include <kcmdlineargs.h> #include <klocale.h> #include <tdeconfig.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqfileinfo.h> #include <tqstringlist.h> #include <tdeconfig.h> diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 9e10123..9186349 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -80,7 +80,7 @@ TaskManager::~TaskManager() void TaskManager::configure_startup() { - TDEConfig c("klaunchrc", true); + TDEConfig c("tdelaunchrc", true); c.setGroup("FeedbackStyle"); if (!c.readBoolEntry("TaskbarButton", true)) return; diff --git a/tdewallet/allyourbase.h b/tdewallet/allyourbase.h index 34c37d3..b6b0770 100644 --- a/tdewallet/allyourbase.h +++ b/tdewallet/allyourbase.h @@ -22,7 +22,7 @@ #define ALLYOURBASE_H #include <kiconview.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdewallet.h> #include <kiconloader.h> #include <kicontheme.h> diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp index 406a58e..96cd94b 100644 --- a/tdewallet/konfigurator/konfigurator.cpp +++ b/tdewallet/konfigurator/konfigurator.cpp @@ -27,7 +27,7 @@ #include <kdialog.h> #include <kgenericfactory.h> #include <kinputdialog.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdewallet.h> #include <tqcheckbox.h> diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp index 3d85950..c7b17ae 100644 --- a/tdewallet/kwmapeditor.cpp +++ b/tdewallet/kwmapeditor.cpp @@ -19,10 +19,10 @@ #include "kwmapeditor.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> #include <twin.h> diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp index 05b6e83..054824b 100644 --- a/tdewallet/tdewalleteditor.cpp +++ b/tdewallet/tdewalleteditor.cpp @@ -26,7 +26,7 @@ #include <dcopclient.h> #include <dcopref.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kdialog.h> @@ -34,11 +34,11 @@ #include <kiconview.h> #include <kinputdialog.h> #include <tdeio/netaccess.h> -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include <klocale.h> #include <kmdcodec.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <ksqueezedtextlabel.h> #include <kstandarddirs.h> #include <kstdaction.h> diff --git a/tdewallet/tdewalleteditor.h b/tdewallet/tdewalleteditor.h index 6016c95..83d5138 100644 --- a/tdewallet/tdewalleteditor.h +++ b/tdewallet/tdewalleteditor.h @@ -23,7 +23,7 @@ #include "walletwidget.h" #include <tdewallet.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqstringlist.h> class TDEAction; diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp index 25978f5..296e2e5 100644 --- a/tdewallet/tdewalletmanager.cpp +++ b/tdewallet/tdewalletmanager.cpp @@ -25,7 +25,7 @@ #include <dcopclient.h> #include <dcopref.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/tdewallet/tdewalletmanager.h b/tdewallet/tdewalletmanager.h index 0a12f99..77cf00f 100644 --- a/tdewallet/tdewalletmanager.h +++ b/tdewallet/tdewalletmanager.h @@ -20,7 +20,7 @@ #ifndef KWALLETMANAGER_H #define KWALLETMANAGER_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <dcopobject.h> #include <tqptrlist.h> diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp index 4a2037a..d95ac73 100644 --- a/tdewallet/tdewalletpopup.cpp +++ b/tdewallet/tdewalletpopup.cpp @@ -20,7 +20,7 @@ #include "tdewalletpopup.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kiconview.h> #include <klocale.h> diff --git a/tdewallet/tdewalletpopup.h b/tdewallet/tdewalletpopup.h index c0b5616..ab8cc8f 100644 --- a/tdewallet/tdewalletpopup.h +++ b/tdewallet/tdewalletpopup.h @@ -20,7 +20,7 @@ #ifndef KWALLETPOPUP_H #define KWALLETPOPUP_H -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqmap.h> #include <tqstring.h> |