7 files changed, 36 insertions, 24 deletions

diff --git a/noncore/apps/tableviewer/browsekeyentry.cpp b/noncore/apps/tableviewer/browsekeyentry.cpp
index 04e7902..bab9af6 100644
--- a/noncore/apps/tableviewer/browsekeyentry.cpp
+++ b/noncore/apps/tableviewer/browsekeyentry.cpp
@@ -10,36 +10,38 @@
 **
 ** 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.
 **
 **********************************************************************/ 
 #include "browsekeyentry.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qtoolbutton.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qpopupmenu.h>
 #include <qhbox.h>
 #include <qdatetime.h>
 
-//#include <iostream.h>
-#include <qheader.h>
-// For qWarning(const char *)
 
 /*!
     \class TVBrowseKeyEntry
     \brief a Widget used enter keys into the TVBrowseViewWidget
 
     The TVBrowseKeyEntry Widget provides the facility to enter
     various key types to be search on in the table.  The key can be changed
     and the entry field will update to the correct sort of widget appropriately
 */
 
 /*!
     Constructs the widget 
@@ -219,24 +221,23 @@ void TVBrowseKeyEntry::searchOnText()
             m = monthKey->text().toInt(&ok);
             if (!ok)
                 return;
             y = yearKey->text().toInt(&ok);
             if (!ok)
                 return;
             if(!QDate::isValid(y, m, d))
                 return;
             sendkey = (void *) new QDate(y, m, d);
             break;
         }
         default:
-            qWarning("TVBrowseKeyEntry::searchOnText() "
-                     "cannot work out data type");
+            owarn << "TVBrowseKeyEntry::searchOnText() cannot work out data type" << oendl;
             return;
     }
     emit searchOnKey(ts->current_column, sendkey);
 }
 
 /*! \fn void TVBrowseKeyEntry::searchOnKey(int currentKeyId, void *v)
 
     This signal indicates that a search on key index currentKeyId should be
     done searching for the value v.
 */ 
diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp
index b58af85..c35dbea 100644
--- a/noncore/apps/tableviewer/db/common.cpp
+++ b/noncore/apps/tableviewer/db/common.cpp
@@ -851,26 +851,25 @@ int KeyList::addKey(QString name, TVVariant::KeyType type)
             return addKey(name, TVVariant("<undefined>").asString());
             break;
         case TVVariant::Date: 
             return addKey(name, TVVariant(QDate::currentDate()).asDate());
             break;
         case TVVariant::Time: 
             return addKey(name, TVVariant(QTime(0,0,0)).toTime());
             break;
         case TVVariant::Int: 
             return addKey(name, TVVariant(0).toInt());
             break;
         default:
-            qWarning(QObject::tr("KeyList::addKey() Cannot make default "
-                        "value for type %1, Key not added.").arg(type));
+            owarn << "KeyList::addKey() Cannot make default value for type " << type << ", Key not added." << oendl;
             break;
     }
     return -1;
 }
 
 void KeyList::setKeyFlags(int i, int flag) 
 {
     if(find(i))
         find(i)->setFlags(flag);
 }
 
 int KeyList::getKeyFlags(int i) const
@@ -1199,27 +1198,25 @@ void DataElem::setField(int i, QString q)
         }
         case TVVariant::Date: {
             t.asDate();
             setField(i, t);
             return;
         }
         case TVVariant::Time: {
             t.asTime();
             setField(i, t);
             return;
         }
         default:
