summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-31 10:47:03 (UTC)
committer mickeyl <mickeyl>2005-08-31 10:47:03 (UTC)
commit465eb3107bb32ad7ab2d726d8a510538fca56764 (patch) (side-by-side diff)
tree8ab94dd3a9530edc08116207493b674660fc8788
parentcde931654d1966be6989e6c8f3cfacb23e6822a2 (diff)
downloadopie-465eb3107bb32ad7ab2d726d8a510538fca56764.zip
opie-465eb3107bb32ad7ab2d726d8a510538fca56764.tar.gz
opie-465eb3107bb32ad7ab2d726d8a510538fca56764.tar.bz2
diminish error message
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/devicesinfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp
index 176d178..164d608 100644
--- a/noncore/settings/sysinfo/devicesinfo.cpp
+++ b/noncore/settings/sysinfo/devicesinfo.cpp
@@ -125,49 +125,49 @@ Category::Category( DevicesView* parent, const QString& name )
{
odebug << "Category '" << name << "' inserted. Scanning for devices..." << oendl;
}
Category::~Category()
{
}
//=================================================================================================
CpuCategory::CpuCategory( DevicesView* parent )
:Category( parent, "1. Central Processing Unit" )
{
}
CpuCategory::~CpuCategory()
{
}
void CpuCategory::populate()
{
odebug << "CpuCategory::populate()" << oendl;
QFile cpuinfofile( "/proc/cpuinfo" );
if ( !cpuinfofile.exists() || !cpuinfofile.open( IO_ReadOnly ) )
{
- new CpuDevice( this, "ERROR: /proc/cpuinfo not found or unaccessible" );
+ new CpuDevice( this, "(no cpu found)" );
return;
}
QTextStream cpuinfo( &cpuinfofile );
int cpucount = 0;
CpuDevice* dev = 0;
while ( !cpuinfo.atEnd() )
{
QString line = cpuinfo.readLine();
odebug << "got line '" << line << "'" << oendl;
if ( line.lower().startsWith( "processor" ) )
{
dev = new CpuDevice( this, QString( "CPU #%1" ).arg( cpucount++ ) );
dev->addInfo( line );
}
else
{
if ( dev ) dev->addInfo( line );
}
}
}
//=================================================================================================
@@ -211,49 +211,49 @@ void CardsCategory::populate()
while ( it.current() )
{
CardDevice *dev = new CardDevice( this, it.current()->identity() );
dev->setInfo( it.current() );
++it;
}
}
//=================================================================================================
UsbCategory::UsbCategory( DevicesView* parent )
:Category( parent, "4. Universal Serial Bus" )
{
}
UsbCategory::~UsbCategory()
{
}
void UsbCategory::populate()
{
odebug << "UsbCategory::populate()" << oendl;
QFile usbinfofile( "/proc/bus/usb/devices" );
if ( !usbinfofile.exists() || !usbinfofile.open( IO_ReadOnly ) )
{
- new UsbDevice( this, "ERROR: /proc/bus/usb/devices not found or unaccessible" );
+ new UsbDevice( this, "(no USB found)" );
return;
}
QTextStream usbinfo( &usbinfofile );
int _bus, _level, _parent, _port, _count, _device, _channels, _power;
float _speed;
QString _manufacturer, _product, _serial;
int usbcount = 0;
UsbDevice* lastDev = 0;
UsbDevice* dev = 0;
while ( !usbinfo.atEnd() )
{
QString line = usbinfo.readLine();
odebug << "got line '" << line << "'" << oendl;
if ( line.startsWith( "T:" ) )
{
sscanf(line.local8Bit().data(), "T: Bus=%2d Lev=%2d Prnt=%2d Port=%d Cnt=%2d Dev#=%3d Spd=%3f MxCh=%2d", &_bus, &_level, &_parent, &_port, &_count, &_device, &_speed, &_channels);
if ( !_level )
{
odebug << "adding new bus" << oendl;
dev = new UsbDevice( this, QString( "Generic USB Hub Device" ) );
lastDev = dev;