summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-26 20:27:10 (UTC)
committer kergoth <kergoth>2003-01-26 20:27:10 (UTC)
commit4ce67fbdfb5e82bbde3a8963d3e956567438689d (patch) (unidiff)
treee35167d7c0d16aa462b336cd4aa4cba64c292892
parent06d7d61516ee27b60c39453ef61215708aa3468a (diff)
downloadopie-4ce67fbdfb5e82bbde3a8963d3e956567438689d.zip
opie-4ce67fbdfb5e82bbde3a8963d3e956567438689d.tar.gz
opie-4ce67fbdfb5e82bbde3a8963d3e956567438689d.tar.bz2
None->Rot0 name for transformation enum, as it stomped on someone elses None ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp2
-rw-r--r--library/qpeapplication.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 78eb416..9e97c56 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -250,9 +250,9 @@ ODevice::ODevice ( )
250 d-> m_vendor = Vendor_Unknown; 250 d-> m_vendor = Vendor_Unknown;
251 d-> m_systemstr = "Unknown"; 251 d-> m_systemstr = "Unknown";
252 d-> m_system = System_Unknown; 252 d-> m_system = System_Unknown;
253 d-> m_sysverstr = "0.0"; 253 d-> m_sysverstr = "0.0";
254 d-> m_rotation = None; 254 d-> m_rotation = Rot0;
255 255
256 d-> m_holdtime = 1000; // 1000ms 256 d-> m_holdtime = 1000; // 1000ms
257 257
258 QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); 258 QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 7505115..7f74510 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -156,17 +156,17 @@ inline int QPEApplication::execDialog( QDialog* d, bool nomax )
156 showDialog(d,nomax); 156 showDialog(d,nomax);
157 return d->exec(); 157 return d->exec();
158} 158}
159 159
160enum Transformation { None, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ 160enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
161 161
162inline void QPEApplication::setCurrentRotation( int r ) 162inline void QPEApplication::setCurrentRotation( int r )
163{ 163{
164 Transformation e; 164 Transformation e;
165 165
166 switch (r) { 166 switch (r) {
167 case 0: 167 case 0:
168 e = None; 168 e = Rot0;
169 break; 169 break;
170 case 90: 170 case 90:
171 e = Rot90; 171 e = Rot90;
172 break; 172 break;