summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/backend/obackendfactory.h24
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp36
-rw-r--r--libopie2/opiepim/core/ocontactaccess.cpp25
-rw-r--r--libopie2/opiepim/core/opimaccesstemplate.h11
-rw-r--r--libopie2/opiepim/core/opimcontact.cpp4
-rw-r--r--libopie2/opiepim/core/opimnotifymanager.cpp4
-rw-r--r--libopie2/opiepim/core/opimrecordlist.h5
7 files changed, 60 insertions, 49 deletions
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h
index 6f46652..3680ded 100644
--- a/libopie2/opiepim/backend/obackendfactory.h
+++ b/libopie2/opiepim/backend/obackendfactory.h
@@ -35,8 +35,5 @@
#define OPIE_BACKENDFACTORY_H_
-#include <qstring.h>
-#include <qasciidict.h>
-#include <qpe/config.h>
-
+/* OPIE */
#include <opie2/opimaccessbackend.h>
#include <opie2/opimglobal.h>
@@ -46,4 +43,5 @@
#include <opie2/ocontactaccessbackend_vcard.h>
#include <opie2/odatebookaccessbackend_xml.h>
+#include <opie2/odebug.h>
#ifdef __USE_SQL
@@ -53,4 +51,12 @@
#endif
+#include <qpe/config.h>
+
+/* QT */
+#include <qstring.h>
+#include <qasciidict.h>
+
+
+
using namespace Opie;
using namespace Opie::Pim;
@@ -91,5 +97,5 @@ class OBackendFactory
static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database,
const QString& appName, const QString& filename = QString::null ){
- qWarning("Selected backend for %d is: %d", type, database );
+ owarn << "Selected backend for " << type << " is: " << database << oendl;
// If we should use the dafult database style, we have to request it
OPimGlobal::DatabaseStyle use_database = database;
@@ -109,5 +115,5 @@ class OBackendFactory
break;
#else
- qWarning ("OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!");
+ owarn << "OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!" << oendl;
// Fall through !!
#endif
@@ -128,5 +134,5 @@ class OBackendFactory
break;
#else
- qWarning ("OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!");
+ owarn << "OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!" << oendl;
// Fall through !!
#endif
@@ -147,5 +153,5 @@ class OBackendFactory
break;
#else
- qWarning("OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!");
+ owarn << "OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!" << oendl;
// Fall through !!
#endif
@@ -154,5 +160,5 @@ class OBackendFactory
break;
case OPimGlobal::VCARD:
- qWarning("OBackendFactory:: VCal Backend for DATEBOOK not implemented!");
+ owarn << "OBackendFactory:: VCal Backend for DATEBOOK not implemented!" << oendl;
return (T*) NULL;
break;
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 5ffcb11..00d62ee 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -138,6 +138,6 @@ bool OPimContactAccessBackend_XML::save()
// because, I don't feel like using QDir.
if ( ::rename( strNewFile.latin1(), m_fileName.latin1() ) < 0 ) {
- qWarning( "problem renaming file %s to %s, errno: %d",
- strNewFile.latin1(), m_journalName.latin1(), errno );
+ owarn << "problem renaming file " << strNewFile << " to " << m_journalName
+ << ", errno: " << errno << oendl;
// remove the tmp file...
QFile::remove( strNewFile );
@@ -279,13 +279,11 @@ QArray<int> OPimContactAccessBackend_XML::queryByExample ( const OPimContact &qu
// the current/given date and the maximum date
// ( maximum time range ) !
- qWarning("Checking if %s is between %s and %s ! ",
- checkDate->toString().latin1(),
- current.toString().latin1(),
- queryDate->toString().latin1() );
+ owarn << "Checking if " << checkDate->toString() << " is between " << current.toString()
+ << " and " << queryDate->toString() << " ! " << oendl;
if ( current.daysTo( *queryDate ) >= 0 ){
if ( !( ( *checkDate >= current ) &&
( *checkDate <= *queryDate ) ) ){
allcorrect = false;
- qWarning (" Nope!..");
+ owarn << " Nope!.." << oendl;
}
}
@@ -608,6 +606,6 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
while( element && !isJournal ){
if( element->tagName() != QString::fromLatin1("Contacts") ){
- //qWarning ("OPimContactDefBack::Searching for Tag \"Contacts\"! Found: %s",
- // element->tagName().latin1());
+ //owarn << "OPimContactDefBack::Searching for Tag \"Contacts\"! Found: "
+ // << element->tagName() << oendl;
element = element->nextChild();
} else {
@@ -619,6 +617,6 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
while( element ){
if( element->tagName() != QString::fromLatin1("Contact") ){
- //qWarning ("OPimContactDefBack::Searching for Tag \"Contact\"! Found: %s",
- // element->tagName().latin1());
+ //owarn << "OPimContactDefBack::Searching for Tag \"Contact\"! Found: "
+ // << element->tagName() << oendl;
element = element->nextChild();
continue;
@@ -627,6 +625,6 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
* attributes contained
*/
- //qWarning("OPimContactDefBack::load element tagName() : %s",
- // element->tagName().latin1() );
+ //owarn << "OPimContactDefBack::load element tagName() : "
+ // << element->tagName() << oendl;
QString dummy;
foundAction = false;
@@ -637,5 +635,5 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
customMap.clear();
for( it = aMap.begin(); it != aMap.end(); ++it ){
- // qWarning ("Read Attribute: %s=%s", it.key().latin1(),it.data().latin1());
+ // owarn << "Read Attribute: " << it.key() << "=" << it.data() << oendl;
int *find = dict[ it.key() ];
@@ -663,5 +661,5 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
action = journal_action(it.data().toInt());
foundAction = true;
- qWarning ("ODefBack(journal)::ACTION found: %d", action);
+ owarn << "ODefBack(journal)::ACTION found: " << action << oendl;
break;
case JOURNALROW:
@@ -688,14 +686,12 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
case ACTION_REMOVE:
if ( !remove (contact.uid()) )
- qWarning ("ODefBack(journal)::Unable to remove uid: %d",
- contact.uid() );
+ owarn << "ODefBack(journal)::Unable to remove uid: " << contact.uid() << oendl;
break;
case ACTION_REPLACE:
if ( !replace ( contact ) )
- qWarning ("ODefBack(journal)::Unable to replace uid: %d",
- contact.uid() );
+ owarn << "ODefBack(journal)::Unable to replace uid: " << contact.uid() << oendl;
break;
default:
- qWarning ("Unknown action: ignored !");
+ owarn << "Unknown action: ignored !" << oendl;
break;
}
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index a372267..7a3d7cb 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -37,4 +37,14 @@
#include "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>
#include <qdatetime.h>
@@ -44,7 +54,5 @@
#include <qcopchannel_qws.h>
-//#include <qpe/qcopenvelope_qws.h>
-#include <qpe/global.h>
-
+/* STD */
#include <errno.h>
#include <fcntl.h>
@@ -52,7 +60,4 @@
#include <stdlib.h>
-#include <opie2/ocontactaccessbackend_xml.h>
-#include <opie2/opimresolver.h>
-#include <opie2/opimglobal.h>
namespace Opie {
@@ -66,5 +71,5 @@ OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
*/
if( end == 0 ) {
- qWarning ("Using BackendFactory !");
+ owarn << "Using BackendFactory !" << oendl;
end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( OPimGlobal::CONTACTLIST, appname );
}
@@ -140,11 +145,11 @@ void OPimContactAccess::copMessage( const QCString &msg, const QByteArray & )
{
if ( msg == "addressbookUpdated()" ){
- qWarning ("OPimContactAccess: Received addressbokUpdated()");
+ owarn << "OPimContactAccess: Received addressbokUpdated()" << oendl;
emit signalChanged ( this );
} else if ( msg == "flush()" ) {
- qWarning ("OPimContactAccess: Received flush()");
+ owarn << "OPimContactAccess: Received flush()" << oendl;
save ();
} else if ( msg == "reload()" ) {
- qWarning ("OPimContactAccess: Received reload()");
+ owarn << "OPimContactAccess: Received reload()" << oendl;
reload ();
emit signalChanged ( this );
diff --git a/libopie2/opiepim/core/opimaccesstemplate.h b/libopie2/opiepim/core/opimaccesstemplate.h
index e438980..55d600a 100644
--- a/libopie2/opiepim/core/opimaccesstemplate.h
+++ b/libopie2/opiepim/core/opimaccesstemplate.h
@@ -31,6 +31,5 @@
#define OPIE_PIM_ACCESS_TEMPLATE_H
-#include <qarray.h>
-
+/* OPIE */
#include <opie2/opimrecord.h>
#include <opie2/opimaccessbackend.h>
@@ -39,4 +38,8 @@
#include <opie2/opimcache.h>
#include <opie2/opimtemplatebase.h>
+#include <opie2/odebug.h>
+
+/* QT */
+#include <qarray.h>
namespace Opie {
@@ -206,5 +209,5 @@ OPimAccessTemplate<T>::OPimAccessTemplate( BackEnd* end )
template <class T>
OPimAccessTemplate<T>::~OPimAccessTemplate() {
- qWarning("~OPimAccessTemplate<T>");
+ owarn << "~OPimAccessTemplate<T>" << oendl;
delete m_backEnd;
}
@@ -261,5 +264,5 @@ T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar,
* avoid two finds in QCache...
*/
- // qWarning("find it now %d", uid );
+ // owarn << "find it now " << uid << oendl;
if (m_cache.contains( uid ) ) {
return m_cache.find( uid );
diff --git a/libopie2/opiepim/core/opimcontact.cpp b/libopie2/opiepim/core/opimcontact.cpp
index 48a74d0..36e9a93 100644
--- a/libopie2/opiepim/core/opimcontact.cpp
+++ b/libopie2/opiepim/core/opimcontact.cpp
@@ -1174,5 +1174,5 @@ QDate OPimContact::birthday() const
{
QString str = find( Qtopia::Birthday );
- // qWarning ("Birthday %s", str.latin1() );
+ // owarn << "Birthday " << str << oendl;
if ( !str.isEmpty() )
return OPimDateConversion::dateFromString ( str );
@@ -1189,5 +1189,5 @@ QDate OPimContact::anniversary() const
QDate empty;
QString str = find( Qtopia::Anniversary );
- // qWarning ("Anniversary %s", str.latin1() );
+ // owarn << "Anniversary " << str << oendl;
if ( !str.isEmpty() )
return OPimDateConversion::dateFromString ( str );
diff --git a/libopie2/opiepim/core/opimnotifymanager.cpp b/libopie2/opiepim/core/opimnotifymanager.cpp
index 0f863aa..516dc79 100644
--- a/libopie2/opiepim/core/opimnotifymanager.cpp
+++ b/libopie2/opiepim/core/opimnotifymanager.cpp
@@ -228,6 +228,6 @@ void OPimNotifyManager::alarmsFromString( const QString& str )
QStringList alarm = QStringList::split( ":", ( *it ), TRUE ); // allow empty
owarn << "alarm: " << alarm.join( "___" ) << "" << oendl;
- qWarning( "alarm[0]: %s %s", alarm[ 0 ].latin1(),
- OPimDateConversion::dateTimeFromString( alarm[ 0 ] ).toString().latin1() );
+ owarn << "alarm[0]: " << alarm[ 0 ] << " "
+ << OPimDateConversion::dateTimeFromString( alarm[ 0 ] ).toString() << oendl;
OPimAlarm al( alarm[ 2 ].toInt(), OPimDateConversion::dateTimeFromString( alarm[ 0 ] ),
alarm[ 1 ].toInt() );
diff --git a/libopie2/opiepim/core/opimrecordlist.h b/libopie2/opiepim/core/opimrecordlist.h
index b23138d..1d5027f 100644
--- a/libopie2/opiepim/core/opimrecordlist.h
+++ b/libopie2/opiepim/core/opimrecordlist.h
@@ -34,4 +34,5 @@
#include <opie2/opimtemplatebase.h>
#include <opie2/opimrecord.h>
+//#include <opie2/odebug.h>
/* QT */
@@ -190,5 +191,5 @@ template <class T>
OPimRecordListIterator<T>::OPimRecordListIterator( const OPimRecordListIterator<T>& it )
{
- // qWarning("OPimRecordListIterator copy c'tor");
+ //owarn << "OPimRecordListIterator copy c'tor" << oendl;
m_uids = it.m_uids;
m_current = it.m_current;
@@ -216,5 +217,5 @@ template <class T>
T OPimRecordListIterator<T>::operator*()
{
- //qWarning("operator* %d %d", m_current, m_uids[m_current] );
+ //owarn << "operator* " << m_current << " " << m_uids[m_current] << oendl;
if ( !m_end )
m_record = m_temp->find( m_uids[ m_current ], m_uids, m_current,