2 files changed, 48 insertions, 6 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 980e436..1074a62 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -332,4 +332,6 @@ KABCore::~KABCore()
     delete syncManager;
+#ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
+#endif
 }
@@ -369,2 +371,3 @@ void KABCore::disableBR(bool b)
 {
+#ifndef DESKTOP_VERSION
     if ( b ) {
@@ -372,4 +375,4 @@ void KABCore::disableBR(bool b)
             toggleBeamReceive( );
-            mBRdisabled = true;
         }
+        mBRdisabled = true;
     } else {
@@ -377,5 +380,6 @@ void KABCore::disableBR(bool b)
             mBRdisabled = false;
-            toggleBeamReceive( );
+            //toggleBeamReceive( );
         }
     }
+#endif
 
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index 10e3c76..848d8af 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -31,2 +31,3 @@
 #include <qdir.h>
+#include <qregexp.h>
 #include <qapplication.h>
@@ -269,4 +270,5 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   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"), "");
    
@@ -293,3 +295,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
     addressee.insertCustom( "KADDRESSBOOK", "X-Department", tempS );
-  tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer());
+  tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer()).replace( QRegExp("\\r"), "");
   if ( !tempS.isEmpty() )
@@ -312,3 +314,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   //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 ));
@@ -398,2 +400,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetHomeAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -403,2 +406,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetHomeAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -408,2 +412,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetHomeAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -413,2 +418,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetHomeAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -418,2 +424,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetHomeAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -423,2 +430,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetHomeAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -428,2 +436,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetHomeAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -441,2 +450,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -446,2 +456,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -451,2 +462,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -456,2 +468,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -461,2 +474,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -466,2 +480,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -471,2 +486,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetBusinessAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -484,2 +500,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetOtherAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -489,2 +506,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetOtherAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -494,2 +512,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetOtherAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -499,2 +518,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetOtherAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -504,2 +524,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetOtherAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -509,2 +530,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetOtherAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -526,2 +548,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetMailingAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -531,2 +554,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetMailingAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -536,2 +560,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetMailingAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -541,2 +566,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetMailingAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -546,2 +572,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetMailingAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -551,2 +578,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetMailingAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -556,2 +584,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   phoneS = QString::fromUcs2( aItem->GetMailingAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
@@ -593,2 +622,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   tempS = QString::fromUcs2(aItem->GetInternetFreeBusyAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( !tempS.isEmpty() )
@@ -613,2 +643,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   tempAdd = QString::fromUcs2(aItem->GetHobby().GetBuffer()); 
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
@@ -618,2 +649,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   tempAdd =QString::fromUcs2(aItem->GetPersonalHomePage().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
@@ -623,2 +655,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   tempAdd = QString::fromUcs2(aItem->GetBillingInformation().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
@@ -628,2 +661,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   tempAdd = QString::fromUcs2(aItem->GetCustomerID().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
@@ -633,2 +667,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   tempAdd = QString::fromUcs2(aItem->GetUser1().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
@@ -638,2 +673,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   tempAdd = QString::fromUcs2(aItem->GetUser2().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
@@ -643,2 +679,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   tempAdd = QString::fromUcs2(aItem->GetUser3().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
@@ -647,3 +684,4 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   }
-  tempAdd = QString::fromUcs2(aItem->GetUser4().GetBuffer()); 
+  tempAdd = QString::fromUcs2(aItem->GetUser4().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), ""); 
   if ( ! tempAdd.isEmpty() ) {