Clock now works with liquid without drawing "interesting" patterns

(also reformated the file with astyle)

1 files changed, 43 insertions, 23 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index e3621d9..5b901c1 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -104,52 +104,59 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
 
     clockRB = new QRadioButton ( tr( "Clock" ), controls  );
     gl->addWidget( clockRB, 0, 0 );
     grp->insert( clockRB );
 
     swatchRB = new QRadioButton ( tr( "Stopwatch" ), controls );
     gl->addWidget( swatchRB, 1, 0 );
     grp->insert( swatchRB );
 
     connect( grp, SIGNAL(clicked(int)), this, SLOT(modeSelect(int)) );
     grp->setButton( 0 );
 
-    set = new QPushButton ( controls );
-    set->setMaximumSize(50,30);
-    gl->addWidget( set, 0, 1 );
-    set->setText( tr( "Start" ) );
-    set->setEnabled( FALSE );
-    grp->insert( set );
+	set
+		= new QPushButton ( controls );
+	set
+		->setMaximumSize( 50, 30 );
+	gl->addWidget( set
+		               , 0, 1 );
+	set
+		->setText( tr( "Start" ) );
+	set
+		->setEnabled( FALSE );
+	grp->insert( set
+		           );
 
     reset = new QPushButton ( controls );
     gl->addWidget( reset, 1, 1 );
     reset->setText( tr( "Reset" ) );
     reset->setEnabled( FALSE );
     grp->insert( reset );
 
     alarmOffBtn = new QPushButton ( controls );
 //    alarmOffBtn->setMaximumSize(60,30);
     gl->addWidget( alarmOffBtn, 0, 2 );
 
     alarmBtn = new QPushButton ( controls );
       //  alarmBtn->setMaximumSize(60,30);
     gl->addWidget( alarmBtn, 1, 2 );
     alarmBtn->setText( tr( "Set Alarm" ) );
 
     OClickableLabel *click = new OClickableLabel(controls, "label" );
     click->setText(tr("Set date and time." ) );
     gl->addMultiCellWidget( click,  3,  3,  0, 2,  AlignHCenter);
     connect( click, SIGNAL(clicked() ), this, SLOT(slotAdjustTime() ) );
 
-    connect( set, SIGNAL( pressed() ), SLOT( slotSet() ) );
+	connect( set
+		         , SIGNAL( pressed() ), SLOT( slotSet() ) );
     connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) );
 
     connect( alarmBtn, SIGNAL( clicked() ), SLOT( slotSetAlarm() ) );
     connect( snoozeBtn, SIGNAL( clicked() ), SLOT( slotSnooze() ) );
     connect( alarmOffBtn, SIGNAL( clicked() ), SLOT( slotToggleAlarm() ) );
 
     connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
        this, SLOT(appMessage(const QCString&, const QByteArray&)) );
 
     t = new QTimer( this );
     connect( t, SIGNAL( timeout() ), SLOT( updateClock() ) );
     t->start( 1000 );
