2 files changed, 4 insertions, 4 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 828a9de..a63753e 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -1,217 +1,217 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #define QTOPIA_INTERNAL_CONTACT_MRE
 #include "ocontact.h"
-#include "vobject_p.h"
+#include "../../library/backend/vobject_p.h"
-#include "qfiledirect_p.h"
+#include "../../library/backend/qfiledirect_p.h"
 #include <qpe/stringutil.h>
 #include <qpe/timeconversion.h>
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
 #include <qmap.h>
 #include <stdio.h>
 /*!
  \class Contact contact.h
  \brief The Contact class holds the data of an address book entry.
  This data includes information the name of the person, contact
  information, and business information such as deparment and job title.
  \ingroup qtopiaemb
  \ingroup qtopiadesktop
 */
 Qtopia::UidGen OContact::sUidGen( Qtopia::UidGen::Qtopia );
 /*!
  Creates a new, empty contact.
 */
 OContact::OContact()
    : OPimRecord(), mMap(), d( 0 )
 {
 }
 /*!
  \internal
  Creates a new contact.  The properties of the contact are
  set from \a fromMap.
 */
 OContact::OContact( const QMap<int, QString> &fromMap ) :
    OPimRecord(), mMap( fromMap ), d( 0 )
 {
    QString cats = mMap[ Qtopia::AddressCategory ];
    if ( !cats.isEmpty() )
        setCategories( idsFromString( cats ) );
    QString uidStr = find( Qtopia::AddressUid );
    if ( uidStr.isEmpty() )
        setUid( uidGen().generate() );
    else
        setUid( uidStr.toInt() );
    if ( !uidStr.isEmpty() )
        setUid( uidStr.toInt() );
 }
 /*!
  Destroys a contact.
 */
 OContact::~OContact()
 {
 }
 /*! \fn void OContact::setTitle( const QString &str )
  Sets the title of the contact to \a str.
 */
 /*! \fn void OContact::setFirstName( const QString &str )
  Sets the first name of the contact to \a str.
 */
 /*! \fn void OContact::setMiddleName( const QString &str )
  Sets the middle name of the contact to \a str.
 */
 /*! \fn void OContact::setLastName( const QString &str )
  Sets the last name of the contact to \a str.
 */
 /*! \fn void OContact::setSuffix( const QString &str )
  Sets the suffix of the contact to \a str.
 */
 /*! \fn void OContact::setFileAs( const QString &str )
  Sets the contact to filed as \a str.
 */
 /*! \fn void OContact::setDefaultEmail( const QString &str )
  Sets the default email of the contact to \a str.
 */
 /*! \fn void OContact::setHomeStreet( const QString &str )
  Sets the home street address of the contact to \a str.
 */
 /*! \fn void OContact::setHomeCity( const QString &str )
  Sets the home city of the contact to \a str.
 */
 /*! \fn void OContact::setHomeState( const QString &str )
  Sets the home state of the contact to \a str.
 */
 /*! \fn void OContact::setHomeZip( const QString &str )
  Sets the home zip code of the contact to \a str.
 */
 /*! \fn void OContact::setHomeCountry( const QString &str )
  Sets the home country of the contact to \a str.
 */
 /*! \fn void OContact::setHomePhone( const QString &str )
  Sets the home phone number of the contact to \a str.
 */
 /*! \fn void OContact::setHomeFax( const QString &str )
  Sets the home fax number of the contact to \a str.
 */
 /*! \fn void OContact::setHomeMobile( const QString &str )
  Sets the home mobile phone number of the contact to \a str.
 */
 /*! \fn void OContact::setHomeWebpage( const QString &str )
  Sets the home webpage of the contact to \a str.
 */
 /*! \fn void OContact::setCompany( const QString &str )
  Sets the company for contact to \a str.
 */
 /*! \fn void OContact::setJobTitle( const QString &str )
  Sets the job title of the contact to \a str.
 */
 /*! \fn void OContact::setDepartment( const QString &str )
  Sets the department for contact to \a str.
 */
 /*! \fn void OContact::setOffice( const QString &str )
  Sets the office for contact to \a str.
 */
 /*! \fn void OContact::setBusinessStreet( const QString &str )
  Sets the business street address of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessCity( const QString &str )
  Sets the business city of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessState( const QString &str )
  Sets the business state of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessZip( const QString &str )
  Sets the business zip code of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessCountry( const QString &str )
  Sets the business country of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPhone( const QString &str )
  Sets the business phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessFax( const QString &str )
  Sets the business fax number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessMobile( const QString &str )
  Sets the business mobile phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPager( const QString &str )
  Sets the business pager number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessWebpage( const QString &str )
  Sets the business webpage of the contact to \a str.
 */
 /*! \fn void OContact::setProfession( const QString &str )
  Sets the profession of the contact to \a str.
 */
 /*! \fn void OContact::setAssistant( const QString &str )
  Sets the assistant of the contact to \a str.
 */
 /*! \fn void OContact::setManager( const QString &str )
  Sets the manager of the contact to \a str.
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 828a9de..a63753e 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -1,217 +1,217 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #define QTOPIA_INTERNAL_CONTACT_MRE
 #include "ocontact.h"
-#include "vobject_p.h"
+#include "../../library/backend/vobject_p.h"
-#include "qfiledirect_p.h"
+#include "../../library/backend/qfiledirect_p.h"
 #include <qpe/stringutil.h>
 #include <qpe/timeconversion.h>
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
 #include <qmap.h>
 #include <stdio.h>
 /*!
  \class Contact contact.h
  \brief The Contact class holds the data of an address book entry.
  This data includes information the name of the person, contact
  information, and business information such as deparment and job title.
  \ingroup qtopiaemb
  \ingroup qtopiadesktop
 */
 Qtopia::UidGen OContact::sUidGen( Qtopia::UidGen::Qtopia );
 /*!
  Creates a new, empty contact.
 */
 OContact::OContact()
    : OPimRecord(), mMap(), d( 0 )
 {
 }
 /*!
  \internal
  Creates a new contact.  The properties of the contact are
  set from \a fromMap.
 */
 OContact::OContact( const QMap<int, QString> &fromMap ) :
    OPimRecord(), mMap( fromMap ), d( 0 )
 {
    QString cats = mMap[ Qtopia::AddressCategory ];
    if ( !cats.isEmpty() )
        setCategories( idsFromString( cats ) );
    QString uidStr = find( Qtopia::AddressUid );
    if ( uidStr.isEmpty() )
        setUid( uidGen().generate() );
    else
        setUid( uidStr.toInt() );
    if ( !uidStr.isEmpty() )
        setUid( uidStr.toInt() );
 }
 /*!
  Destroys a contact.
 */
 OContact::~OContact()
 {
 }
 /*! \fn void OContact::setTitle( const QString &str )
  Sets the title of the contact to \a str.
 */
 /*! \fn void OContact::setFirstName( const QString &str )
  Sets the first name of the contact to \a str.
 */
 /*! \fn void OContact::setMiddleName( const QString &str )
  Sets the middle name of the contact to \a str.
 */
 /*! \fn void OContact::setLastName( const QString &str )
  Sets the last name of the contact to \a str.
 */
 /*! \fn void OContact::setSuffix( const QString &str )
  Sets the suffix of the contact to \a str.
 */
 /*! \fn void OContact::setFileAs( const QString &str )
  Sets the contact to filed as \a str.
 */
 /*! \fn void OContact::setDefaultEmail( const QString &str )
  Sets the default email of the contact to \a str.
 */
 /*! \fn void OContact::setHomeStreet( const QString &str )
  Sets the home street address of the contact to \a str.
 */
 /*! \fn void OContact::setHomeCity( const QString &str )
  Sets the home city of the contact to \a str.
 */
 /*! \fn void OContact::setHomeState( const QString &str )
  Sets the home state of the contact to \a str.
 */
 /*! \fn void OContact::setHomeZip( const QString &str )
  Sets the home zip code of the contact to \a str.
 */
 /*! \fn void OContact::setHomeCountry( const QString &str )
  Sets the home country of the contact to \a str.
 */
 /*! \fn void OContact::setHomePhone( const QString &str )
  Sets the home phone number of the contact to \a str.
 */
 /*! \fn void OContact::setHomeFax( const QString &str )
  Sets the home fax number of the contact to \a str.
 */
 /*! \fn void OContact::setHomeMobile( const QString &str )
  Sets the home mobile phone number of the contact to \a str.
 */
 /*! \fn void OContact::setHomeWebpage( const QString &str )
  Sets the home webpage of the contact to \a str.
 */
 /*! \fn void OContact::setCompany( const QString &str )
  Sets the company for contact to \a str.
 */
 /*! \fn void OContact::setJobTitle( const QString &str )
  Sets the job title of the contact to \a str.
 */
 /*! \fn void OContact::setDepartment( const QString &str )
  Sets the department for contact to \a str.
 */
 /*! \fn void OContact::setOffice( const QString &str )
  Sets the office for contact to \a str.
 */
 /*! \fn void OContact::setBusinessStreet( const QString &str )
  Sets the business street address of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessCity( const QString &str )
  Sets the business city of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessState( const QString &str )
  Sets the business state of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessZip( const QString &str )
  Sets the business zip code of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessCountry( const QString &str )
  Sets the business country of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPhone( const QString &str )
  Sets the business phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessFax( const QString &str )
  Sets the business fax number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessMobile( const QString &str )
  Sets the business mobile phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPager( const QString &str )
  Sets the business pager number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessWebpage( const QString &str )
  Sets the business webpage of the contact to \a str.
 */
 /*! \fn void OContact::setProfession( const QString &str )
  Sets the profession of the contact to \a str.
 */
 /*! \fn void OContact::setAssistant( const QString &str )
  Sets the assistant of the contact to \a str.
 */
 /*! \fn void OContact::setManager( const QString &str )
  Sets the manager of the contact to \a str.