author | mickeyl <mickeyl> | 2005-05-19 11:59:50 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-19 11:59:50 (UTC) |
commit | cdecf5d75233150cba06094262158fb218e9bf03 (patch) (side-by-side diff) | |
tree | 7cd9a17fc2eb820638e73945454b02c07a927520 /noncore/settings/sysinfo/devicesinfo.cpp | |
parent | ed7ba8b228d3d0ffae9c9b68900b7f723d7ade4a (diff) | |
download | opie-cdecf5d75233150cba06094262158fb218e9bf03.zip opie-cdecf5d75233150cba06094262158fb218e9bf03.tar.gz opie-cdecf5d75233150cba06094262158fb218e9bf03.tar.bz2 |
use OPcmciaSystem
Diffstat (limited to 'noncore/settings/sysinfo/devicesinfo.cpp') (more/less context) (ignore whitespace changes)
-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 @@ -21,24 +21,25 @@ _;:, .> :=|. This program is free software; you can -. .:....=;==+<; 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> @@ -176,66 +177,48 @@ InputCategory::InputCategory( DevicesView* parent ) 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() { } |