2 files changed, 4 insertions, 5 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 3adbf61..df5a0d9 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -46,33 +46,33 @@
 #include <qlineedit.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qtextcodec.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kfiledialog.h>
 
 QDateTime KSyncManager::mRequestedSyncEvent;
 
 
 KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
-    : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu)
+    : QObject(),  mPrefs(prefs ), mParent(parent),mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu)
 {
     mServerSocket = 0;
     bar = new QProgressBar ( 1, 0 );
     bar->setCaption ("");
     mWriteBackInPast = 2;
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( mPrefs->mPassiveSyncAutoStart )
       enableQuick( false );
 
 }
@@ -447,36 +447,35 @@ void KSyncManager::syncLocalFile()
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent );
     if ( fn == "" )
         return;
     if (  syncWithFile(  fn, false ) ) {
         qDebug("KSM::syncLocalFile() successful ");
     }
 
 }
 
 bool  KSyncManager::syncWithFile( QString fn , bool quick )
 {
     bool ret = false;
     QFileInfo info;
     info.setFile( fn );
     QString mess;
-    bool loadbup = true;
     if ( !info. exists() ) {
         mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
-        int result = QMessageBox::warning( mParent, i18n("Warning!"),
+        QMessageBox::warning( mParent, i18n("Warning!"),
                                            mess );
         return ret;
     }
     int result = 0;
     if ( !quick ) {
         mess =  i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         result = QMessageBox::warning( mParent, i18n("Warning!"),
                                        mess,
                                        i18n("Sync"), i18n("Cancel"), 0,
                                        0, 1 );
         if ( result )
             return false;
     }
     if ( mAskForPreferences )
         if ( !edit_sync_options()) {
             mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
@@ -543,33 +542,33 @@ void KSyncManager::multiSync( bool askforPrefs  )
 
 int KSyncManager::ringSync()
 {
    
     int syncedProfiles = 0;
     unsigned int i;
     QTime timer;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     QStringList syncProfileNames = mSyncProfileNames;
     KSyncProfile* temp = new KSyncProfile ();
     mAskForPreferences = false;
     for ( i = 0; i < syncProfileNames.count(); ++i ) {
         mCurrentSyncProfile = i;
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
         temp->readConfig(&config);
 
-        bool includeInRingSync;
+        bool includeInRingSync = false;
         switch(mTargetApp)
             {
             case (KAPI):
                 includeInRingSync = temp->getIncludeInRingSyncAB();
                 break;
             case (KOPI):
                 includeInRingSync = temp->getIncludeInRingSync();
                 break;
             case (PWMPI):
                 includeInRingSync = temp->getIncludeInRingSyncPWM();
                 break;
             default:
                 qDebug("KSM::ringSync: invalid apptype selected");
                 break;
               
             }
diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp
index e24ad9e..89db22b 100644
--- a/libkdepim/phoneaccess.cpp
+++ b/libkdepim/phoneaccess.cpp
@@ -169,33 +169,33 @@ bool PhoneAccess::writeToPhone( QString fileName)
         }
     }
     return true;
 }
 bool PhoneAccess::readFromPhone( QString fileName)
 {
 
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_ 
     QString command ="kammu --backup " + fileName + " -yes" ;
 #else
     QString command ="./kammu --backup " + fileName + " -yes" ;
 #endif
 #else
     QString command ="kammu --backup " + fileName + " -yes" ;
 #endif
-    int ret;
+    int ret = 1;
     while ( ret != 0 ) {
         QLabel* status = new QLabel( i18n(" This may take 1-3 minutes!"), 0 );
         int w = 235;
         int h = status->sizeHint().height()+20 ;
         int dw = QApplication::desktop()->width();
         int dh = QApplication::desktop()->height();
         if ( dw > 310 )
             w = 310;
         status->setCaption(i18n("Reading from phone...") );
         status->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
         status->show();
         status->raise();
         status->update();
         qApp->processEvents();
         status->update();
         qApp->processEvents();