summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sysinfo/devicesinfo.cpp31
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
@@ -31,4 +31,5 @@ _;:,     .>    :=|. This program is free software; you can
#include <opie2/odebug.h>
#include <opie2/oinputsystem.h>
+#include <opie2/opcmciasystem.h>
#include <opie2/olayout.h>
#include <opie2/olistview.h>
@@ -186,6 +187,5 @@ void InputCategory::populate()
while ( it.current() )
{
- OInputDevice* dev = it.current();
- new InputDevice( this, dev->identity() );
+ new InputDevice( this, it.current()->identity() );
++it;
}
@@ -205,27 +205,10 @@ 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() )
- {
- QString line = cardinfo.readLine();
- odebug << "got line '" << line << "'" << oendl;
- if ( line.startsWith( "Socket" ) )
- {
- new CardDevice( this, line );
- }
- else
+ OPcmciaSystem* sys = OPcmciaSystem::instance();
+ OPcmciaSystem::CardIterator it = sys->iterator();
+ while ( it.current() )
{
- continue;
- }
+ new CardDevice( this, (const char*) it.currentKey() );
+ ++it;
}
}