Rename many classes and header files to avoid conflicts with KDE4

11 years ago · 09470cb1bf
parent 6a1e482053
commit 09470cb1bf
43 changed files with 66 additions and 66 deletions
--- 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"
--- 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;
--- 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"
--- 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>
--- 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>
--- 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>
--- 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 

--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>

--- a/kpackage/debAptInterface.h
+++ b/kpackage/debAptInterface.h
@ -29,7 +29,7 @@

 #include "../config.h"

-#include <kaction.h>
+#include <tdeaction.h>

 #include "debInterface.h"

--- 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
--- 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>
--- 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;
--- 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"
--- 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
--- 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"
--- 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;
--- 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>
--- 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;

--- 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>
--- 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

--- 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;

--- 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"
--- 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>
--- 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"

--- 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 
--- 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>

--- a/kuser/kgroupvw.h
+++ b/kuser/kgroupvw.h
@ -23,7 +23,7 @@

 #include <tqwidget.h>

-#include <klistview.h>
+#include <tdelistview.h>

 #include "kgroup.h"

--- a/kuser/kuservw.h
+++ b/kuser/kuservw.h
@ -23,7 +23,7 @@

 #include <tqwidget.h>

-#include <klistview.h>
+#include <tdelistview.h>

 #include "kuser.h"

--- 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>
--- 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>

--- 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;
--- 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"
--- 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;
--- 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);
--- 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();
--- 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++)
--- 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"
--- 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;