-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 2 |
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() | |||
170 | 170 | ||
171 | d->m_holdtime = 1000; // 1000ms | 171 | d->m_holdtime = 1000; // 1000ms |
172 | d->m_buttons = 0; | 172 | d->m_buttons = 0; |
173 | d->m_cpu_frequencies = new QStrList; | 173 | d->m_cpu_frequencies = new QStrList; |
174 | 174 | ||
175 | 175 | ||
176 | /* mixer */ | 176 | /* mixer */ |
177 | d->m_sound = d->m_vol = d->m_mixer = -1; | 177 | d->m_sound = d->m_vol = d->m_mixer = -1; |
178 | 178 | ||
179 | // New distribution detection code first checks for legacy distributions, | 179 | // New distribution detection code first checks for legacy distributions, |
180 | // identified by /etc/familiar-version or /etc/oz_version. | 180 | // identified by /etc/familiar-version or /etc/oz_version. |
181 | // Then check for OpenEmbedded and lastly, read /etc/issue | 181 | // Then check for OpenEmbedded and lastly, read /etc/issue |
182 | 182 | ||
183 | for ( unsigned int i = 0; i < sizeof distributions; ++i ) | 183 | for ( unsigned int i = 0; i < sizeof distributions; ++i ) |
184 | { | 184 | { |
185 | if ( QFile::exists( distributions[i].sysvfile ) ) | 185 | if ( QFile::exists( distributions[i].sysvfile ) ) |
186 | { | 186 | { |
187 | d->m_systemstr = distributions[i].sysstr; | 187 | d->m_systemstr = distributions[i].sysstr; |
188 | d->m_system = distributions[i].system; | 188 | d->m_system = distributions[i].system; |
189 | d->m_sysverstr = "<Unknown>"; | 189 | d->m_sysverstr = "<Unknown>"; |
190 | QFile f( distributions[i].sysvfile ); | 190 | QFile f( distributions[i].sysvfile ); |
191 | if ( f.open( IO_ReadOnly ) ) | 191 | if ( f.open( IO_ReadOnly ) ) |
192 | { | 192 | { |
193 | QTextStream ts( &f ); | 193 | QTextStream ts( &f ); |
194 | d->m_sysverstr = ts.readLine(); | 194 | d->m_sysverstr = ts.readLine().replace( QRegExp( "\\\\." ), "" ); |
195 | } | 195 | } |
196 | break; | 196 | break; |
197 | } | 197 | } |
198 | } | 198 | } |
199 | } | 199 | } |
200 | 200 | ||
201 | void ODevice::systemMessage( const QCString &msg, const QByteArray & ) | 201 | void ODevice::systemMessage( const QCString &msg, const QByteArray & ) |
202 | { | 202 | { |
203 | if ( msg == "deviceButtonMappingChanged()" ) { | 203 | if ( msg == "deviceButtonMappingChanged()" ) { |
204 | reloadButtonMapping(); | 204 | reloadButtonMapping(); |
205 | } | 205 | } |
206 | } | 206 | } |
207 | 207 | ||
208 | void ODevice::init(const QString&) | 208 | void ODevice::init(const QString&) |
209 | { | 209 | { |
210 | } | 210 | } |
211 | 211 | ||
212 | /** | 212 | /** |
213 | * This method initialises the button mapping | 213 | * This method initialises the button mapping |
214 | */ | 214 | */ |
215 | void ODevice::initButtons() | 215 | void ODevice::initButtons() |
216 | { | 216 | { |
217 | if ( d->m_buttons ) | 217 | if ( d->m_buttons ) |
218 | return; | 218 | return; |