summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--gammu/emb/common/gsmstate.h2
-rw-r--r--kaddressbook/kabcore.cpp6
-rw-r--r--libkdepim/phoneaccess.cpp12
3 files changed, 10 insertions, 10 deletions
diff --git a/gammu/emb/common/gsmstate.h b/gammu/emb/common/gsmstate.h
index 2b4806c..f15a6a7 100644
--- a/gammu/emb/common/gsmstate.h
+++ b/gammu/emb/common/gsmstate.h
@@ -162,5 +162,4 @@ typedef struct _GSM_Reply_Function GSM_Reply_Function;
# undef GSM_ENABLE_MROUTERBLUE
#endif
-
#ifndef WIN32
# ifdef ENABLE_LGPL
@@ -1578,2 +1577,3 @@ void GSM_GetPhoneFeaturesForBackup(GSM_StateMachine *s, GSM_Backup_Info *info);
* vim: noexpandtab sw=8 ts=8 sts=8:
*/
+
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7bec90a..b014cba 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -36,4 +36,5 @@ $Id$
#include <qtimer.h>
#include <qlabel.h>
+#include <qregexp.h>
#include <qlineedit.h>
#include <qcheckbox.h>
@@ -727,4 +728,9 @@ void KABCore::export2phone()
t <<datastream;
outFile.close();
+ if ( PhoneAccess::writeToPhone( fileName ) )
+ qDebug("Export okay ");
+ else
+ qDebug("Error export contacts ");
+
} else {
qDebug("Error open temp file ");
diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp
index c0bd6cc..357cd39 100644
--- a/libkdepim/phoneaccess.cpp
+++ b/libkdepim/phoneaccess.cpp
@@ -41,5 +41,5 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
#endif
//qDebug("save %d ", load );
- QString content;
+ QString content = "[gammu]\n";;
bool write = false;
bool addPort = true, addConnection = true, addModel = true;
@@ -54,5 +54,5 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
//qDebug("*%s* ", line.latin1() );
if ( line.left(7 ) == "[gammu]" ) {
- ;
+ ;
} else
if ( line.left(4 ) == "port" ) {
@@ -94,8 +94,6 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
}
}
-
+
if ( addConnection ) {
- if ( ! write )
- content += "[gammu]\n";
write = true;
content += "connection = ";
@@ -104,6 +102,4 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
}
if ( addPort ) {
- if ( ! write )
- content += "[gammu]\n";
write = true;
content += "port = ";
@@ -113,6 +109,4 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
}
if ( addModel ) {
- if ( ! write )
- content += "[gammu]\n";
write = true;
content += "model = ";