Rename many classes and header files to avoid conflicts with KDE4

4 files changed, 6 insertions, 6 deletions

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