Remove the need for explicit <= 0, >= 360 etc handling by using % 360.

1 files changed, 4 insertions, 11 deletions

diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 4743388..3a5a3c9 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -76,78 +76,71 @@ QString RotateApplet::tr( const char* s, const char* p ) const
 QIconSet RotateApplet::icon ( ) const
 {
 	QPixmap pix;
 	QImage img = Resource::loadImage ( "Rotation" );
 
 	if ( !img. isNull ( ))
 		pix. convertFromImage ( img. smoothScale ( 14, 14 ));
 	return pix;
 }
 
 QPopupMenu *RotateApplet::popup ( QWidget * ) const
 {
 	return 0;
 }
 
 void RotateApplet::activated ( )
 {
     int currentRotation = QPEApplication::defaultRotation();
 
     int newRotation;
 
     Config cfg( "qpe" );
     cfg.setGroup( "Appearance" );
 
     // 0 -> 90° clockwise, 1 -> 90° counterclockwise
     bool rotDirection = cfg.readBoolEntry( "rotatedir" );
 
     // hide inputs methods before rotation
     QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
 
     if ( m_flipped )  {
         if ( rotDirection  )  {
-            newRotation = currentRotation - 90;
-            if (newRotation <=0) newRotation = 270;
-	//ipaqs like the 36xx have the display rotated
-	// to 270 as default, and -90 is invalid => handle this here
+            newRotation = ( currentRotation + 270 ) % 360;
         } else {
-            newRotation = currentRotation + 90;
-            if(newRotation >= 360) newRotation = 0;	//ipaqs like the 36xx have the display
-            //rotated to 270 as default, so 360 does nothing => handle this here
+            newRotation = ( currentRotation + 90 ) % 360;
         }
     } else {
         if ( rotDirection )  {
-            newRotation = currentRotation + 90;
-             if(newRotation >= 360) newRotation = 0;
+            newRotation = ( currentRotation + 90 ) % 360;
         } else {
-            newRotation = currentRotation - 90;
-            if (newRotation <=0) newRotation = 270;
+            newRotation = ( currentRotation + 270 ) % 360;
          }
     }
     QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
     env << newRotation;
     QCopEnvelope env2( "QPE/System", "setDefaultRotation(int)" );
     env2 << newRotation;
 
     m_flipped = !m_flipped;
 }
 
 
 QRESULT RotateApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
 	*iface = 0;
 	if ( uuid == IID_QUnknown )
 		*iface = this;
 	else if ( uuid == IID_MenuApplet )
 		*iface = this;
 
 	if ( *iface )
 		(*iface)-> addRef ( );
 	return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
 	Q_CREATE_INSTANCE( RotateApplet )
 }