Merge from BRANCH_1_0

6 files changed, 11 insertions, 18 deletions

diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 480d261..078ce8d 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -123,16 +123,6 @@ void BatteryMeter::paintEvent( QPaintEvent* )
         QFontMetrics fm( f );
         p.setFont( f );
-        if ( percent > 98 ) {
-            p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "F" ) );
-        }
-        else if ( percent < 5 )
-        {
-            p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "E" ) );
-        }
-        else
-        {
-            p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
-            p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
-        }
+        p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
+        p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
         return;
     }
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 092a48d..5936b5d 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -241,5 +241,5 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
       }
 
-      int jackPerc =  ( jackPercent / 100.0 ) * screenWidth - 47;
+      int jackPerc =  ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
 
       qDrawShadePanel( &p,   9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index b8c4553..4ed09b8 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -273,5 +273,7 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
 		popUp(text, "cardmon/" + cardInPcmcia1Type);
 	    }
+#ifndef QT_NO_SOUND
 	    QSound::play(Resource::findSound("cardmon/card" + what));
+#endif
 	}
     } else {
@@ -325,5 +327,7 @@ bool CardMonitor::getStatusSd(int showPopUp)
 	}
 	//qDebug("TEXT: " + text );
+#ifndef QT_NO_SOUND
 	QSound::play(Resource::findSound("cardmon/card" + what));
+#endif
 	popUp(text, "cardmon/ide");	// XX add SD pic
     }
diff --git a/core/applets/homeapplet/home.h b/core/applets/homeapplet/home.h
index 64af97d..1186caf 100644
--- a/core/applets/homeapplet/home.h
+++ b/core/applets/homeapplet/home.h
@@ -33,5 +33,5 @@ public:
 
     virtual int position() const;
-    
+
     virtual QString name ( ) const;
     virtual QIconSet icon ( ) const;
@@ -40,5 +40,5 @@ public:
     virtual QString tr( const char*, const char* ) const;
     virtual QPopupMenu *popup ( QWidget *parent ) const;
-    
+
     virtual void activated ( );
 
diff --git a/core/applets/restartapplet2/.cvsignore b/core/applets/restartapplet2/.cvsignore
index a403d26..4943911 100644
--- a/core/applets/restartapplet2/.cvsignore
+++ b/core/applets/restartapplet2/.cvsignore
@@ -5,3 +5,2 @@ config.in
 moc_*
 opieobjconfig.in
-opieobj
diff --git a/core/applets/suspendapplet/suspend.h b/core/applets/suspendapplet/suspend.h
index 0c92bcb..75467c1 100644
--- a/core/applets/suspendapplet/suspend.h
+++ b/core/applets/suspendapplet/suspend.h
@@ -33,5 +33,5 @@ public:
 
     virtual int position() const;
-    
+
     virtual QString name ( ) const;
     virtual QIconSet icon ( ) const;
@@ -40,5 +40,5 @@ public:
     virtual QString tr( const char*, const char* ) const;
     virtual QPopupMenu *popup ( QWidget *parent ) const;
-    
+
     virtual void activated ( );