author | zecke <zecke> | 2004-08-06 12:10:04 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-06 12:10:04 (UTC) |
commit | cf4207c5c299812e46f40aaee307100f58317a97 (patch) (unidiff) | |
tree | 5ddff7987fb9010c2940c3e8b4f68852774c93d6 | |
parent | 20e6c238513eb91f47c3030c2db7ada7cf4b7f25 (diff) | |
download | opie-cf4207c5c299812e46f40aaee307100f58317a97.zip opie-cf4207c5c299812e46f40aaee307100f58317a97.tar.gz opie-cf4207c5c299812e46f40aaee307100f58317a97.tar.bz2 |
Update to the on-server move.
We now have
core/ with DataTypes, PUBLIC API
backend/ for concrete implementation of backends and the 'Interface description'
ui/ For UI related classes
private/ For private implementation details
-rw-r--r-- | Rules.make | 4 | ||||
-rw-r--r-- | libopie2/opiepim/backend/backends.pro | 53 | ||||
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessvcal.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/core.pro | 61 | ||||
-rw-r--r-- | libopie2/opiepim/core/ocontactaccess.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiepim/opiepim.pro | 6 | ||||
-rw-r--r-- | libopie2/opiepim/ui/ui.pro | 4 |
8 files changed, 77 insertions, 59 deletions
@@ -132,68 +132,70 @@ $(TOPDIR)/.depends.cfgs: | |||
132 | # config.in interdependencies | 132 | # config.in interdependencies |
133 | @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs | 133 | @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs |
134 | @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ | 134 | @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ |
135 | @-rm -f dirs | 135 | @-rm -f dirs |
136 | 136 | ||
137 | $(QTDIR)/stamp-headers : | 137 | $(QTDIR)/stamp-headers : |
138 | @-rm -f $(QTDIR)/stamp-headers* | 138 | @-rm -f $(QTDIR)/stamp-headers* |
139 | ( cd $(QTDIR)/include; \ | 139 | ( cd $(QTDIR)/include; \ |
140 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ | 140 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ |
141 | qcopchannel_qws.h qwindowsystem_qws.h \ | 141 | qcopchannel_qws.h qwindowsystem_qws.h \ |
142 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) | 142 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) |
143 | touch $@ | 143 | touch $@ |
144 | 144 | ||
145 | $(QTDIR)/stamp-headers-x11 : | 145 | $(QTDIR)/stamp-headers-x11 : |
146 | @-rm -f $(QTDIR)/stamp-headers* | 146 | @-rm -f $(QTDIR)/stamp-headers* |
147 | cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) | 147 | cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) |
148 | touch $@ | 148 | touch $@ |
149 | 149 | ||
150 | $(OPIEDIR)/stamp-headers : | 150 | $(OPIEDIR)/stamp-headers : |
151 | @-rm -f $(OPIEDIR)/stamp-headers* | 151 | @-rm -f $(OPIEDIR)/stamp-headers* |
152 | mkdir -p $(TOPDIR)/include/qpe \ | 152 | mkdir -p $(TOPDIR)/include/qpe \ |
153 | $(TOPDIR)/include/qtopia \ | 153 | $(TOPDIR)/include/qtopia \ |
154 | $(TOPDIR)/include/opie \ | 154 | $(TOPDIR)/include/opie \ |
155 | $(TOPDIR)/include/opie2 \ | 155 | $(TOPDIR)/include/opie2 \ |
156 | $(TOPDIR)/include/opie2/private \ | ||
156 | $(TOPDIR)/include/qtopia/private \ | 157 | $(TOPDIR)/include/qtopia/private \ |
157 | $(TOPDIR)/include/sl | 158 | $(TOPDIR)/include/sl |
158 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 159 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
159 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 160 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
160 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 161 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
161 | ifeq ($(CONFIG_LIBOPIE),y) | 162 | ifeq ($(CONFIG_LIBOPIE),y) |
162 | # libopie1 | 163 | # libopie1 |
163 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 164 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
164 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 165 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
165 | ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) | 166 | ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) |
166 | endif | 167 | endif |
167 | # libopie2 | 168 | # libopie2 |
168 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) | 169 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) |
169 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) | 170 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) |
170 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) | 171 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) |
171 | ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) | 172 | ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) |
172 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) | 173 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) |
173 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) | 174 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) |
174 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) | 175 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) |
175 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; ) | 176 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) |
177 | ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) | ||
176 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) | 178 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) |
177 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) | 179 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) |
178 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) | 180 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) |
179 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) | 181 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) |
180 | ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) | 182 | ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) |
181 | # auxilliary libraries | 183 | # auxilliary libraries |
182 | ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) | 184 | ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) |
183 | ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) | 185 | ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) |
184 | ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) | 186 | ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) |
185 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) | 187 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) |
186 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) | 188 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) |
187 | # all | 189 | # all |
188 | ifeq ($(CONFIG_LIBOPIE),y) | 190 | ifeq ($(CONFIG_LIBOPIE),y) |
189 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 191 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
190 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 192 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
191 | endif | 193 | endif |
192 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 194 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
193 | ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) | 195 | ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) |
194 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 196 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
195 | ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) | 197 | ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) |
196 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 198 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
197 | touch $@ | 199 | touch $@ |
198 | 200 | ||
199 | $(OPIEDIR)/stamp-headers-x11 : | 201 | $(OPIEDIR)/stamp-headers-x11 : |
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro index f91e98a..42d807c 100644 --- a/libopie2/opiepim/backend/backends.pro +++ b/libopie2/opiepim/backend/backends.pro | |||
@@ -1,44 +1,37 @@ | |||
1 | SOURCES += \ | 1 | SOURCES += \ |
2 | core/backends/ocontactaccessbackend_vcard.cpp \ | 2 | backend/ocontactaccessbackend_vcard.cpp \ |
3 | core/backends/ocontactaccessbackend_xml.cpp \ | 3 | backend/ocontactaccessbackend_xml.cpp \ |
4 | core/backends/ocontactaccess.cpp \ | 4 | backend/odatebookaccessbackend.cpp \ |
5 | core/backends/odatebookaccessbackend.cpp \ | 5 | backend/odatebookaccessbackend_xml.cpp \ |
6 | core/backends/odatebookaccessbackend_xml.cpp \ | 6 | backend/otodoaccessbackend.cpp \ |
7 | core/backends/otodoaccessbackend.cpp \ | 7 | backend/otodoaccessvcal.cpp \ |
8 | core/backends/otodoaccess.cpp \ | 8 | backend/otodoaccessxml.cpp |
9 | core/backends/otodoaccessvcal.cpp \ | ||
10 | core/backends/otodoaccessxml.cpp \ | ||
11 | core/backends/odatebookaccess.cpp | ||
12 | 9 | ||
13 | HEADERS += \ | 10 | HEADERS += \ |
14 | core/backends/obackendfactory.h \ | 11 | backend/obackendfactory.h \ |
15 | core/backends/ocontactaccessbackend.h \ | 12 | backend/ocontactaccessbackend.h \ |
16 | core/backends/ocontactaccessbackend_vcard.h \ | 13 | backend/ocontactaccessbackend_vcard.h \ |
17 | core/backends/ocontactaccessbackend_xml.h \ | 14 | backend/ocontactaccessbackend_xml.h \ |
18 | core/backends/ocontactaccess.h \ | 15 | backend/odatebookaccessbackend.h \ |
19 | core/backends/odatebookaccessbackend.h \ | 16 | backend/odatebookaccessbackend_xml.h \ |
20 | core/backends/odatebookaccessbackend_xml.h \ | 17 | backend/opimaccessbackend.h \ |
21 | core/backends/opimaccessbackend.h \ | 18 | backend/otodoaccessbackend.h \ |
22 | core/backends/opimaccesstemplate.h \ | 19 | backend/otodoaccessvcal.h \ |
23 | core/backends/otodoaccessbackend.h \ | 20 | backend/otodoaccessxml.h |
24 | core/backends/otodoaccess.h \ | ||
25 | core/backends/otodoaccessvcal.h \ | ||
26 | core/backends/otodoaccessxml.h \ | ||
27 | core/backends/odatebookaccess.h | ||
28 | 21 | ||
29 | contains( ENABLE_SQL_PIM_BACKEND, y ) { | 22 | contains( ENABLE_SQL_PIM_BACKEND, y ) { |
30 | message ( Enabling the SQL Backend for libopiepim2 ) | 23 | message ( Enabling the SQL Backend for libopiepim2 ) |
31 | DEFINES += __USE_SQL | 24 | DEFINES += __USE_SQL |
32 | LIBS += -lopiedb2 | 25 | LIBS += -lopiedb2 |
33 | HEADERS += core/backends/otodoaccesssql.h \ | 26 | HEADERS += backend/otodoaccesssql.h \ |
34 | core/backends/ocontactaccessbackend_sql.h \ | 27 | backend/ocontactaccessbackend_sql.h \ |
35 | core/backends/odatebookaccessbackend_sql.h | 28 | backend/odatebookaccessbackend_sql.h |
36 | SOURCES += core/backends/otodoaccesssql.cpp \ | 29 | SOURCES += backend/otodoaccesssql.cpp \ |
37 | core/backends/ocontactaccessbackend_sql.cpp \ | 30 | backend/ocontactaccessbackend_sql.cpp \ |
38 | core/backends/odatebookaccessbackend_sql.cpp | 31 | backend/odatebookaccessbackend_sql.cpp |
39 | } | 32 | } |
40 | 33 | ||
41 | !contains( ENABLE_SQL_PIM_BACKEND, y ) { | 34 | !contains( ENABLE_SQL_PIM_BACKEND, y ) { |
42 | message ( No SQL Backend in libopiepim2 ) | 35 | message ( No SQL Backend in libopiepim2 ) |
43 | } | 36 | } |
44 | 37 | ||
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp index 6b66814..af77a05 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp | |||
@@ -10,49 +10,49 @@ | |||
10 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | /* | 29 | /* |
30 | * VCard Backend for the OPIE-Contact Database. | 30 | * VCard Backend for the OPIE-Contact Database. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | 33 | ||
34 | #include "vobject_p.h" | 34 | #include <opie2/private/vobject_p.h> |
35 | 35 | ||
36 | /* OPIE */ | 36 | /* OPIE */ |
37 | #include <opie2/ocontactaccessbackend_vcard.h> | 37 | #include <opie2/ocontactaccessbackend_vcard.h> |
38 | #include <opie2/odebug.h> | 38 | #include <opie2/odebug.h> |
39 | 39 | ||
40 | #include <qpe/timeconversion.h> | 40 | #include <qpe/timeconversion.h> |
41 | 41 | ||
42 | //FIXME: Hack to allow direct access to FILE* fh. Rewrite this! | 42 | //FIXME: Hack to allow direct access to FILE* fh. Rewrite this! |
43 | #define protected public | 43 | #define protected public |
44 | #include <qfile.h> | 44 | #include <qfile.h> |
45 | #undef protected | 45 | #undef protected |
46 | 46 | ||
47 | namespace Opie { | 47 | namespace Opie { |
48 | 48 | ||
49 | OPimContactAccessBackend_VCard::OPimContactAccessBackend_VCard ( const QString& , const QString& filename ): | 49 | OPimContactAccessBackend_VCard::OPimContactAccessBackend_VCard ( const QString& , const QString& filename ): |
50 | m_dirty( false ), | 50 | m_dirty( false ), |
51 | m_file( filename ) | 51 | m_file( filename ) |
52 | { | 52 | { |
53 | load(); | 53 | load(); |
54 | } | 54 | } |
55 | 55 | ||
56 | 56 | ||
57 | bool OPimContactAccessBackend_VCard::load () | 57 | bool OPimContactAccessBackend_VCard::load () |
58 | { | 58 | { |
diff --git a/libopie2/opiepim/backend/otodoaccessvcal.cpp b/libopie2/opiepim/backend/otodoaccessvcal.cpp index 14a325e..7d58a40 100644 --- a/libopie2/opiepim/backend/otodoaccessvcal.cpp +++ b/libopie2/opiepim/backend/otodoaccessvcal.cpp | |||
@@ -6,49 +6,49 @@ | |||
6 | .>+-= | 6 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "vobject_p.h" | 30 | #include <opie2/private/vobject_p.h> |
31 | 31 | ||
32 | /* OPIE */ | 32 | /* OPIE */ |
33 | #include <opie2/otodoaccessvcal.h> | 33 | #include <opie2/otodoaccessvcal.h> |
34 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | 35 | ||
36 | #include <qpe/timeconversion.h> | 36 | #include <qpe/timeconversion.h> |
37 | 37 | ||
38 | /* QT */ | 38 | /* QT */ |
39 | //FIXME: Hack to allow direct access to FILE* fh. Rewrite this! | 39 | //FIXME: Hack to allow direct access to FILE* fh. Rewrite this! |
40 | #define protected public | 40 | #define protected public |
41 | #include <qfile.h> | 41 | #include <qfile.h> |
42 | #undef protected | 42 | #undef protected |
43 | 43 | ||
44 | using namespace Opie; | 44 | using namespace Opie; |
45 | 45 | ||
46 | namespace { | 46 | namespace { |
47 | static OPimTodo eventByVObj( VObject *obj ){ | 47 | static OPimTodo eventByVObj( VObject *obj ){ |
48 | OPimTodo event; | 48 | OPimTodo event; |
49 | VObject *ob; | 49 | VObject *ob; |
50 | QCString name; | 50 | QCString name; |
51 | // no uid, attendees, ... and no fun | 51 | // no uid, attendees, ... and no fun |
52 | // description | 52 | // description |
53 | if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){ | 53 | if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){ |
54 | name = vObjectStringZValue( ob ); | 54 | name = vObjectStringZValue( ob ); |
diff --git a/libopie2/opiepim/core/core.pro b/libopie2/opiepim/core/core.pro index 597b1e8..b1b5655 100644 --- a/libopie2/opiepim/core/core.pro +++ b/libopie2/opiepim/core/core.pro | |||
@@ -1,23 +1,48 @@ | |||
1 | HEADERS += \ | 1 | HEADERS += \ |
2 | core/ocontactaccess.h \ | ||
3 | core/odatebookaccess.h \ | ||
4 | core/opimaccessfactory.h \ | ||
5 | core/opimaccesstemplate.h \ | ||
6 | core/opimcache.h \ | ||
7 | core/opimcontactfields.h \ | ||
8 | core/opimcontact.h \ | ||
2 | core/opimdateconversion.h \ | 9 | core/opimdateconversion.h \ |
3 | core/opimcache.h \ | 10 | core/opimevent.h \ |
4 | core/opimmaintainer.h \ | 11 | core/opimglobal.h \ |
5 | core/opimresolver.h \ | 12 | core/opimmaintainer.h \ |
6 | core/opimstate.h \ | 13 | core/opimnotify.h \ |
7 | core/opimxref.h \ | 14 | core/opimnotifymanager.h \ |
8 | core/opimxrefmanager.h \ | 15 | core/opimrecord.h \ |
9 | core/opimxrefpartner.h \ | 16 | core/opimrecordlist.h \ |
10 | core/opimrecurrence.h \ | 17 | core/opimrecurrence.h \ |
11 | core/opimtemplatebase.h \ | 18 | core/opimresolver.h \ |
12 | core/opimtimezone.h | 19 | core/opimstate.h \ |
20 | core/opimtemplatebase.h \ | ||
21 | core/opimtimezone.h \ | ||
22 | core/opimtodo.h \ | ||
23 | core/opimxref.h \ | ||
24 | core/opimxrefmanager.h \ | ||
25 | core/opimxrefpartner.h \ | ||
26 | core/otodoaccess.h | ||
13 | 27 | ||
14 | SOURCES += \ | 28 | SOURCES += \ |
29 | core/ocontactaccess.cpp \ | ||
30 | core/odatebookaccess.cpp \ | ||
31 | core/opimcontactfields.cpp \ | ||
32 | core/opimcontact.cpp \ | ||
15 | core/opimdateconversion.cpp \ | 33 | core/opimdateconversion.cpp \ |
16 | core/opimmaintainer.cpp \ | 34 | core/opimevent.cpp \ |
17 | core/opimresolver.cpp \ | 35 | core/opimmaintainer.cpp \ |
18 | core/opimstate.cpp \ | 36 | core/opimnotify.cpp \ |
19 | core/opimxref.cpp \ | 37 | core/opimnotifymanager.cpp \ |
20 | core/opimxrefmanager.cpp \ | 38 | core/opimrecord.cpp \ |
21 | core/opimxrefpartner.cpp \ | 39 | core/opimrecurrence.cpp \ |
22 | core/opimrecurrence.cpp \ | 40 | core/opimresolver.cpp \ |
23 | core/opimtimezone.cpp | 41 | core/opimstate.cpp \ |
42 | core/opimtimezone.cpp \ | ||
43 | core/opimtodo.cpp \ | ||
44 | core/opimxref.cpp \ | ||
45 | core/opimxrefmanager.cpp \ | ||
46 | core/opimxrefpartner.cpp \ | ||
47 | core/otodoaccess.cpp | ||
48 | |||
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp index 2602493..771d855 100644 --- a/libopie2/opiepim/core/ocontactaccess.cpp +++ b/libopie2/opiepim/core/ocontactaccess.cpp | |||
@@ -12,50 +12,50 @@ | |||
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | /* | 29 | /* |
30 | * ===================================================================== | 30 | * ===================================================================== |
31 | * ToDo: XML-Backend: Automatic reload if something was changed... | 31 | * ToDo: XML-Backend: Automatic reload if something was changed... |
32 | * | 32 | * |
33 | * | 33 | * |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "ocontactaccess.h" | 36 | #include <opie2/ocontactaccess.h> |
37 | #include "obackendfactory.h" | 37 | #include <opie2/obackendfactory.h> |
38 | 38 | ||
39 | /* OPIE */ | 39 | /* OPIE */ |
40 | #include <opie2/ocontactaccessbackend_xml.h> | 40 | #include <opie2/ocontactaccessbackend_xml.h> |
41 | #include <opie2/opimresolver.h> | 41 | #include <opie2/opimresolver.h> |
42 | #include <opie2/opimglobal.h> | 42 | #include <opie2/opimglobal.h> |
43 | #include <opie2/odebug.h> | 43 | #include <opie2/odebug.h> |
44 | 44 | ||
45 | //#include <qpe/qcopenvelope_qws.h> | 45 | //#include <qpe/qcopenvelope_qws.h> |
46 | #include <qpe/global.h> | 46 | #include <qpe/global.h> |
47 | 47 | ||
48 | /* QT */ | 48 | /* QT */ |
49 | #include <qasciidict.h> | 49 | #include <qasciidict.h> |
50 | #include <qdatetime.h> | 50 | #include <qdatetime.h> |
51 | #include <qfile.h> | 51 | #include <qfile.h> |
52 | #include <qregexp.h> | 52 | #include <qregexp.h> |
53 | #include <qlist.h> | 53 | #include <qlist.h> |
54 | #include <qcopchannel_qws.h> | 54 | #include <qcopchannel_qws.h> |
55 | 55 | ||
56 | /* STD */ | 56 | /* STD */ |
57 | #include <errno.h> | 57 | #include <errno.h> |
58 | #include <fcntl.h> | 58 | #include <fcntl.h> |
59 | #include <unistd.h> | 59 | #include <unistd.h> |
60 | #include <stdlib.h> | 60 | #include <stdlib.h> |
61 | 61 | ||
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro index 318aecf..af8e63d 100644 --- a/libopie2/opiepim/opiepim.pro +++ b/libopie2/opiepim/opiepim.pro | |||
@@ -1,27 +1,23 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \ | ||
5 | opimnotifymanager.h opimevent.h | ||
6 | 4 | ||
7 | SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ | ||
8 | opimnotifymanager.cpp opimevent.cpp | ||
9 | INTERFACES = | 5 | INTERFACES = |
10 | TARGET = opiepim2 | 6 | TARGET = opiepim2 |
11 | VERSION = 1.8.6 | 7 | VERSION = 1.8.6 |
12 | INCLUDEPATH += $(OPIEDIR)/include | 8 | INCLUDEPATH += $(OPIEDIR)/include |
13 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
14 | LIBS += -lopiecore2 | 10 | LIBS += -lopiecore2 |
15 | 11 | ||
16 | include ( $(OPIEDIR)/gen.pro ) | 12 | include ( $(OPIEDIR)/gen.pro ) |
17 | include ( core/core.pro ) | 13 | include ( core/core.pro ) |
18 | include ( core/backends/backends.pro ) | 14 | include ( backend/backends.pro ) |
19 | include ( ui/ui.pro ) | 15 | include ( ui/ui.pro ) |
20 | 16 | ||
21 | !contains( platform, x11 ) { | 17 | !contains( platform, x11 ) { |
22 | include ( $(OPIEDIR)/include.pro ) | 18 | include ( $(OPIEDIR)/include.pro ) |
23 | } | 19 | } |
24 | 20 | ||
25 | contains( platform, x11 ) { | 21 | contains( platform, x11 ) { |
26 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 22 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
27 | } | 23 | } |
diff --git a/libopie2/opiepim/ui/ui.pro b/libopie2/opiepim/ui/ui.pro index 530bd9f..6aa01a7 100644 --- a/libopie2/opiepim/ui/ui.pro +++ b/libopie2/opiepim/ui/ui.pro | |||
@@ -1,7 +1,9 @@ | |||
1 | HEADERS += ui/opimmainwindow.h \ | 1 | HEADERS += ui/opimmainwindow.h \ |
2 | ui/opimrecurrencewidget.h | 2 | ui/opimrecurrencewidget.h \ |
3 | ui/todayconfigwidget.h \ | ||
4 | ui/todayplugininterface.h | ||
3 | 5 | ||
4 | SOURCES += ui/opimmainwindow.cpp \ | 6 | SOURCES += ui/opimmainwindow.cpp \ |
5 | ui/opimrecurrencewidget.cpp | 7 | ui/opimrecurrencewidget.cpp |
6 | 8 | ||
7 | INTERFACES += ui/opimrecurrencebase.ui \ No newline at end of file | 9 | INTERFACES += ui/opimrecurrencebase.ui \ No newline at end of file |