1 files changed, 18 insertions, 10 deletions

diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp
index dbf9370..6e544ba 100644
--- a/noncore/apps/tableviewer/db/common.cpp
+++ b/noncore/apps/tableviewer/db/common.cpp
@@ -12,25 +12,33 @@
 ** 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.
 **
 **********************************************************************/ 
-#include <stdlib.h>
+#include "common.h"   
+#include "datacache.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/timestring.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qstring.h>
 #include <qheader.h>
 #include <qvector.h>
 #include <qdatetime.h>
-#include <qpe/timestring.h>
-#include "common.h"
-#include "datacache.h"
+
+/* STD */
 #include <assert.h>
+#include <stdlib.h>
 
 static const int del_flag = 0x1;
 static const int new_flag = 0x2;
 
 /* Helper function */
 
 int parseNextNumber(QString *q) {
     QChar c;
@@ -307,17 +315,17 @@ void TVVariant::load(QDataStream &s )
         case Int:
             {
                 int x;
                 s >> x;
                 d->value.i = x;
             }
       break;
         default:
-      qFatal("Unrecognized data type");
+      ofatal << "Unrecognized data type" << oendl; 
     }
 }
 
 void TVVariant::save( QDataStream &s ) const
 {
     s << type();
 
     switch( d->typ ) {
@@ -1073,17 +1081,17 @@ QDataStream &operator>>( QDataStream &s, DataElem &d)
 {
     int i;
     int size;
     TVVariant t;
     int index = 0;
 
     s >> size; /* redundent data but makes streaming easier */
     if (size != d.getNumFields()) {
-        qWarning("DataSize mis-match");
+        owarn << "DataSize mis-match" << oendl; 
         return s; /* sanity check failed.. don't load */
     }
 
     for(i = 0; i < size; i++) {
         s >> (Q_UINT16)index;
         s >> t;
         d.setField(index, t);
     }
@@ -1372,17 +1380,17 @@ bool DataElem::contains(int i, TVVariant v) const
             /* meaningless for ints */
             /* meaningless for time */
             /* meaningless for dates */
         case TVVariant::Int: 
         case TVVariant::Time:
         case TVVariant::Date:
             break;
         default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
     }
     return FALSE;
 }
 
 bool DataElem::startsWith(int i, TVVariant v) const
 {
     if (!hasValidValue(i)) return FALSE;
 
@@ -1398,17 +1406,17 @@ bool DataElem::startsWith(int i, TVVariant v) const
             /* meaningless for ints */
             /* meaningless for time */
             /* meaningless for dates */
         case TVVariant::Int: 
         case TVVariant::Time:
         case TVVariant::Date:
             return FALSE;
         default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
     }
     return FALSE;
 }
 
 bool DataElem::endsWith(int i, TVVariant v) const
 {
     if (!hasValidValue(i)) return FALSE;
 
@@ -1424,17 +1432,17 @@ bool DataElem::endsWith(int i, TVVariant v) const
             /* meaningless for ints */
             /* meaningless for time */
             /* meaningless for dates */
         case TVVariant::Int: 
         case TVVariant::Time:
         case TVVariant::Date:
             return FALSE;
         default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
     }
     return FALSE;
 }
 
 /*!
     Determins which of the first to parameters are closer to the third, target
     parameter.
 
@@ -1456,15 +1464,15 @@ bool DataElem::closer(DataElem*d1, DataElem *d2, TVVariant target, int column)
 
     if(!target.isValid()) return FALSE;
 
     type = d1->getField(column).type();
 
     if(d2) {
         if (type != d2->getField(column).type()) {
                 /* can't do compare */
-                qWarning("Tried to compare two incompatable types");
+                owarn << "Tried to compare two incompatable types" << oendl; 
                 return FALSE;
         }
         return target.closer(d1->getField(column), d2->getField(column));
     } 
     return target.close(d1->getField(column));
 }