@@ -162,25 +169,26 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
     connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(changeClock(bool)) );
 
     QString tmp = config.readEntry("clockAlarmHour", "");
     bool ok;
     hour = tmp.toInt(&ok,10);
     tmp = config.readEntry("clockAlarmMinute","");
     minute = tmp.toInt(&ok,10);
 
     if( config.readEntry("clockAlarmSet","FALSE") == "TRUE") {
         alarmOffBtn->setText( tr( "Alarm Is On" ) );
         alarmBool=TRUE;
         snoozeBtn->show();
-    } else {
+	}
+	else {
         alarmOffBtn->setText( tr( "Alarm Is Off" ) );
         alarmBool=FALSE;
         snoozeBtn->hide();
     }
 
     QTimer::singleShot( 0, this, SLOT(updateClock()) );
     modeSelect(0);
 }
 
 Clock::~Clock()
 {
     toggleScreenSaver( true );
@@ -191,33 +199,35 @@ void Clock::updateClock()
     if ( clockRB->isChecked() ) {
   QTime tm = QDateTime::currentDateTime().time();
   QString s;
   if ( ampm ) {
       int hour = tm.hour();
       if (hour == 0)
     hour = 12;
       if (hour > 12)
     hour -= 12;
       s.sprintf( "%2d%c%02d", hour, ':', tm.minute() );
       ampmLabel->setText( (tm.hour() >= 12) ? "PM" : "AM" );
       ampmLabel->show();
-  } else {
+		}
+		else {
       s.sprintf( "%2d%c%02d", tm.hour(), ':', tm.minute() );
       ampmLabel->hide();
   }
   lcd->display( s );
   lcd->repaint( FALSE );
   aclock->display( QTime::currentTime() );
   date->setText( TimeString::longDateString( QDate::currentDate() ) );
-    } else {
+	}
+	else {
   QTime swatch_time;
   QString lcdtext;
   int totalms = swatch_totalms;
   if ( swatch_running )
       totalms += swatch_start.elapsed();
   swatch_time = QTime(0,0,0).addMSecs(totalms);
   QString d = swatch_running ? QString("    ")
         : QString::number(totalms%1000+1000);
   lcdtext = swatch_time.toString() + "." + d.right(3).left(sw_prec);
   lcd->display( lcdtext );
   lcd->repaint( FALSE );
   aclock->display( swatch_time );
@@ -232,66 +242,72 @@ void Clock::changeClock( bool a )
 }
 
 void Clock::clearClock( void )
 {
     lcd->display( QTime( 0,0,0 ).toString() );
     aclock->display( QTime( 0,0,0 ) );
 }
 
 void Clock::slotSet()
 {
     if  ( t->isActive() ) {
   swatch_totalms += swatch_start.elapsed();
-  set->setText( tr( "Start" ) );
+		set
+			->setText( tr( "Start" ) );
   t->stop();
   swatch_running = FALSE;
   toggleScreenSaver( TRUE );
   updateClock();
-    } else {
+	}
+	else {
   swatch_start.start();
-  set->setText( tr( "Stop" ) );
+		set
+			->setText( tr( "Stop" ) );
         t->start( 1000 );
   swatch_running = TRUE;
   // disable screensaver while stop watch is running
   toggleScreenSaver( FALSE );
     }
 }
 
 void Clock::slotReset()
 {
     t->stop();
     swatch_start.start();
     swatch_totalms = 0;
 
     if (swatch_running )
   t->start(1000);
 
     updateClock();
 }
 
 void Clock::modeSelect( int m )
 {
     if ( m ) {
   lcd->setNumDigits( 8+1+sw_prec );
   lcd->setMinimumWidth( lcd->sizeHint().width() );
-  set->setEnabled( TRUE );
+		set
+			->setEnabled( TRUE );
   reset->setEnabled( TRUE );
   ampmLabel->hide();
 
   if ( !swatch_running )
       t->stop();
-    } else {
+	}
+	else {
   lcd->setNumDigits( 5 );
   lcd->setMinimumWidth( lcd->sizeHint().width() );
-  set->setEnabled( FALSE );
+		set
+			->setEnabled( FALSE );
   reset->setEnabled( FALSE );
   t->start(1000);
     }
     updateClock();
 }
 
 //this sets the alarm time
 void Clock::slotSetAlarm()
 {
     if( !snoozeBtn->isHidden())
         slotToggleAlarm();
     Set_Alarm *setAlarmDlg;
@@ -333,25 +349,26 @@ void Clock::slotSnooze()
 
 //toggles alarm on/off
 void Clock::slotToggleAlarm()
 {
     Config config( "qpe" );
     config.setGroup("Time");
     if(alarmBool) {
         config.writeEntry("clockAlarmSet","FALSE");
         alarmOffBtn->setText( tr( "Alarm Is Off" ) );
         snoozeBtn->hide();
         alarmBool=FALSE;
         alarmOff();
-    } else {
+	}
+	else {
         config.writeEntry("clockAlarmSet","TRUE");
         alarmOffBtn->setText( tr( "Alarm Is On" ) );
         snoozeBtn->show();
         alarmBool=TRUE;
         alarmOn();
     }
     config.write();
 }
 
 void Clock::alarmOn()
 {
     QDate d = QDate::currentDate();
@@ -371,56 +388,58 @@ void Clock::alarmOn()
 
 void Clock::alarmOff()
 {
     int warn = 0;
     bSound=FALSE;
         AlarmServer::deleteAlarm( when,
                                "QPE/Application/clock",
                                "alarm(QDateTime,int)", warn );
       qDebug("Alarm Off "+ when.toString());
       setCaption("Clock");
 }
 
-void Clock::appMessage(const QCString& msg, const QByteArray& data)
+void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ )
 {
     int stopTimer = 0;
     int timerStay = 5000;
     bSound=TRUE;
     qDebug("Message received in clock");
    if ( msg == "alarm(QDateTime,int)" ) {
        Config config( "qpe" );
        config.setGroup("Time");
        if(config.readBoolEntry("mp3Alarm",0)){
             
            QCopEnvelope e("QPE/Application/opieplayer","setDocument(QString)");
            e<<config.readEntry("mp3File","");
-       } else {
+		}
+		else {
 
        Sound::soundAlarm();
        stopTimer = startTimer( timerStay);
     }
    }
    show();
    raise();
    QPEApplication::setKeepRunning();
    setActiveWindow();
 }
 
 void Clock::timerEvent( QTimerEvent *e )
 {
     static int stop = 0;
     if ( stop < 120 && bSound) {
         Sound::soundAlarm();
         stop++;
-    } else {
+	}
+	else {
         stop = 0;
         killTimer( e->timerId() );
         alarmOffBtn->setText( tr( "Alarm Is Off" ) );
         alarmBool=FALSE;
         snoozeBtn->hide();
         setCaption(tr("Clock: Alarm was missed."));
     }
 }
 
 
 QSizePolicy AnalogClock::sizePolicy() const
 {
@@ -438,26 +457,26 @@ void AnalogClock::drawContents( QPainter *p )
     QPoint h1( r.x() + r.width() / 2, r.y() + r.height() / 4 );
     QPoint h2( r.x() + r.width() / 2, r.y() + r.height() / 2 );
 
     QPoint m1( r.x() + r.width() / 2, r.y() + r.height() / 8 );
     QPoint m2( r.x() + r.width() / 2, r.y() + r.height() / 2 );
 
     QPoint s1( r.x() + r.width() / 2, r.y() + 8 );
     QPoint s2( r.x() + r.width() / 2, r.y() + r.height() / 2 );
 
     QColor color( clear ? backgroundColor() : black );
     QTime time = clear ? prevTime : currTime;
 
-    if ( clear && prevTime.secsTo(currTime) > 1 ) {
-  p->eraseRect( rect() );
+	if ( clear ) {
+		erase( rect() );
   return;
     }
 
     if ( !clear ) {
   // draw ticks
   p->setPen( QPen( color, 1 ) );
   for ( int i = 0; i < 12; i++ )
       p->drawLine( rotate( center, l1, i * 30 ), rotate( center, l2, i * 30 ) );
     }
 
     if ( !clear || prevTime.minute() != currTime.minute() ||
       prevTime.hour() != currTime.hour() ) {
@@ -496,16 +515,17 @@ void AnalogClock::display( const QTime& t )
 }
 
 QPoint AnalogClock::rotate( QPoint c, QPoint p, int a )
 {
     double angle = deg2rad * ( - a + 180 );
     double nx = c.x() - ( p.x() - c.x() ) * cos( angle ) -
     ( p.y() - c.y() ) * sin( angle );
     double ny = c.y() - ( p.y() - c.y() ) * cos( angle ) +
     ( p.x() - c.x() ) * sin( angle );
     return QPoint( nx, ny );
 }
 
-void Clock::slotAdjustTime() {
+void Clock::slotAdjustTime()
+{
     QCopEnvelope e("QPE/System", "execute(QString)");
     e << QString("systemtime");
 }