-rw-r--r-- | library/qpeapplication.cpp | 8 | ||||
-rw-r--r-- | library/qpeapplication.h | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f5bf0c5..7463074 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -1046,53 +1046,51 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data applyStyle(); } else if ( msg == "toggleApplicationMenu()" ) { QWidget *active = activeWindow ( ); if ( active ) { QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( ); bool oldactive = man-> isActive ( ); man-> setActive( !man-> isActive() ); if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" ); } } } else if ( msg == "setDefaultRotation(int)" ) { if ( type() == GuiServer ) { int r; stream >> r; setDefaultRotation( r ); } } else if ( msg == "setCurrentRotation(int)" ) { - if ( type() == GuiServer ) { - int r; - stream >> r; - setCurrentRotation( r ); - } + int r; + stream >> r; + setCurrentRotation( r ); } else if ( msg == "shutdown()" ) { if ( type() == GuiServer ) shutdown(); } else if ( msg == "quit()" ) { if ( type() != GuiServer ) tryQuit(); } else if ( msg == "forceQuit()" ) { if ( type() != GuiServer ) quit(); } else if ( msg == "restart()" ) { if ( type() == GuiServer ) restart(); } else if ( msg == "language(QString)" ) { if ( type() == GuiServer ) { QString l; stream >> l; QString cl = getenv( "LANG" ); if ( cl != l ) { if ( l.isNull() ) diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 82954d0..4c37ea6 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h @@ -144,53 +144,48 @@ 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 { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ inline void QPEApplication::setCurrentRotation( int r ) { - if ( qApp->type() != GuiServer ) { - QCopEnvelope e( "QPE/System", "setCurrentRotation(int)" ); - e << r; - return; - } Transformation e; switch (r) { case 0: 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 ); } |