OL import fixes

4 files changed, 57 insertions, 8 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 980e436..1074a62 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -329,10 +329,12 @@ KABCore::~KABCore()
     mAddressBook = 0;
     KABC::StdAddressBook::close();
     
     delete syncManager;
+#ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
+#endif
 }
 void KABCore::receive( const QCString& cmsg, const QByteArray& data )
 {
     qDebug("KA: QCOP message received: %s ", cmsg.data()  );
@@ -366,19 +368,21 @@ void KABCore::toggleBeamReceive( )
 
 
 void KABCore::disableBR(bool b)
 {
+#ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive( );
-            mBRdisabled = true;
         }
+        mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
-            toggleBeamReceive( );
+            //toggleBeamReceive( );
         }
     }
+#endif
 
 }
 void KABCore::recieve( QString fn  )
 {
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index 10e3c76..848d8af 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -28,8 +28,9 @@
 #include <qprogressbar.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
+#include <qregexp.h>
 #include <qapplication.h>
 #include <qhbox.h>
 #include <qheader.h>
 #include <qdatetime.h>
@@ -266,10 +267,11 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   //addressee.setTimeZone( const TimeZone &timeZone );
   //addressee.setGeo( const Geo &geo );
   //addressee.setTitle( QString::fromUcs2(aItem->GetJobTitle().GetBuffer()) );// titel is the prefix
   addressee.setRole( QString::fromUcs2(aItem->GetJobTitle().GetBuffer()) );
-  addressee.setOrganization( QString::fromUcs2(aItem->GetCompanyName().GetBuffer()) );
+  addressee.setOrganization( QString::fromUcs2(aItem->GetCompanyName().GetBuffer()).replace( QRegExp("\\r"), "") );
   QString notesStr = QString::fromUcs2(aItem->GetBody().GetBuffer());
+  notesStr.replace( QRegExp("\\r"), "");
    
   addressee.setProductId( QString::fromUcs2(aItem->GetCustomerID().GetBuffer()) );
   //addressee.setRevision( const QDateTime &revision );
   // addressee.setSortString( const QString &sortString );
@@ -290,9 +292,9 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
     addressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", tempS );
   tempS = QString::fromUcs2(aItem->GetDepartment().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Department", tempS );
-  tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer());
+  tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer()).replace( QRegExp("\\r"), "");
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Office",tempS );
   tempS = QString::fromUcs2(aItem->GetProfession().GetBuffer());
   if ( !tempS.isEmpty() )
@@ -309,9 +311,9 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   //addressee.setLogo( const Picture &logo );
   //addressee.setPhoto( const Picture &photo );
   //addressee.setSound( const Sound &sound );
   //addressee.setAgent( const Agent &agent );
-  QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer());
+  QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), "");
   addressee.setCategories( QStringList::split( ";", cat ));
   
   QString phoneS;
 
@@ -395,38 +397,45 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   KABC::Address addressHome;
   KABC::Address* addressAdd = &addressHome;
   bool insert = false;
   phoneS = QString::fromUcs2( aItem->GetHomeAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     // redundant !addressAdd->setExtended(phoneS  );
     // insert = true;
   }
@@ -438,38 +447,45 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   KABC::Address addressWork;
   addressAdd = &addressWork;
   insert = false;
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     // redundant !addressAdd->setExtended(phoneS  );
     // insert = true;
   }
@@ -481,33 +497,39 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
  KABC::Address addressOther;
   addressAdd = &addressOther;
   insert = false;
   phoneS = QString::fromUcs2( aItem->GetOtherAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
@@ -523,38 +545,45 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
  KABC::Address addressMail;
   addressAdd = &addressMail;
   insert = false;
   phoneS = QString::fromUcs2( aItem->GetMailingAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     // redundant ! addressAdd->setExtended(phoneS  );
     // insert = true;
   }
@@ -590,8 +619,9 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
 #endif
   // ++++++++++++++++++++++ end of ALL addresses
   //GetUserProperties();
   tempS = QString::fromUcs2(aItem->GetInternetFreeBusyAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-FreeBusyUrl", tempS );
   tempS = QString::fromUcs2(aItem->GetChildren().GetBuffer());
   if ( !tempS.isEmpty() )
@@ -610,43 +640,51 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
     additionalInfo += i18n("\nLanguage: ");
     additionalInfo += tempAdd;
   }
   tempAdd = QString::fromUcs2(aItem->GetHobby().GetBuffer()); 
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nHobby: ");
     additionalInfo += tempAdd;;
   }
   tempAdd =QString::fromUcs2(aItem->GetPersonalHomePage().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nHomepage: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetBillingInformation().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nBilling information: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetCustomerID().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nCustomer ID: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetUser1().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nUser1: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetUser2().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nUser2: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetUser3().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nUser3: ");
     additionalInfo += tempAdd;;
   }
-  tempAdd = QString::fromUcs2(aItem->GetUser4().GetBuffer()); 
+  tempAdd = QString::fromUcs2(aItem->GetUser4().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), ""); 
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nUser4: ");
     additionalInfo += tempAdd;;
   }
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 0a3c2d5..c0bde0d 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -30,8 +30,9 @@
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qapplication.h>
 #include <qhbox.h>
+#include <qregexp.h>
 #include <qheader.h>
 #include <qdatetime.h>
 #include <qlistview.h>
 
@@ -249,9 +250,9 @@ void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRe
     event->setFloats( false );
   }
   event->setSummary( QString::fromUcs2( aItem->GetSubject().GetBuffer()) );
   event->setLocation( QString::fromUcs2( aItem->GetLocation().GetBuffer()) );
-  event->setDescription( QString::fromUcs2( aItem->GetBody().GetBuffer())  );
+  event->setDescription( QString::fromUcs2( aItem->GetBody().GetBuffer()).replace( QRegExp("\\r"), "")  );
   QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer());
   event->setCategories( QStringList::split( ";", cat ));
   if ( aItem->GetReminderSet() ) {
     event->clearAlarms();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9e215b9..63484d6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -287,27 +287,33 @@ MainWindow::~MainWindow()
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mCalendar;
     delete mSyncManager;
+#ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
+#endif
 
 
 }
 
 void MainWindow::disableBR(bool b)
 {
+#ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive();
             mBRdisabled = true;
         }
+        mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
-            toggleBeamReceive();
+            //makes no sense,because other cal ap is probably running
+            // toggleBeamReceive(); 
         }
     }
+#endif
 
 }
 bool MainWindow::beamReceiveEnabled()
 {