run the optimize_connect script

the whole cvs is tagged with "before_optimize_connect" if there are problems you
can check the diff (but it had compiled and run here)

2 files changed, 6 insertions, 6 deletions

diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index 10ed743..40dc297 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -1,181 +1,181 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #include <qapplication.h>
 #include <qdatetime.h>
 #include <qcopchannel_qws.h>
 
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 
 #include <opie2/opimresolver.h>
 #include "opimmainwindow.h"
 
 namespace Opie {
 OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent,
                                 const char* name, WFlags flag )
     : QMainWindow( parent, name, flag ), m_rtti(-1), m_service( service ), m_fallBack(0l) {
 
     /*
      * let's generate our QCopChannel
      */
     m_str = QString("QPE/"+m_service).local8Bit();
     m_channel= new QCopChannel(m_str, this );
-    connect(m_channel, SIGNAL(received(const QCString&, const QByteArray& ) ),
-            this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
-    connect(qApp, SIGNAL(appMessage(const QCString&, const QByteArray& ) ),
-            this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
+    connect(m_channel, SIGNAL(received(const QCString&,const QByteArray&) ),
+            this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
+    connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&) ),
+            this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
 
     /* connect flush and reload */
     connect(qApp, SIGNAL(flush() ),
             this, SLOT(flush() ) );
     connect(qApp, SIGNAL(reload() ),
             this, SLOT(reload() ) );
 }
 OPimMainWindow::~OPimMainWindow() {
     delete m_channel;
 }
 QCopChannel* OPimMainWindow::channel() {
     return m_channel;
 }
 void OPimMainWindow::doSetDocument( const QString&  ) {
 
 }
 void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) {
     bool needShow = false;
     /*
      * create demands to create
      * a new record...
      */
     QDataStream stream(array, IO_ReadOnly);
     if ( cmd == "create()" ) {
         raise();
         int uid = create();
         QCopEnvelope e(m_str, "created(int)" );
         e << uid;
         needShow = true;
     }else if ( cmd == "remove(int)" ) {
         int uid;
         stream >> uid;
         bool rem = remove( uid );
         QCopEnvelope e(m_str, "removed(bool)" );
         e << rem;
         needShow = true;
     }else if ( cmd == "beam(int)" ) {
         int uid;
         stream >> uid;
         beam( uid);
     }else if ( cmd == "show(int)" ) {
         raise();
         int uid;
         stream >> uid;
         show( uid );
         needShow = true;
     }else if ( cmd == "edit(int)" ) {
         raise();
         int uid;
         stream >> uid;
         edit( uid );
     }else if ( cmd == "add(int,QByteArray)" ) {
         int rtti;
         QByteArray array;
         stream >> rtti;
         stream >> array;
         m_fallBack = record(rtti, array );
         if (!m_fallBack) return;
         add( *m_fallBack );
         delete m_fallBack;
     }else if ( cmd == "alarm(QDateTime,int)" ) {
         raise();
         QDateTime dt; int uid;
         stream >> dt;
         stream >> uid;
         qWarning(" Date: %s Uid: %d", dt.toString().latin1(), uid );
         QDateTime current = QDateTime::currentDateTime();
         if ( current.time().hour() != dt.time().hour() && current.time().minute() != dt.time().minute() )
             return;
         doAlarm( dt,  uid );
         needShow = true;
     }
 
     if (needShow )
         QPEApplication::setKeepRunning();
 }
 /* implement the url scripting here */
 void OPimMainWindow::setDocument( const QString& str) {
     doSetDocument( str );
 }
 /*
  * we now try to get the array demarshalled
  * check if the rtti matches this one
  */
 OPimRecord* OPimMainWindow::record( int rtti,  const QByteArray& array ) {
     if ( service() != rtti )
         return 0l;
 
     OPimRecord* record = OPimResolver::self()->record( rtti );
     QDataStream str(array, IO_ReadOnly );
     if ( !record || !record->loadFromStream(str) ) {
         delete record;
         record = 0l;
     }
 
     return record;
 }
 /*
  * get the rtti for the service
  */
 int OPimMainWindow::service() {
     if ( m_rtti == -1 )
         m_rtti  =  OPimResolver::self()->serviceId( m_service );
 
     return m_rtti;
 }
 void OPimMainWindow::doAlarm( const QDateTime&, int  ) {
 
 }
 void OPimMainWindow::startAlarm(int count  ) {
     m_alarmCount = count;
     m_playedCount = 0;
     Sound::soundAlarm();
     m_timerId = startTimer( 5000 );
 }
 void OPimMainWindow::killAlarm() {
     killTimer( m_timerId );
 }
 void OPimMainWindow::timerEvent( QTimerEvent* e) {
     if ( m_playedCount <m_alarmCount ) {
         m_playedCount++;
         Sound::soundAlarm();
     }else {
         killTimer( e->timerId() );
     }
 }
 
 }
