| -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 @@ -32,2 +32,3 @@ _;:, .> :=|. This program is free software; you can #include <opie2/oinputsystem.h> +#include <opie2/opcmciasystem.h> #include <opie2/olayout.h> @@ -187,4 +188,3 @@ void InputCategory::populate() { - OInputDevice* dev = it.current(); - new InputDevice( this, dev->identity() ); + new InputDevice( this, it.current()->identity() ); ++it; @@ -206,25 +206,8 @@ 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; } |