-            qWarning(
-                QObject::tr("DataElem::setField(%1, %2) No valid type found").arg(i).arg(q)
-                );
+            owarn << "DataElem::setField(" << i << ", " << q << ") No valid type found" << oendl;
     }
 }
 
 /*!
     Sets the value of the elements field index i to the value at the pointer
     value.
 
     \param i index of the field to set
     \param value a pointer to the (already allocated) value to set 
 */
 void DataElem::setField(int i, TVVariant value) 
 {
diff --git a/noncore/apps/tableviewer/db/datacache.cpp b/noncore/apps/tableviewer/db/datacache.cpp
index 6380e1b..de57961 100644
--- a/noncore/apps/tableviewer/db/datacache.cpp
+++ b/noncore/apps/tableviewer/db/datacache.cpp
@@ -147,25 +147,25 @@ bool DBStore::saveSource(QIODevice *outDev, const QString &source)
     has already reached the maximum allowable size this function does not alter
     the database.
 
     \param delm An already allocated and initialized data element to be added
 */
 void DBStore::addItem(DataElem *delem)
 {
     addItemInternal(delem);
 }
 
 void DBStore::addItemInternal(DataElem *delem)
 {
-    /* if already full, don't over fill, do a qWarning though */
+    /* if already full, don't over fill, do a owarn though */
     if (full) {
         owarn << "Attempted to add items to already full table" << oendl; 
         return;
     }
 
     master_table.insert(number_elems, delem);
 
     current_elem = number_elems;
     number_elems++;
 
     if(number_elems >= table_size) {
         /* filled current table, double if we can */
diff --git a/noncore/apps/tableviewer/db/datacache.h b/noncore/apps/tableviewer/db/datacache.h
index c5dc637..e38050c 100644
--- a/noncore/apps/tableviewer/db/datacache.h
+++ b/noncore/apps/tableviewer/db/datacache.h
@@ -18,48 +18,54 @@
 **
 **********************************************************************/
 
 /*
  * This file is used to load the xml files that represent the database.
  * The main requirment for said file is each data entry must contain a key,
  * otherwise any other data headings are allowed.
  */
 
 #ifndef __DATACACHE_H__
 #define __DATACACHE_H__
 
+#include "common.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qstring.h>
 #include <qvector.h>
-#include "common.h"
 
 class DBStore;
 
 /*! Abstract class that defines how database stuff can be accessed */
 class DBAccess {
 public:
 
 //    DBAccess(DBStore *d) { dstore = d; }
     virtual ~DBAccess() {}
 
     virtual QString type() {
         return QString();
     }
 
     virtual bool openSource(QIODevice *) {
-        qWarning("DBAccess::openSource not yet implemented");
+        owarn << "DBAccess::openSource not yet implemented" << oendl;
         return false;
     }
 
     virtual bool saveSource(QIODevice *) {
-        qWarning("DBAccess::saveSource(QString) not yet implemented");
+        owarn << "DBAccess::saveSource(QString) not yet implemented" << oendl;
         return false;
     }
 
 protected:
     DBStore *dstore;
     QString source_name;
 };
 
 class DBStore {
 public:
     DBStore();
     ~DBStore();
diff --git a/noncore/apps/tableviewer/ui/browsekeyentry.cpp b/noncore/apps/tableviewer/ui/browsekeyentry.cpp
index 42e24dd..6b78437 100644
--- a/noncore/apps/tableviewer/ui/browsekeyentry.cpp
+++ b/noncore/apps/tableviewer/ui/browsekeyentry.cpp
@@ -11,36 +11,36 @@
 ** 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.
 **
 **********************************************************************/ 
 #include "browsekeyentry.h"
 #include "commonwidgets.h"
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 #include <qtoolbutton.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qpopupmenu.h>
 #include <qhbox.h>
 #include <qdatetime.h>
 
-#include <qheader.h>
-// For qWarning(const char *)
-
 /*!
     \class TVBrowseKeyEntry
     \brief a Widget used enter keys into the TVBrowseViewWidget
 
     The TVBrowseKeyEntry Widget provides the facility to enter
     various key types to be search on in the table.  The key can be changed
     and the entry field will update to the correct sort of widget appropriately
 */
 
 /*!
     Constructs the widget 
 */
@@ -183,24 +183,23 @@ void TVBrowseKeyEntry::searchOnText()
         }
         case TVVariant::Time: {
             sendkey = TVVariant(QTime(timeKey->time()));
             break;
         }
         case TVVariant::Date: {
             sendkey = TVVariant(QDate(dateKey->date()));
             break;
         }
         case TVVariant::Invalid:
             break;
         default:
-            qWarning("TVBrowseKeyEntry::searchOnText() "
-                     "cannot work out data type");
+            owarn << "TVBrowseKeyEntry::searchOnText() cannot work out data type" << oendl;
             return;
     }
     emit searchOnKey(ts->current_column, sendkey);
 }
 
 /*! \fn void TVBrowseKeyEntry::searchOnKey(int currentKeyId, TVVariant)
 
     This signal indicates that a search on key index currentKeyId should be
     done searching for the value v.
 */ 
diff --git a/noncore/apps/tableviewer/ui/filterkeyentry.cpp b/noncore/apps/tableviewer/ui/filterkeyentry.cpp
index d108fbd..4d74d6b 100644
--- a/noncore/apps/tableviewer/ui/filterkeyentry.cpp
+++ b/noncore/apps/tableviewer/ui/filterkeyentry.cpp
@@ -11,24 +11,29 @@
 ** 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.
 **
 **********************************************************************/ 
 #include "filterkeyentry.h"
 #include "commonwidgets.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qwidgetstack.h>
 #include <qcombobox.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qsizepolicy.h>
 #include <qdatetime.h>
 #include <qhbox.h>
 
 TVFilterKeyEntry::TVFilterKeyEntry(QWidget *parent, const char *name, WFlags f)
     : QWidget(parent, name, f)
 {
     int stack_elem = 0;
@@ -191,18 +196,17 @@ TVVariant TVFilterKeyEntry::getCompareValue()
             break; 
         } 
         case TVVariant::Time: {
             sendkey = TVVariant(QTime(timeKey->time())); 
             break; 
         }
         case TVVariant::Date: {
             sendkey = TVVariant(QDate(dateKey->date())); 
             break; 
         }
         default: {
             sendkey = TVVariant(0);
-            qWarning("TVFilterKeyEntry::getCompareValue() "
-                     "cannot work out data type");
+            owarn << "TVFilterKeyEntry::getCompareValue() cannot work out data type" << oendl;
         }
     }
     return sendkey;
 }
