author | kergoth <kergoth> | 2003-01-26 20:27:10 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-26 20:27:10 (UTC) |
commit | 4ce67fbdfb5e82bbde3a8963d3e956567438689d (patch) (side-by-side diff) | |
tree | e35167d7c0d16aa462b336cd4aa4cba64c292892 | |
parent | 06d7d61516ee27b60c39453ef61215708aa3468a (diff) | |
download | opie-4ce67fbdfb5e82bbde3a8963d3e956567438689d.zip opie-4ce67fbdfb5e82bbde3a8963d3e956567438689d.tar.gz opie-4ce67fbdfb5e82bbde3a8963d3e956567438689d.tar.bz2 |
None->Rot0 name for transformation enum, as it stomped on someone elses None ;)
-rw-r--r-- | libopie/odevice.cpp | 2 | ||||
-rw-r--r-- | library/qpeapplication.h | 4 |
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 @@ -206,97 +206,97 @@ static QCString makeChannel ( const char *str ) { if ( str && !::strchr ( str, '/' )) return QCString ( "QPE/Application/" ) + str; else return str; } ODevice *ODevice::inst ( ) { static ODevice *dev = 0; if ( !dev ) { if ( QFile::exists ( "/proc/hal/model" )) dev = new iPAQ ( ); else if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) dev = new Zaurus ( ); else dev = new ODevice ( ); dev-> init ( ); } 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 ); b. setUserText ( qApp-> translate ( "Button", ib-> utext )); b. setPixmap ( Resource::loadPixmap ( ib-> pix )); b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); d-> m_buttons. append ( b ); } } reloadButtonMapping ( ); } ODevice::~ODevice ( ) { delete d; } bool ODevice::setSoftSuspend ( bool /*soft*/ ) { return false; } //#include <linux/apm_bios.h> #define APM_IOC_SUSPEND OD_IO( 'A', 2 ) diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 7505115..7f74510 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h @@ -112,77 +112,77 @@ protected: void internalSetStyle( const QString &style ); void prepareForTermination(bool willrestart); virtual void restart(); virtual void shutdown(); bool eventFilter( QObject *, QEvent * ); void timerEvent( QTimerEvent * ); bool raiseAppropriateWindow(); virtual void tryQuit(); virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) private: void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QCopChannel *sysChannel; QCopChannel *pidChannel; #endif QPEApplicationData *d; bool reserved_sh; }; 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 |