diff --git a/libopie2/opiepim/ui/opimrecurrencewidget.cpp b/libopie2/opiepim/ui/opimrecurrencewidget.cpp
index 569bdd5..90c1a5f 100644
--- a/libopie2/opiepim/ui/opimrecurrencewidget.cpp
+++ b/libopie2/opiepim/ui/opimrecurrencewidget.cpp
@@ -299,336 +299,336 @@ void OPimRecurrenceWidget::setupRepeatLabel( int x) {
     if ( x > 1 )
 	lblVar1->show();
     else
 	lblVar1->hide();
 
     switch ( currInterval ) {
 	case None:
 	    break;
 	case Day:
 	    if ( x > 1 )
 		strVar2 = tr( "days" );
 	    else
 		strVar2 = tr( "day" );
 	    break;
 	case Week:
 	    if ( x > 1 )
 		strVar2 = tr( "weeks" );
 	    else
 		strVar2 = tr( "week" );
 	    break;
 	case Month:
 	    if ( x > 1 )
 		strVar2 = tr( "months" );
 	    else
 		strVar2 = tr( "month" );
 	    break;
 	case Year:
 	    if ( x > 1 )
 		strVar2 = tr( "years" );
 	    else
 		strVar2 = tr( "year" );
 	    break;
     }
     if ( !strVar2.isNull() )
 	lblVar2->setText( strVar2 );
 }
 void OPimRecurrenceWidget::slotWeekLabel() {
     QString str;
     QListIterator<QToolButton> it( listExtra );
     unsigned int i;
     unsigned int keepMe;
     bool bNeedCarriage = FALSE;
     // don't do something we'll regret!!!
     if ( currInterval != Week )
 	return;
 
     if ( startWeekOnMonday )
 	keepMe = start.dayOfWeek() - 1;
     else
 	keepMe = start.dayOfWeek() % 7;
 
     QStringList list;
     for ( i = 0; *it; ++it, i++ ) {
 	// a crazy check, if you are repeating weekly, the current day
 	// must be selected!!!
 	if ( i == keepMe && !( (*it)->isOn() ) )
 	    (*it)->setOn( TRUE );
 	if ( (*it)->isOn() ) {
 	    if ( startWeekOnMonday )
 		list.append( dayLabel[i] );
 	    else {
 		if ( i == 0 )
 		    list.append( dayLabel[6] );
 		else
 		    list.append( dayLabel[i - 1] );
 	    }
 	}
     }
     QStringList::Iterator itStr;
     for ( i = 0, itStr = list.begin(); itStr != list.end(); ++itStr, i++ ) {
 	if ( i == 3 )
 	    bNeedCarriage = TRUE;
 	else
 	    bNeedCarriage = FALSE;
 	if ( str.isNull() )
 	    str = *itStr;
 	else if ( i == list.count() - 1 ) {
 	    if ( i < 2 )
 		str += tr(" and ") + *itStr;
 	    else {
 		if ( bNeedCarriage )
 		    str += tr( ",\nand " ) + *itStr;
 		else
 		    str += tr( ", and " ) + *itStr;
 	    }
 	} else {
 	    if ( bNeedCarriage )
 		str += ",\n" + *itStr;
 	    else
 		str += ", " + *itStr;
 	}
     }
     str = str.prepend( tr("on ") );
 
     lblWeekVar->setText( str );
 }
 void OPimRecurrenceWidget::slotMonthLabel(int type) {
     QString str;
     if ( currInterval != Month || type > 1 )
 	return;
     if ( type == 1 )
 		str = strMonthDateTemplate.arg( numberPlacing(start.day()) );
     else
 		str = strMonthDayTemplate.arg( numberPlacing(week(start)))
 			  .arg( dayLabel[start.dayOfWeek() - 1] );
     lblRepeat->setText( str );
 }
 void OPimRecurrenceWidget::slotChangeStartOfWeek( bool onMonday ) {
  startWeekOnMonday = onMonday;
     // we need to make this unintrusive as possible...
     int saveSpin = spinFreq->value();
     char days = 0;
     int day;
     QListIterator<QToolButton> itExtra( listExtra );
     for ( day = 1; *itExtra; ++itExtra, day = day << 1 ) {
 	if ( (*itExtra)->isOn() ) {
 	    if ( !startWeekOnMonday )
 		days |= day;
 	    else {
 		if ( day == 1 )
 		    days |= OPimRecurrence::SUN;
 		else
 		    days |= day >> 1;
 	    }
 	}
     }
     setupWeekly();
     spinFreq->setValue( saveSpin );
     int buttons;
     for ( day = 0x01, buttons = 0; buttons < 7;
 	  day = day << 1, buttons++ ) {
 	if ( days & day ) {
 	    if ( startWeekOnMonday )
 		fraExtra->setButton( buttons );
 	    else {
 		if ( buttons == 7 )
 		    fraExtra->setButton( 0 );
 		else
 		    fraExtra->setButton( buttons + 1 );
 	    }
 	}
     }
     slotWeekLabel();
 }
 void OPimRecurrenceWidget::setupNone() {
    lblRepeat->setText( tr("No Repeat") );
     lblVar1->hide();
     lblVar2->hide();
     hideExtras();
     cmdEnd->hide();
     lblFreq->hide();
     lblEvery->hide();
     lblFreq->hide();
     spinFreq->hide();
     lblEnd->hide();
     lblWeekVar->hide();
 }
 void OPimRecurrenceWidget::setupDaily() {
   hideExtras();
     lblWeekVar->hide();
     spinFreq->setValue( 1 );
     lblFreq->setText( tr("day(s)") );
     lblVar2->show();
     showRepeatStuff();
     lblRepeat->setText( strDayTemplate );
     setupRepeatLabel( 1 );
 }
 void OPimRecurrenceWidget::setupWeekly() {
 // reshow the buttons...
     fraExtra->setTitle( tr("Repeat On") );
     fraExtra->setExclusive( FALSE );
     fraExtra->show();
     if ( startWeekOnMonday ) {
 	cmdExtra1->setText( tr("Mon") );
 	cmdExtra2->setText( tr("Tue") );
 	cmdExtra3->setText( tr("Wed") );
 	cmdExtra4->setText( tr("Thu") );
 	cmdExtra5->setText( tr("Fri") );
 	cmdExtra6->setText( tr("Sat") );
 	cmdExtra7->setText( tr("Sun") );
     } else {
 	cmdExtra1->setText( tr("Sun") );
 	cmdExtra2->setText( tr("Mon") );
 	cmdExtra3->setText( tr("Tue") );
 	cmdExtra4->setText( tr("Wed") );
 	cmdExtra5->setText( tr("Thu") );
 	cmdExtra6->setText( tr("Fri") );
 	cmdExtra7->setText( tr("Sat") );
     }
     // I hope clustering these improve performance....
     cmdExtra1->setOn( FALSE );
     cmdExtra2->setOn( FALSE );
     cmdExtra3->setOn( FALSE );
     cmdExtra4->setOn( FALSE );
     cmdExtra5->setOn( FALSE );
     cmdExtra6->setOn( FALSE );
     cmdExtra7->setOn( FALSE );
 
     cmdExtra1->show();
     cmdExtra2->show();
     cmdExtra3->show();
     cmdExtra4->show();
     cmdExtra5->show();
     cmdExtra6->show();
     cmdExtra7->show();
 
     lblWeekVar->show();
     spinFreq->setValue( 1 );
     // might as well set the day too...
     if ( startWeekOnMonday ) {
 	fraExtra->setButton( start.dayOfWeek() - 1 );
     } else {
 	fraExtra->setButton( start.dayOfWeek() % 7 );
     }
     lblFreq->setText( tr("week(s)") );
     lblVar2->show();
     showRepeatStuff();
     setupRepeatLabel( 1 );
 }
 void OPimRecurrenceWidget::setupMonthly() {
     hideExtras();
     lblWeekVar->hide();
     fraExtra->setTitle( tr("Repeat By") );
     fraExtra->setExclusive( TRUE );
     fraExtra->show();
     cmdExtra1->setText( tr("Day") );
     cmdExtra1->show();
     cmdExtra2->setText( tr("Date") );
     cmdExtra2->show();
     spinFreq->setValue( 1 );
     lblFreq->setText( tr("month(s)") );
     lblVar2->show();
     showRepeatStuff();
     setupRepeatLabel( 1 );
 }
 void OPimRecurrenceWidget::setupYearly() {
 hideExtras();
     lblWeekVar->hide();
     spinFreq->setValue( 1 );
     lblFreq->setText( tr("year(s)") );
     lblFreq->show();
     lblFreq->show();
     showRepeatStuff();
     lblVar2->show();
     QString strEvery = strYearTemplate.arg( start.monthName(start.month()) ).arg( numberPlacing(start.day()) );
     lblRepeat->setText( strEvery );
     setupRepeatLabel( 1 );
 
 }
 void OPimRecurrenceWidget::init() {
  QPopupMenu *m1 = new QPopupMenu( this );
     repeatPicker = new DateBookMonth( m1, 0, TRUE );
     m1->insertItem( repeatPicker );
     cmdEnd->setPopup( m1 );
     cmdEnd->setPopupDelay( 0 );
 
-    QObject::connect( repeatPicker, SIGNAL(dateClicked(int, int, int)),
-                      this, SLOT(endDateChanged(int, int, int)) );
+    QObject::connect( repeatPicker, SIGNAL(dateClicked(int,int,int)),
+                      this, SLOT(endDateChanged(int,int,int)) );
     QObject::connect( qApp, SIGNAL(weekChanged(bool)),
 		      this, SLOT(slotChangeStartOfWeek(bool)) );
 
     listRTypeButtons.setAutoDelete( TRUE );
     listRTypeButtons.append( cmdNone );
     listRTypeButtons.append( cmdDay );
     listRTypeButtons.append( cmdWeek );
     listRTypeButtons.append( cmdMonth );
     listRTypeButtons.append( cmdYear );
 
     listExtra.setAutoDelete( TRUE );
     listExtra.append( cmdExtra1 );
     listExtra.append( cmdExtra2 );
     listExtra.append( cmdExtra3 );
     listExtra.append( cmdExtra4 );
     listExtra.append( cmdExtra5 );
     listExtra.append( cmdExtra6 );
     listExtra.append( cmdExtra7 );
 }
 void OPimRecurrenceWidget::hideExtras() {
       // hide the extra buttons...
     fraExtra->hide();
     chkNoEnd->hide();
     QListIterator<QToolButton> it( listExtra );
     for ( ; *it; ++it ) {
 	(*it)->hide();
 	(*it)->setOn( FALSE );
     }
 }
 void OPimRecurrenceWidget::showRepeatStuff() {
     cmdEnd->show();
     chkNoEnd->show();
     lblFreq->show();
     lblEvery->show();
     lblFreq->show();
     spinFreq->show();
     lblEnd->show();
     lblRepeat->setText( tr("Every") );
 }
 
 
 static int week( const QDate &start )
 {
     // figure out the week...
     int stop = start.day(),
         sentinel = start.dayOfWeek(),
         dayOfWeek = QDate( start.year(), start.month(), 1 ).dayOfWeek(),
         week = 1,
 	i;
     for ( i = 1; i < stop; i++ ) {
 	if ( dayOfWeek++ == sentinel )
 	    week++;
 	if ( dayOfWeek > 7 )
 	    dayOfWeek = 0;
     }
     return week;
 }
 
 static QString numberPlacing( int x )
 {
     // I hope this works in other languages besides english...
     QString str = QString::number( x );
     switch ( x % 10 ) {
 	case 1:
 	    str += QWidget::tr( "st" );
 	    break;
 	case 2:
 	    str += QWidget::tr( "nd" );
 	    break;
 	case 3:
 	    str += QWidget::tr( "rd" );
 	    break;
 	default:
 	    str += QWidget::tr( "th" );
 	    break;
     }
     return str;
 }