diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 01:53:24 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 01:53:24 -0600 |
commit | ab30808a02417f4cb2320c9770acc223e72721fa (patch) | |
tree | a173c2d559eb1d439253cb7718ac5e888ac23eb4 | |
parent | d2811f2c1ad7edbc344e4e4973704b8924e8eba0 (diff) | |
download | tdeadmin-ab30808a02417f4cb2320c9770acc223e72721fa.tar.gz tdeadmin-ab30808a02417f4cb2320c9770acc223e72721fa.zip |
Fix unintended rename of disklist
-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 | ||||
-rw-r--r-- | lilo-config/kde-qt-common/general.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lilo-config/common/Disks.cc b/lilo-config/common/Disks.cc index eba20b3..b4a417d 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::distdelist() +StringList ptable::disklist() { /* The basics behind scanning for a disk are simple: If it can be * * opened, it exists. * @@ -121,7 +121,7 @@ StringList ptable::distdelist() StringList ptable::partlist() { StringList s; - StringList d=distdelist(); + StringList d=disklist(); 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 1ea937c..8965694 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=distdelist()); + ptable(StringList const &disks=disklist()); ptable(String const &disk); - static StringList distdelist(); + static StringList disklist(); 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 bd9683f..4171170 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.distdelist(); + StringList drives=p.disklist(); 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 2080a87..2040025 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::distdelist(); + StringList p=ptable::disklist(); p+=ptable::partlist(); p.sort(); for(StringList::const_iterator it=p.begin(); it!=p.end(); it++) |