summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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
@@ -30,6 +30,7 @@ _;:,     .>    :=|. This program is free software; you can
30/* OPIE */ 30/* OPIE */
31#include <opie2/odebug.h> 31#include <opie2/odebug.h>
32#include <opie2/oinputsystem.h> 32#include <opie2/oinputsystem.h>
33#include <opie2/opcmciasystem.h>
33#include <opie2/olayout.h> 34#include <opie2/olayout.h>
34#include <opie2/olistview.h> 35#include <opie2/olistview.h>
35#include <qpe/qpeapplication.h> 36#include <qpe/qpeapplication.h>
@@ -185,8 +186,7 @@ void InputCategory::populate()
185 OInputSystem::DeviceIterator it = sys->iterator(); 186 OInputSystem::DeviceIterator it = sys->iterator();
186 while ( it.current() ) 187 while ( it.current() )
187 { 188 {
188 OInputDevice* dev = it.current(); 189 new InputDevice( this, it.current()->identity() );
189 new InputDevice( this, dev->identity() );
190 ++it; 190 ++it;
191 } 191 }
192} 192}
@@ -204,29 +204,12 @@ CardsCategory::~CardsCategory()
204void CardsCategory::populate() 204void CardsCategory::populate()
205{ 205{
206 odebug << "CardsCategory::populate()" << oendl; 206 odebug << "CardsCategory::populate()" << oendl;
207 QString fileName; 207 OPcmciaSystem* sys = OPcmciaSystem::instance();
208 if ( QFile::exists( "/var/run/stab" ) ) { fileName = "/var/run/stab"; } 208 OPcmciaSystem::CardIterator it = sys->iterator();
209 else if ( QFile::exists( "/var/state/pcmcia/stab" ) ) { fileName = "/var/state/pcmcia/stab"; } 209 while ( it.current() )
210 else { fileName = "/var/lib/pcmcia/stab"; }
211 QFile cardinfofile( fileName );
212 if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) )
213 {
214 new CardDevice( this, "ERROR: pcmcia info file not found or unaccessible" );
215 return;
216 }
217 QTextStream cardinfo( &cardinfofile );
218 while ( !cardinfo.atEnd() )
219 { 210 {
220 QString line = cardinfo.readLine(); 211 new CardDevice( this, (const char*) it.currentKey() );
221 odebug << "got line '" << line << "'" << oendl; 212 ++it;
222 if ( line.startsWith( "Socket" ) )
223 {
224 new CardDevice( this, line );
225 }
226 else
227 {
228 continue;
229 }
230 } 213 }
231} 214}
232 215