1 files changed, 30 insertions, 25 deletions

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
@@ -19,4 +19,11 @@
 **********************************************************************/
 #include "tvfilterview.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qtoolbutton.h>
 #include <qcombobox.h>
@@ -27,11 +34,10 @@
 #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" );
+    if ( !name )
+    setName( "Filter View" );
 
     QVBoxLayout *vlayout = new QVBoxLayout(this);
@@ -89,6 +95,6 @@ TVFilterView::TVFilterView(TableState *t, QWidget* parent,
     connect(keyNameCombo, SIGNAL(activated(int)), this, SLOT( updateTerm() ));
 
-    connect(display, SIGNAL(selectionChanged(QListViewItem*)), this, 
-            SLOT(setTerm(QListViewItem*)));
+    connect(display, SIGNAL(selectionChanged(QListViewItem*)), this,
+        SLOT(setTerm(QListViewItem*)));
 
     ts = t;
@@ -103,5 +109,5 @@ TVFilterView::TVFilterView(TableState *t, QWidget* parent,
 
 /*!
-    Destroys the TVFilterView widget 
+    Destroys the TVFilterView widget
 */
 TVFilterView::~TVFilterView()
@@ -119,5 +125,5 @@ void TVFilterView::reset()
 }
 
-void TVFilterView::rebuildKeys() 
+void TVFilterView::rebuildKeys()
 {
     int i;
@@ -126,5 +132,5 @@ void TVFilterView::rebuildKeys()
     if(!ts->kRep) return;
     keyEntry->setTableState(ts);
-    
+
     /* set up the list of keys that can be compared on */
     keyNameCombo->clear();
@@ -133,10 +139,10 @@ void TVFilterView::rebuildKeys()
     i = 0;
     while(it.current()) {
-            if(ts->kRep->validIndex(it.currentKey())) {
-                        keyNameCombo->insertItem(it.current()->name());
-                        keyIds.insert(i, it.currentKey());
-                        ++i;
-                }
-                ++it;
+        if(ts->kRep->validIndex(it.currentKey())) {
+            keyNameCombo->insertItem(it.current()->name());
+            keyIds.insert(i, it.currentKey());
+            ++i;
+        }
+        ++it;
     }
 }
@@ -147,5 +153,5 @@ bool TVFilterView::passesFilter(DataElem *d) {
 
     FilterTerm *t;
-    
+
     for (t = terms.first(); t != 0; t = terms.next() ) {
         /* check against filter */
@@ -176,6 +182,5 @@ bool TVFilterView::passesFilter(DataElem *d) {
                 break;
             default:
-                qWarning("TVFilterView::passesFilter() "
-                         "unrecognized filter type");
+                owarn << "TVFilterView::passesFilter() unrecognized filter type" << oendl;
                 return false;
         }
@@ -195,5 +200,5 @@ bool TVFilterView::filterActive() const
 
 /* SLOTS */
-void TVFilterView::newTerm() 
+void TVFilterView::newTerm()
 {
     if (!ts) return;
@@ -213,5 +218,5 @@ void TVFilterView::newTerm()
 }
 
-void TVFilterView::updateTerm() 
+void TVFilterView::updateTerm()
 {
     FilterTerm *term;
@@ -232,5 +237,5 @@ void TVFilterView::updateTerm()
     term->ct = keyEntry->getCompareType(),
     term->value = keyEntry->getCompareValue();
-   
+
     keyString = keyNameCombo->currentText();
 
@@ -261,5 +266,5 @@ void TVFilterView::updateTerm()
 
     /* remove old view */
-    if (term->view) 
+    if (term->view)
         delete(term->view);
     term->view = new QListViewItem(display, 0, keyString, cmpString, vString);
@@ -268,5 +273,5 @@ void TVFilterView::updateTerm()
 
 /* deletes current term */
-void TVFilterView::deleteTerm() 
+void TVFilterView::deleteTerm()
 {
     if(!current) return;
@@ -285,5 +290,5 @@ void TVFilterView::deleteTerm()
 
 /* clears all terminations */
-void TVFilterView::clearTerms() 
+void TVFilterView::clearTerms()
 {
     while(current)
@@ -293,5 +298,5 @@ void TVFilterView::clearTerms()
 void TVFilterView::setTerm(QListViewItem *target)
 {
-    /* Iterate through the list to find item with view=target.. 
+    /* Iterate through the list to find item with view=target..
      * set as current, delete */
     FilterTerm *term = current;
@@ -302,5 +307,5 @@ void TVFilterView::setTerm(QListViewItem *target)
 
     if (!current) {
-        current = term; 
+        current = term;
     }
 }