summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index d78277f..501b601 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -1126,65 +1126,65 @@ void Zaurus::init ( )
1126 QFile f ( "/proc/filesystems" ); 1126 QFile f ( "/proc/filesystems" );
1127 QString model; 1127 QString model;
1128 1128
1129 if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) { 1129 if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) {
1130 d-> m_vendorstr = "OpenZaurus Team"; 1130 d-> m_vendorstr = "OpenZaurus Team";
1131 d-> m_systemstr = "OpenZaurus"; 1131 d-> m_systemstr = "OpenZaurus";
1132 d-> m_system = System_OpenZaurus; 1132 d-> m_system = System_OpenZaurus;
1133 1133
1134 f. close ( ); 1134 f. close ( );
1135 1135
1136 f. setName ( "/etc/oz_version" ); 1136 f. setName ( "/etc/oz_version" );
1137 if ( f. open ( IO_ReadOnly )) { 1137 if ( f. open ( IO_ReadOnly )) {
1138 QTextStream ts ( &f ); 1138 QTextStream ts ( &f );
1139 d-> m_sysverstr = ts. readLine ( );//. mid ( 10 ); 1139 d-> m_sysverstr = ts. readLine ( );//. mid ( 10 );
1140 f. close ( ); 1140 f. close ( );
1141 } 1141 }
1142 } 1142 }
1143 else { 1143 else {
1144 d-> m_systemstr = "Zaurus"; 1144 d-> m_systemstr = "Zaurus";
1145 d-> m_system = System_Zaurus; 1145 d-> m_system = System_Zaurus;
1146 } 1146 }
1147 1147
1148 f. setName ( "/proc/cpuinfo" ); 1148 f. setName ( "/proc/cpuinfo" );
1149 if ( f. open ( IO_ReadOnly ) ) { 1149 if ( f. open ( IO_ReadOnly ) ) {
1150 QTextStream ts ( &f ); 1150 QTextStream ts ( &f );
1151 QString line; 1151 QString line;
1152 while( line = ts. readLine ( ) ) { 1152 while( line = ts. readLine ( ) ) {
1153 if ( line. left ( 8 ) == "Hardware" ) 1153 if ( line. left ( 8 ) == "Hardware" )
1154 break; 1154 break;
1155 } 1155 }
1156 int loc = line. find ( ":" ); 1156 int loc = line. find ( ":" );
1157 if ( loc != -1 ) 1157 if ( loc != -1 )
1158 model = line. mid ( loc + 2 ). simplifyWhitespace( ); 1158 model = line. mid ( loc + 2 ). simplifyWhiteSpace( );
1159 } 1159 }
1160 1160
1161 if ( model == "SHARP Corgi" ) { 1161 if ( model == "SHARP Corgi" ) {
1162 d-> m_model = Model_Zaurus_SLC700; 1162 d-> m_model = Model_Zaurus_SLC700;
1163 d-> m_modelstr = "Zaurus SL-C700"; 1163 d-> m_modelstr = "Zaurus SL-C700";
1164 } else if ( model == "SHARP Poodle" ) { 1164 } else if ( model == "SHARP Poodle" ) {
1165 d-> m_model = Model_Zaurus_SLB600; 1165 d-> m_model = Model_Zaurus_SLB600;
1166 d-> m_modelstr = "Zaurus SL-B500 or SL-5600"; 1166 d-> m_modelstr = "Zaurus SL-B500 or SL-5600";
1167 } else if ( model = "Sharp-Collie" ) { 1167 } else if ( model = "Sharp-Collie" ) {
1168 d-> m_model = Model_Zaurus_SL5500; 1168 d-> m_model = Model_Zaurus_SL5500;
1169 d-> m_modelstr = "Zaurus SL-5500 or SL-5000d"; 1169 d-> m_modelstr = "Zaurus SL-5500 or SL-5000d";
1170 } else { 1170 } else {
1171 d-> m_model = Model_Zaurus_SL5500; 1171 d-> m_model = Model_Zaurus_SL5500;
1172 d-> m_modelstr = "Zaurus (Model unknown)"; 1172 d-> m_modelstr = "Zaurus (Model unknown)";
1173 } 1173 }
1174 1174
1175 bool flipstate = false; 1175 bool flipstate = false;
1176 switch ( d-> m_model ) { 1176 switch ( d-> m_model ) {
1177 case Model_Zaurus_SLA300: 1177 case Model_Zaurus_SLA300:
1178 d-> m_rotation = Rot0; 1178 d-> m_rotation = Rot0;
1179 break; 1179 break;
1180 case Model_Zaurus_SLC700: 1180 case Model_Zaurus_SLC700:
1181 // Note: need to 1) set flipstate based on physical screen orientation 1181 // Note: need to 1) set flipstate based on physical screen orientation
1182 // and 2) check to see if the user overrode the rotation direction 1182 // and 2) check to see if the user overrode the rotation direction
1183 // using appearance, and if so, remove that item from the Config to 1183 // using appearance, and if so, remove that item from the Config to
1184 // ensure the rotate applet flips us back to the previous state. 1184 // ensure the rotate applet flips us back to the previous state.
1185 if ( flipstate ) { 1185 if ( flipstate ) {
1186 // 480x640 1186 // 480x640
1187 d-> m_rotation = Rot0; 1187 d-> m_rotation = Rot0;
1188 d-> m_direction = CW; 1188 d-> m_direction = CW;
1189 } else { 1189 } else {
1190 // 640x480 1190 // 640x480