2 files changed, 13 insertions, 8 deletions

diff --git a/libopie/pim/ocontactaccess.cpp b/libopie/pim/ocontactaccess.cpp
index 2e3ec1f..bc359f7 100644
--- a/libopie/pim/ocontactaccess.cpp
+++ b/libopie/pim/ocontactaccess.cpp
@@ -1,168 +1,173 @@
 /*
  * Class to manage the Contacts.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * Info: This class could just work with a change in the header-file
  *       of the Contact class ! Therefore our libopie only compiles
  *       with our version of libqpe
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.9  2004/03/02 12:14:22  alwin
+ * 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)
+ *
  * Revision 1.8  2003/05/08 13:55:09  tille
  * search stuff
  * and match, toRichText & toShortText in oevent
  *
  * Revision 1.7  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.6  2002/11/01 15:10:42  eilers
  * Added regExp-search in database for all fields in a contact.
  *
  * Revision 1.5  2002/10/16 10:52:40  eilers
  * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
  *
  * Revision 1.4  2002/10/14 16:21:54  eilers
  * Some minor interface updates
  *
  * Revision 1.3  2002/10/07 17:34:24  eilers
  * added OBackendFactory for advanced backend access
  *
  * Revision 1.2  2002/10/02 16:18:11  eilers
  * debugged and seems to work almost perfectly ..
  *
  * Revision 1.1  2002/09/27 17:11:44  eilers
  * Added API for accessing the Contact-Database ! It is compiling, but
  * please do not expect that anything is working !
  * I will debug that stuff in the next time ..
  * Please read README_COMPILE for compiling !
  *
  *
  */
 
 #include "ocontactaccess.h"
 #include "obackendfactory.h"
 
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <qlist.h>
 #include <qcopchannel_qws.h>
 
 //#include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 #include "ocontactaccessbackend_xml.h"
 
 
 OContactAccess::OContactAccess ( const QString appname, const QString ,
                          OContactAccessBackend* end, bool autosync ):
         OPimAccessTemplate<OContact>( end )
 {
         /* take care of the backend. If there is no one defined, we
          * will use the XML-Backend as default (until we have a cute SQL-Backend..).
          */
         if( end == 0 ) {
                 qWarning ("Using BackendFactory !");
                 end = OBackendFactory<OContactAccessBackend>::Default( "contact", appname );
         }
         // Set backend locally and in template
         m_backEnd = end;
         OPimAccessTemplate<OContact>::setBackEnd (end);
 
 
         /* Connect signal of external db change to function */
         QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
-        connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)),
-               this, SLOT(copMessage( const QCString &, const QByteArray &)) );
+        connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+               this, SLOT(copMessage(const QCString&,const QByteArray&)) );
         if ( autosync ){
                 QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
-                connect( syncchannel, SIGNAL(received(const QCString &, const QByteArray &)),
-                         this, SLOT(copMessage( const QCString &, const QByteArray &)) );
+                connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                         this, SLOT(copMessage(const QCString&,const QByteArray&)) );
         }
 
 
 }
 OContactAccess::~OContactAccess ()
 {
         /* The user may forget to save the changed database, therefore try to
          * do it for him..
          */
         save();
         // delete m_backEnd; is done by template..
 }
 
 
 bool OContactAccess::save ()
 {
         /* If the database was changed externally, we could not save the
          * Data. This will remove added items which is unacceptable !
          * Therefore: Reload database and merge the data...
          */
         if ( OPimAccessTemplate<OContact>::wasChangedExternally() )
                 reload();
 
         bool status = OPimAccessTemplate<OContact>::save();
         if ( !status ) return false;
 
         /* Now tell everyone that new data is available.
          */
         QCopEnvelope e( "QPE/PIM", "addressbookUpdated()" );
 
         return true;
 }
 
 const uint OContactAccess::querySettings()
 {
         return ( m_backEnd->querySettings() );
 }
 
 bool OContactAccess::hasQuerySettings ( int querySettings ) const
 {
         return ( m_backEnd->hasQuerySettings ( querySettings ) );
 }
 ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
 {
         QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
         return ( ORecordList<OContact>(matchingContacts, this) );
 }
 
 
 bool OContactAccess::wasChangedExternally()const
 {
         return ( m_backEnd->wasChangedExternally() );
 }
 
 
 void OContactAccess::copMessage( const QCString &msg, const QByteArray & )
 {
         if ( msg == "addressbookUpdated()" ){
                 qWarning ("OContactAccess: Received addressbokUpdated()");
                 emit signalChanged ( this );
         } else if ( msg == "flush()" ) {
                 qWarning ("OContactAccess: Received flush()");
                 save ();
         } else if ( msg == "reload()" ) {
                 qWarning ("OContactAccess: Received reload()");
                 reload ();
                 emit signalChanged ( this );
         }
 }
diff --git a/libopie/pim/opimmainwindow.cpp b/libopie/pim/opimmainwindow.cpp
index 2739e26..99a0333 100644
--- a/libopie/pim/opimmainwindow.cpp
+++ b/libopie/pim/opimmainwindow.cpp
@@ -1,150 +1,150 @@
 #include <qapplication.h>
 #include <qdatetime.h>
 #include <qcopchannel_qws.h>
 
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 
 #include "opimresolver.h"
 #include "opimmainwindow.h"
 
 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() );
     }
 }