-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 af77ed1..fcdbf45 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -146,97 +146,97 @@ ODevice *ODevice::inst() | |||
146 | qDebug( "ODevice() - found '%s'", (const char*) line ); | 146 | qDebug( "ODevice() - found '%s'", (const char*) line ); |
147 | cpu_info = line; | 147 | cpu_info = line; |
148 | if( line.contains( "genuineintel", false ) ) { | 148 | if( line.contains( "genuineintel", false ) ) { |
149 | dev = new Internal::GenuineIntel(); | 149 | dev = new Internal::GenuineIntel(); |
150 | break; | 150 | break; |
151 | } | 151 | } |
152 | } | 152 | } |
153 | } | 153 | } |
154 | } | 154 | } |
155 | else | 155 | else |
156 | { | 156 | { |
157 | qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO ); | 157 | qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO ); |
158 | } | 158 | } |
159 | if ( !dev ) dev = new ODevice(); | 159 | if ( !dev ) dev = new ODevice(); |
160 | dev->init(cpu_info); | 160 | dev->init(cpu_info); |
161 | } | 161 | } |
162 | return dev; | 162 | return dev; |
163 | } | 163 | } |
164 | 164 | ||
165 | ODevice::ODevice() | 165 | ODevice::ODevice() |
166 | { | 166 | { |
167 | d = new ODeviceData; | 167 | d = new ODeviceData; |
168 | 168 | ||
169 | d->m_modelstr = "Unknown"; | 169 | d->m_modelstr = "Unknown"; |
170 | d->m_model = Model_Unknown; | 170 | d->m_model = Model_Unknown; |
171 | d->m_vendorstr = "Unknown"; | 171 | d->m_vendorstr = "Unknown"; |
172 | d->m_vendor = Vendor_Unknown; | 172 | d->m_vendor = Vendor_Unknown; |
173 | d->m_systemstr = "Unknown"; | 173 | d->m_systemstr = "Unknown"; |
174 | d->m_system = System_Unknown; | 174 | d->m_system = System_Unknown; |
175 | d->m_sysverstr = "0.0"; | 175 | d->m_sysverstr = "0.0"; |
176 | d->m_rotation = Rot0; | 176 | d->m_rotation = Rot0; |
177 | d->m_direction = CW; | 177 | d->m_direction = CW; |
178 | 178 | ||
179 | d->m_holdtime = 1000; // 1000ms | 179 | d->m_holdtime = 1000; // 1000ms |
180 | d->m_buttons = 0; | 180 | d->m_buttons = 0; |
181 | d->m_cpu_frequencies = new QStrList; | 181 | d->m_cpu_frequencies = new QStrList; |
182 | 182 | ||
183 | 183 | ||
184 | /* mixer */ | 184 | /* mixer */ |
185 | d->m_sound = d->m_vol = d->m_mixer = -1; | 185 | d->m_sound = d->m_vol = d->m_mixer = -1; |
186 | 186 | ||
187 | /* System QCopChannel created */ | 187 | /* System QCopChannel created */ |
188 | d->m_initializedButtonQcop = false; | 188 | d->m_initializedButtonQcop = false; |
189 | 189 | ||
190 | // New distribution detection code first checks for legacy distributions, | 190 | // New distribution detection code first checks for legacy distributions, |
191 | // identified by /etc/familiar-version or /etc/oz_version. | 191 | // identified by /etc/familiar-version or /etc/oz_version. |
192 | // Then check for OpenEmbedded and lastly, read /etc/issue | 192 | // Then check for OpenEmbedded and lastly, read /etc/issue |
193 | 193 | ||
194 | for ( unsigned int i = 0; i < sizeof distributions; ++i ) | 194 | for ( unsigned int i = 0; i < sizeof(distributions)/sizeof(ODistribution); ++i ) |
195 | { | 195 | { |
196 | if ( QFile::exists( distributions[i].sysvfile ) ) | 196 | if ( QFile::exists( distributions[i].sysvfile ) ) |
197 | { | 197 | { |
198 | d->m_systemstr = distributions[i].sysstr; | 198 | d->m_systemstr = distributions[i].sysstr; |
199 | d->m_system = distributions[i].system; | 199 | d->m_system = distributions[i].system; |
200 | d->m_sysverstr = "<Unknown>"; | 200 | d->m_sysverstr = "<Unknown>"; |
201 | QFile f( distributions[i].sysvfile ); | 201 | QFile f( distributions[i].sysvfile ); |
202 | if ( f.open( IO_ReadOnly ) ) | 202 | if ( f.open( IO_ReadOnly ) ) |
203 | { | 203 | { |
204 | QTextStream ts( &f ); | 204 | QTextStream ts( &f ); |
205 | d->m_sysverstr = ts.readLine().replace( QRegExp( "\\\\." ), "" ); | 205 | d->m_sysverstr = ts.readLine().replace( QRegExp( "\\\\." ), "" ); |
206 | } | 206 | } |
207 | break; | 207 | break; |
208 | } | 208 | } |
209 | } | 209 | } |
210 | } | 210 | } |
211 | 211 | ||
212 | void ODevice::systemMessage( const QCString &msg, const QByteArray & ) | 212 | void ODevice::systemMessage( const QCString &msg, const QByteArray & ) |
213 | { | 213 | { |
214 | if ( msg == "deviceButtonMappingChanged()" ) { | 214 | if ( msg == "deviceButtonMappingChanged()" ) { |
215 | reloadButtonMapping(); | 215 | reloadButtonMapping(); |
216 | } | 216 | } |
217 | } | 217 | } |
218 | 218 | ||
219 | void ODevice::init(const QString&) | 219 | void ODevice::init(const QString&) |
220 | { | 220 | { |
221 | } | 221 | } |
222 | 222 | ||
223 | /** | 223 | /** |
224 | * This method initialises the button mapping | 224 | * This method initialises the button mapping |
225 | */ | 225 | */ |
226 | void ODevice::initButtons() | 226 | void ODevice::initButtons() |
227 | { | 227 | { |
228 | if ( d->m_buttons ) | 228 | if ( d->m_buttons ) |
229 | return; | 229 | return; |
230 | 230 | ||
231 | qDebug ( "init Buttons" ); | 231 | qDebug ( "init Buttons" ); |
232 | d->m_buttons = new QValueList <ODeviceButton>; | 232 | d->m_buttons = new QValueList <ODeviceButton>; |
233 | for ( uint i = 0; i < ( sizeof( default_buttons ) / sizeof( default_button )); i++ ) { | 233 | for ( uint i = 0; i < ( sizeof( default_buttons ) / sizeof( default_button )); i++ ) { |
234 | default_button *db = default_buttons + i; | 234 | default_button *db = default_buttons + i; |
235 | ODeviceButton b; | 235 | ODeviceButton b; |
236 | b. setKeycode ( db->code ); | 236 | b. setKeycode ( db->code ); |
237 | b. setUserText ( QObject::tr ( "Button", db->utext )); | 237 | b. setUserText ( QObject::tr ( "Button", db->utext )); |
238 | b. setPixmap ( Resource::loadPixmap ( db->pix )); | 238 | b. setPixmap ( Resource::loadPixmap ( db->pix )); |
239 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( db->fpressedservice ), db->fpressedaction )); | 239 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( db->fpressedservice ), db->fpressedaction )); |
240 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( db->fheldservice ), db->fheldaction )); | 240 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( db->fheldservice ), db->fheldaction )); |
241 | d->m_buttons->append ( b ); | 241 | d->m_buttons->append ( b ); |
242 | } | 242 | } |