summaryrefslogtreecommitdiff
path: root/library
authoreilers <eilers>2002-11-09 14:32:55 (UTC)
committer eilers <eilers>2002-11-09 14:32:55 (UTC)
commitcb7218cf112f24976e6f6bbd6e683d38ba31b00b (patch) (unidiff)
treeaa177870ab587c8401f283801db432ea5c452578 /library
parent98a73d0b6feca9105a0ce8bb57a1308f0317badb (diff)
downloadopie-cb7218cf112f24976e6f6bbd6e683d38ba31b00b.zip
opie-cb7218cf112f24976e6f6bbd6e683d38ba31b00b.tar.gz
opie-cb7218cf112f24976e6f6bbd6e683d38ba31b00b.tar.bz2
added
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/backend/contact.h4
-rw-r--r--library/backend/timeconversion.cpp15
-rw-r--r--library/library.pro2
3 files changed, 16 insertions, 5 deletions
diff --git a/library/backend/contact.h b/library/backend/contact.h
index 4999430..2294986 100644
--- a/library/backend/contact.h
+++ b/library/backend/contact.h
@@ -194,34 +194,34 @@ public:
194 QString toRichText() const; 194 QString toRichText() const;
195 QMap<int, QString> toMap() const; 195 QMap<int, QString> toMap() const;
196 QString field( int key ) const { return find( key ); } 196 QString field( int key ) const { return find( key ); }
197 197
198 198
199 // journaling... 199 // journaling...
200 void saveJournal( journal_action action, const QString &key = QString::null ); 200 void saveJournal( journal_action action, const QString &key = QString::null );
201 void save( QString &buf ) const; 201 void save( QString &buf ) const;
202 202
203 void setUid( int i ) 203 void setUid( int i )
204{ Record::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); } 204{ Record::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); }
205 205
206 void setEmails( const QString &v );
207 QString emails() const { return find( Qtopia::Emails ); }
206private: 208private:
207 friend class AbEditor; 209 friend class AbEditor;
208 friend class AbTable; 210 friend class AbTable;
209 friend class AddressBookAccessPrivate; 211 friend class AddressBookAccessPrivate;
210 friend class XMLIO; 212 friend class XMLIO;
211 213
212 QString emailSeparator() const { return " "; } 214 QString emailSeparator() const { return " "; }
213 // the emails should be seperated by a comma 215 // the emails should be seperated by a comma
214 void setEmails( const QString &v );
215 QString emails() const { return find( Qtopia::Emails ); }
216 216
217 void insert( int key, const QString &value ); 217 void insert( int key, const QString &value );
218 void replace( int key, const QString &value ); 218 void replace( int key, const QString &value );
219 QString find( int key ) const; 219 QString find( int key ) const;
220 220
221 QString displayAddress( const QString &street, 221 QString displayAddress( const QString &street,
222 const QString &city, 222 const QString &city,
223 const QString &state, 223 const QString &state,
224 const QString &zip, 224 const QString &zip,
225 const QString &country ) const; 225 const QString &country ) const;
226 226
227 Qtopia::UidGen &uidGen() { return sUidGen; } 227 Qtopia::UidGen &uidGen() { return sUidGen; }
diff --git a/library/backend/timeconversion.cpp b/library/backend/timeconversion.cpp
index 3c25922..df7b0d5 100644
--- a/library/backend/timeconversion.cpp
+++ b/library/backend/timeconversion.cpp
@@ -16,33 +16,42 @@
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include <qglobal.h> 21#include <qglobal.h>
22#include <qtopia/timeconversion.h> 22#include <qtopia/timeconversion.h>
23#include <qregexp.h> 23#include <qregexp.h>
24#include <stdlib.h> 24#include <stdlib.h>
25 25
26QString TimeConversion::toString( const QDate &d ) 26QString TimeConversion::toString( const QDate &d )
27{ 27{
28 QString r = QString::number( d.day() ) + "." + 28 QString empty;
29 if ( d.isNull() )
30 return empty;
31
32 QString r = QString::number( d.day() ) + "." +
29 QString::number( d.month() ) + "." + 33 QString::number( d.month() ) + "." +
30 QString::number( d.year() ); 34 QString::number( d.year() );
31 //qDebug("TimeConversion::toString %s", r.latin1()); 35 //qDebug("TimeConversion::toString %s", r.latin1());
32 return r; 36
37 return r;
33} 38}
34 39
35QDate TimeConversion::fromString( const QString &datestr ) 40QDate TimeConversion::fromString( const QString &datestr )
36{ 41{
42 QDate empty;
43 if ( datestr.isEmpty() )
44 return empty;
45
37 int monthPos = datestr.find('.'); 46 int monthPos = datestr.find('.');
38 int yearPos = datestr.find('.', monthPos+1 ); 47 int yearPos = datestr.find('.', monthPos+1 );
39 if ( monthPos == -1 || yearPos == -1 ) { 48 if ( monthPos == -1 || yearPos == -1 ) {
40 qDebug("fromString didn't find . in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, yearPos ); 49 qDebug("fromString didn't find . in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, yearPos );
41 return QDate(); 50 return QDate();
42 } 51 }
43 int d = datestr.left( monthPos ).toInt(); 52 int d = datestr.left( monthPos ).toInt();
44 int m = datestr.mid( monthPos+1, yearPos - monthPos - 1 ).toInt(); 53 int m = datestr.mid( monthPos+1, yearPos - monthPos - 1 ).toInt();
45 int y = datestr.mid( yearPos+1 ).toInt(); 54 int y = datestr.mid( yearPos+1 ).toInt();
46 QDate date ( y,m,d ); 55 QDate date ( y,m,d );
47 //qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, yearPos); 56 //qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, yearPos);
48 return date; 57 return date;
diff --git a/library/library.pro b/library/library.pro
index fba98f8..142c609 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -104,24 +104,26 @@ SOURCES = calendar.cpp \
104 backend/event.cpp \ 104 backend/event.cpp \
105 backend/contact.cpp \ 105 backend/contact.cpp \
106 categorymenu.cpp \ 106 categorymenu.cpp \
107 categoryedit_p.cpp \ 107 categoryedit_p.cpp \
108 categoryselect.cpp \ 108 categoryselect.cpp \
109 categorywidget.cpp \ 109 categorywidget.cpp \
110 ir.cpp \ 110 ir.cpp \
111 backend/vcc_yacc.cpp \ 111 backend/vcc_yacc.cpp \
112 backend/vobject.cpp \ 112 backend/vobject.cpp \
113 findwidget_p.cpp \ 113 findwidget_p.cpp \
114 finddialog.cpp \ 114 finddialog.cpp \
115 lnkproperties.cpp 115 lnkproperties.cpp
116# QPE crashes on my Notebook if it tries to play sound
117DEFINES = QT_NO_SOUND
116# Qt 3 compatibility 118# Qt 3 compatibility
117HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h 119HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
118SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp 120SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
119INCLUDEPATH += $(OPIEDIR)/include backend 121INCLUDEPATH += $(OPIEDIR)/include backend
120 LIBS += -ldl -lcrypt -lm 122 LIBS += -ldl -lcrypt -lm
121INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 123INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
122 TARGET = qpe 124 TARGET = qpe
123 DESTDIR = $(QTDIR)/lib$(PROJMAK) 125 DESTDIR = $(QTDIR)/lib$(PROJMAK)
124# This is set by configure$(OPIEDIR). 126# This is set by configure$(OPIEDIR).
125 VERSION = 1.5.0.1 127 VERSION = 1.5.0.1
126 128
127TRANSLATIONS = ../i18n/de/libqpe.ts \ 129TRANSLATIONS = ../i18n/de/libqpe.ts \