| -rw-r--r-- | noncore/settings/sysinfo/devicesinfo.cpp | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp index 7e8aee8..945edea 100644 --- a/noncore/settings/sysinfo/devicesinfo.cpp +++ b/noncore/settings/sysinfo/devicesinfo.cpp @@ -17,32 +17,33 @@ _;:, .> :=|. This program is free software; you can _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = General Public License along with -- :-=` this application; see the file LICENSE.GPL. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "devicesinfo.h" /* OPIE */ #include <opie2/odebug.h> #include <opie2/oinputsystem.h> +#include <opie2/opcmciasystem.h> #include <opie2/olayout.h> #include <opie2/olistview.h> #include <qpe/qpeapplication.h> using namespace Opie::Core; using namespace Opie::Ui; /* QT */ #include <qobjectlist.h> #include <qlistview.h> #include <qcombobox.h> #include <qfile.h> #include <qpushbutton.h> #include <qtextstream.h> #include <qtextview.h> #include <qtimer.h> #include <qwhatsthis.h> @@ -172,74 +173,56 @@ void CpuCategory::populate() InputCategory::InputCategory( DevicesView* parent ) :Category( parent, "2. Input Subsystem" ) { } InputCategory::~InputCategory() { } void InputCategory::populate() { odebug << "InputCategory::populate()" << oendl; OInputSystem* sys = OInputSystem::instance(); OInputSystem::DeviceIterator it = sys->iterator(); while ( it.current() ) { - OInputDevice* dev = it.current(); - new InputDevice( this, dev->identity() ); + new InputDevice( this, it.current()->identity() ); ++it; } } //================================================================================================= CardsCategory::CardsCategory( DevicesView* parent ) :Category( parent, "3. Removable Cards" ) { } CardsCategory::~CardsCategory() { } void CardsCategory::populate() { odebug << "CardsCategory::populate()" << oendl; - QString fileName; - if ( QFile::exists( "/var/run/stab" ) ) { fileName = "/var/run/stab"; } - else if ( QFile::exists( "/var/state/pcmcia/stab" ) ) { fileName = "/var/state/pcmcia/stab"; } - else { fileName = "/var/lib/pcmcia/stab"; } - QFile cardinfofile( fileName ); - if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) ) - { - new CardDevice( this, "ERROR: pcmcia info file not found or unaccessible" ); - return; - } - QTextStream cardinfo( &cardinfofile ); - while ( !cardinfo.atEnd() ) + OPcmciaSystem* sys = OPcmciaSystem::instance(); + OPcmciaSystem::CardIterator it = sys->iterator(); + while ( it.current() ) { - QString line = cardinfo.readLine(); - odebug << "got line '" << line << "'" << oendl; - if ( line.startsWith( "Socket" ) ) - { - new CardDevice( this, line ); - } - else - { - continue; - } + new CardDevice( this, (const char*) it.currentKey() ); + ++it; } } //================================================================================================= UsbCategory::UsbCategory( DevicesView* parent ) :Category( parent, "4. Universal Serial Bus" ) { } UsbCategory::~UsbCategory() { } void UsbCategory::populate() { odebug << "UsbCategory::populate()" << oendl; |