author | ar <ar> | 2004-06-01 22:21:23 (UTC) |
---|---|---|
committer | ar <ar> | 2004-06-01 22:21:23 (UTC) |
commit | d4fe7d53ddf8f3e7ae046a511f0dc061f30d45ce (patch) (unidiff) | |
tree | 4bab082304716df1ec924ef040161e3cf9c10366 /libopie2/opiepim/core | |
parent | baed1d5ab8589aef14440009bc4e7380bcc5a741 (diff) | |
download | opie-d4fe7d53ddf8f3e7ae046a511f0dc061f30d45ce.zip opie-d4fe7d53ddf8f3e7ae046a511f0dc061f30d45ce.tar.gz opie-d4fe7d53ddf8f3e7ae046a511f0dc061f30d45ce.tar.bz2 |
- convert to odebug framework
-rw-r--r-- | libopie2/opiepim/core/ocontactaccess.cpp | 25 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimaccesstemplate.h | 11 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimcontact.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimnotifymanager.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimrecordlist.h | 5 |
5 files changed, 29 insertions, 20 deletions
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 | |||
@@ -38,2 +38,12 @@ | |||
38 | 38 | ||
39 | /* OPIE */ | ||
40 | #include <opie2/ocontactaccessbackend_xml.h> | ||
41 | #include <opie2/opimresolver.h> | ||
42 | #include <opie2/opimglobal.h> | ||
43 | #include <opie2/odebug.h> | ||
44 | |||
45 | //#include <qpe/qcopenvelope_qws.h> | ||
46 | #include <qpe/global.h> | ||
47 | |||
48 | /* QT */ | ||
39 | #include <qasciidict.h> | 49 | #include <qasciidict.h> |
@@ -45,5 +55,3 @@ | |||
45 | 55 | ||
46 | //#include <qpe/qcopenvelope_qws.h> | 56 | /* STD */ |
47 | #include <qpe/global.h> | ||
48 | |||
49 | #include <errno.h> | 57 | #include <errno.h> |
@@ -53,5 +61,2 @@ | |||
53 | 61 | ||
54 | #include <opie2/ocontactaccessbackend_xml.h> | ||
55 | #include <opie2/opimresolver.h> | ||
56 | #include <opie2/opimglobal.h> | ||
57 | 62 | ||
@@ -67,3 +72,3 @@ OPimContactAccess::OPimContactAccess ( const QString appname, const QString , | |||
67 | if( end == 0 ) { | 72 | if( end == 0 ) { |
68 | qWarning ("Using BackendFactory !"); | 73 | owarn << "Using BackendFactory !" << oendl; |
69 | end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( OPimGlobal::CONTACTLIST, appname ); | 74 | end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( OPimGlobal::CONTACTLIST, appname ); |
@@ -141,9 +146,9 @@ void OPimContactAccess::copMessage( const QCString &msg, const QByteArray & ) | |||
141 | if ( msg == "addressbookUpdated()" ){ | 146 | if ( msg == "addressbookUpdated()" ){ |
142 | qWarning ("OPimContactAccess: Received addressbokUpdated()"); | 147 | owarn << "OPimContactAccess: Received addressbokUpdated()" << oendl; |
143 | emit signalChanged ( this ); | 148 | emit signalChanged ( this ); |
144 | } else if ( msg == "flush()" ) { | 149 | } else if ( msg == "flush()" ) { |
145 | qWarning ("OPimContactAccess: Received flush()"); | 150 | owarn << "OPimContactAccess: Received flush()" << oendl; |
146 | save (); | 151 | save (); |
147 | } else if ( msg == "reload()" ) { | 152 | } else if ( msg == "reload()" ) { |
148 | qWarning ("OPimContactAccess: Received reload()"); | 153 | owarn << "OPimContactAccess: Received reload()" << oendl; |
149 | reload (); | 154 | reload (); |
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 | |||
@@ -32,4 +32,3 @@ | |||
32 | 32 | ||
33 | #include <qarray.h> | 33 | /* OPIE */ |
34 | |||
35 | #include <opie2/opimrecord.h> | 34 | #include <opie2/opimrecord.h> |
@@ -40,2 +39,6 @@ | |||
40 | #include <opie2/opimtemplatebase.h> | 39 | #include <opie2/opimtemplatebase.h> |
40 | #include <opie2/odebug.h> | ||
41 | |||
42 | /* QT */ | ||
43 | #include <qarray.h> | ||
41 | 44 | ||
@@ -207,3 +210,3 @@ template <class T> | |||
207 | OPimAccessTemplate<T>::~OPimAccessTemplate() { | 210 | OPimAccessTemplate<T>::~OPimAccessTemplate() { |
208 | qWarning("~OPimAccessTemplate<T>"); | 211 | owarn << "~OPimAccessTemplate<T>" << oendl; |
209 | delete m_backEnd; | 212 | delete m_backEnd; |
@@ -262,3 +265,3 @@ T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar, | |||
262 | */ | 265 | */ |
263 | // qWarning("find it now %d", uid ); | 266 | // owarn << "find it now " << uid << oendl; |
264 | if (m_cache.contains( uid ) ) { | 267 | if (m_cache.contains( 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 | |||
@@ -1175,3 +1175,3 @@ QDate OPimContact::birthday() const | |||
1175 | QString str = find( Qtopia::Birthday ); | 1175 | QString str = find( Qtopia::Birthday ); |
1176 | // qWarning ("Birthday %s", str.latin1() ); | 1176 | // owarn << "Birthday " << str << oendl; |
1177 | if ( !str.isEmpty() ) | 1177 | if ( !str.isEmpty() ) |
@@ -1190,3 +1190,3 @@ QDate OPimContact::anniversary() const | |||
1190 | QString str = find( Qtopia::Anniversary ); | 1190 | QString str = find( Qtopia::Anniversary ); |
1191 | // qWarning ("Anniversary %s", str.latin1() ); | 1191 | // owarn << "Anniversary " << str << oendl; |
1192 | if ( !str.isEmpty() ) | 1192 | if ( !str.isEmpty() ) |
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 | |||
@@ -229,4 +229,4 @@ void OPimNotifyManager::alarmsFromString( const QString& str ) | |||
229 | owarn << "alarm: " << alarm.join( "___" ) << "" << oendl; | 229 | owarn << "alarm: " << alarm.join( "___" ) << "" << oendl; |
230 | qWarning( "alarm[0]: %s %s", alarm[ 0 ].latin1(), | 230 | owarn << "alarm[0]: " << alarm[ 0 ] << " " |
231 | OPimDateConversion::dateTimeFromString( alarm[ 0 ] ).toString().latin1() ); | 231 | << OPimDateConversion::dateTimeFromString( alarm[ 0 ] ).toString() << oendl; |
232 | OPimAlarm al( alarm[ 2 ].toInt(), OPimDateConversion::dateTimeFromString( alarm[ 0 ] ), | 232 | OPimAlarm al( alarm[ 2 ].toInt(), OPimDateConversion::dateTimeFromString( alarm[ 0 ] ), |
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 | |||
@@ -35,2 +35,3 @@ | |||
35 | #include <opie2/opimrecord.h> | 35 | #include <opie2/opimrecord.h> |
36 | //#include <opie2/odebug.h> | ||
36 | 37 | ||
@@ -191,3 +192,3 @@ OPimRecordListIterator<T>::OPimRecordListIterator( const OPimRecordListIterator< | |||
191 | { | 192 | { |
192 | // qWarning("OPimRecordListIterator copy c'tor"); | 193 | //owarn << "OPimRecordListIterator copy c'tor" << oendl; |
193 | m_uids = it.m_uids; | 194 | m_uids = it.m_uids; |
@@ -217,3 +218,3 @@ T OPimRecordListIterator<T>::operator*() | |||
217 | { | 218 | { |
218 | //qWarning("operator* %d %d", m_current, m_uids[m_current] ); | 219 | //owarn << "operator* " << m_current << " " << m_uids[m_current] << oendl; |
219 | if ( !m_end ) | 220 | if ( !m_end ) |