Diffstat (limited to 'libopie2/opiecore/device/odevice.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index 62a2e03..cef7f63 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -81,54 +81,56 @@ struct default_button default_buttons [] = { | |||
81 | "QPE/TaskBar", "toggleStartMenu()" }, | 81 | "QPE/TaskBar", "toggleStartMenu()" }, |
82 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), | 82 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), |
83 | "devicebuttons/z_mail", | 83 | "devicebuttons/z_mail", |
84 | "opiemail", "raise()", | 84 | "opiemail", "raise()", |
85 | "opiemail", "newMail()" }, | 85 | "opiemail", "newMail()" }, |
86 | }; | 86 | }; |
87 | 87 | ||
88 | ODevice *ODevice::inst() | 88 | ODevice *ODevice::inst() |
89 | { | 89 | { |
90 | static ODevice *dev = 0; | 90 | static ODevice *dev = 0; |
91 | 91 | ||
92 | // rewrite this to only use /proc/cpuinfo or so | 92 | // rewrite this to only use /proc/cpuinfo or so |
93 | QString cpu_info; | ||
93 | 94 | ||
94 | if ( !dev ) | 95 | if ( !dev ) |
95 | { | 96 | { |
96 | QFile f( PATH_PROC_CPUINFO ); | 97 | QFile f( PATH_PROC_CPUINFO ); |
97 | if ( f.open( IO_ReadOnly ) ) | 98 | if ( f.open( IO_ReadOnly ) ) |
98 | { | 99 | { |
99 | QTextStream s( &f ); | 100 | QTextStream s( &f ); |
100 | while ( !s.atEnd() ) | 101 | while ( !s.atEnd() ) |
101 | { | 102 | { |
102 | QString line; | 103 | QString line; |
103 | line = s.readLine(); | 104 | line = s.readLine(); |
104 | if ( line.startsWith( "Hardware" ) ) | 105 | if ( line.startsWith( "Hardware" ) ) |
105 | { | 106 | { |
106 | qDebug( "ODevice() - found '%s'", (const char*) line ); | 107 | qDebug( "ODevice() - found '%s'", (const char*) line ); |
108 | cpu_info = line; | ||
107 | if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); | 109 | if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); |
108 | else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); | 110 | else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); |
109 | else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); | 111 | else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); |
110 | else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); | 112 | else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); |
111 | else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); | 113 | else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); |
112 | else qWarning( "ODevice() - unknown hardware - using default." ); | 114 | else qWarning( "ODevice() - unknown hardware - using default." ); |
113 | break; | 115 | break; |
114 | } | 116 | } |
115 | } | 117 | } |
116 | } | 118 | } |
117 | else | 119 | else |
118 | { | 120 | { |
119 | qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO ); | 121 | qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO ); |
120 | } | 122 | } |
121 | if ( !dev ) dev = new ODevice(); | 123 | if ( !dev ) dev = new ODevice(); |
122 | dev->init(); | 124 | dev->init(cpu_info); |
123 | } | 125 | } |
124 | return dev; | 126 | return dev; |
125 | } | 127 | } |
126 | 128 | ||
127 | ODevice::ODevice() | 129 | ODevice::ODevice() |
128 | { | 130 | { |
129 | d = new ODeviceData; | 131 | d = new ODeviceData; |
130 | 132 | ||
131 | d->m_modelstr = "Unknown"; | 133 | d->m_modelstr = "Unknown"; |
132 | d->m_model = Model_Unknown; | 134 | d->m_model = Model_Unknown; |
133 | d->m_vendorstr = "Unknown"; | 135 | d->m_vendorstr = "Unknown"; |
134 | d->m_vendor = Vendor_Unknown; | 136 | d->m_vendor = Vendor_Unknown; |
@@ -141,25 +143,25 @@ ODevice::ODevice() | |||
141 | d->m_holdtime = 1000; // 1000ms | 143 | d->m_holdtime = 1000; // 1000ms |
142 | d->m_buttons = 0; | 144 | d->m_buttons = 0; |
143 | d->m_cpu_frequencies = new QStrList; | 145 | d->m_cpu_frequencies = new QStrList; |
144 | } | 146 | } |
145 | 147 | ||
146 | void ODevice::systemMessage ( const QCString &msg, const QByteArray & ) | 148 | void ODevice::systemMessage ( const QCString &msg, const QByteArray & ) |
147 | { | 149 | { |
148 | if ( msg == "deviceButtonMappingChanged()" ) { | 150 | if ( msg == "deviceButtonMappingChanged()" ) { |
149 | reloadButtonMapping(); | 151 | reloadButtonMapping(); |
150 | } | 152 | } |
151 | } | 153 | } |
152 | 154 | ||
153 | void ODevice::init() | 155 | void ODevice::init(const QString&) |
154 | { | 156 | { |
155 | } | 157 | } |
156 | 158 | ||
157 | /** | 159 | /** |
158 | * This method initialises the button mapping | 160 | * This method initialises the button mapping |
159 | */ | 161 | */ |
160 | void ODevice::initButtons() | 162 | void ODevice::initButtons() |
161 | { | 163 | { |
162 | if ( d->m_buttons ) | 164 | if ( d->m_buttons ) |
163 | return; | 165 | return; |
164 | 166 | ||
165 | qDebug ( "init Buttons" ); | 167 | qDebug ( "init Buttons" ); |