summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-16 01:27:37 (UTC)
committer sandman <sandman>2002-06-16 01:27:37 (UTC)
commiteb414eb5d393f0f727e833fc8901aef096558997 (patch) (side-by-side diff)
treef4b8d8ac34c7dc1b44dda8d25cd37e3ae1dffa62
parente4d3c7c1aab2b54262aafdd655edbc78d21d5ac5 (diff)
downloadopie-eb414eb5d393f0f727e833fc8901aef096558997.zip
opie-eb414eb5d393f0f727e833fc8901aef096558997.tar.gz
opie-eb414eb5d393f0f727e833fc8901aef096558997.tar.bz2
Fixed typo in iPAQ detection routine .. model enum really works now
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/ohwinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie/ohwinfo.cpp b/libopie/ohwinfo.cpp
index ae07c6c..30c47c8 100644
--- a/libopie/ohwinfo.cpp
+++ b/libopie/ohwinfo.cpp
@@ -1,84 +1,84 @@
#include <qfile.h>
#include <qtextstream.h>
#include "ohwinfo.h"
struct OHwInfoData {
QString m_vendorstr;
OHwVendor m_vendor;
QString m_modelstr;
OHwModel m_model;
};
OHwInfo *OHwInfo::inst ( )
{
static OHwInfo *inf = 0;
if ( !inf ) {
inf = new OHwInfo ( );
}
return inf;
}
OHwInfo::OHwInfo ( )
{
m_data = new OHwInfoData ( );
QFile f ( "/proc/hal/model" );
if ( f. open ( IO_ReadOnly )) {
QTextStream ts ( &f );
- m_data-> m_modelstr = ts. readLine ( );
+ m_data-> m_modelstr = "H" + ts. readLine ( );
if ( m_data-> m_modelstr == "H3100" )
m_data-> m_model = OMODEL_iPAQ_H31xx;
else if ( m_data-> m_modelstr == "H3600" )
m_data-> m_model = OMODEL_iPAQ_H36xx;
else if ( m_data-> m_modelstr == "H3700" )
m_data-> m_model = OMODEL_iPAQ_H37xx;
else if ( m_data-> m_modelstr == "H3800" )
m_data-> m_model = OMODEL_iPAQ_H38xx;
else
m_data-> m_model = OMODEL_Unknown;
m_data-> m_vendorstr = "HP";
m_data-> m_vendor = OVENDOR_HP;
f. close ( );
}
else {
m_data-> m_modelstr = "Unknown";
m_data-> m_model = OMODEL_Unknown;
m_data-> m_vendorstr = "Unkown";
m_data-> m_vendor = OVENDOR_Unknown;
}
}
OHwInfo::~OHwInfo ( )
{
delete m_data;
}
QString OHwInfo::vendorString ( )
{
return m_data-> m_vendorstr;
}
OHwVendor OHwInfo::vendor ( )
{
return m_data-> m_vendor;
}
QString OHwInfo::modelString ( )
{
return m_data-> m_modelstr;
}
OHwModel OHwInfo::model ( )
{
return m_data-> m_model;
}