author | zecke <zecke> | 2004-08-06 12:10:04 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-06 12:10:04 (UTC) |
commit | cf4207c5c299812e46f40aaee307100f58317a97 (patch) (side-by-side diff) | |
tree | 5ddff7987fb9010c2940c3e8b4f68852774c93d6 /libopie2/opiepim | |
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-- | 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 | 37 | ||||
-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 |
7 files changed, 62 insertions, 46 deletions
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 @@ SOURCES += \ - core/backends/ocontactaccessbackend_vcard.cpp \ - core/backends/ocontactaccessbackend_xml.cpp \ - core/backends/ocontactaccess.cpp \ - core/backends/odatebookaccessbackend.cpp \ - core/backends/odatebookaccessbackend_xml.cpp \ - core/backends/otodoaccessbackend.cpp \ - core/backends/otodoaccess.cpp \ - core/backends/otodoaccessvcal.cpp \ - core/backends/otodoaccessxml.cpp \ - core/backends/odatebookaccess.cpp + backend/ocontactaccessbackend_vcard.cpp \ + backend/ocontactaccessbackend_xml.cpp \ + backend/odatebookaccessbackend.cpp \ + backend/odatebookaccessbackend_xml.cpp \ + backend/otodoaccessbackend.cpp \ + backend/otodoaccessvcal.cpp \ + backend/otodoaccessxml.cpp HEADERS += \ - core/backends/obackendfactory.h \ - core/backends/ocontactaccessbackend.h \ - core/backends/ocontactaccessbackend_vcard.h \ - core/backends/ocontactaccessbackend_xml.h \ - core/backends/ocontactaccess.h \ - core/backends/odatebookaccessbackend.h \ - core/backends/odatebookaccessbackend_xml.h \ - core/backends/opimaccessbackend.h \ - core/backends/opimaccesstemplate.h \ - core/backends/otodoaccessbackend.h \ - core/backends/otodoaccess.h \ - core/backends/otodoaccessvcal.h \ - core/backends/otodoaccessxml.h \ - core/backends/odatebookaccess.h + backend/obackendfactory.h \ + backend/ocontactaccessbackend.h \ + backend/ocontactaccessbackend_vcard.h \ + backend/ocontactaccessbackend_xml.h \ + backend/odatebookaccessbackend.h \ + backend/odatebookaccessbackend_xml.h \ + backend/opimaccessbackend.h \ + backend/otodoaccessbackend.h \ + backend/otodoaccessvcal.h \ + backend/otodoaccessxml.h contains( ENABLE_SQL_PIM_BACKEND, y ) { message ( Enabling the SQL Backend for libopiepim2 ) DEFINES += __USE_SQL LIBS += -lopiedb2 - HEADERS += core/backends/otodoaccesssql.h \ - core/backends/ocontactaccessbackend_sql.h \ - core/backends/odatebookaccessbackend_sql.h - SOURCES += core/backends/otodoaccesssql.cpp \ - core/backends/ocontactaccessbackend_sql.cpp \ - core/backends/odatebookaccessbackend_sql.cpp + HEADERS += backend/otodoaccesssql.h \ + backend/ocontactaccessbackend_sql.h \ + backend/odatebookaccessbackend_sql.h + SOURCES += backend/otodoaccesssql.cpp \ + backend/ocontactaccessbackend_sql.cpp \ + backend/odatebookaccessbackend_sql.cpp } !contains( ENABLE_SQL_PIM_BACKEND, y ) { message ( No SQL Backend in libopiepim2 ) } 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 @@ -22,25 +22,25 @@ -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * VCard Backend for the OPIE-Contact Database. */ -#include "vobject_p.h" +#include <opie2/private/vobject_p.h> /* OPIE */ #include <opie2/ocontactaccessbackend_vcard.h> #include <opie2/odebug.h> #include <qpe/timeconversion.h> //FIXME: Hack to allow direct access to FILE* fh. Rewrite this! #define protected public #include <qfile.h> #undef protected 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 @@ -18,25 +18,25 @@ _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "vobject_p.h" +#include <opie2/private/vobject_p.h> /* OPIE */ #include <opie2/otodoaccessvcal.h> #include <opie2/odebug.h> #include <qpe/timeconversion.h> /* QT */ //FIXME: Hack to allow direct access to FILE* fh. Rewrite this! #define protected public #include <qfile.h> #undef protected 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 @@ HEADERS += \ - core/opimdateconversion.h \ + core/ocontactaccess.h \ + core/odatebookaccess.h \ + core/opimaccessfactory.h \ + core/opimaccesstemplate.h \ core/opimcache.h \ + core/opimcontactfields.h \ + core/opimcontact.h \ + core/opimdateconversion.h \ + core/opimevent.h \ + core/opimglobal.h \ core/opimmaintainer.h \ + core/opimnotify.h \ + core/opimnotifymanager.h \ + core/opimrecord.h \ + core/opimrecordlist.h \ + core/opimrecurrence.h \ core/opimresolver.h \ core/opimstate.h \ + core/opimtemplatebase.h \ + core/opimtimezone.h \ + core/opimtodo.h \ core/opimxref.h \ core/opimxrefmanager.h \ core/opimxrefpartner.h \ - core/opimrecurrence.h \ - core/opimtemplatebase.h \ - core/opimtimezone.h + core/otodoaccess.h SOURCES += \ + core/ocontactaccess.cpp \ + core/odatebookaccess.cpp \ + core/opimcontactfields.cpp \ + core/opimcontact.cpp \ core/opimdateconversion.cpp \ + core/opimevent.cpp \ core/opimmaintainer.cpp \ + core/opimnotify.cpp \ + core/opimnotifymanager.cpp \ + core/opimrecord.cpp \ + core/opimrecurrence.cpp \ core/opimresolver.cpp \ core/opimstate.cpp \ + core/opimtimezone.cpp \ + core/opimtodo.cpp \ core/opimxref.cpp \ core/opimxrefmanager.cpp \ core/opimxrefpartner.cpp \ - core/opimrecurrence.cpp \ - core/opimtimezone.cpp + core/otodoaccess.cpp + 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 @@ -24,26 +24,26 @@ -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * ===================================================================== * ToDo: XML-Backend: Automatic reload if something was changed... * * */ -#include "ocontactaccess.h" -#include "obackendfactory.h" +#include <opie2/ocontactaccess.h> +#include <opie2/obackendfactory.h> /* OPIE */ #include <opie2/ocontactaccessbackend_xml.h> #include <opie2/opimresolver.h> #include <opie2/opimglobal.h> #include <opie2/odebug.h> //#include <qpe/qcopenvelope_qws.h> #include <qpe/global.h> /* QT */ #include <qasciidict.h> 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 @@ TEMPLATE = lib CONFIG += qt warn_on DESTDIR = $(OPIEDIR)/lib -HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \ - opimnotifymanager.h opimevent.h -SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ - opimnotifymanager.cpp opimevent.cpp INTERFACES = TARGET = opiepim2 VERSION = 1.8.6 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lopiecore2 include ( $(OPIEDIR)/gen.pro ) include ( core/core.pro ) -include ( core/backends/backends.pro ) +include ( backend/backends.pro ) include ( ui/ui.pro ) !contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) } contains( platform, x11 ) { LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib } 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 @@ HEADERS += ui/opimmainwindow.h \ - ui/opimrecurrencewidget.h + ui/opimrecurrencewidget.h \ + ui/todayconfigwidget.h \ + ui/todayplugininterface.h SOURCES += ui/opimmainwindow.cpp \ ui/opimrecurrencewidget.cpp INTERFACES += ui/opimrecurrencebase.ui
\ No newline at end of file |