From 854d4a0c686962cd73ac7418b5fbf4b2d73adab7 Mon Sep 17 00:00:00 2001 From: zautrix Date: Sat, 26 Nov 2005 12:38:58 +0000 Subject: sync --- diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9571f16..8d024c1 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -4,7 +4,7 @@ Requires the Qt and KDE widget libraries, available at no cost at http://www.troll.no and http://www.kde.org respectively - Copyright (c) 1997, 1998, 1999 + Copyright (c) savecale1997, 1998, 1999 Preston Brown (preton.brown@yale.edu) Fester Zigterman (F.J.F.ZigtermanRustenburg@student.utwente.nl) Ian Dawes (iadawes@globalserve.net) @@ -779,6 +779,8 @@ void CalendarView::setScrollBarStep(int val ) { #ifdef DESKTOP_VERSION mDateScrollBar->setLineStep ( val ); +#else + Q_UNUSED( val ); #endif } void CalendarView::scrollBarValue(int val ) @@ -805,6 +807,8 @@ void CalendarView::scrollBarValue(int val ) QDate d ( year,1,1 ); mNavigator->selectDates( d.addDays( stepdays-1) , count ); flag_blockScrollBar = false; +#else + Q_UNUSED( val ); #endif } @@ -1602,6 +1606,7 @@ void CalendarView::checkExternalId( Incidence * inc ) } bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) { + bool syncOK = true; int addedEvent = 0; int addedEventR = 0; @@ -1732,7 +1737,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int int calID = inR->calID(); remote->deleteIncidence( inR ); inR = inL->clone(); - inR->setCalID( calID ); + inR->setCalID_block( calID ); inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) inR->setIDStr( idS ); @@ -1747,7 +1752,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int int calID = inL->calID(); local->deleteIncidence( inL ); inL = inR->clone(); - inL->setCalID( calID ); + inL->setCalID_block( calID ); if ( mSyncManager->syncWithDesktop() ) inL->setPilotId( pid ); inL->setIDStr( idS ); @@ -1778,7 +1783,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) ); - inL->setCalID( 0 );// add to default cal + inL->setCalID_block( 0 );// add to default cal local->addIncidence( inL ); ++addedEvent; @@ -1788,7 +1793,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR->setLastModified( modifiedCalendar ); inL = inR->clone(); inL->setIDStr( ":" ); - inL->setCalID( 0 );// add to default cal + inL->setCalID_block( 0 );// add to default cal local->addIncidence( inL ); ++addedEvent; @@ -1846,7 +1851,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR = inL->clone(); inR->setIDStr( ":" ); inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); - inR->setCalID( 0 );// add to default cal + inR->setCalID_block( 0 );// add to default cal remote->addIncidence( inR ); } } @@ -1861,7 +1866,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inL->setLastModified( modifiedCalendar ); inR = inL->clone(); inR->setIDStr( ":" ); - inR->setCalID( 0 );// add to default cal + inR->setCalID_block( 0 );// add to default cal remote->addIncidence( inR ); } } @@ -2449,7 +2454,9 @@ void CalendarView::mergeFileResource( QString fn ,QString resource ) { if ( resource == "ALL" ) { + mCalendar->setAllCalendarEnabled( true ); mergeFile( fn ); + restoreCalendarSettings(); return; } @@ -2597,8 +2604,12 @@ bool CalendarView::saveCalendars() } bool CalendarView::saveCalendarResource(QString filename, QString resource) { - if ( resource == "ALL" ) - return saveCalendar( filename ); + if ( resource == "ALL" ) { + mCalendar->setAllCalendarEnabled( true ); + bool retval = saveCalendar( filename ); + restoreCalendarSettings(); + return retval; + } int exclusiveResource = KOPrefs::instance()->getFuzzyCalendarID( resource ); if ( !exclusiveResource ) { qDebug("KO: CalendarView::saveCalendarResource: resource not found %s", resource.latin1() ); diff --git a/libkcal/dndfactory_dummy.h b/libkcal/dndfactory_dummy.h index 6b73f34..44cc114 100644 --- a/libkcal/dndfactory_dummy.h +++ b/libkcal/dndfactory_dummy.h @@ -54,7 +54,10 @@ class DndFactory { /** cut, copy, and paste operations follow. */ bool copyEvent(Event *) { return false; } /** pastes the event and returns a pointer to the new event pasted. */ - Event *pasteEvent(const QDate &, const QTime *newTime = 0) { return 0; } + Event *pasteEvent(const QDate &, const QTime *newTime = 0) { + Q_UNUSED( newTime ); + return 0; + } }; } diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h index 3e8ab45..9bb3201 100644 --- a/libkdepim/categoryeditdialog.h +++ b/libkdepim/categoryeditdialog.h @@ -36,8 +36,8 @@ namespace KPIM { Q_OBJECT public: - CategorySelectItem(QListView * parent, const QString & text, Type tt) : - QCheckListItem (parent, text, tt ) , QObject( parent ) + CategorySelectItem(QListView * parent, const QString & text, Type tt) : QObject( parent ), + QCheckListItem (parent, text, tt ) {;} signals: diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index a4e0024..2a9b43e 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp @@ -42,6 +42,7 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent, : CategorySelectDialog_base( parent, name, true, fl ), mPrefs( prefs ) { + Q_UNUSED( modal ); mColorItem = 0; mColorEnabled = false; mCategories->header()->hide(); diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 0109c02..28c48fe 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -753,7 +753,6 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) if ( QApplication::desktop()->width() > 320 ) maxlen += 25; mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) ); - int fileSize = 0; int result = system ( preCommand ); // 0 : okay // 256: no such file or dir @@ -924,7 +923,7 @@ void KSyncManager::confSync() QStringList oldSyncProfileNames = mSyncProfileNames; mSyncProfileNames = sp->getSyncProfileNames(); mLocalMachineName = sp->getLocalMachineName (); - int ii; + uint ii; for ( ii = 0; ii < oldSyncProfileNames.count(); ++ii ) { if ( ! mSyncProfileNames.contains( oldSyncProfileNames[ii] ) ) mImplementation->removeSyncInfo( oldSyncProfileNames[ii] ); @@ -1141,15 +1140,15 @@ void KSyncManager::syncPi() mCurrentResourceLocal = ""; mCurrentResourceRemote = ""; if ( mSpecificResources.count() ) { - int lastSyncRes = mSpecificResources.count()/2; + uint lastSyncRes = mSpecificResources.count()/2; int ccc = mSpecificResources.count()-1; while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) { --ccc; --lastSyncRes; //qDebug ( "KSM: sync pi %d",ccc ); } - int startLocal = 0; - int startRemote = mSpecificResources.count()/2; + uint startLocal = 0; + uint startRemote = mSpecificResources.count()/2; emit multiResourceSyncStart( true ); while ( startLocal < mSpecificResources.count()/2 ) { if ( startLocal+1 >= lastSyncRes ) diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 604adb8..04cdade 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h @@ -235,7 +235,7 @@ class KSyncInterface public : virtual void removeSyncInfo( QString syncProfile) = 0; virtual bool sync(KSyncManager* manager, QString filename, int mode, QString resource) = 0; - virtual bool syncExternal(KSyncManager* manager, QString resource) + virtual bool syncExternal(KSyncManager* /*manager*/, QString /*resource*/) { // empty implementation, because some syncable applications do not // have an external(sharpdtm) syncmode, like pwmanager. -- cgit v0.9.0.2