summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-26 20:27:10 (UTC)
committer kergoth <kergoth>2003-01-26 20:27:10 (UTC)
commit4ce67fbdfb5e82bbde3a8963d3e956567438689d (patch) (side-by-side diff)
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
@@ -242,25 +242,25 @@ ODevice::ODevice ( )
{
d = new ODeviceData;
d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false;
d-> m_modelstr = "Unknown";
d-> m_model = Model_Unknown;
d-> m_vendorstr = "Unknown";
d-> m_vendor = Vendor_Unknown;
d-> m_systemstr = "Unknown";
d-> m_system = System_Unknown;
d-> m_sysverstr = "0.0";
- d-> m_rotation = None;
+ d-> m_rotation = Rot0;
d-> m_holdtime = 1000; // 1000ms
QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
}
void ODevice::systemMessage ( const QCString &msg, const QByteArray & )
{
if ( msg == "deviceButtonMappingChanged()" ) {
reloadButtonMapping ( );
}
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 7505115..7f74510 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -148,33 +148,33 @@ inline void QPEApplication::showDialog( QDialog* d, bool nomax )
} else {
d->resize(w,h);
d->show();
}
}
inline int QPEApplication::execDialog( QDialog* d, bool nomax )
{
showDialog(d,nomax);
return d->exec();
}
-enum Transformation { None, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
+enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
inline void QPEApplication::setCurrentRotation( int r )
{
Transformation e;
switch (r) {
case 0:
- e = None;
+ e = Rot0;
break;
case 90:
e = Rot90;
break;
case 180:
e = Rot180;
break;
case 270:
e = Rot270;
break;
default:
return;