summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kaddressbookE.pro5
-rw-r--r--kmicromail/kmicromailE.pro4
-rw-r--r--korganizer/calendarview.cpp2
-rw-r--r--korganizer/korganizerE.pro7
-rw-r--r--libkcal/phoneformat.cpp79
-rw-r--r--libkcal/phoneformat.h14
6 files changed, 66 insertions, 45 deletions
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 41f293d..86166d8 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -23,6 +23,11 @@ LIBS += -lmicroqtcompat
LIBS += -lmicrokabc
LIBS += -lqpe
LIBS += -ljpeg
+
+LIBS += -lmicrogammu
+LIBS += -lbluetooth
+LIBS += -lsdp
+
LIBS += $(QTOPIALIB)
LIBS += -L$(QPEDIR)/lib
LIBS += -Wl,-export-dynamic
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 8d13796..9cedb21 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -56,6 +56,10 @@ LIBS += $(QTOPIALIB)
#LIBS += -lqtopia
#next line for Zaurus only
#LIBS += -luuid
+
+LIBS += -lmicrogammu
+LIBS += -lbluetooth
+LIBS += -lsdp
#
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a7f7010..b307649 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1188,7 +1188,7 @@ void CalendarView::syncExternal( int mode )
CalendarLocal* calendar = new CalendarLocal();
calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
bool syncOK = false;
- boo loadSuccess = false;
+ bool loadSuccess = false;
PhoneFormat* phoneFormat = 0;
#ifndef DESKTOP_VERSION
SharpFormat* sharpFormat = 0;
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 727764a..b39de35 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -17,6 +17,13 @@ LIBS += -lmicrokde
LIBS += -lmicroqtcompat
LIBS += -lmicrokabc
#LIBS += -lmicrokabcwrap
+
+#LIBS += $(QPEDIR)/lib/gammu
+LIBS += -lmicrogammu
+LIBS += -lbluetooth
+LIBS += -lsdp
+
+
LIBS += -lqpe
LIBS += -ljpeg
LIBS += $(QTOPIALIB)
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index f78730d..fa18683 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -59,10 +59,10 @@ using namespace KCal;
//ALED
//MDAY
-class SharpParser : public QObject
+class PhoneParser : public QObject
{
public:
- SharpParser( Calendar *calendar ) : mCalendar( calendar ) {
+ PhoneParser( Calendar *calendar ) : mCalendar( calendar ) {
oldCategories = 0;
}
@@ -80,18 +80,18 @@ class SharpParser : public QObject
}
if ( skip )
return false;
- ulong cSum = SharpFormat::getCsum(attList );
+ ulong cSum = PhoneFormat::getCsum(attList );
if ( qName == "Event" ) {
Event *event;
- event = existingCalendar->event( attList[0].toInt() );
+ event = existingCalendar->event( attList[0] );
if ( event )
event = (Event*)event->clone();
else
event = new Event;
- event->setZaurusId( attList[0].toInt() );
- event->setZaurusUid( cSum );
- event->setZaurusStat( -2 );
+ // event->setZaurusId( attList[0].toInt() );
+ //event->setZaurusUid( cSum );
+ //event->setZaurusStat( -2 );
event->setSummary( attList[2] );
event->setLocation( attList[3] );
@@ -188,7 +188,7 @@ class SharpParser : public QObject
} else if ( qName == "Todo" ) {
Todo *todo;
- todo = existingCalendar->todo( attList[0].toInt() );
+ todo = existingCalendar->todo( attList[0] );
if (todo )
todo = (Todo*)todo->clone();
else
@@ -200,9 +200,9 @@ class SharpParser : public QObject
//3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb "" "
//2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes
- todo->setZaurusId( attList[0].toInt() );
- todo->setZaurusUid( cSum );
- todo->setZaurusStat( -2 );
+ //todo->setZaurusId( attList[0] );
+ //todo->setZaurusUid( cSum );
+ //todo->setZaurusStat( -2 );
todo->setSummary( attList[7] );
todo->setDescription( attList[8]);
@@ -323,17 +323,17 @@ class SharpParser : public QObject
static QMap<QString,QString> mCategoriesMap;
};
-QMap<QString,QString> SharpParser::mCategoriesMap;
+QMap<QString,QString> PhoneParser::mCategoriesMap;
-SharpFormat::SharpFormat()
+PhoneFormat::PhoneFormat()
{
mCategories = 0;
}
-SharpFormat::~SharpFormat()
+PhoneFormat::~PhoneFormat()
{
}
-ulong SharpFormat::getCsum( const QStringList & attList)
+ulong PhoneFormat::getCsum( const QStringList & attList)
{
int max = attList.count() -1;
ulong cSum = 0;
@@ -359,7 +359,7 @@ ulong SharpFormat::getCsum( const QStringList & attList)
//extern "C" GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum);
#include <stdlib.h>
#define DEBUGMODE false
-bool SharpFormat::load( Calendar *calendar, Calendar *existngCal )
+bool PhoneFormat::load( Calendar *calendar, Calendar *existngCal )
{
GSM_StateMachine s;
@@ -488,7 +488,7 @@ static char *cp;
#endif
return true;
}
-int SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
+int PhoneFormat::getNumFromRecord( QString answer, Incidence* inc )
{
int retval = -1;
QStringList templist;
@@ -529,16 +529,16 @@ int SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
int newnum = templist[0].toInt( &ok );
if ( ok && newnum > 0) {
retval = newnum;
- inc->setZaurusId( newnum );
- inc->setZaurusUid( getCsum( templist ) );
- inc->setZaurusStat( -4 );
+ //inc->setZaurusId( newnum );
+ //inc->setZaurusUid( getCsum( templist ) );
+ //inc->setZaurusStat( -4 );
}
}
}
//qDebug("getNumFromRecord returning : %d ", retval);
return retval;
}
-bool SharpFormat::save( Calendar *calendar)
+bool PhoneFormat::save( Calendar *calendar)
{
QLabel status ( i18n("Processing/adding events ..."), 0 );
@@ -570,11 +570,11 @@ bool SharpFormat::save( Calendar *calendar)
int procCount = 0;
while ( ev ) {
//qDebug("i %d ", ++i);
- if ( ev->zaurusStat() != -2 ) {
+ if ( true /*ev->zaurusStat() != -2*/ ) {
status.setText ( message + QString::number ( ++procCount ) );
qApp->processEvents();
QString eString = getEventString( ev );
- if ( ev->zaurusStat() == -3 ) { // delete
+ if (/* ev->zaurusStat() == -3 */ true) { // delete
// deleting empty strings does not work.
// we write first and x and then delete the record with the x
eString = eString.replace( QRegExp(",\"\""),",\"x\"" );
@@ -583,7 +583,7 @@ bool SharpFormat::save( Calendar *calendar)
deleteEnt = true;
changeEnt = true;
}
- else if ( ev->zaurusId() == -1 ) { // add new
+ else if ( /*ev->zaurusId() == -1*/true ) { // add new
command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
system ( command.utf8() );
QFile file( fileName );
@@ -656,11 +656,11 @@ bool SharpFormat::save( Calendar *calendar)
message = i18n("Processing todo # ");
procCount = 0;
while ( to ) {
- if ( to->zaurusStat() != -2 ) {
+ if ( true /*to->zaurusStat() != -2 */) {
status.setText ( message + QString::number ( ++procCount ) );
qApp->processEvents();
QString eString = getTodoString( to );
- if ( to->zaurusStat() == -3 ) { // delete
+ if ( /*to->zaurusStat() == -3*/true ) { // delete
// deleting empty strings does not work.
// we write first and x and then delete the record with the x
eString = eString.replace( QRegExp(",\"\""),",\"x\"" );
@@ -669,7 +669,7 @@ bool SharpFormat::save( Calendar *calendar)
deleteEnt = true;
changeEnt = true;
}
- else if ( to->zaurusId() == -1 ) { // add new
+ else if ( true /*to->zaurusId() == -1*/ ) { // add new
command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName;
system ( command.utf8() );
QFile file( fileName );
@@ -734,7 +734,7 @@ bool SharpFormat::save( Calendar *calendar)
return true;
}
-QString SharpFormat::dtToString( const QDateTime& dti, bool useTZ )
+QString PhoneFormat::dtToString( const QDateTime& dti, bool useTZ )
{
QString datestr;
QString timestr;
@@ -756,8 +756,9 @@ QString SharpFormat::dtToString( const QDateTime& dti, bool useTZ )
}
return datestr + timestr;
}
-QString SharpFormat::getEventString( Event* event )
+QString PhoneFormat::getEventString( Event* event )
{
+#if 0
QStringList list;
list.append( QString::number(event->zaurusId() ) );
list.append( event->categories().join(",") );
@@ -917,11 +918,13 @@ QString SharpFormat::getEventString( Event* event )
}
}
return list.join(",");
-
+#endif
+ return QString();
}
-QString SharpFormat::getTodoString( Todo* todo )
+QString PhoneFormat::getTodoString( Todo* todo )
{
+#if 0
QStringList list;
list.append( QString::number( todo->zaurusId() ) );
list.append( todo->categories().join(",") );
@@ -969,8 +972,10 @@ QString SharpFormat::getTodoString( Todo* todo )
}
}
return list.join(",");
+#endif
+ return QString();
}
-QString SharpFormat::getPart( const QString & text, bool &ok, int &start )
+QString PhoneFormat::getPart( const QString & text, bool &ok, int &start )
{
//qDebug("start %d ", start);
@@ -1028,11 +1033,11 @@ QString SharpFormat::getPart( const QString & text, bool &ok, int &start )
}
}
}
-bool SharpFormat::fromString( Calendar *calendar, const QString & text)
+bool PhoneFormat::fromString( Calendar *calendar, const QString & text)
{
return false;
}
-bool SharpFormat::fromString2Cal( Calendar *calendar,Calendar *existingCalendar, GSM_StateMachine* s, const QString & type)
+bool PhoneFormat::fromString2Cal( Calendar *calendar,Calendar *existingCalendar, GSM_StateMachine* s, const QString & type)
{
GSM_Phone_Functions *Phone;
@@ -1042,7 +1047,7 @@ bool SharpFormat::fromString2Cal( Calendar *calendar,Calendar *existingCalendar,
Phone=s->Phone.Functions;
bool gshutdown = false;
- SharpParser handler( calendar );
+ PhoneParser handler( calendar );
//handler.setCategoriesList( mCategories );
QStringList templist;
QString tempString;
@@ -1330,7 +1335,7 @@ typedef struct {
int end = text.find ("\n",start)+1;
bool ok = true;
start = end;
- SharpParser handler( calendar );
+ PhoneParser handler( calendar );
handler.setCategoriesList( mCategories );
while ( start > 0 ) {
templist.clear();
@@ -1353,7 +1358,7 @@ typedef struct {
return false;
}
-QString SharpFormat::toString( Calendar * )
+QString PhoneFormat::toString( Calendar * )
{
return QString::null;
}
diff --git a/libkcal/phoneformat.h b/libkcal/phoneformat.h
index f4cb52c..4ddf6f0 100644
--- a/libkcal/phoneformat.h
+++ b/libkcal/phoneformat.h
@@ -18,8 +18,8 @@
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-#ifndef SHARPFORMAT_H
-#define SHARPAFORMAT_H
+#ifndef PHONEFORMAT_H
+#define PHONEFORMAT_H
#include <qstring.h>
@@ -27,20 +27,20 @@
#include "calformat.h"
extern "C" {
-#include "gammu.h"
+#include "../gammu/emb/common/gammu.h"
}
namespace KCal {
/**
- This class implements the calendar format used by Sharp.
+ This class implements the calendar format used by Phone.
*/
-class SharpFormat : public QObject {
+class PhoneFormat : public QObject {
public:
/** Create new iCalendar format. */
- SharpFormat();
- virtual ~SharpFormat();
+ PhoneFormat();
+ virtual ~PhoneFormat();
bool load( Calendar * ,Calendar *);
bool save( Calendar * );