summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-09-08 21:05:17 (UTC)
committer mickeyl <mickeyl>2004-09-08 21:05:17 (UTC)
commit189f40847bbaaed928cb99d64f51f708c96a967b (patch) (side-by-side diff)
treef0f1b7fac675e960be2472dcd7ea4b64034630a0
parentdbab81a4311ab27fd991a7f56f7804d2212d057d (diff)
downloadopie-189f40847bbaaed928cb99d64f51f708c96a967b.zip
opie-189f40847bbaaed928cb99d64f51f708c96a967b.tar.gz
opie-189f40847bbaaed928cb99d64f51f708c96a967b.tar.bz2
remove things like \n and \l from the system version string
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 129215b..280b0c5 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -170,49 +170,49 @@ ODevice::ODevice()
d->m_holdtime = 1000; // 1000ms
d->m_buttons = 0;
d->m_cpu_frequencies = new QStrList;
/* mixer */
d->m_sound = d->m_vol = d->m_mixer = -1;
// New distribution detection code first checks for legacy distributions,
// identified by /etc/familiar-version or /etc/oz_version.
// Then check for OpenEmbedded and lastly, read /etc/issue
for ( unsigned int i = 0; i < sizeof distributions; ++i )
{
if ( QFile::exists( distributions[i].sysvfile ) )
{
d->m_systemstr = distributions[i].sysstr;
d->m_system = distributions[i].system;
d->m_sysverstr = "<Unknown>";
QFile f( distributions[i].sysvfile );
if ( f.open( IO_ReadOnly ) )
{
QTextStream ts( &f );
- d->m_sysverstr = ts.readLine();
+ d->m_sysverstr = ts.readLine().replace( QRegExp( "\\\\." ), "" );
}
break;
}
}
}
void ODevice::systemMessage( const QCString &msg, const QByteArray & )
{
if ( msg == "deviceButtonMappingChanged()" ) {
reloadButtonMapping();
}
}
void ODevice::init(const QString&)
{
}
/**
* This method initialises the button mapping
*/
void ODevice::initButtons()
{
if ( d->m_buttons )
return;