diff options
43 files changed, 66 insertions, 66 deletions
diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp index 98e6603..a90a45f 100644 --- a/kcron/ktapp.cpp +++ b/kcron/ktapp.cpp @@ -11,15 +11,15 @@ #include "ktapp.h" #include <kmenubar.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kmessagebox.h> #include <tdeconfig.h> #include <kapplication.h> #include <klocale.h> // i18n() #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstatusbar.h> #include "cthost.h" diff --git a/kcron/ktapp.h b/kcron/ktapp.h index 5a00140..f133291 100644 --- a/kcron/ktapp.h +++ b/kcron/ktapp.h @@ -16,7 +16,7 @@ #include <config.h> #endif -#include <kmainwindow.h> +#include <tdemainwindow.h> class TDEAction; class TQString; diff --git a/kcron/ktprintopt.cpp b/kcron/ktprintopt.cpp index f609869..e754c21 100644 --- a/kcron/ktprintopt.cpp +++ b/kcron/ktprintopt.cpp @@ -15,7 +15,7 @@ #include <tqlayout.h> #include <kdialog.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <klocale.h> #include <kapplication.h> #include "ktprintopt.h" diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp index d0ceabd..99bd359 100644 --- a/kcron/kttask.cpp +++ b/kcron/kttask.cpp @@ -22,7 +22,7 @@ #include <tqpalette.h> #include <kapplication.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <klocale.h> #include <tdefiledialog.h> #include <kmessagebox.h> diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp index 44bcece..e692279 100644 --- a/kdat/KDatMainWindow.cpp +++ b/kdat/KDatMainWindow.cpp @@ -32,8 +32,8 @@ #include <kapplication.h> #include <kiconloader.h> #include <kmenubar.h> -#include <kpopupmenu.h> -#include <ktoolbar.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> #include <kglobal.h> #include <tdeconfig.h> #include <kmessagebox.h> diff --git a/kdat/KDatMainWindow.h b/kdat/KDatMainWindow.h index d893bdc..f709f5f 100644 --- a/kdat/KDatMainWindow.h +++ b/kdat/KDatMainWindow.h @@ -19,7 +19,7 @@ #ifndef KDat_h #define KDat_h -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kdialog.h> #include <tqpushbutton.h> #include <tqlabel.h> diff --git a/knetwortdeconf/knetwortdeconf/Makefile.am b/knetwortdeconf/knetwortdeconf/Makefile.am index 3fc914f..6df330e 100644 --- a/knetwortdeconf/knetwortdeconf/Makefile.am +++ b/knetwortdeconf/knetwortdeconf/Makefile.am @@ -17,7 +17,7 @@ kcm_knetwortdeconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -n ## INCLUDES were found outside tdevelop specific part -kcm_knetwortdeconfmodule_la_SOURCES = kselectdistrodlg.ui kknownhostinfo.cpp \ +kcm_knetwortdeconfmodule_la_SOURCES = tdeselectdistrodlg.ui kknownhostinfo.cpp \ kinterfaceupdowndlg.ui kaddknownhostdlg.ui kdetectdistrodlg.ui knetwortdeconfmodule.cpp \ kroutinginfo.cpp kreloadnetworkdlg.ui kaddressvalidator.cpp kdnsinfo.cpp \ knetworkinfo.cpp kadddevicedlg.ui kadddnsserverdlg.ui knetwortdeconfigparser.cpp \ @@ -26,7 +26,7 @@ kcm_knetwortdeconfmodule_la_SOURCES = kselectdistrodlg.ui kknownhostinfo.cpp \ kprofileslistviewtooltip.cpp -EXTRA_DIST = main.cpp knetwortdeconf.cpp knetwortdeconf.h knetwortdeconf.desktop cr16-app-knetwortdeconf.png cr22-app-knetwortdeconf.png cr32-app-knetwortdeconf.png knetwortdeconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetwortdeconfigparser.cpp knetwortdeconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetwortdeconfmodule.cpp knetwortdeconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h kselectdistrodlg.ui kcm_knetwortdeconfmodule version.h +EXTRA_DIST = main.cpp knetwortdeconf.cpp knetwortdeconf.h knetwortdeconf.desktop cr16-app-knetwortdeconf.png cr22-app-knetwortdeconf.png cr32-app-knetwortdeconf.png knetwortdeconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetwortdeconfigparser.cpp knetwortdeconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetwortdeconfmodule.cpp knetwortdeconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h tdeselectdistrodlg.ui kcm_knetwortdeconfmodule version.h xdg_apps_DATA = kcm_knetwortdeconfmodule.desktop diff --git a/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui b/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui index ef47e58..c14f352 100644 --- a/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui +++ b/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui @@ -295,7 +295,7 @@ <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconf.h b/knetwortdeconf/knetwortdeconf/knetwortdeconf.h index 5948678..9ce0c29 100644 --- a/knetwortdeconf/knetwortdeconf/knetwortdeconf.h +++ b/knetwortdeconf/knetwortdeconf/knetwortdeconf.h @@ -42,11 +42,11 @@ #include <tqlayout.h> #include <kdialog.h> #include <kinputdialog.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <klineedit.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kcombobox.h> #include <kmessagebox.h> #include <kaboutapplication.h> diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui b/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui index fd6abad..a608eb0 100644 --- a/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui +++ b/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui @@ -1075,25 +1075,25 @@ </Q_SLOTS> <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>klineedit.h</includehint> <includehint>kcombobox.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.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>klineedit.h</includehint> <includehint>klineedit.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h b/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h index 8161da5..a50a741 100644 --- a/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h +++ b/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h @@ -42,7 +42,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kdebug.h> @@ -51,7 +51,7 @@ #include "kdetectdistrodlg.h" #include "kreloadnetworkdlg.h" #include "kinterfaceupdowndlg.h" -#include "kselectdistrodlg.h" +#include "tdeselectdistrodlg.h" /** *@author Juan Luis Baptiste diff --git a/knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui b/knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui index 5baaebb..ab822a2 100644 --- a/knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui +++ b/knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui @@ -135,7 +135,7 @@ <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp index c35013a..b673b4f 100644 --- a/kpackage/debAptInterface.cpp +++ b/kpackage/debAptInterface.cpp @@ -28,7 +28,7 @@ #include <stdlib.h> #include "klocale.h" -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kdebug.h> diff --git a/kpackage/debAptInterface.h b/kpackage/debAptInterface.h index 933622b..af5d7d1 100644 --- a/kpackage/debAptInterface.h +++ b/kpackage/debAptInterface.h @@ -29,7 +29,7 @@ #include "../config.h" -#include <kaction.h> +#include <tdeaction.h> #include "debInterface.h" diff --git a/kpackage/findf.h b/kpackage/findf.h index c5100f7..e2aad23 100644 --- a/kpackage/findf.h +++ b/kpackage/findf.h @@ -46,7 +46,7 @@ // KDE headers #include <kapplication.h> #include <kmenubar.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdialogbase.h> class FindF : public KDialogBase diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index 37e7944..71db454 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -41,8 +41,8 @@ #include <kprogress.h> #include <kurl.h> #include <kapplication.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include <klocale.h> #include <kinputdialog.h> #include <kglobal.h> diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h index 216ad22..dfdcc93 100644 --- a/kpackage/kpackage.h +++ b/kpackage/kpackage.h @@ -37,7 +37,7 @@ // KDE headers #include <kurl.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kpPty.h> class KFileDialog; diff --git a/kpackage/kplview.h b/kpackage/kplview.h index 239e743..73f5823 100644 --- a/kpackage/kplview.h +++ b/kpackage/kplview.h @@ -39,7 +39,7 @@ #include <tqlayout.h> // KDE headers -#include "klistview.h" +#include "tdelistview.h" // ksetup headers #include "packageInfo.h" diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp index 958b901..8856276 100644 --- a/kpackage/managementWidget.cpp +++ b/kpackage/managementWidget.cpp @@ -34,10 +34,10 @@ #include <klocale.h> #include <kdebug.h> -#include <klistviewsearchline.h> -#include <kaction.h> +#include <tdelistviewsearchline.h> +#include <tdeaction.h> #include <kstdaction.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kiconloader.h> // kpackage.headers diff --git a/kpackage/managementWidget.h b/kpackage/managementWidget.h index f681fc0..5fbe49b 100644 --- a/kpackage/managementWidget.h +++ b/kpackage/managementWidget.h @@ -53,9 +53,9 @@ #include <tqhbox.h> // KDE headers -#include <kaction.h> -#include <klistview.h> -#include <klistviewsearchline.h> +#include <tdeaction.h> +#include <tdelistview.h> +#include <tdelistviewsearchline.h> // ksetup headers #include "packageInfo.h" diff --git a/kpackage/packageDisplay.h b/kpackage/packageDisplay.h index 091e031..5a1faf4 100644 --- a/kpackage/packageDisplay.h +++ b/kpackage/packageDisplay.h @@ -46,8 +46,8 @@ #include <tqtabbar.h> #include <tqtabwidget.h> #include <tqvbox.h> -#include <kpopupmenu.h> -#include <klistview.h> +#include <tdepopupmenu.h> +#include <tdelistview.h> class packagePropertiesWidget; class packageInfo; diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp index d7c3fc1..b17d9f5 100644 --- a/kpackage/pkgOptions.cpp +++ b/kpackage/pkgOptions.cpp @@ -32,7 +32,7 @@ #include <klocale.h> #include <kglobal.h> #include <kglobalsettings.h> -#include <klistview.h> +#include <tdelistview.h> #include <kseparator.h> #include <kdebug.h> #include <kpushbutton.h> diff --git a/kpackage/utils.h b/kpackage/utils.h index 4608965..5501f91 100644 --- a/kpackage/utils.h +++ b/kpackage/utils.h @@ -29,7 +29,7 @@ #include "../config.h" #include <string.h> -#include <klistview.h> +#include <tdelistview.h> class KpTreeListItem; diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp index 2735861..3d42700 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -47,7 +47,7 @@ #include <kprocess.h> #include <kstandarddirs.h> #include <kcursor.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <klocale.h> #include <kglobalsettings.h> diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp index 67f8404..b80f503 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -52,11 +52,11 @@ #include <tqsimplerichtext.h> #include <kresolver.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kkeydialog.h> #include <kmenubar.h> #include <kcompletion.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kdebug.h> #include <kapplication.h> @@ -64,7 +64,7 @@ #include <khelpmenu.h> #include <klocale.h> #include <kmessagebox.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kedittoolbar.h> #include <kiconloader.h> #include <tdefiledialog.h> @@ -90,7 +90,7 @@ namespace Status { enum { - Changed, Checklist, Writable + Changed, Chectdelist, Writable }; } // namespace Status diff --git a/ksysv/TopWidget.h b/ksysv/TopWidget.h index 2cf56b0..522d535 100644 --- a/ksysv/TopWidget.h +++ b/ksysv/TopWidget.h @@ -15,7 +15,7 @@ #ifndef KSV_TOPWIDGET_H #define KSV_TOPWIDGET_H -#include <kmainwindow.h> +#include <tdemainwindow.h> class TQCheckBox; diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp index 1939d57..ff59c0c 100644 --- a/ksysv/ksv_conf.cpp +++ b/ksysv/ksv_conf.cpp @@ -16,7 +16,7 @@ #include <kapplication.h> #include <kglobal.h> #include <kglobalsettings.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdeconfig.h> #include "ksv_core.h" diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp index 3edaaf0..eebe6fd 100644 --- a/ksysv/ksvdraglist.cpp +++ b/ksysv/ksvdraglist.cpp @@ -45,7 +45,7 @@ #include <tqlabel.h> #include <kapplication.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kglobal.h> #include <klocale.h> #include <kdebug.h> diff --git a/ksysv/ksvdraglist.h b/ksysv/ksvdraglist.h index c086f02..6c75706 100644 --- a/ksysv/ksvdraglist.h +++ b/ksysv/ksvdraglist.h @@ -38,7 +38,7 @@ #include <tqcolor.h> #include <tqpixmap.h> -#include <klistview.h> +#include <tdelistview.h> #include "Data.h" diff --git a/ksysv/ksvlookandfeel.cpp b/ksysv/ksvlookandfeel.cpp index 3284107..e5b2137 100644 --- a/ksysv/ksvlookandfeel.cpp +++ b/ksysv/ksvlookandfeel.cpp @@ -29,7 +29,7 @@ #include <tqlayout.h> #include <kdialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> /* * Constructs a KSVLookAndFeel which is a child of 'parent', with the diff --git a/kuser/editGroup.h b/kuser/editGroup.h index 16a8ae4..9ac2cda 100644 --- a/kuser/editGroup.h +++ b/kuser/editGroup.h @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <kcombobox.h> #include <klineedit.h> diff --git a/kuser/kgroupvw.h b/kuser/kgroupvw.h index 0b29dab..4b8ff33 100644 --- a/kuser/kgroupvw.h +++ b/kuser/kgroupvw.h @@ -23,7 +23,7 @@ #include <tqwidget.h> -#include <klistview.h> +#include <tdelistview.h> #include "kgroup.h" diff --git a/kuser/kuservw.h b/kuser/kuservw.h index 15068a6..78e1072 100644 --- a/kuser/kuservw.h +++ b/kuser/kuservw.h @@ -23,7 +23,7 @@ #include <tqwidget.h> -#include <klistview.h> +#include <tdelistview.h> #include "kuser.h" diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp index fd9eee6..fc2d32a 100644 --- a/kuser/mainView.cpp +++ b/kuser/mainView.cpp @@ -26,7 +26,7 @@ #include <tqfile.h> #include <kinputdialog.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kiconloader.h> #include <kmessagebox.h> #include <kdebug.h> diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp index 046ed76..fd46949 100644 --- a/kuser/mainWidget.cpp +++ b/kuser/mainWidget.cpp @@ -21,14 +21,14 @@ #include <tqtooltip.h> #include <tqtimer.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kiconloader.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kstdaction.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstatusbar.h> #include <kedittoolbar.h> diff --git a/kuser/mainWidget.h b/kuser/mainWidget.h index dbe2b34..35d0511 100644 --- a/kuser/mainWidget.h +++ b/kuser/mainWidget.h @@ -21,7 +21,7 @@ #ifndef _KU_MAINWIDGET_H_ #define _KU_MAINWIDGET_H_ -#include <kmainwindow.h> +#include <tdemainwindow.h> class SelectConn; class mainView; diff --git a/kuser/propdlg.h b/kuser/propdlg.h index a94ddc4..c7c1fae 100644 --- a/kuser/propdlg.h +++ b/kuser/propdlg.h @@ -34,7 +34,7 @@ #include <kdatetimewidget.h> #include <knuminput.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <kcombobox.h> #include "kuser.h" diff --git a/lilo-config/common/Disks.cc b/lilo-config/common/Disks.cc index b4a417d..eba20b3 100644 --- a/lilo-config/common/Disks.cc +++ b/lilo-config/common/Disks.cc @@ -34,7 +34,7 @@ #include <stdlib.h> #include <string.h> -StringList ptable::disklist() +StringList ptable::distdelist() { /* The basics behind scanning for a disk are simple: If it can be * * opened, it exists. * @@ -121,7 +121,7 @@ StringList ptable::disklist() StringList ptable::partlist() { StringList s; - StringList d=disklist(); + StringList d=distdelist(); for(StringList::const_iterator it=d.begin(); it!=d.end(); it++) { for(int i=1; i<32; i++) { String drive; diff --git a/lilo-config/common/Disks.h b/lilo-config/common/Disks.h index 8965694..1ea937c 100644 --- a/lilo-config/common/Disks.h +++ b/lilo-config/common/Disks.h @@ -33,9 +33,9 @@ #include <map> class ptable { public: - ptable(StringList const &disks=disklist()); + ptable(StringList const &disks=distdelist()); ptable(String const &disk); - static StringList disklist(); + static StringList distdelist(); static StringList partlist(); static String mountpoint(String const &device, bool fstab_fallback=false); static String device(String const &mountpt, bool fstab_fallback=false); diff --git a/lilo-config/common/lilo.cc b/lilo-config/common/lilo.cc index 4171170..bd9683f 100644 --- a/lilo-config/common/lilo.cc +++ b/lilo-config/common/lilo.cc @@ -179,7 +179,7 @@ String const liloconf::liloOut() bool liloconf::probe() { ptable p; - StringList drives=p.disklist(); + StringList drives=p.distdelist(); String const root=p.device("/", true); checked=false; defaults.clear(); diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp index 2040025..2080a87 100644 --- a/lilo-config/kde-qt-common/general.cpp +++ b/lilo-config/kde-qt-common/general.cpp @@ -45,7 +45,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren TQLabel *drive_lbl=new TQLabel(_("Install &boot record to drive/partition:"), drv); drive=new TQComboBox(false, drv); drive_lbl->setBuddy(drive); - StringList p=ptable::disklist(); + StringList p=ptable::distdelist(); p+=ptable::partlist(); p.sort(); for(StringList::const_iterator it=p.begin(); it!=p.end(); it++) diff --git a/secpolicy/secpolicywin.cpp b/secpolicy/secpolicywin.cpp index 9404f19..14493dd 100644 --- a/secpolicy/secpolicywin.cpp +++ b/secpolicy/secpolicywin.cpp @@ -29,7 +29,7 @@ #include <kdialog.h> #include <dcopclient.h> #include <tqpopupmenu.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include "pamview.h" #include "secpolicywin.h" diff --git a/secpolicy/secpolicywin.h b/secpolicy/secpolicywin.h index 3284473..912d149 100644 --- a/secpolicy/secpolicywin.h +++ b/secpolicy/secpolicywin.h @@ -25,7 +25,7 @@ #ifndef _SECPOLICYWIN_H #define _SECPOLICYWIN_H -#include <kmainwindow.h> +#include <tdemainwindow.h> class PamView; |