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
@@ -5,5 +5,5 @@
   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)
@@ -780,4 +780,6 @@ void CalendarView::setScrollBarStep(int val )
 #ifdef DESKTOP_VERSION
     mDateScrollBar->setLineStep ( val );
+#else
+    Q_UNUSED( val );
 #endif
 }
@@ -806,4 +808,6 @@ void CalendarView::scrollBarValue(int val )
     mNavigator->selectDates( d.addDays(  stepdays-1) , count );
     flag_blockScrollBar = false;
+#else
+    Q_UNUSED( val );
 #endif
 
@@ -1603,4 +1607,5 @@ void CalendarView::checkExternalId( Incidence * inc )
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
+
     bool syncOK = true;
     int addedEvent = 0;
@@ -1733,5 +1738,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         remote->deleteIncidence( inR );
                         inR = inL->clone();
-                        inR->setCalID( calID );
+                        inR->setCalID_block( calID );
                         inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                         if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
@@ -1748,5 +1753,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             local->deleteIncidence( inL );
                             inL = inR->clone();
-                            inL->setCalID( calID );
+                            inL->setCalID_block( calID );
                             if ( mSyncManager->syncWithDesktop() )
                                 inL->setPilotId( pid  );
@@ -1779,5 +1784,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             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;
@@ -1789,5 +1794,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             inL = inR->clone();
                             inL->setIDStr( ":" );
-                            inL->setCalID( 0 );// add to default cal
+                            inL->setCalID_block( 0 );// add to default cal
                             local->addIncidence( inL );
                             ++addedEvent;
@@ -1847,5 +1852,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                                 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 );
                             }
@@ -1862,5 +1867,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                                 inR = inL->clone();
                                 inR->setIDStr( ":" );
-                                inR->setCalID( 0 );// add to default cal
+                                inR->setCalID_block( 0 );// add to default cal
                                 remote->addIncidence(  inR );
                             }
@@ -2450,5 +2455,7 @@ void CalendarView::mergeFileResource( QString fn ,QString resource )
 
     if ( resource == "ALL" ) {
+        mCalendar->setAllCalendarEnabled( true ); 
         mergeFile( fn );
+        restoreCalendarSettings();
         return;
     }
@@ -2598,6 +2605,10 @@ 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 ) {
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
@@ -55,5 +55,8 @@ class DndFactory {
     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
@@ -37,6 +37,6 @@ namespace KPIM {
   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 ) 
     {;}
 
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index a4e0024..2a9b43e 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -43,4 +43,5 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
     mPrefs( prefs )
 {
+    Q_UNUSED( modal );
     mColorItem = 0;
     mColorEnabled = false;
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 0109c02..28c48fe 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -754,5 +754,4 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
         maxlen += 25;
     mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) );
-    int fileSize = 0;
     int result = system ( preCommand );
     // 0 : okay
@@ -925,5 +924,5 @@ void KSyncManager::confSync()
     mSyncProfileNames = sp->getSyncProfileNames();
     mLocalMachineName = sp->getLocalMachineName ();
-    int ii;
+    uint ii;
     for ( ii = 0; ii < oldSyncProfileNames.count(); ++ii ) {
         if ( ! mSyncProfileNames.contains( oldSyncProfileNames[ii] ) )
@@ -1142,5 +1141,5 @@ void KSyncManager::syncPi()
     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() ) {
@@ -1149,6 +1148,6 @@ void KSyncManager::syncPi()
             //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 ) {
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 604adb8..04cdade 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -236,5 +236,5 @@ class KSyncInterface
     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