-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp | 64 | ||||
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp | 18 | ||||
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp | 32 | ||||
-rw-r--r-- | libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp | 43 | ||||
-rw-r--r-- | libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp | 42 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccesssql.cpp | 48 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessvcal.cpp | 10 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.cpp | 65 |
8 files changed, 178 insertions, 144 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp index 14207be..dda23cc 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp @@ -34,9 +34,3 @@ -#include <qarray.h> -#include <qdatetime.h> -#include <qstringlist.h> - -#include <qpe/global.h> -#include <qpe/recordfields.h> - +/* OPIE */ #include <opie2/opimcontact.h> @@ -48,2 +42,12 @@ #include <opie2/osqlquery.h> +#include <opie2/odebug.h> + +#include <qpe/global.h> +#include <qpe/recordfields.h> + +/* QT */ +#include <qarray.h> +#include <qdatetime.h> +#include <qstringlist.h> + @@ -270,3 +274,3 @@ namespace { // qu += "commit;"; - qDebug("add %s", qu.latin1() ); + odebug << "add " << qu << "" << oendl; return qu; @@ -318,3 +322,3 @@ namespace { - // qWarning("find query: %s", qu.latin1() ); + // owarn << "find query: " << qu << "" << oendl; return qu; @@ -352,3 +356,3 @@ OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* a { - qDebug("C'tor OPimContactAccessBackend_SQL starts"); + odebug << "C'tor OPimContactAccessBackend_SQL starts" << oendl; QTime t; @@ -369,3 +373,3 @@ OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* a - qDebug("C'tor OPimContactAccessBackend_SQL ends: %d ms", t.elapsed() ); + odebug << "C'tor OPimContactAccessBackend_SQL ends: " << t.elapsed() << " ms" << oendl; } @@ -432,3 +436,3 @@ bool OPimContactAccessBackend_SQL::add ( const OPimContact &newcontact ) { - qDebug("add in contact SQL-Backend"); + odebug << "add in contact SQL-Backend" << oendl; InsertQuery ins( newcontact ); @@ -471,3 +475,3 @@ OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const { - qDebug("OPimContactAccessBackend_SQL::find()"); + odebug << "OPimContactAccessBackend_SQL::find()" << oendl; QTime t; @@ -478,3 +482,3 @@ OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const - qDebug("OPimContactAccessBackend_SQL::find() needed: %d ms", t.elapsed() ); + odebug << "OPimContactAccessBackend_SQL::find() needed: " << t.elapsed() << " ms" << oendl; return retContact; @@ -587,3 +591,3 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu - qDebug( "queryByExample query: %s", qu.latin1() ); + odebug << "queryByExample query: " << qu << "" << oendl; @@ -622,3 +626,3 @@ QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const - qDebug( "query: %s", qu.latin1() ); + odebug << "query: " << qu << "" << oendl; @@ -703,3 +707,3 @@ QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc, int , int , int ) - // qDebug("sorted query is: %s", query.latin1() ); + // odebug << "sorted query is: " << query << "" << oendl; @@ -714,3 +718,3 @@ QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc, int , int , int ) - qDebug("sorted needed %d ms!", t.elapsed() ); + odebug << "sorted needed " << t.elapsed() << " ms!" << oendl; return list; @@ -721,3 +725,3 @@ void OPimContactAccessBackend_SQL::update() { - qDebug("Update starts"); + odebug << "Update starts" << oendl; QTime t; @@ -737,3 +741,3 @@ void OPimContactAccessBackend_SQL::update() - qDebug("Update ends %d ms", t.elapsed() ); + odebug << "Update ends " << t.elapsed() << " ms" << oendl; } @@ -742,3 +746,3 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const { - qDebug("extractUids"); + odebug << "extractUids" << oendl; QTime t; @@ -748,3 +752,3 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const QArray<int> ints(list.count() ); - qDebug(" count = %d", list.count() ); + odebug << " count = " << list.count() << "" << oendl; @@ -755,3 +759,3 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const } - qDebug("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() ); + odebug << "extractUids ready: count2 = " << i << " needs " << t.elapsed() << " ms" << oendl; @@ -790,3 +794,3 @@ QMap<int, QString> OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co - // qDebug("Reading %s... found: %s", (*it).latin1(), value.latin1() ); + // odebug << "Reading " << (*it) << "... found: " << value << "" << oendl; @@ -808,3 +812,3 @@ QMap<int, QString> OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co case Qtopia::AddressCategory: - qDebug("Category is: %s", value.latin1() ); + odebug << "Category is: " << value << "" << oendl; default: @@ -818,5 +822,5 @@ QMap<int, QString> OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co - // qDebug("Adding UID: %s", resItem.data( "uid" ).latin1() ); - qDebug("RequestNonCustom needed: insg.:%d ms, query: %d ms, mapping: %d ms", - t.elapsed(), t2needed, t3needed ); + // odebug << "Adding UID: " << resItem.data( "uid" ) << "" << oendl; + odebug << "RequestNonCustom needed: insg.:" << t.elapsed() << " ms, query: " << t2needed + << " ms, mapping: " << t3needed << " ms" << oendl; @@ -836,3 +840,3 @@ QMap<QString, QString> OPimContactAccessBackend_SQL::requestCustom( int uid ) c if ( res_custom.state() == OSQLResult::Failure ) { - qWarning("OSQLResult::Failure in find query !!"); + owarn << "OSQLResult::Failure in find query !!" << oendl; QMap<QString, QString> empty; @@ -847,3 +851,3 @@ QMap<QString, QString> OPimContactAccessBackend_SQL::requestCustom( int uid ) c - qDebug("RequestCustom needed: %d ms", t.elapsed() ); + odebug << "RequestCustom needed: " << t.elapsed() << " ms" << oendl; return customMap; diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp index ffa6a7d..b6ea461 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp @@ -37,2 +37,4 @@ #include <opie2/ocontactaccessbackend_vcard.h> +#include <opie2/odebug.h> + #include <qpe/timeconversion.h> @@ -66,3 +68,3 @@ bool OPimContactAccessBackend_VCard::load () }else{ - qWarning("File \"%s\" not found !", m_file.latin1() ); + owarn << "File \"" << m_file << "\" not found !" << oendl; return false; @@ -79,3 +81,3 @@ bool OPimContactAccessBackend_VCard::load () con.setUid( 1 ); - qWarning("assigned new uid %d",con.uid() ); + owarn << "assigned new uid " << con.uid() << "" << oendl; } @@ -318,3 +320,3 @@ OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj ) - qWarning("value %s %d", value.data(), type ); + owarn << "value " << value.data() << " " << type << "" << oendl; if ( (type & (VOICE|HOME) ) == (VOICE|HOME) && (type & (CELL|HOME) ) != (CELL|HOME) ) @@ -512,3 +514,3 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c ) if ( c.birthday().isValid() ){ - qWarning("Exporting birthday as: %s", convDateToVCardDate( c.birthday() ).latin1() ); + owarn << "Exporting birthday as: " << convDateToVCardDate( c.birthday() ) << "" << oendl; safeAddPropValue( vcard, VCBirthDateProp, convDateToVCardDate( c.birthday() ) ); @@ -531,3 +533,3 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c ) if ( c.anniversary().isValid() ){ - qWarning("Exporting anniversary as: %s", convDateToVCardDate( c.anniversary() ).latin1() ); + owarn << "Exporting anniversary as: " << convDateToVCardDate( c.anniversary() ) << "" << oendl; safeAddPropValue( vcard, "X-Qtopia-Anniversary", convDateToVCardDate( c.anniversary() ) ); @@ -560,3 +562,3 @@ QDate OPimContactAccessBackend_VCard::convVCardDateToDate( const QString& datest if ( monthPos == -1 || dayPos == -1 ) { - qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos ); + odebug << "fromString didn't find - in str = " << datestr << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl; // Ok.. No "-" found, therefore we will try to read other format ( YYYYMMDD ) @@ -566,3 +568,3 @@ QDate OPimContactAccessBackend_VCard::convVCardDateToDate( const QString& datest sep_ignore = 0; - qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos ); + odebug << "Try with follwing positions str = " << datestr << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl; } else { @@ -574,3 +576,3 @@ QDate OPimContactAccessBackend_VCard::convVCardDateToDate( const QString& datest int d = datestr.mid( dayPos + sep_ignore ).toInt(); - qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos); + odebug << "TimeConversion::fromString ymd = " << datestr << " => " << y << " " << m << " " << d << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl; QDate date ( y,m,d ); diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp index 7b4d81f..5ffcb11 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp @@ -32,4 +32,13 @@ + +/* OPIE */ #include <opie2/ocontactaccessbackend_xml.h> +#include <opie2/xmltree.h> +#include <opie2/ocontactaccessbackend.h> +#include <opie2/ocontactaccess.h> +#include <opie2/odebug.h> + +#include <qpe/global.h> +/* QT */ #include <qasciidict.h> @@ -41,8 +50,3 @@ -#include <qpe/global.h> - -#include <opie2/xmltree.h> -#include <opie2/ocontactaccessbackend.h> -#include <opie2/ocontactaccess.h> - +/* STD */ #include <stdlib.h> @@ -106,3 +110,3 @@ bool OPimContactAccessBackend_XML::save() for ( ; it.current(); ++it ) { - // qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset ); + // owarn << " Uid " << (*it)->uid() << " at Offset: " << idx_offset << "" << oendl; out += "<Contact "; @@ -461,3 +465,3 @@ bool OPimContactAccessBackend_XML::add ( const OPimContact &newcontact ) { - //qWarning("odefaultbackend: ACTION::ADD"); + //owarn << "odefaultbackend: ACTION::ADD" << oendl; updateJournal (newcontact, ACTION_ADD); @@ -485,3 +489,3 @@ bool OPimContactAccessBackend_XML::replace ( const OPimContact &contact ) - qWarning("Nur zur Sicherheit: %d == %d ?",contact.uid(), newCont->uid()); + owarn << "Nur zur Sicherheit: " << contact.uid() << " == " << newCont->uid() << " ?" << oendl; @@ -591,3 +595,3 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal - //qWarning( "OPimContactDefaultBackEnd::loading %s", filename.latin1() ); + //owarn << "OPimContactDefaultBackEnd::loading " << filename << "" << oendl; @@ -599,3 +603,3 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal XMLElement *element = root->firstChild(); - //qWarning("OPimContactAccess::load tagName(): %s", root->tagName().latin1() ); + //owarn << "OPimContactAccess::load tagName(): " << root->tagName() << "" << oendl; element = element->firstChild(); @@ -639,3 +643,3 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal if ( !find ) { - // qWarning("Attribute %s not known.", it.key().latin1()); + // owarn << "Attribute " << it.key() << " not known." << oendl; //contact.setCustomField(it.key(), it.data()); @@ -706,6 +710,6 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal }else { - qWarning("ODefBack::could not load"); + owarn << "ODefBack::could not load" << oendl; } delete root; - qWarning("returning from loading" ); + owarn << "returning from loading" << oendl; return true; diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp index f4f3c94..105c106 100644 --- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp +++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp @@ -33,10 +33,3 @@ -#include <stdio.h> -#include <stdlib.h> - -#include <qarray.h> -#include <qstringlist.h> - -#include <qpe/global.h> - +/* OPIE */ #include <opie2/osqldriver.h> @@ -47,2 +40,14 @@ #include <opie2/odatebookaccessbackend_sql.h> +#include <opie2/odebug.h> + +#include <qpe/global.h> + +/* QT */ +#include <qarray.h> +#include <qstringlist.h> + +/* STD */ +#include <stdio.h> +#include <stdlib.h> + @@ -164,3 +169,3 @@ bool ODateBookAccessBackend_SQL::load() - qWarning( "command: %s", qu.latin1() ); + owarn << "command: " << qu << "" << oendl; @@ -223,3 +228,3 @@ void ODateBookAccessBackend_SQL::clear() OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{ - qDebug( "ODateBookAccessBackend_SQL::find( %d )", uid ); + odebug << "ODateBookAccessBackend_SQL::find( " << uid << " )" << oendl; @@ -228,3 +233,3 @@ OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{ - qDebug( "Query: %s", qu.latin1() ); + odebug << "Query: " << qu << "" << oendl; @@ -249,3 +254,3 @@ OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{ - qDebug( "ODateBookAccessBackend_SQL::find( %d ) end", uid ); + odebug << "ODateBookAccessBackend_SQL::find( " << uid << " ) end" << oendl; return retDate; @@ -285,3 +290,3 @@ bool ODateBookAccessBackend_SQL::add( const OPimEvent& ev ) } - qWarning("add %s", qu.latin1() ); + owarn << "add " << qu << "" << oendl; @@ -392,3 +397,3 @@ QArray<int> ODateBookAccessBackend_SQL::matchRegexp( const QRegExp &r ) const - qDebug( "query: %s", qu.latin1() ); + odebug << "query: " << qu << "" << oendl; @@ -407,3 +412,3 @@ QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const { - qWarning("extractUids"); + owarn << "extractUids" << oendl; QTime t; @@ -413,3 +418,3 @@ QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const QArray<int> ints(list.count() ); - qWarning(" count = %d", list.count() ); + owarn << " count = " << list.count() << "" << oendl; @@ -420,3 +425,3 @@ QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const } - qWarning("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() ); + owarn << "extractUids ready: count2 = " << i << " needs " << t.elapsed() << " ms" << oendl; @@ -437,3 +442,3 @@ QMap<QString, QString> ODateBookAccessBackend_SQL::requestCustom( int uid ) cons if ( res_custom.state() == OSQLResult::Failure ) { - qWarning("OSQLResult::Failure in find query !!"); + owarn << "OSQLResult::Failure in find query !!" << oendl; QMap<QString, QString> empty; @@ -448,3 +453,3 @@ QMap<QString, QString> ODateBookAccessBackend_SQL::requestCustom( int uid ) cons - qDebug("RequestCustom needed: %d ms", t.elapsed() ); + odebug << "RequestCustom needed: " << t.elapsed() << " ms" << oendl; return customMap; diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp index 77c0253..2ff36e3 100644 --- a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp +++ b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp @@ -28,2 +28,19 @@ */ + +/* OPIE */ +#include <opie2/opimnotifymanager.h> +#include <opie2/opimrecurrence.h> +#include <opie2/opimtimezone.h> +#include <opie2/odatebookaccessbackend_xml.h> +#include <opie2/odebug.h> + +#include <qtopia/global.h> +#include <qtopia/stringutil.h> +#include <qtopia/timeconversion.h> + +/* QT */ +#include <qasciidict.h> +#include <qfile.h> + +/* STD */ #include <errno.h> @@ -40,13 +57,2 @@ -#include <qasciidict.h> -#include <qfile.h> - -#include <qtopia/global.h> -#include <qtopia/stringutil.h> -#include <qtopia/timeconversion.h> - -#include <opie2/opimnotifymanager.h> -#include <opie2/opimrecurrence.h> -#include <opie2/opimtimezone.h> -#include <opie2/odatebookaccessbackend_xml.h> @@ -118,3 +124,3 @@ namespace { inline void save( const OPimEvent& ev, QString& buf ) { - qWarning("Saving %d %s", ev.uid(), ev.description().latin1() ); + owarn << "Saving " << ev.uid() << " " << ev.description() << "" << oendl; buf += " description=\"" + Qtopia::escapeString(ev.description() ) + "\""; @@ -492,6 +498,6 @@ void ODateBookAccessBackend_XML::finalizeRecord( OPimEvent& ev ) { /* to current date time */ - // qWarning(" Start is %d", start ); + // owarn << " Start is " << start << "" << oendl; OPimTimeZone zone( ev.timeZone().isEmpty() ? OPimTimeZone::current() : ev.timeZone() ); QDateTime date = zone.toDateTime( start ); - qWarning(" Start is %s", date.toString().latin1() ); + owarn << " Start is " << date.toString() << "" << oendl; ev.setStartDateTime( zone.toDateTime( date, OPimTimeZone::current() ) ); @@ -516,6 +522,6 @@ void ODateBookAccessBackend_XML::finalizeRecord( OPimEvent& ev ) { if ( m_raw.contains( ev.uid() ) || m_rep.contains( ev.uid() ) ) { - qWarning("already contains assign uid"); + owarn << "already contains assign uid" << oendl; ev.setUid( 1 ); } - qWarning("addind %d %s", ev.uid(), ev.description().latin1() ); + owarn << "addind " << ev.uid() << " " << ev.description() << "" << oendl; if ( ev.hasRecurrence() ) @@ -527,3 +533,3 @@ void ODateBookAccessBackend_XML::finalizeRecord( OPimEvent& ev ) { void ODateBookAccessBackend_XML::setField( OPimEvent& e, int id, const QString& value) { -// qWarning(" setting %s", value.latin1() ); +// owarn << " setting " << value << "" << oendl; switch( id ) { @@ -612,3 +618,3 @@ void ODateBookAccessBackend_XML::setField( OPimEvent& e, int id, const QString& QDate date( (*it).left(4).toInt(), (*it).mid(4, 2).toInt(), (*it).right(2).toInt() ); - qWarning("adding exception %s", date.toString().latin1() ); + owarn << "adding exception " << date.toString() << "" << oendl; recur()->exceptions().append( date ); diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp index 132b5a6..6f65c48 100644 --- a/libopie2/opiepim/backend/otodoaccesssql.cpp +++ b/libopie2/opiepim/backend/otodoaccesssql.cpp @@ -30,8 +30,3 @@ -#include <qdatetime.h> -#include <qmap.h> -#include <qstring.h> - -#include <qpe/global.h> - +/* OPIE */ #include <opie2/osqldriver.h> @@ -45,2 +40,11 @@ #include <opie2/opimrecurrence.h> +#include <opie2/odebug.h> + +#include <qpe/global.h> + +/* QT */ +#include <qdatetime.h> +#include <qmap.h> +#include <qstring.h> + @@ -293,3 +297,3 @@ namespace { - qDebug("add %s", qu.latin1() ); + odebug << "add " << qu << "" << oendl; return qu; @@ -458,3 +462,3 @@ OPimTodo OPimTodoAccessBackendSQL::find( int uid, const QArray<int>& ints, uint CACHE = readAhead(); - qDebug("searching for %d", uid ); + odebug << "searching for " << uid << "" << oendl; QArray<int> search( CACHE ); @@ -468,3 +472,3 @@ OPimTodo OPimTodoAccessBackendSQL::find( int uid, const QArray<int>& ints, for (uint i = cur; i < ints.count() && size < CACHE; i++ ) { - qDebug("size %d %d", size, ints[i] ); + odebug << "size " << size << " " << ints[i] << "" << oendl; search[size] = ints[i]; @@ -543,3 +547,3 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder, int sortFilter, int cat ) { - qDebug("sorted %d, %d", asc, sortOrder ); + odebug << "sorted " << asc << ", " << sortOrder << "" << oendl; QString query; @@ -602,3 +606,3 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder, if ( !asc ) { - qDebug("not ascending!"); + odebug << "not ascending!" << oendl; query += " DESC"; @@ -606,3 +610,3 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder, - qDebug( query ); + odebug << query << oendl; OSQLRawQuery raw(query ); @@ -631,3 +635,3 @@ OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res ) const{ OSQLResultItem::ValueList::Iterator it = list.begin(); - qDebug("todo1"); + odebug << "todo1" << oendl; OPimTodo to = todo( (*it) ); @@ -637,3 +641,3 @@ OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res ) const{ for ( ; it != list.end(); ++it ) { - qDebug("caching"); + odebug << "caching" << oendl; cache( todo( (*it) ) ); @@ -643,3 +647,3 @@ OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res ) const{ OPimTodo OPimTodoAccessBackendSQL::todo( OSQLResultItem& item )const { - qDebug("todo(ResultItem)"); + odebug << "todo(ResultItem)" << oendl; @@ -651,3 +655,3 @@ OPimTodo OPimTodoAccessBackendSQL::todo( OSQLResultItem& item )const { - qDebug("Item is completed: %d", item.data("completed").toInt() ); + odebug << "Item is completed: " << item.data("completed").toInt() << "" << oendl; @@ -752,3 +756,3 @@ QArray<int> OPimTodoAccessBackendSQL::uids( const OSQLResult& res) const{ QArray<int> ints(list.count() ); - qDebug(" count = %d", list.count() ); + odebug << " count = " << list.count() << "" << oendl; @@ -778,3 +782,3 @@ QArray<int> OPimTodoAccessBackendSQL::matchRegexp( const QRegExp &r ) const - qDebug( "query: %s", qu.latin1() ); + odebug << "query: " << qu << "" << oendl; @@ -818,3 +822,3 @@ void OPimTodoAccessBackendSQL::removeAllCompleted(){ - qDebug( "Number of completed: %d", completed_uids.size() ); + odebug << "Number of completed: " << completed_uids.size() << "" << oendl; @@ -844,3 +848,3 @@ void OPimTodoAccessBackendSQL::removeAllCompleted(){ - qDebug( "query: %s", qu.latin1() ); + odebug << "query: " << qu << "" << oendl; @@ -849,3 +853,3 @@ void OPimTodoAccessBackendSQL::removeAllCompleted(){ if ( res.state() == OSQLResult::Failure ) { - qWarning("OPimTodoAccessBackendSQL::removeAllCompleted():Failure in query: %s", qu.latin1() ); + owarn << "OPimTodoAccessBackendSQL::removeAllCompleted():Failure in query: " << qu << "" << oendl; } @@ -862,3 +866,3 @@ QMap<QString, QString> OPimTodoAccessBackendSQL::requestCustom( int uid ) const if ( res_custom.state() == OSQLResult::Failure ) { - qWarning("OSQLResult::Failure in find query !!"); + owarn << "OSQLResult::Failure in find query !!" << oendl; QMap<QString, QString> empty; diff --git a/libopie2/opiepim/backend/otodoaccessvcal.cpp b/libopie2/opiepim/backend/otodoaccessvcal.cpp index 03d4479..14a325e 100644 --- a/libopie2/opiepim/backend/otodoaccessvcal.cpp +++ b/libopie2/opiepim/backend/otodoaccessvcal.cpp @@ -29,7 +29,11 @@ -/* OPIE */ #include "vobject_p.h" -#include <qpe/timeconversion.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! @@ -90,3 +94,3 @@ namespace { name = vObjectStringZValue( ob ); - qWarning("Categories:%s", name.data() ); + owarn << "Categories:" << name.data() << "" << oendl; } diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index cce6111..3e06d88 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp @@ -28,2 +28,21 @@ */ + +/* OPIE */ +#include <opie2/opimdateconversion.h> +#include <opie2/opimstate.h> +#include <opie2/opimtimezone.h> +#include <opie2/opimnotifymanager.h> +#include <opie2/opimrecurrence.h> +#include <opie2/otodoaccessxml.h> +#include <opie2/odebug.h> + +#include <qpe/global.h> +#include <qpe/stringutil.h> +#include <qpe/timeconversion.h> + +/* QT */ +#include <qfile.h> +#include <qvector.h> + +/* STD */ #include <errno.h> @@ -38,16 +57,2 @@ -#include <qfile.h> -#include <qvector.h> - -#include <qpe/global.h> -#include <qpe/stringutil.h> -#include <qpe/timeconversion.h> - -#include <opie2/opimdateconversion.h> -#include <opie2/opimstate.h> -#include <opie2/opimtimezone.h> -#include <opie2/opimnotifymanager.h> -#include <opie2/opimrecurrence.h> -#include <opie2/otodoaccessxml.h> - using namespace Opie; @@ -179,3 +184,3 @@ bool OPimTodoAccessXML::load() { i+= strLen; - qWarning("Found a start at %d %d", i, (point-dt) ); + owarn << "Found a start at " << i << " " << (point-dt) << "" << oendl; @@ -235,3 +240,3 @@ bool OPimTodoAccessXML::load() { */ - qWarning("End at %d", i ); + owarn << "End at " << i << "" << oendl; if (m_events.contains( ev.uid() ) || ev.uid() == 0) { @@ -258,3 +263,3 @@ bool OPimTodoAccessXML::load() { - qWarning("counts %d records loaded!", m_events.count() ); + owarn << "counts " << m_events.count() << " records loaded!" << oendl; return true; @@ -266,5 +271,5 @@ bool OPimTodoAccessXML::reload() { bool OPimTodoAccessXML::save() { -// qWarning("saving"); +// owarn << "saving" << oendl; if (!m_opened || !m_changed ) { -// qWarning("not saving"); +// owarn << "not saving" << oendl; return true; @@ -309,3 +314,3 @@ bool OPimTodoAccessXML::save() { if( ::rename( strNewFile.latin1(), m_file.latin1() ) < 0 ) { -// qWarning("error renaming"); +// owarn << "error renaming" << oendl; QFile::remove( strNewFile ); @@ -347,3 +352,3 @@ void OPimTodoAccessXML::clear() { bool OPimTodoAccessXML::add( const OPimTodo& todo ) { -// qWarning("add"); +// owarn << "add" << oendl; m_changed = true; @@ -406,3 +411,3 @@ void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev, const QCString& attr, const QString& val) { -// qWarning("parse to do from XMLElement" ); +// owarn << "parse to do from XMLElement" << oendl; @@ -412,3 +417,3 @@ void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev, if (!find ) { -// qWarning("Unknown option" + it.key() ); +// owarn << "Unknown option" + it.key() << oendl; ev.setCustomField( attr, val ); @@ -465,4 +470,4 @@ void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev, QStringList alarm = QStringList::split(":", (*it), TRUE ); // allow empty - qWarning("alarm: %s", alarm.join("___").latin1() ); - qWarning("alarm[0]: %s %s", alarm[0].latin1(), OPimDateConversion::dateTimeFromString( alarm[0] ).toString().latin1() ); + owarn << "alarm: " << alarm.join("___") << "" << oendl; + owarn << "alarm[0]: " << alarm[0] << " " << OPimDateConversion::dateTimeFromString( alarm[0] ).toString() << "" << oendl; OPimAlarm al( alarm[2].toInt(), OPimDateConversion::dateTimeFromString( alarm[0] ), alarm[1].toInt() ); @@ -539,3 +544,3 @@ QString customToXml(const QMap<QString, QString>& customMap ) { - //qWarning(QString("writing custom %1").arg(customMap.count())); + //owarn << QString("writing custom %1").arg(customMap.count()) << oendl; QString buf(" "); @@ -543,3 +548,3 @@ QString customToXml(const QMap<QString, QString>& customMap ) cit != customMap.end(); ++cit) { -// qWarning(".ITEM."); +// owarn << ".ITEM." << oendl; buf += cit.key(); @@ -572,3 +577,3 @@ QString OPimTodoAccessXML::toString( const OPimTodo& ev )const { } -// qWarning( "Uid %d", ev.uid() ); +// owarn << "Uid " << ev.uid() << "" << oendl; str += "Uid=\"" + QString::number( ev.uid() ) + "\" "; @@ -619,3 +624,3 @@ QString OPimTodoAccessXML::toString( const OPimTodo& ev )const { // now write the list - qWarning("als: %s", als.join("____________").latin1() ); + owarn << "als: " << als.join("____________") << "" << oendl; str += "Alarms=\""+als.join(";") +"\" "; @@ -840,3 +845,3 @@ QArray<int> OPimTodoAccessXML::sorted( bool asc, int sortOrder, /* if ( (*it).isOverdue() && !bOnly ) { - qWarning("item is overdue but !bOnly"); + owarn << "item is overdue but !bOnly" << oendl; continue; |