| -rw-r--r-- | korganizer/calendarview.cpp | 29 | ||||
| -rw-r--r-- | libkcal/dndfactory_dummy.h | 5 | ||||
| -rw-r--r-- | libkdepim/categoryeditdialog.h | 4 | ||||
| -rw-r--r-- | libkdepim/categoryselectdialog.cpp | 1 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 9 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.h | 2 |
6 files changed, 32 insertions, 18 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9571f16..8d024c1 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -6,3 +6,3 @@ - Copyright (c) 1997, 1998, 1999 + Copyright (c) savecale1997, 1998, 1999 Preston Brown (preton.brown@yale.edu) @@ -781,2 +781,4 @@ void CalendarView::setScrollBarStep(int val ) mDateScrollBar->setLineStep ( val ); +#else + Q_UNUSED( val ); #endif @@ -807,2 +809,4 @@ void CalendarView::scrollBarValue(int val ) flag_blockScrollBar = false; +#else + Q_UNUSED( val ); #endif @@ -1604,2 +1608,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int { + bool syncOK = true; @@ -1734,3 +1739,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR = inL->clone(); - inR->setCalID( calID ); + inR->setCalID_block( calID ); inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); @@ -1749,3 +1754,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inL = inR->clone(); - inL->setCalID( calID ); + inL->setCalID_block( calID ); if ( mSyncManager->syncWithDesktop() ) @@ -1780,3 +1785,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int - inL->setCalID( 0 );// add to default cal + inL->setCalID_block( 0 );// add to default cal local->addIncidence( inL ); @@ -1790,3 +1795,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inL->setIDStr( ":" ); - inL->setCalID( 0 );// add to default cal + inL->setCalID_block( 0 );// add to default cal local->addIncidence( inL ); @@ -1848,3 +1853,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); - inR->setCalID( 0 );// add to default cal + inR->setCalID_block( 0 );// add to default cal remote->addIncidence( inR ); @@ -1863,3 +1868,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR->setIDStr( ":" ); - inR->setCalID( 0 );// add to default cal + inR->setCalID_block( 0 );// add to default cal remote->addIncidence( inR ); @@ -2451,3 +2456,5 @@ void CalendarView::mergeFileResource( QString fn ,QString resource ) if ( resource == "ALL" ) { + mCalendar->setAllCalendarEnabled( true ); mergeFile( fn ); + restoreCalendarSettings(); return; @@ -2599,4 +2606,8 @@ 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 ); 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 @@ -56,3 +56,6 @@ class DndFactory { /** 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 @@ -38,4 +38,4 @@ namespace KPIM { - 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 ) {;} diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index a4e0024..2a9b43e 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp @@ -44,2 +44,3 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent, { + Q_UNUSED( modal ); mColorItem = 0; diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 0109c02..28c48fe 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -755,3 +755,2 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) ); - int fileSize = 0; int result = system ( preCommand ); @@ -926,3 +925,3 @@ void KSyncManager::confSync() mLocalMachineName = sp->getLocalMachineName (); - int ii; + uint ii; for ( ii = 0; ii < oldSyncProfileNames.count(); ++ii ) { @@ -1143,3 +1142,3 @@ void KSyncManager::syncPi() if ( mSpecificResources.count() ) { - int lastSyncRes = mSpecificResources.count()/2; + uint lastSyncRes = mSpecificResources.count()/2; int ccc = mSpecificResources.count()-1; @@ -1150,4 +1149,4 @@ void KSyncManager::syncPi() } - int startLocal = 0; - int startRemote = mSpecificResources.count()/2; + uint startLocal = 0; + uint startRemote = mSpecificResources.count()/2; emit multiResourceSyncStart( true ); diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 604adb8..04cdade 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h @@ -237,3 +237,3 @@ class KSyncInterface 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*/) { |