summaryrefslogtreecommitdiff
path: root/libopie2/opiepim/backend
authormickeyl <mickeyl>2004-02-24 20:15:06 (UTC)
committer mickeyl <mickeyl>2004-02-24 20:15:06 (UTC)
commita1a6a1013eae9a4ca4607f2d656c98821a30f431 (patch) (side-by-side diff)
tree1622cd7992b061d9105965fcd3adbceda8504499 /libopie2/opiepim/backend
parent17eafbf019590393ccd01647c5c9d5d880b95e39 (diff)
downloadopie-a1a6a1013eae9a4ca4607f2d656c98821a30f431.zip
opie-a1a6a1013eae9a4ca4607f2d656c98821a30f431.tar.gz
opie-a1a6a1013eae9a4ca4607f2d656c98821a30f431.tar.bz2
substitute hack with another hack to enforce LGPL compliance
Diffstat (limited to 'libopie2/opiepim/backend') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp15
-rw-r--r--libopie2/opiepim/backend/otodoaccessvcal.cpp17
2 files changed, 20 insertions, 12 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index b569f8b..ffa6a7d 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -29,13 +29,18 @@
/*
* VCard Backend for the OPIE-Contact Database.
*/
-#include <opie2/ocontactaccessbackend_vcard.h>
-#include "../../../../library/backend/vobject_p.h"
-#include "../../../../library/backend/qfiledirect_p.h"
+
+#include "vobject_p.h"
+
+/* OPIE */
+#include <opie2/ocontactaccessbackend_vcard.h>
#include <qpe/timeconversion.h>
+//FIXME: Hack to allow direct access to FILE* fh. Rewrite this!
+#define protected public
#include <qfile.h>
+#undef protected
namespace Opie {
@@ -94,7 +99,7 @@ bool OPimContactAccessBackend_VCard::save()
if (!m_dirty )
return true;
- QFileDirect file( m_file );
+ QFile file( m_file );
if (!file.open(IO_WriteOnly ) )
return false;
@@ -105,7 +110,7 @@ bool OPimContactAccessBackend_VCard::save()
VObject *vo;
for(QMap<int, OPimContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
vo = createVObject( *it );
- writeVObject( file.directHandle() , vo );
+ writeVObject( file.fh, vo ); //FIXME: HACK!!!
cleanVObject( vo );
}
cleanStrTbl();
diff --git a/libopie2/opiepim/backend/otodoaccessvcal.cpp b/libopie2/opiepim/backend/otodoaccessvcal.cpp
index 0a1baf9..03d4479 100644
--- a/libopie2/opiepim/backend/otodoaccessvcal.cpp
+++ b/libopie2/opiepim/backend/otodoaccessvcal.cpp
@@ -26,14 +26,17 @@
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-#include <qfile.h>
-
-#include <qtopia/private/vobject_p.h>
-#include <qtopia/timeconversion.h>
-#include <qtopia/private/qfiledirect_p.h>
+/* OPIE */
+#include "vobject_p.h"
+#include <qpe/timeconversion.h>
#include <opie2/otodoaccessvcal.h>
+//FIXME: Hack to allow direct access to FILE* fh. Rewrite this!
+#define protected public
+#include <qfile.h>
+#undef protected
+
using namespace Opie;
namespace {
@@ -179,7 +182,7 @@ bool OPimTodoAccessVCal::save() {
if (!m_dirty )
return true;
- QFileDirect file( m_file );
+ QFile file( m_file );
if (!file.open(IO_WriteOnly ) )
return false;
@@ -191,7 +194,7 @@ bool OPimTodoAccessVCal::save() {
vo = vobjByEvent( it.data() );
addVObjectProp(obj, vo );
}
- writeVObject( file.directHandle(), obj );
+ writeVObject( file.fh, obj ); //FIXME: HACK!!!
cleanVObject( obj );
cleanStrTbl();