author | zautrix <zautrix> | 2004-10-27 11:17:28 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-27 11:17:28 (UTC) |
commit | f73d249579d52d7aeaacde2dcb23abeb42f9ee95 (patch) (side-by-side diff) | |
tree | 75dfc3cd592804c1b87bd2588df2e856a0ac776b | |
parent | ce5b6b62c92cc051c5c9e780508b6d42c46df8ed (diff) | |
download | kdepimpi-f73d249579d52d7aeaacde2dcb23abeb42f9ee95.zip kdepimpi-f73d249579d52d7aeaacde2dcb23abeb42f9ee95.tar.gz kdepimpi-f73d249579d52d7aeaacde2dcb23abeb42f9ee95.tar.bz2 |
compile fix
-rw-r--r-- | kabc/addressbook.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index df0fba4..d101589 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -567,25 +567,25 @@ void AddressBook::removeSyncInfo( QString syncProfile) if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) { it2 = it; //qDebug("removing %s ",(*it).uid().latin1() ); ++it; removeAddressee( it2 ); } else { //qDebug("skipping %s ",(*it).uid().latin1() ); ++it; } } } else { Addressee lse; - lse = mAddressBook->findByUid( "last-syncAddressee-"+ syncProfile ); + lse = findByUid( "last-syncAddressee-"+ syncProfile ); if ( ! lse.isEmpty() ) removeAddressee( lse ); } } void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync ) { Iterator ait; for ( ait = begin(); ait != end(); ++ait ) { QString id = (*ait).IDStr(); (*ait).setIDStr( ":"); (*ait).setExternalUID( id ); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index e56e46a..2f00a09 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -304,29 +304,29 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const SLOT( browse( const QString& ) ) ); mAddressBookService = new KAddressBookService( this ); #endif //KAB_EMBEDDED mMessageTimer = new QTimer( this ); connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); mEditorDialog = 0; createAddresseeEditorDialog( this ); setModified( false ); - mBRdisabled = 0; + mBRdisabled = false; #ifndef DESKTOP_VERSION infrared = 0; #endif - toggleBeamReceive( ); + //toggleBeamReceive( ); } KABCore::~KABCore() { // save(); //saveSettings(); //KABPrefs::instance()->writeConfig(); delete AddresseeConfig::instance(); mAddressBook = 0; KABC::StdAddressBook::close(); delete syncManager; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index dc2026b..fc2d59b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -270,25 +270,25 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : mView->dialogManager()->showSyncOptions(); } //US listen for result adressed from Ka/Pi #ifndef DESKTOP_VERSION connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); #endif #ifndef DESKTOP_VERSION infrared = 0; #endif mBRdisabled = false; - toggleBeamReceive(); + //toggleBeamReceive(); } MainWindow::~MainWindow() { //qDebug("MainWindow::~MainWindow() "); //save toolbar location delete mCalendar; delete mSyncManager; #ifndef DESKTOP_VERSION if ( infrared ) delete infrared; #endif |