None->Rot0 name for transformation enum, as it stomped on someone elses None ;)

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
@@ -230,49 +230,49 @@ ODevice *ODevice::inst ( )
 	return dev;
 }
 
 
 /**************************************************
  *
  * common
  *
  **************************************************/
 
 
 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 ( );
 	} 
 }
 
 void ODevice::init ( )
 {
 	// Simulation uses iPAQ 3660 device buttons
 
 	for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) {
 		i_button *ib = ipaq_buttons + i;	
 		ODeviceButton b;
 		
 		if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) {		
 			b. setKeycode ( ib-> code );
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 7505115..7f74510 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -136,53 +136,53 @@ private:
 };
 
 inline void QPEApplication::showDialog( QDialog* d, bool nomax )
 {
     QSize sh = d->sizeHint();
     int w = QMAX(sh.width(),d->width());
     int h = QMAX(sh.height(),d->height());
     if ( !nomax
             && ( w > qApp->desktop()->width()*3/4
                  || h > qApp->desktop()->height()*3/4 ) )
     {
         d->showMaximized();
     } 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;
     }
 
     qDebug("calling qApp->desktop()->qwsDisplay()->setTransformation( %d )\n", e);
     qApp->desktop()->qwsDisplay()->setTransformation( e );
 }
 
 
 #endif