author | zecke <zecke> | 2004-08-20 21:59:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-20 21:59:48 (UTC) |
commit | e67b6a8748af0856d77eeb46048d36e58314793e (patch) (unidiff) | |
tree | 284808173f9574c3c466eb8c65865bd7aed6de2d | |
parent | da08f45abfb5e74c390d12736d3db9e8050068a2 (diff) | |
download | opie-e67b6a8748af0856d77eeb46048d36e58314793e.zip opie-e67b6a8748af0856d77eeb46048d36e58314793e.tar.gz opie-e67b6a8748af0856d77eeb46048d36e58314793e.tar.bz2 |
back out unintentional change. Use an unknown ODevice instead
of Internal::Zaurus
-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 835586e..b58f9eb 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -126,49 +126,49 @@ ODevice *ODevice::inst() | |||
126 | { | 126 | { |
127 | QTextStream s( &f ); | 127 | QTextStream s( &f ); |
128 | while ( !s.atEnd() ) | 128 | while ( !s.atEnd() ) |
129 | { | 129 | { |
130 | QString line; | 130 | QString line; |
131 | line = s.readLine(); | 131 | line = s.readLine(); |
132 | if ( line.startsWith( "Hardware" ) ) | 132 | if ( line.startsWith( "Hardware" ) ) |
133 | { | 133 | { |
134 | qDebug( "ODevice() - found '%s'", (const char*) line ); | 134 | qDebug( "ODevice() - found '%s'", (const char*) line ); |
135 | cpu_info = line; | 135 | cpu_info = line; |
136 | if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); | 136 | if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); |
137 | else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); | 137 | else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); |
138 | else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); | 138 | else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); |
139 | else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); | 139 | else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); |
140 | else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); | 140 | else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); |
141 | else qWarning( "ODevice() - unknown hardware - using default." ); | 141 | else qWarning( "ODevice() - unknown hardware - using default." ); |
142 | break; | 142 | break; |
143 | } | 143 | } |
144 | } | 144 | } |
145 | } | 145 | } |
146 | else | 146 | else |
147 | { | 147 | { |
148 | qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO ); | 148 | qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO ); |
149 | } | 149 | } |
150 | if ( !dev ) dev = new Internal::Zaurus(); | 150 | if ( !dev ) dev = new ODevice(); |
151 | dev->init(cpu_info); | 151 | dev->init(cpu_info); |
152 | } | 152 | } |
153 | return dev; | 153 | return dev; |
154 | } | 154 | } |
155 | 155 | ||
156 | ODevice::ODevice() | 156 | ODevice::ODevice() |
157 | { | 157 | { |
158 | d = new ODeviceData; | 158 | d = new ODeviceData; |
159 | 159 | ||
160 | d->m_modelstr = "Unknown"; | 160 | d->m_modelstr = "Unknown"; |
161 | d->m_model = Model_Unknown; | 161 | d->m_model = Model_Unknown; |
162 | d->m_vendorstr = "Unknown"; | 162 | d->m_vendorstr = "Unknown"; |
163 | d->m_vendor = Vendor_Unknown; | 163 | d->m_vendor = Vendor_Unknown; |
164 | d->m_systemstr = "Unknown"; | 164 | d->m_systemstr = "Unknown"; |
165 | d->m_system = System_Unknown; | 165 | d->m_system = System_Unknown; |
166 | d->m_sysverstr = "0.0"; | 166 | d->m_sysverstr = "0.0"; |
167 | d->m_rotation = Rot0; | 167 | d->m_rotation = Rot0; |
168 | d->m_direction = CW; | 168 | d->m_direction = CW; |
169 | 169 | ||
170 | d->m_holdtime = 1000; // 1000ms | 170 | d->m_holdtime = 1000; // 1000ms |
171 | d->m_buttons = 0; | 171 | d->m_buttons = 0; |
172 | d->m_cpu_frequencies = new QStrList; | 172 | d->m_cpu_frequencies = new QStrList; |
173 | 173 | ||
174 | // New distribution detection code first checks for legacy distributions, | 174 | // New distribution detection code first checks for legacy distributions, |