summaryrefslogtreecommitdiffstats
path: root/lilo-config/common/Disks.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:58 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:58 -0600
commit09470cb1bf92cbed1abf0f7096af9ed87a262624 (patch)
treee030116c829671f6a75d4fed1e2cfd786e0484fc /lilo-config/common/Disks.cc
parent6a1e482053c3400d39984fb5c6cbacf627950676 (diff)
downloadtdeadmin-09470cb1bf92cbed1abf0f7096af9ed87a262624.tar.gz
tdeadmin-09470cb1bf92cbed1abf0f7096af9ed87a262624.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'lilo-config/common/Disks.cc')
-rw-r--r--lilo-config/common/Disks.cc4
1 files changed, 2 insertions, 2 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;