summaryrefslogtreecommitdiff
authoreilers <eilers>2004-03-31 15:11:38 (UTC)
committer eilers <eilers>2004-03-31 15:11:38 (UTC)
commit10ed731c865d41955bf2aeb721cad592cd56b545 (patch) (side-by-side diff)
tree2c05853293b3e0a1020a51bb84a804e0074e2c2b
parent0a56adea03683be6066622bbbbae1f0b8c73db12 (diff)
downloadopie-10ed731c865d41955bf2aeb721cad592cd56b545.zip
opie-10ed731c865d41955bf2aeb721cad592cd56b545.tar.gz
opie-10ed731c865d41955bf2aeb721cad592cd56b545.tar.bz2
Fixed small bug, causes some crashes at startup: qDebug("... %s"); is bad.. ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index f3e2cfb..1ad0327 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -48,97 +48,97 @@ _;:, .> :=|. This program is free software; you can
/* STD */
#include <fcntl.h>
#include <math.h>
#include <stdlib.h>
#include <signal.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <unistd.h>
#ifndef QT_NO_SOUND
#include <linux/soundcard.h>
#endif
const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
using namespace Opie::Core;
ODevice *ODevice::inst()
{
static ODevice *dev = 0;
// rewrite this to only use /proc/cpuinfo or so
if ( !dev )
{
QFile f( PATH_PROC_CPUINFO );
if ( f.open( IO_ReadOnly ) )
{
QTextStream s( &f );
while ( !s.atEnd() )
{
QString line;
line = s.readLine();
if ( line.startsWith( "Hardware" ) )
{
qDebug( "ODevice() - found '%s'", (const char*) line );
if ( line.contains( "sharp", false ) ) dev = new Private::Zaurus();
else if ( line.contains( "ipaq", false ) ) dev = new Private::iPAQ();
else if ( line.contains( "simpad", false ) ) dev = new Private::SIMpad();
else if ( line.contains( "jornada", false ) ) dev = new Private::Jornada();
else if ( line.contains( "ramses", false ) ) dev = new Private::Ramses();
else qWarning( "ODevice() - unknown hardware - using default." );
break;
}
}
}
else
{
- qWarning( "ODevice() - can't open '%s' - unknown hardware - using default." );
+ qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO );
}
if ( !dev ) dev = new ODevice();
dev->init();
}
return dev;
}
ODevice::ODevice()
{
d = new ODeviceData;
d->m_modelstr = "Unknown";
d->m_model = Model_Unknown;
d->m_vendorstr = "Unknown";
d->m_vendor = Vendor_Unknown;
d->m_systemstr = "Unknown";
d->m_system = System_Unknown;
d->m_sysverstr = "0.0";
d->m_rotation = Rot0;
d->m_direction = CW;
d->m_holdtime = 1000; // 1000ms
d->m_buttons = 0;
d->m_cpu_frequencies = new QStrList;
}
void ODevice::systemMessage ( const QCString &msg, const QByteArray & )
{
if ( msg == "deviceButtonMappingChanged()" ) {
reloadButtonMapping();
}
}
void ODevice::init()
{
}
/**
* This method initialises the button mapping
*/
void ODevice::initButtons()
{
if ( d->m_buttons )
return;
qDebug ( "init Buttons" );
d->m_buttons = new QValueList <ODeviceButton>;