diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:58 -0600 |
| commit | 09470cb1bf92cbed1abf0f7096af9ed87a262624 (patch) | |
| tree | e030116c829671f6a75d4fed1e2cfd786e0484fc /lilo-config/common | |
| parent | 6a1e482053c3400d39984fb5c6cbacf627950676 (diff) | |
| download | tdeadmin-09470cb1bf92cbed1abf0f7096af9ed87a262624.tar.gz tdeadmin-09470cb1bf92cbed1abf0f7096af9ed87a262624.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'lilo-config/common')
| -rw-r--r-- | lilo-config/common/Disks.cc | 4 | ||||
| -rw-r--r-- | lilo-config/common/Disks.h | 4 | ||||
| -rw-r--r-- | lilo-config/common/lilo.cc | 2 |
3 files changed, 5 insertions, 5 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(); |