author | alwin <alwin> | 2004-03-02 12:14:15 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-02 12:14:15 (UTC) |
commit | 0d59c780513da78033f4d9040475dee9db0256d4 (patch) (unidiff) | |
tree | 503d320b4aa3daae9982082e7b34e3e2c48bdfb7 /core/pim/datebook/datebook.cpp | |
parent | a0981652d61776d70f25980f035748b21339e946 (diff) | |
download | opie-0d59c780513da78033f4d9040475dee9db0256d4.zip opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.gz opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.bz2 |
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)
Diffstat (limited to 'core/pim/datebook/datebook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebook.cpp | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index af26302..3934411 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -156,26 +156,26 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
156 | if(defaultView==WEEK) needEvilHack=true;// viewWeek(); | 156 | if(defaultView==WEEK) needEvilHack=true;// viewWeek(); |
157 | if(defaultView==WEEKLST) viewWeekLst(); | 157 | if(defaultView==WEEKLST) viewWeekLst(); |
158 | if(defaultView==MONTH) viewMonth(); | 158 | if(defaultView==MONTH) viewMonth(); |
159 | 159 | ||
160 | connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(changeClock(bool)) ); | 160 | connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(changeClock(bool)) ); |
161 | connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(changeWeek(bool)) ); | 161 | connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(changeWeek(bool)) ); |
162 | 162 | ||
163 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 163 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
164 | connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)), this, SLOT(appMessage(const QCString&, const QByteArray&)) ); | 164 | connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), this, SLOT(appMessage(const QCString&,const QByteArray&)) ); |
165 | #endif | 165 | #endif |
166 | 166 | ||
167 | // listen on QPE/System | 167 | // listen on QPE/System |
168 | #if defined(Q_WS_QWS) | 168 | #if defined(Q_WS_QWS) |
169 | #if !defined(QT_NO_COP) | 169 | #if !defined(QT_NO_COP) |
170 | QCopChannel *channel = new QCopChannel( "QPE/System", this ); | 170 | QCopChannel *channel = new QCopChannel( "QPE/System", this ); |
171 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) ); | 171 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) ); |
172 | channel = new QCopChannel( "QPE/Datebook", this ); | 172 | channel = new QCopChannel( "QPE/Datebook", this ); |
173 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) ); | 173 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) ); |
174 | #endif | 174 | #endif |
175 | #endif | 175 | #endif |
176 | 176 | ||
177 | qDebug("done t=%d", t.elapsed() ); | 177 | qDebug("done t=%d", t.elapsed() ); |
178 | 178 | ||
179 | connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); | 179 | connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); |
180 | connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) ); | 180 | connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) ); |
181 | /* | 181 | /* |
@@ -512,31 +512,31 @@ void DateBook::initDay() | |||
512 | if ( !dayView ) { | 512 | if ( !dayView ) { |
513 | dayView = new DateBookDay( ampm, onMonday, db, views, "day view" ); | 513 | dayView = new DateBookDay( ampm, onMonday, db, views, "day view" ); |
514 | views->addWidget( dayView, DAY ); | 514 | views->addWidget( dayView, DAY ); |
515 | dayView->setJumpToCurTime( bJumpToCurTime ); | 515 | dayView->setJumpToCurTime( bJumpToCurTime ); |
516 | dayView->setStartViewTime( startTime ); | 516 | dayView->setStartViewTime( startTime ); |
517 | dayView->setRowStyle( rowStyle ); | 517 | dayView->setRowStyle( rowStyle ); |
518 | connect( this, SIGNAL( newEvent() ), dayView, SLOT( redraw() ) ); | 518 | connect( this, SIGNAL( newEvent() ), dayView, SLOT( redraw() ) ); |
519 | connect( dayView, SIGNAL( newEvent() ), this, SLOT( fileNew() ) ); | 519 | connect( dayView, SIGNAL( newEvent() ), this, SLOT( fileNew() ) ); |
520 | connect( dayView, SIGNAL( removeEvent( const Event & ) ), this, SLOT( removeEvent( const Event & ) ) ); | 520 | connect( dayView, SIGNAL( removeEvent(const Event&) ), this, SLOT( removeEvent(const Event&) ) ); |
521 | connect( dayView, SIGNAL( editEvent( const Event & ) ), this, SLOT( editEvent( const Event & ) ) ); | 521 | connect( dayView, SIGNAL( editEvent(const Event&) ), this, SLOT( editEvent(const Event&) ) ); |
522 | connect( dayView, SIGNAL( duplicateEvent( const Event & ) ), this, SLOT( duplicateEvent( const Event & ) ) ); | 522 | connect( dayView, SIGNAL( duplicateEvent(const Event&) ), this, SLOT( duplicateEvent(const Event&) ) ); |
523 | connect( dayView, SIGNAL( beamEvent( const Event & ) ), this, SLOT( beamEvent( const Event & ) ) ); | 523 | connect( dayView, SIGNAL( beamEvent(const Event&) ), this, SLOT( beamEvent(const Event&) ) ); |
524 | connect( dayView, SIGNAL(sigNewEvent(const QString &)), this, SLOT(slotNewEventFromKey(const QString &)) ); | 524 | connect( dayView, SIGNAL(sigNewEvent(const QString&)), this, SLOT(slotNewEventFromKey(const QString&)) ); |
525 | } | 525 | } |
526 | } | 526 | } |
527 | 527 | ||
528 | void DateBook::initWeek() | 528 | void DateBook::initWeek() |
529 | { | 529 | { |
530 | if ( !weekView ) { | 530 | if ( !weekView ) { |
531 | weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" ); | 531 | weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" ); |
532 | weekView->setStartViewTime( startTime ); | 532 | weekView->setStartViewTime( startTime ); |
533 | views->addWidget( weekView, WEEK ); | 533 | views->addWidget( weekView, WEEK ); |
534 | connect( weekView, SIGNAL( showDate( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) ); | 534 | connect( weekView, SIGNAL( showDate(int,int,int) ), this, SLOT( showDay(int,int,int) ) ); |
535 | connect( this, SIGNAL( newEvent() ), weekView, SLOT( redraw() ) ); | 535 | connect( this, SIGNAL( newEvent() ), weekView, SLOT( redraw() ) ); |
536 | } | 536 | } |
537 | 537 | ||
538 | //But also get it right: the year that we display can be different | 538 | //But also get it right: the year that we display can be different |
539 | //from the year of the current date. So, first find the year | 539 | //from the year of the current date. So, first find the year |
540 | //number of the current week. | 540 | //number of the current week. |
541 | int yearNumber, totWeeks; | 541 | int yearNumber, totWeeks; |
542 | calcWeek( currentDate(), totWeeks, yearNumber, onMonday ); | 542 | calcWeek( currentDate(), totWeeks, yearNumber, onMonday ); |
@@ -551,31 +551,31 @@ void DateBook::initWeek() | |||
551 | } | 551 | } |
552 | 552 | ||
553 | void DateBook::initWeekLst() { | 553 | void DateBook::initWeekLst() { |
554 | if ( !weekLstView ) { | 554 | if ( !weekLstView ) { |
555 | weekLstView = new DateBookWeekLst( ampm, onMonday, db, views, "weeklst view" ); | 555 | weekLstView = new DateBookWeekLst( ampm, onMonday, db, views, "weeklst view" ); |
556 | views->addWidget( weekLstView, WEEKLST ); | 556 | views->addWidget( weekLstView, WEEKLST ); |
557 | 557 | ||
558 | //weekLstView->setStartViewTime( startTime ); | 558 | //weekLstView->setStartViewTime( startTime ); |
559 | connect( weekLstView, SIGNAL( showDate( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) ); | 559 | connect( weekLstView, SIGNAL( showDate(int,int,int) ), this, SLOT( showDay(int,int,int) ) ); |
560 | connect( weekLstView, SIGNAL( addEvent( const QDateTime &, const QDateTime &, const QString & , const QString &) ), | 560 | connect( weekLstView, SIGNAL( addEvent(const QDateTime&,const QDateTime&,const QString&, const QString&) ), |
561 | this, SLOT( slotNewEntry( const QDateTime &, const QDateTime &, const QString & , const QString &) ) ); | 561 | this, SLOT( slotNewEntry(const QDateTime&,const QDateTime&,const QString&, const QString&) ) ); |
562 | connect( this, SIGNAL( newEvent() ), weekLstView, SLOT( redraw() ) ); | 562 | connect( this, SIGNAL( newEvent() ), weekLstView, SLOT( redraw() ) ); |
563 | connect( weekLstView, SIGNAL( editEvent( const Event & ) ), this, SLOT( editEvent( const Event & ) ) ); | 563 | connect( weekLstView, SIGNAL( editEvent(const Event&) ), this, SLOT( editEvent(const Event&) ) ); |
564 | } | 564 | } |
565 | } | 565 | } |
566 | 566 | ||
567 | 567 | ||
568 | void DateBook::initMonth() | 568 | void DateBook::initMonth() |
569 | { | 569 | { |
570 | if ( !monthView ) { | 570 | if ( !monthView ) { |
571 | monthView = new DateBookMonth( views, "month view", FALSE, db ); | 571 | monthView = new DateBookMonth( views, "month view", FALSE, db ); |
572 | views->addWidget( monthView, MONTH ); | 572 | views->addWidget( monthView, MONTH ); |
573 | connect( monthView, SIGNAL( dateClicked( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) ); | 573 | connect( monthView, SIGNAL( dateClicked(int,int,int) ), this, SLOT( showDay(int,int,int) ) ); |
574 | connect( this, SIGNAL( newEvent() ), monthView, SLOT( redraw() ) ); | 574 | connect( this, SIGNAL( newEvent() ), monthView, SLOT( redraw() ) ); |
575 | qApp->processEvents(); | 575 | qApp->processEvents(); |
576 | } | 576 | } |
577 | } | 577 | } |
578 | 578 | ||
579 | void DateBook::loadSettings() | 579 | void DateBook::loadSettings() |
580 | { | 580 | { |
581 | Config qpeconfig( "qpe" ); | 581 | Config qpeconfig( "qpe" ); |
@@ -900,17 +900,17 @@ static const char * beamfile = "/tmp/obex/event.vcs"; | |||
900 | 900 | ||
901 | void DateBook::beamEvent( const Event &e ) | 901 | void DateBook::beamEvent( const Event &e ) |
902 | { | 902 | { |
903 | qDebug("trying to beamn"); | 903 | qDebug("trying to beamn"); |
904 | unlink( beamfile ); // delete if exists | 904 | unlink( beamfile ); // delete if exists |
905 | mkdir("/tmp/obex/", 0755); | 905 | mkdir("/tmp/obex/", 0755); |
906 | Event::writeVCalendar( beamfile, e ); | 906 | Event::writeVCalendar( beamfile, e ); |
907 | Ir *ir = new Ir( this ); | 907 | Ir *ir = new Ir( this ); |
908 | connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) ); | 908 | connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); |
909 | QString description = e.description(); | 909 | QString description = e.description(); |
910 | ir->send( beamfile, description, "text/x-vCalendar" ); | 910 | ir->send( beamfile, description, "text/x-vCalendar" ); |
911 | } | 911 | } |
912 | 912 | ||
913 | void DateBook::beamDone( Ir *ir ) | 913 | void DateBook::beamDone( Ir *ir ) |
914 | { | 914 | { |
915 | delete ir; | 915 | delete ir; |
916 | unlink( beamfile ); | 916 | unlink( beamfile ); |
@@ -919,21 +919,19 @@ void DateBook::beamDone( Ir *ir ) | |||
919 | void DateBook::slotFind() | 919 | void DateBook::slotFind() |
920 | { | 920 | { |
921 | // move it to the day view... | 921 | // move it to the day view... |
922 | viewDay(); | 922 | viewDay(); |
923 | FindDialog frmFind( "Calendar", this ); // no tr needed | 923 | FindDialog frmFind( "Calendar", this ); // no tr needed |
924 | frmFind.setUseDate( true ); | 924 | frmFind.setUseDate( true ); |
925 | frmFind.setDate( currentDate() ); | 925 | frmFind.setDate( currentDate() ); |
926 | QObject::connect( &frmFind, | 926 | QObject::connect( &frmFind, |
927 | SIGNAL(signalFindClicked(const QString&, const QDate&, | 927 | SIGNAL(signalFindClicked(const QString&,const QDate&,bool,bool,int)), |
928 | bool, bool, int)), | ||
929 | this, | 928 | this, |
930 | SLOT(slotDoFind(const QString&, const QDate&, | 929 | SLOT(slotDoFind(const QString&,const QDate&,bool,bool,int)) ); |
931 | bool, bool, int)) ); | ||
932 | QObject::connect( this, | 930 | QObject::connect( this, |
933 | SIGNAL(signalNotFound()), | 931 | SIGNAL(signalNotFound()), |
934 | &frmFind, | 932 | &frmFind, |
935 | SLOT(slotNotFound()) ); | 933 | SLOT(slotNotFound()) ); |
936 | QObject::connect( this, | 934 | QObject::connect( this, |
937 | SIGNAL(signalWrapAround()), | 935 | SIGNAL(signalWrapAround()), |
938 | &frmFind, | 936 | &frmFind, |
939 | SLOT(slotWrapAround()) ); | 937 | SLOT(slotWrapAround()) ); |