diff --git a/noncore/apps/tableviewer/ui/tvfilterview.cpp b/noncore/apps/tableviewer/ui/tvfilterview.cpp
index 22f1fb7..198c8b5 100644
--- a/noncore/apps/tableviewer/ui/tvfilterview.cpp
+++ b/noncore/apps/tableviewer/ui/tvfilterview.cpp
@@ -9,33 +9,39 @@
 ** 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.
 **
 **********************************************************************/
 #include "tvfilterview.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qtoolbutton.h>
 #include <qcombobox.h>
 #include <qlistview.h>
 #include <qlayout.h>
 #include <qheader.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 
-#include <qpe/qpeapplication.h>
 
 TVFilterView::TVFilterView(TableState *t, QWidget* parent,
                            const char *name, WFlags fl ) : QDialog(parent, name, TRUE, fl)
 {
     if ( !name ) 
         setName( "Filter View" );
 
     QVBoxLayout *vlayout = new QVBoxLayout(this);
 
     display = new QListView(this, "display");
     display->addColumn("Key");
     display->addColumn("Constraint");
@@ -166,26 +172,25 @@ bool TVFilterView::passesFilter(DataElem *d) {
                 if (!d->contains(t->keyIndex, t->value))
                     return false;
                 break;
             case ct_startswith:
                 if (!d->startsWith(t->keyIndex, t->value))
                     return false;
                 break;
             case ct_endswith:
                 if (!d->endsWith(t->keyIndex, t->value))
                     return false;
                 break;
             default:
-                qWarning("TVFilterView::passesFilter() "
-                         "unrecognized filter type");
+                owarn << "TVFilterView::passesFilter() unrecognized filter type" << oendl;
                 return false;
         }
     }
     return true;
 }
 
 bool TVFilterView::filterActive() const
 {
     /* when button operated, also check the do_filter value
     return do_filter;
     */
     if (terms.isEmpty())