20 files changed, 1037 insertions, 998 deletions

diff --git a/noncore/apps/opie-write/qrichtext_p.h b/noncore/apps/opie-write/qrichtext_p.h
index e368edb..3778feb 100644
--- a/noncore/apps/opie-write/qrichtext_p.h
+++ b/noncore/apps/opie-write/qrichtext_p.h
@@ -47,12 +47,15 @@
 // version to version without notice, or even be removed.
 //
 // We mean it.
 //
 //
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 #ifndef QT_H
 #include "qstring.h"
 #include "qlist.h"
 #include "qrect.h"
 #include "qfontmetrics.h"
 #include "qintdict.h"
@@ -121,34 +124,34 @@ public:
     QTextFormat *format() const;
     QTextCustomItem *customItem() const;
     void setFormat( QTextFormat *f );
     void setCustomItem( QTextCustomItem *i );
     struct CustomData
     {
-        QTextFormat *format;
-        QTextCustomItem *custom;
-        QString anchorName;
-        QString anchorHref;
+    QTextFormat *format;
+    QTextCustomItem *custom;
+    QString anchorName;
+    QString anchorHref;
     };
 
     void loseCustomItem();
 
     union {
-        QTextFormat* format;
-        CustomData* custom;
+    QTextFormat* format;
+    CustomData* custom;
     } d;
 
     bool isAnchor() const { return ( type & Anchor) != 0; }
     QString anchorName() const;
     QString anchorHref() const;
     void setAnchor( const QString& name, const QString& href );
 
 private:
     QTextStringChar &operator=( const QTextStringChar & ) {
-        //abort();
-        return *this;
+    //abort();
+    return *this;
     }
     friend class QComplexText;
     friend class QTextParagraph;
 };
 
 #if defined(Q_TEMPLATEDLL)
@@ -205,20 +208,20 @@ private:
     uint dir : 5;
 };
 
 inline bool QTextString::isBidi() const
 {
     if ( bidiDirty )
-        checkBidi();
+    checkBidi();
     return bidi;
 }
 
 inline bool QTextString::isRightToLeft() const
 {
     if ( bidiDirty )
-        checkBidi();
+    checkBidi();
     return rightToLeft;
 }
 
 inline QChar::Direction QTextString::direction() const
 {
     return (QChar::Direction) dir;
@@ -381,13 +384,13 @@ inline QTextCommandHistory::~QTextCommandHistory()
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 class Q_EXPORT QTextCustomItem
 {
 public:
     QTextCustomItem( QTextDocument *p )
-        :  xpos(0), ypos(-1), width(-1), height(0), parent( p )
+    :  xpos(0), ypos(-1), width(-1), height(0), parent( p )
     {}
     virtual ~QTextCustomItem();
     virtual void draw(QPainter* p, int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected ) = 0;
 
     virtual void adjustToPainter( QPainter* );
 
@@ -435,13 +438,13 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT QMap<QString, QString>;
 #endif
 
 class Q_EXPORT QTextImage : public QTextCustomItem
 {
 public:
     QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, const QString& context,
-                QMimeSourceFactory &factory );
+        QMimeSourceFactory &factory );
     virtual ~QTextImage();
 
     Placement placement() const { return place; }
     void adjustToPainter( QPainter* );
     int minimumWidth() const { return width; }
 
@@ -460,13 +463,13 @@ private:
 };
 
 class Q_EXPORT QTextHorizontalLine : public QTextCustomItem
 {
 public:
     QTextHorizontalLine( QTextDocument *p, const QMap<QString, QString> &attr, const QString& context,
-                         QMimeSourceFactory &factory );
+             QMimeSourceFactory &factory );
     virtual ~QTextHorizontalLine();
 
     void adjustToPainter( QPainter* );
     void draw(QPainter* p, int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected );
     QString richText() const;
 
@@ -529,17 +532,17 @@ class QTextTable;
 class Q_EXPORT QTextTableCell : public QLayoutItem
 {
     friend class QTextTable;
 
 public:
     QTextTableCell( QTextTable* table,
-                    int row, int column,
-                    const QMap<QString, QString> &attr,
-                    const QStyleSheetItem* style,
-                    const QTextFormat& fmt, const QString& context,
-                    QMimeSourceFactory &factory, QStyleSheet *sheet, const QString& doc );
+            int row, int column,
+            const QMap<QString, QString> &attr,
+            const QStyleSheetItem* style,
+            const QTextFormat& fmt, const QString& context,
+            QMimeSourceFactory &factory, QStyleSheet *sheet, const QString& doc );
     virtual ~QTextTableCell();
 
     QSize sizeHint() const ;
     QSize minimumSize() const ;
     QSize maximumSize() const ;
     QSizePolicy::ExpandData expanding() const;
@@ -603,13 +606,13 @@ public:
     QTextTable( QTextDocument *p, const QMap<QString, QString> &attr );
     virtual ~QTextTable();
 
     void adjustToPainter( QPainter *p );
     void pageBreak( int  y, QTextFlow* flow );
     void draw( QPainter* p, int x, int y, int cx, int cy, int cw, int ch,
-               const QColorGroup& cg, bool selected );
+           const QColorGroup& cg, bool selected );
 
     bool noErase() const { return TRUE; }
     bool ownLine() const { return TRUE; }
     Placement placement() const { return place; }
     bool isNested() const { return TRUE; }
     void resize( int nwidth );
@@ -681,15 +684,15 @@ class Q_EXPORT QTextDocument : public QObject
     friend class QTextCursor;
     friend class QTextEdit;
     friend class QTextParagraph;
 
 public:
     enum SelectionIds {
-        Standard = 0,
-        Temp = 32000 // This selection must not be drawn, it's used e.g. by undo/redo to
-        // remove multiple lines with removeSelectedText()
+    Standard = 0,
+    Temp = 32000 // This selection must not be drawn, it's used e.g. by undo/redo to
+    // remove multiple lines with removeSelectedText()
     };
 
     QTextDocument( QTextDocument *p );
     QTextDocument( QTextDocument *d, QTextFormatCollection *f );
     virtual ~QTextDocument();
 
@@ -788,17 +791,17 @@ public:
     void setPaper( QBrush *brush ) { if ( backBrush ) delete backBrush; backBrush = brush; }
     QBrush *paper() const { return backBrush; }
 
     void doLayout( QPainter *p, int w );
     void draw( QPainter *p, const QRect& rect, const QColorGroup &cg, const QBrush *paper = 0 );
     void drawParagraph( QPainter *p, QTextParagraph *parag, int cx, int cy, int cw, int ch,
-                    QPixmap *&doubleBuffer, const QColorGroup &cg,
-                    bool drawCursor, QTextCursor *cursor, bool resetChanged = TRUE );
+            QPixmap *&doubleBuffer, const QColorGroup &cg,
+            bool drawCursor, QTextCursor *cursor, bool resetChanged = TRUE );
     QTextParagraph *draw( QPainter *p, int cx, int cy, int cw, int ch, const QColorGroup &cg,
-                      bool onlyChanged = FALSE, bool drawCursor = FALSE, QTextCursor *cursor = 0,
-                      bool resetChanged = TRUE );
+              bool onlyChanged = FALSE, bool drawCursor = FALSE, QTextCursor *cursor = 0,
+              bool resetChanged = TRUE );
 
     void registerCustomItem( QTextCustomItem *i, QTextParagraph *p );
     void unregisterCustomItem( QTextCustomItem *i, QTextParagraph *p );
 
     void setFlow( QTextFlow *f );
     void takeFlow();
@@ -855,28 +858,28 @@ private:
     void init();
     QPixmap *bufferPixmap( const QSize &s );
     // HTML parser
     bool hasPrefix(const QChar* doc, int length, int pos, QChar c);
     bool hasPrefix(const QChar* doc, int length, int pos, const QString& s);
     QTextCustomItem* parseTable( const QMap<QString, QString> &attr, const QTextFormat &fmt,
-                                 const QChar* doc, int length, int& pos, QTextParagraph *curpar );
+                 const QChar* doc, int length, int& pos, QTextParagraph *curpar );
     bool eatSpace(const QChar* doc, int length, int& pos, bool includeNbsp = FALSE );
     bool eat(const QChar* doc, int length, int& pos, QChar c);
     QString parseOpenTag(const QChar* doc, int length, int& pos, QMap<QString, QString> &attr, bool& emptyTag);
     QString parseCloseTag( const QChar* doc, int length, int& pos );
     QChar parseHTMLSpecialChar(const QChar* doc, int length, int& pos);
     QString parseWord(const QChar* doc, int length, int& pos, bool lower = TRUE);
     QChar parseChar(const QChar* doc, int length, int& pos, QStyleSheetItem::WhiteSpaceMode wsm );
     void setRichTextInternal( const QString &text, QTextCursor* cursor = 0 );
     void setRichTextMarginsInternal( QPtrList< QPtrVector<QStyleSheetItem> >& styles, QTextParagraph* stylesPar );
 
 private:
     struct Q_EXPORT Focus {
-        QTextParagraph *parag;
-        int start, len;
-        QString href;
+    QTextParagraph *parag;
+    int start, len;
+    QString href;
     };
 
     int cx, cy, cw, vw;
     QTextParagraph *fParag, *lParag;
     QTextPreProcessor *pProcessor;
     QMap<int, QColor> selectionColors;
@@ -928,13 +931,13 @@ private:
 
 
 class Q_EXPORT QTextDeleteCommand : public QTextCommand
 {
 public:
     QTextDeleteCommand( QTextDocument *d, int i, int idx, const QMemArray<QTextStringChar> &str,
-                        const QByteArray& oldStyle );
+            const QByteArray& oldStyle );
     QTextDeleteCommand( QTextParagraph *p, int idx, const QMemArray<QTextStringChar> &str );
     virtual ~QTextDeleteCommand();
 
     Commands type() const { return Delete; }
     QTextCursor *execute( QTextCursor *c );
     QTextCursor *unexecute( QTextCursor *c );
@@ -948,16 +951,16 @@ protected:
 };
 
 class Q_EXPORT QTextInsertCommand : public QTextDeleteCommand
 {
 public:
     QTextInsertCommand( QTextDocument *d, int i, int idx, const QMemArray<QTextStringChar> &str,
-                        const QByteArray& oldStyleInfo )
-        : QTextDeleteCommand( d, i, idx, str, oldStyleInfo ) {}
+            const QByteArray& oldStyleInfo )
+    : QTextDeleteCommand( d, i, idx, str, oldStyleInfo ) {}
     QTextInsertCommand( QTextParagraph *p, int idx, const QMemArray<QTextStringChar> &str )
-        : QTextDeleteCommand( p, idx, str ) {}
+    : QTextDeleteCommand( p, idx, str ) {}
     virtual ~QTextInsertCommand() {}
 
     Commands type() const { return Insert; }
     QTextCursor *execute( QTextCursor *c ) { return QTextDeleteCommand::unexecute( c ); }
     QTextCursor *unexecute( QTextCursor *c ) { return QTextDeleteCommand::execute( c ); }
 
@@ -1008,43 +1011,43 @@ struct Q_EXPORT QTextParagraphSelection
 };
 
 struct Q_EXPORT QTextLineStart
 {
     QTextLineStart() : y( 0 ), baseLine( 0 ), h( 0 )
 #ifndef QT_NO_COMPLEXTEXT
-        , bidicontext( 0 )
+    , bidicontext( 0 )
 #endif
     {  }
     QTextLineStart( ushort y_, ushort bl, ushort h_ ) : y( y_ ), baseLine( bl ), h( h_ ),
-        w( 0 )
+    w( 0 )
 #ifndef QT_NO_COMPLEXTEXT
-        , bidicontext( 0 )
+    , bidicontext( 0 )
 #endif
     {  }
 #ifndef QT_NO_COMPLEXTEXT
     QTextLineStart( QBidiContext *c, QBidiStatus s ) : y(0), baseLine(0), h(0),
-        status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref(); }
+    status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref(); }
 #endif
 
     virtual ~QTextLineStart()
     {
 #ifndef QT_NO_COMPLEXTEXT
-        if ( bidicontext && bidicontext->deref() )
-            delete bidicontext;
+    if ( bidicontext && bidicontext->deref() )
+        delete bidicontext;
 #endif
     }
 
 #ifndef QT_NO_COMPLEXTEXT
     void setContext( QBidiContext *c ) {
-        if ( c == bidicontext )
-            return;
-        if ( bidicontext && bidicontext->deref() )
-            delete bidicontext;
-        bidicontext = c;
-        if ( bidicontext )
-            bidicontext->ref();
+    if ( c == bidicontext )
+        return;
+    if ( bidicontext && bidicontext->deref() )
+        delete bidicontext;
+    bidicontext = c;
+    if ( bidicontext )
+        bidicontext->ref();
     }
     QBidiContext *context() const { return bidicontext; }
 #endif
 
 public:
     ushort y, baseLine, h;
@@ -1180,13 +1183,13 @@ public:
     void setFormat( int index, int len, QTextFormat *f, bool useCollection = TRUE, int flags = -1 );
 
     void setAlignment( int a );
     int alignment() const;
 
     virtual void paint( QPainter &painter, const QColorGroup &cg, QTextCursor *cursor = 0, bool drawSelections = FALSE,
-                        int clipx = -1, int clipy = -1, int clipw = -1, int cliph = -1 );
+            int clipx = -1, int clipy = -1, int clipw = -1, int cliph = -1 );
 
     virtual int topMargin() const;
     virtual int bottomMargin() const;
     virtual int leftMargin() const;
     virtual int firstLineMargin() const;
     virtual int rightMargin() const;
@@ -1243,15 +1246,15 @@ public:
     void readStyleInformation( QDataStream& stream );
     void writeStyleInformation( QDataStream& stream ) const;
 
 protected:
     virtual void drawLabel( QPainter* p, int x, int y, int w, int h, int base, const QColorGroup& cg );
     virtual void drawString( QPainter &painter, const QString &str, int start, int len, int xstart,
-                             int y, int baseLine, int w, int h, int selection,
-                             QTextStringChar *formatChar, const QColorGroup& cg,
-                             bool rightToLeft );
+                 int y, int baseLine, int w, int h, int selection,
+                 QTextStringChar *formatChar, const QColorGroup& cg,
+                 bool rightToLeft );
 
 private:
     QMap<int, QTextParagraphSelection> &selections() const;
     QPtrList<QTextCustomItem> &floatingItems() const;
     QBrush backgroundBrush( const QColorGroup&cg ) { if ( bgcol ) return *bgcol; return cg.brush( QColorGroup::Base ); }
     void invalidateStyleCache();
@@ -1312,16 +1315,16 @@ public:
     int widthUsed() const { return thiswused; }
 
     static bool isBreakable( QTextString *string, int pos );
 
 protected:
     virtual QTextLineStart *formatLine( QTextParagraph *parag, QTextString *string, QTextLineStart *line, QTextStringChar *start,
-                                               QTextStringChar *last, int align = Qt3::AlignAuto, int space = 0 );
+                           QTextStringChar *last, int align = Qt3::AlignAuto, int space = 0 );
 #ifndef QT_NO_COMPLEXTEXT
     virtual QTextLineStart *bidiReorderLine( QTextParagraph *parag, QTextString *string, QTextLineStart *line, QTextStringChar *start,
-                                                    QTextStringChar *last, int align, int space );
+                            QTextStringChar *last, int align, int space );
 #endif
     void insertLineStart( QTextParagraph *parag, int index, QTextLineStart *ls );
 
     int thisminw;
     int thiswused;
 
@@ -1376,13 +1379,13 @@ public:
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 class Q_EXPORT QTextPreProcessor
 {
 public:
     enum Ids {
-        Standard = 0
+    Standard = 0
     };
 
     QTextPreProcessor();
     virtual ~QTextPreProcessor() {}
 
     virtual void process( QTextDocument *doc, QTextParagraph *, int, bool = TRUE ) = 0;
@@ -1396,24 +1399,24 @@ class Q_EXPORT QTextFormat
 {
     friend class QTextFormatCollection;
     friend class QTextDocument;
 
 public:
     enum Flags {
-        NoFlags,
-        Bold = 1,
-        Italic = 2,
-        Underline = 4,
-        Family = 8,
-        Size = 16,
-        Color = 32,
-        Misspelled = 64,
-        VAlign = 128,
-        StrikeOut= 256,
-        Font = Bold | Italic | Underline | Family | Size | StrikeOut,
-        Format = Font | Color | Misspelled | VAlign
+    NoFlags,
+    Bold = 1,
+    Italic = 2,
+    Underline = 4,
+    Family = 8,
+    Size = 16,
+    Color = 32,
+    Misspelled = 64,
+    VAlign = 128,
+    StrikeOut= 256,
+    Font = Bold | Italic | Underline | Family | Size | StrikeOut,
+    Format = Font | Color | Misspelled | VAlign
     };
 
     enum VerticalAlignment { AlignNormal, AlignSuperScript, AlignSubScript };
 
     QTextFormat();
     virtual ~QTextFormat();
@@ -1726,20 +1729,20 @@ inline void QTextDocument::setTabStops( int tw )
     tStopWidth = tw;
 }
 
 inline QString QTextDocument::originalText() const
 {
     if ( oTextValid )
-        return oText;
+    return oText;
     return text();
 }
 
 inline void QTextDocument::setFlow( QTextFlow *f )
 {
     if ( flow_ )
-        delete flow_;
+    delete flow_;
     flow_ = f;
 }
 
 inline void QTextDocument::takeFlow()
 {
     flow_ = 0;
@@ -1783,17 +1786,17 @@ inline void QTextFormat::addRef()
 }
 
 inline void QTextFormat::removeRef()
 {
     ref--;
     if ( !collection )
-        return;
+    return;
     if ( this == collection->defFormat )
-        return;
+    return;
     if ( ref == 0 )
-        collection->remove( this );
+    collection->remove( this );
 }
 
 inline QString QTextFormat::key() const
 {
     return k;
 }
@@ -1840,15 +1843,15 @@ inline void QTextParagraph::clearBackgroundColor()
     delete bgcol; bgcol = 0; setChanged( TRUE );
 }
 
 inline void QTextParagraph::append( const QString &s, bool reallyAtEnd )
 {
     if ( reallyAtEnd )
-        insert( str->length(), s );
+    insert( str->length(), s );
     else
-        insert( QMAX( str->length() - 1, 0 ), s );
+    insert( QMAX( str->length() - 1, 0 ), s );
 }
 
 inline QTextParagraph *QTextParagraph::prev() const
 {
     return p;
 }
@@ -1863,13 +1866,13 @@ inline bool QTextParagraph::hasAnySelection() const
     return mSelections ? !selections().isEmpty() : FALSE;
 }
 
 inline void QTextParagraph::setEndState( int s )
 {
     if ( s == state )
-        return;
+    return;
     state = s;
 }
 
 inline int QTextParagraph::endState() const
 {
     return state;
@@ -1880,13 +1883,13 @@ inline void QTextParagraph::setParagId( int i )
     id = i;
 }
 
 inline int QTextParagraph::paragId() const
 {
     if ( id == -1 )
-        qWarning( "invalid parag id!!!!!!!! (%p)", (void*)this );
+    owarn << "invalid parag id!!!!!!!! (" << (void*)this << ")" << oendl;
     return id;
 }
 
 inline bool QTextParagraph::firstPreProcess() const
 {
     return firstPProcess;
@@ -1907,20 +1910,20 @@ inline QTextString *QTextParagraph::string() const
     return str;
 }
 
 inline QTextDocument *QTextParagraph::document() const
 {
     if ( hasdoc )
-        return (QTextDocument*) docOrPseudo;
+    return (QTextDocument*) docOrPseudo;
     return 0;
 }
 
 inline QTextParagraphPseudoDocument *QTextParagraph::pseudoDocument() const
 {
     if ( hasdoc )
-        return 0;
+    return 0;
     return (QTextParagraphPseudoDocument*) docOrPseudo;
 }
 
 
 inline QTextTableCell *QTextParagraph::tableCell() const
 {
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
@@ -13,39 +13,41 @@
 **
 ** 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 
+    Constructs the widget
 */
 TVBrowseKeyEntry::TVBrowseKeyEntry(QWidget *parent, const char *name, WFlags f)
     : QWidget(parent, name, f)
 {
     int stack_elem = 0;
     QHBoxLayout *h_layout = new QHBoxLayout(this);
@@ -77,43 +79,43 @@ TVBrowseKeyEntry::TVBrowseKeyEntry(QWidget *parent, const char *name, WFlags f)
     ws = new QWidgetStack(this, 0);
     ws->addWidget(textKey, stack_elem++);
     ws->addWidget(timeKey, stack_elem++);
     ws->addWidget(dateKey, stack_elem++);
 
     ws->raiseWidget(0);
-   
+
     // TODO connect slots and signals....
-    connect(changeKeyButton, SIGNAL(clicked()), 
+    connect(changeKeyButton, SIGNAL(clicked()),
             this, SLOT(changeKeyMenuSlot()));
-    connect(resetButton, SIGNAL(clicked()), 
+    connect(resetButton, SIGNAL(clicked()),
             this, SLOT(resetKeySlot()));
 
-    connect(textKey, SIGNAL(textChanged(const QString&)), 
+    connect(textKey, SIGNAL(textChanged(const QString&)),
             this, SLOT(searchOnText()));
 
-    connect(dayKey, SIGNAL(textChanged(const QString&)), 
+    connect(dayKey, SIGNAL(textChanged(const QString&)),
             this, SLOT(searchOnText()));
-    connect(monthKey, SIGNAL(textChanged(const QString&)), 
+    connect(monthKey, SIGNAL(textChanged(const QString&)),
             this, SLOT(searchOnText()));
-    connect(yearKey, SIGNAL(textChanged(const QString&)), 
+    connect(yearKey, SIGNAL(textChanged(const QString&)),
             this, SLOT(searchOnText()));
 
-    connect(secondKey, SIGNAL(textChanged(const QString&)), 
+    connect(secondKey, SIGNAL(textChanged(const QString&)),
             this, SLOT(searchOnText()));
-    connect(minuteKey, SIGNAL(textChanged(const QString&)), 
+    connect(minuteKey, SIGNAL(textChanged(const QString&)),
             this, SLOT(searchOnText()));
-    connect(hourKey, SIGNAL(textChanged(const QString&)), 
+    connect(hourKey, SIGNAL(textChanged(const QString&)),
             this, SLOT(searchOnText()));
- 
+
     h_layout->addWidget(ws);
     h_layout->addWidget(resetButton);
     h_layout->addWidget(changeKeyButton);
 }
 
 /*!
-    Destructs the widget 
+    Destructs the widget
 */
 TVBrowseKeyEntry::~TVBrowseKeyEntry()
 {
 }
 
 /*!
@@ -133,23 +135,23 @@ void TVBrowseKeyEntry::changeKeySlot(int id_param)
         case kt_time:
             ws->raiseWidget(1);
             break;
         case kt_date:
             ws->raiseWidget(2);
             break;
-        default: 
-            return; 
+        default:
+            return;
     }
 }
 
 /*!
     Opens the change key menu
 */
 void TVBrowseKeyEntry::changeKeyMenuSlot()
 {
-    if(ts) 
+    if(ts)
         keyMenu->exec(changeKeyButton->mapToGlobal(QPoint(0,0)));
 }
 /*!
     Blanks the key entry widget
     \TODO the actual implmentation
 */
@@ -162,21 +164,21 @@ void TVBrowseKeyEntry::setTableState(TableState *t) {
     ts = t;
 
     /* clear the old */
     keyMenu->clear();
 
     for (i = 0; i < t->kRep->getNumFields(); i++) {
-        keyMenu->insertItem(ts->kRep->getKeyName(i), this, 
+        keyMenu->insertItem(ts->kRep->getKeyName(i), this,
                 SLOT(changeKeySlot(int)), 0, i);
         keyMenu->setItemParameter(i, i);
     }
 }
 
 /*!
-    Searches on the current value of the key entry provided that the 
-    current key is of type text WARNING, TODO fix memory leaks 
+    Searches on the current value of the key entry provided that the
+    current key is of type text WARNING, TODO fix memory leaks
 */
 void TVBrowseKeyEntry::searchOnText()
 {
     void *sendkey;
     int tmp;
 
@@ -225,18 +227,17 @@ void TVBrowseKeyEntry::searchOnText()
             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
@@ -13,14 +13,14 @@
 **
 ** 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 "common.h"   
+**********************************************************************/
+#include "common.h"
 #include "datacache.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/timestring.h>
 using namespace Opie::Core;
@@ -85,19 +85,19 @@ int parseNextNumber(QString *q) {
     </UL>
 */
 int QStringVector::compareItems(Item a, Item b)
 {
     QString *qa = (QString *)a;
     QString *qb = (QString *)b;
-         
+
     return QString::compare(*qa, *qb);
 }
 
 /*!
     \class TVVariant
-    A way of abstracting void * and keeping information on 
+    A way of abstracting void * and keeping information on
     the keytypes and behaviours in one place
 */
 
 TVVariantPrivate::TVVariantPrivate()
 {
     typ = TVVariant::Invalid;
@@ -317,13 +317,13 @@ void TVVariant::load(QDataStream &s )
                 int x;
                 s >> x;
                 d->value.i = x;
             }
       break;
         default:
-      ofatal << "Unrecognized data type" << oendl; 
+      ofatal << "Unrecognized data type" << oendl;
     }
 }
 
 void TVVariant::save( QDataStream &s ) const
 {
     s << type();
@@ -379,13 +379,13 @@ const QString TVVariant::toString() const
         case String:
             return *((QString*)d->value.ptr);
         case Date:
             return ((QDate*)d->value.ptr)->toString();
         case Time:
             return ((QTime*)d->value.ptr)->toString();
-        case Int: 
+        case Int:
                 return QString::number(d->value.i);
         case Invalid:
         default:
             return QString::null;
     }
     return QString::null;
@@ -421,22 +421,22 @@ const QDate TVVariant::toDate() const
         int month = parseNextNumber(&q);
         int year = parseNextNumber(&q);
         if (!QDate::isValid(year, month, day))
             return QDate();
         return QDate(year, month, day);
     }
-        
+
 
     return QDate();
 }
 
 const QTime TVVariant::toTime() const
 {
     if(d->typ == Time)
         return *((QTime *)d->value.ptr);
-    
+
     if(d->typ == String) {
         QString q = toString();
         int hour = parseNextNumber(&q);
         int minute = parseNextNumber(&q);
         int second = parseNextNumber(&q);
         int msecond = parseNextNumber(&q);
@@ -451,13 +451,13 @@ const QTime TVVariant::toTime() const
 #define TV_VARIANT_AS( f ) Q##f& TVVariant::as##f() { \
     if ( d->typ != f ) \
         *this = TVVariant( to##f() ); \
     else \
         detach(); \
     return *((Q##f*)d->value.ptr); }
- 
+
 TV_VARIANT_AS(String)
 TV_VARIANT_AS(Date)
 TV_VARIANT_AS(Time)
 
 #undef TV_VARIANT_AS
 
@@ -557,66 +557,66 @@ bool TVVariant::operator>( const TVVariant &v ) const
 
 /*! True if n is closer to this than o */
 bool TVVariant::closer(TVVariant n, TVVariant o)
 {
     /* Nothing is close to an invalid, so nothing can be closer */
     if(d->typ == Invalid)
-        return FALSE; 
+        return FALSE;
 
     /* can't be closer if of different type */
     if(n.type() != type())
         return FALSE;
 
     /* if new shares type, and old doesn't, then new is closer */
     if(o.type() != type())
         return TRUE;
 
     switch(type()){
         case String: {
-            /* case for strings is close is a substring.. closer is 
+            /* case for strings is close is a substring.. closer is
              * earlier alphabetically */
             QString qs1 = n.toString().lower();
             QString qs2 = o.toString().lower();
             QString qsv = toString().lower();
 
             if (!qs1.startsWith(qsv))
                 return FALSE;
 
             /* contains sub-str, if later than is not closer */
-            if(QString::compare(qs1, qs2) > 0) 
+            if(QString::compare(qs1, qs2) > 0)
                 return FALSE;
             return TRUE;
         }
         case Int: {
             /* case for int is smallest absolute difference */
             int i1 = n.toInt();
             int i2 = o.toInt();
             int iv = toInt();
 
             int diff1 = (i1 - iv);
-            if (diff1 < 0) 
+            if (diff1 < 0)
                 diff1 = -diff1;
             int diff2 = (i2 - iv);
-            if (diff2 < 0) 
+            if (diff2 < 0)
                 diff2 = -diff2;
 
-            if (diff1 < diff2) 
+            if (diff1 < diff2)
                 return TRUE;
             return FALSE;
         }
         case Date: {
             QDate i1 = n.toDate();
             QDate i2 = o.toDate();
             QDate iv = toDate();
 
             /* definition of closer is the least difference in days */
             int diff1 = i1.daysTo(iv);
-            if (diff1 < 0) 
+            if (diff1 < 0)
                 diff1 = -diff1;
             int diff2 = i2.daysTo(iv);
-            if (diff2 < 0) 
+            if (diff2 < 0)
                 diff2 = -diff2;
 
             if (diff1 < diff2)
                 return TRUE;
             return FALSE;
         }
@@ -624,16 +624,16 @@ bool TVVariant::closer(TVVariant n, TVVariant o)
             QTime i1 = n.toTime();
             QTime i2 = o.toTime();
             QTime iv = toTime();
 
             /* definition of closer is the least difference in days */
             int diff1 = i1.msecsTo(iv);
-            if (diff1 < 0) 
+            if (diff1 < 0)
                 diff1 = -diff1;
             int diff2 = i2.msecsTo(iv);
-            if (diff2 < 0) 
+            if (diff2 < 0)
                 diff2 = -diff2;
             if (diff1 < diff2)
                 return TRUE;
             return FALSE;
         }
         default:
@@ -646,30 +646,30 @@ bool TVVariant::closer(TVVariant n, TVVariant o)
 
 /*! True if n is close to this */
 bool TVVariant::close(TVVariant n)
 {
     /* Nothing is close to an invalid, so nothing can be closer */
     if(type() == Invalid)
-        return FALSE; 
+        return FALSE;
 
     /* can't be close if of different type */
     if(n.type() != type())
         return FALSE;
 
     switch(type()){
         case String: {
-            /* case for strings is close is a substring.. closer is 
+            /* case for strings is close is a substring.. closer is
              * earlier alphabetically */
             QString qs1 = n.toString().lower();
             QString qsv = toString().lower();
 
             if (!qs1.startsWith(qsv))
                 return FALSE;
             return TRUE;
         }
-        case Int: 
+        case Int:
         case Date:
         case Time:
             return TRUE;
         default:
             /* don't know how to do 'closer' on this type, hence never closer
              * or even close */
@@ -678,29 +678,29 @@ bool TVVariant::close(TVVariant n)
     return FALSE;
 }
 
 /*!
     \class Key
     \brief document me!
-    
+
     document me!
 */
 
 Key::Key() : kname(), kexample(), kflags(0) { }
 
 Key::Key(QString name, TVVariant example, int flags) :
-    kname(name), kexample(example), kflags(flags) { } 
+    kname(name), kexample(example), kflags(flags) { }
 
 Key::Key(const Key &other)
 {
   kname = other.kname;
   kexample = other.kexample;
   kflags = other.kflags;
 }
 
-Key& Key::operator=(const Key& key) 
+Key& Key::operator=(const Key& key)
 {
     kname = key.kname;
     kexample = key.kexample;
     kflags = key.kflags;
     return *this;
 }
@@ -774,19 +774,19 @@ void Key::setNewFlag(bool v)
     headings by DBStore.  It stores the names and types of the keys
 */
 
 /*!
     Constructs a KeyList
 */
-KeyList::KeyList() : QIntDict<Key>(20) 
+KeyList::KeyList() : QIntDict<Key>(20)
 {
     setAutoDelete(TRUE);
 }
 
 /* Should be deep copy, but isn't */
-KeyList::KeyList(const KeyList &k) : QIntDict<Key>(k) 
+KeyList::KeyList(const KeyList &k) : QIntDict<Key>(k)
 {
     KeyListIterator it(k);
   while(it.current()) {
     replace(it.currentKey(), new Key(*it.current()));
     ++it;
   }
@@ -819,13 +819,13 @@ bool KeyList::operator!=(const KeyList &other)
     return FALSE;
 }
 
 /*!
     Returns the number of keys stored in the KeyList
 */
-int KeyList::getNumFields() const 
+int KeyList::getNumFields() const
 {
     return count();
 }
 
 /*!
     Adds a new key to the KeyList
@@ -844,67 +844,66 @@ int KeyList::addKey(QString name, TVVariant example)
 
 int KeyList::addKey(QString name, TVVariant::KeyType type)
 {
     /* generate a valid type for the example? */
     TVVariant e = TVVariant("0");
     switch(type) {
-        case TVVariant::String: 
+        case TVVariant::String:
             return addKey(name, TVVariant("<undefined>").asString());
             break;
-        case TVVariant::Date: 
+        case TVVariant::Date:
             return addKey(name, TVVariant(QDate::currentDate()).asDate());
             break;
-        case TVVariant::Time: 
+        case TVVariant::Time:
             return addKey(name, TVVariant(QTime(0,0,0)).toTime());
             break;
-        case TVVariant::Int: 
+        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) 
+void KeyList::setKeyFlags(int i, int flag)
 {
     if(find(i))
         find(i)->setFlags(flag);
 }
 
 int KeyList::getKeyFlags(int i) const
 {
     if(find(i))
         return find(i)->flags();
     return 0;
 }
 
-bool KeyList::checkNewFlag(int i) const 
+bool KeyList::checkNewFlag(int i) const
 {
     if (find(i))
         return find(i)->newFlag();
     return false;
 }
 
-void KeyList::setNewFlag(int i, bool f) 
+void KeyList::setNewFlag(int i, bool f)
 {
     if(!find(i))
         return;
     find(i)->setNewFlag(f);
 }
 
-bool KeyList::checkDeleteFlag(int i) const 
+bool KeyList::checkDeleteFlag(int i) const
 {
     if (find(i))
         return find(i)->delFlag();
     return false;
 }
 
-void KeyList::setDeleteFlag(int i, bool f) 
+void KeyList::setDeleteFlag(int i, bool f)
 {
     if(!find(i))
         return;
     find(i)->setDelFlag(f);
 }
 
@@ -915,13 +914,13 @@ QString KeyList::getKeyName(int i) const
 {
     if (find (i))
         return find(i)->name();
     return QString();
 }
 
-void KeyList::setKeyName(int i, const QString &n) 
+void KeyList::setKeyName(int i, const QString &n)
 {
     if(find(i))
         find(i)->setName(n);
 }
 
 /*!
@@ -931,13 +930,13 @@ TVVariant::KeyType KeyList::getKeyType(int i) const
 {
     if(find(i))
         return find(i)->type();
     return TVVariant::Invalid;
 }
 
-void KeyList::setKeyType(int i, TVVariant::KeyType t) 
+void KeyList::setKeyType(int i, TVVariant::KeyType t)
 {
     if(!find(i))
         return;
     switch(t) {
         case TVVariant::String:
             find(i)->setExample(TVVariant(QString("default")));
@@ -1037,15 +1036,15 @@ QDataStream &operator>>( QDataStream &s, KeyList &k)
 
     This class holds the data of a row in a table.
 */
 
 
 /*!
-    Constructs a DataElem.  This function needs a container because the 
-    size, types of keys and primary key are all defined by the containing 
-    database 
+    Constructs a DataElem.  This function needs a container because the
+    size, types of keys and primary key are all defined by the containing
+    database
 */
 DataElem::DataElem(DBStore *c) : values(20)
 {
     int size;
     contained = c;
     size = c->getNumFields();
@@ -1083,13 +1082,13 @@ QDataStream &operator>>( QDataStream &s, DataElem &d)
     int size;
     TVVariant t;
     Q_UINT16 index = 0;
 
     s >> size; /* redundent data but makes streaming easier */
     if (size != d.getNumFields()) {
-        owarn << "DataSize mis-match" << oendl; 
+        owarn << "DataSize mis-match" << oendl;
         return s; /* sanity check failed.. don't load */
     }
 
     for(i = 0; i < size; i++) {
         s >> index;
         s >> t;
@@ -1106,68 +1105,68 @@ int DataElem::getNumFields() const
 
 KeyList DataElem::getKeys() const
 {
     return *(contained->getKeys());
 }
 
-/*! 
+/*!
     This function determines whether field index i of the element has been
     set yet.
 
-    \return A boolean value that is TRUE if the specfied field of this 
-    element has been set and FALSE if the field has not yet been set 
+    \return A boolean value that is TRUE if the specfied field of this
+    element has been set and FALSE if the field has not yet been set
 */
 bool DataElem::hasValidValue(int i) const
 {
     if(!values.find(i))
         return FALSE;
-    if(!contained->getKeys()->validIndex(i)) 
+    if(!contained->getKeys()->validIndex(i))
         return FALSE;
     return values.find(i)->isValid();
 }
 
-/*! 
+/*!
     This function determines whether field name qs of the element has been
     set yet.
 
-    \return A boolean value that is TRUE if the specfied field of this 
-    element has been set and FALSE if the field has not yet been set 
+    \return A boolean value that is TRUE if the specfied field of this
+    element has been set and FALSE if the field has not yet been set
 */
-bool DataElem::hasValidValue(QString qs) const 
+bool DataElem::hasValidValue(QString qs) const
 {
     int i = contained->getKeyIndex(qs);
     return hasValidValue(i);
 }
 
 /*!  returns the type of the field specified by index i */
-TVVariant::KeyType DataElem::getFieldType(int i) const 
+TVVariant::KeyType DataElem::getFieldType(int i) const
 {
     return contained->getKeyType(i);
 }
 
 /*!  returns the type of the field specified by name qs */
 TVVariant::KeyType DataElem::getFieldType(QString qs) const
 {
     int i = contained->getKeyIndex(qs);
     return contained->getKeyType(i);
 }
 
-/*!  
-    returns a pointer to the data stored in field index i for this 
-    data element, (value may not be valid) 
+/*!
+    returns a pointer to the data stored in field index i for this
+    data element, (value may not be valid)
 */
 TVVariant DataElem::getField(int i) const
 {
     if(hasValidValue(i))
         return TVVariant(*values.find(i));
     return TVVariant();
 }
 
-/*!  
-    returns a pointer to the data stored in field name qs for this 
-    data element, (value may not be valid) 
+/*!
+    returns a pointer to the data stored in field name qs for this
+    data element, (value may not be valid)
 */
 TVVariant DataElem::getField(QString qs) const
 {
     int i = contained->getKeyIndex(qs);
     return getField(i);
 }
@@ -1176,13 +1175,13 @@ TVVariant DataElem::getField(QString qs) const
     Sets the value of the elements field index i to the value represented in
     the QString q.
 
     \param i index of the field to set
     \param q a string that can be parsed to get the value to be set
 */
-void DataElem::setField(int i, QString q) 
+void DataElem::setField(int i, QString q)
 {
     /* from the type of the field, parse q and store */
     TVVariant::KeyType kt = contained->getKeyType(i);
 
     TVVariant t = TVVariant(q);
 
@@ -1205,26 +1204,24 @@ void DataElem::setField(int i, QString q)
         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 
+    \param value a pointer to the (already allocated) value to set
 */
-void DataElem::setField(int i, TVVariant value) 
+void DataElem::setField(int i, TVVariant value)
 {
     if (value.isValid()) {
         values.remove(i);
         values.replace(i, new TVVariant(value));
     }
 }
@@ -1233,25 +1230,25 @@ void DataElem::setField(int i, TVVariant value)
     Sets the value of the elements field name qs to the value represented in
     the QString q.
 
     \param qs name of the field to set
     \param q a string that can be parsed to get the value to be set
 */
-void DataElem::setField(QString qs, QString q) 
+void DataElem::setField(QString qs, QString q)
 {
     /* from the type of the field, parse q and store */
     int i = contained->getKeyIndex(qs);
     setField(i, qs);
 }
 
 /*!
     Sets the value of the elements field name qs to the value at the pointer
     value.
 
     \param qs name of the field to set
-    \param value a pointer to the (already allocated) value to set 
+    \param value a pointer to the (already allocated) value to set
 */
 void DataElem::setField(QString qs, TVVariant value)
 {
     int i = contained->getKeyIndex(qs);
     setField(i, value);
 }
@@ -1264,13 +1261,13 @@ void DataElem::unsetField(QString qs)
 {
     int i = contained->getKeyIndex(qs);
     unsetField(i);
 }
 
 /*!
-    Converts the data element to a Rich Text QString 
+    Converts the data element to a Rich Text QString
 */
 QString DataElem::toQString() const
 {
     /* lets make an attempt at this function */
     int i;
     QString scratch = "";
@@ -1287,21 +1284,21 @@ QString DataElem::toQString() const
         ++it;
     }
     return scratch;
 }
 
 /*! formats individual fields to strings so can be displayed */
-QString DataElem::toQString(int i) const 
+QString DataElem::toQString(int i) const
 {
     if(hasValidValue(i)) {
         return getField(i).toString();
     }
     return "";
 }
 /*! formats individual fields to strings so can be sorted by QListView */
-QString DataElem::toSortableQString(int i) const 
+QString DataElem::toSortableQString(int i) const
 {
     QString scratch = "";
     if(hasValidValue(i)) {
         switch (contained->getKeyType(i)) {
             case TVVariant::String: {
                 scratch += getField(i).toString();
@@ -1310,19 +1307,19 @@ QString DataElem::toSortableQString(int i) const
             case TVVariant::Int: {
                 scratch.sprintf("%08d", getField(i).toInt());
                 break;
             }
             case TVVariant::Date: {
                 static QDate epochD(1800, 1, 1);
-                scratch.sprintf("%08d", 
+                scratch.sprintf("%08d",
                                 epochD.daysTo(getField(i).toDate()));
                 break;
             }
             case TVVariant::Time: {
                 static QTime epochT(0, 0, 0);
-                scratch.sprintf("%08d", 
+                scratch.sprintf("%08d",
                                 epochT.msecsTo(getField(i).toTime()));
                 break;
             }
             default:
                 scratch += "Unknown type";
                 break;
@@ -1377,18 +1374,18 @@ bool DataElem::contains(int i, TVVariant v) const
             if (qs1.contains(qs2) > 0) return TRUE;
             break;
         }
             /* meaningless for ints */
             /* meaningless for time */
             /* meaningless for dates */
-        case TVVariant::Int: 
+        case TVVariant::Int:
         case TVVariant::Time:
         case TVVariant::Date:
             break;
         default:
-            owarn << "Tried to compare unknown data type" << oendl; 
+            owarn << "Tried to compare unknown data type" << oendl;
     }
     return FALSE;
 }
 
 bool DataElem::startsWith(int i, TVVariant v) const
 {
@@ -1403,18 +1400,18 @@ bool DataElem::startsWith(int i, TVVariant v) const
             QString qs2 = v.toString().lower();
             return qs1.startsWith(qs2);
         }
             /* meaningless for ints */
             /* meaningless for time */
             /* meaningless for dates */
-        case TVVariant::Int: 
+        case TVVariant::Int:
         case TVVariant::Time:
         case TVVariant::Date:
             return FALSE;
         default:
-            owarn << "Tried to compare unknown data type" << oendl; 
+            owarn << "Tried to compare unknown data type" << oendl;
     }
     return FALSE;
 }
 
 bool DataElem::endsWith(int i, TVVariant v) const
 {
@@ -1429,50 +1426,50 @@ bool DataElem::endsWith(int i, TVVariant v) const
             QString qs2 = v.toString().lower();
             return qs1.startsWith(qs2);
         }
             /* meaningless for ints */
             /* meaningless for time */
             /* meaningless for dates */
-        case TVVariant::Int: 
+        case TVVariant::Int:
         case TVVariant::Time:
         case TVVariant::Date:
             return FALSE;
         default:
-            owarn << "Tried to compare unknown data type" << oendl; 
+            owarn << "Tried to compare unknown data type" << oendl;
     }
     return FALSE;
 }
 
 /*!
     Determins which of the first to parameters are closer to the third, target
     parameter.
 
-    \return 
+    \return
     <UL>
-    <LI>TRUE if the first element is a closer match to the target than the 
+    <LI>TRUE if the first element is a closer match to the target than the
     second element</LI>
     <LI>FALSE if the first element is not a closer match to the target than
     the second element</LI>
     </UL>
 */
 bool DataElem::closer(DataElem*d1, DataElem *d2, TVVariant target, int column)
 {
-    int type; 
+    int type;
 
     if(!d1) return FALSE;
 
     if (!d1->hasValidValue(column)) return FALSE;
 
     if(!target.isValid()) return FALSE;
 
     type = d1->getField(column).type();
 
     if(d2) {
         if (type != d2->getField(column).type()) {
                 /* can't do compare */
-                owarn << "Tried to compare two incompatable types" << oendl; 
+                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));
 }
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
@@ -13,13 +13,13 @@
 **
 ** 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.
 **
-**********************************************************************/ 
+**********************************************************************/
 /*
  * 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.
  */
 
@@ -60,16 +60,16 @@ DBStore::DBStore()
     table_size = INIT_TABLE_SIZE;
 
     current_elem = 0;
     archive = 0;
 }
 
-//TODO 
+//TODO
 /*!
-    Reinitializes the table to empty (include a resize of the master table, 
-    which should free some memory) 
+    Reinitializes the table to empty (include a resize of the master table,
+    which should free some memory)
 */
 void DBStore::freeTable()
 {
     name = "";
     if(archive) {
         delete archive;
@@ -90,62 +90,62 @@ void DBStore::freeTable()
 DBStore::~DBStore()
 {
     freeTable();
 }
 
 /*!
-    This function opens the given xml file, loads it and sets up the 
+    This function opens the given xml file, loads it and sets up the
     appropriate data structures.
 
     \param file_name A string representing the name of the file to be opened
     \return true if successful, false otherwise.
 */
 bool DBStore::openSource(QIODevice *inDev, const QString &source) {
 
-        /* first check if db is already open, if contains data.. then clear */
+    /* first check if db is already open, if contains data.. then clear */
     if(number_elems > 0) {
         freeTable();
     }
 
     if (source == "text/x-xml-tableviewer") {
         archive = new DBXml(this);
     } else if (source == "text/csv") {
-        archive = new DBCsv(this);
+    archive = new DBCsv(this);
     } else
-            return false;
+        return false;
 
     return (archive->openSource(inDev));
 }
 
-bool DBStore::saveSource(QIODevice *outDev, const QString &source) 
+bool DBStore::saveSource(QIODevice *outDev, const QString &source)
 {
     /* saving a new file */
     if(!archive) {
         if (source == "text/x-xml-tableviewer") {
             archive = new DBXml(this);
-        } else if (source == "text/x-xml-tableviewer") {
+    } else if (source == "text/x-xml-tableviewer") {
             archive = new DBCsv(this);
         } else
-            return false;
+        return false;
     }
 
     /* changing file type */
     if(archive->type() != source) {
         delete archive;
         if (source == "text/x-xml-tableviewer") {
             archive = new DBXml(this);
-        } else if (source == "text/x-xml-tableviewer") {
+    } else if (source == "text/x-xml-tableviewer") {
             archive = new DBCsv(this);
-        } else 
-            return false;
+        } else
+        return false;
     }
 
     return (archive->saveSource(outDev));
 }
 
-/*! 
+/*!
     This function is used to add new elements to the database.  If the database
     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
 */
@@ -153,15 +153,15 @@ 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; 
+        owarn << "Attempted to add items to already full table" << oendl;
         return;
     }
 
     master_table.insert(number_elems, delem);
 
     current_elem = number_elems;
@@ -182,43 +182,43 @@ void DBStore::addItemInternal(DataElem *delem)
     }
 }
 
 void DBStore::removeItem(DataElem *r)
 {
     int position = master_table.findRef(r);
-        if(position != -1) {
-                /* there is at least one item, this is it */
-                /* replace this with the last element, decrease the element count */
-                master_table.insert(position, master_table.at(--number_elems));
-                master_table.remove(number_elems);
-                delete r;
-        }
+    if(position != -1) {
+        /* there is at least one item, this is it */
+        /* replace this with the last element, decrease the element count */
+        master_table.insert(position, master_table.at(--number_elems));
+        master_table.remove(number_elems);
+        delete r;
+    }
 }
 
 /*!
     Sets the name of the database
 
     \param n A string representing the new name of the database.
 */
 void DBStore::setName(const QString &n)
 {
-        name = n;
+    name = n;
 }
 
 /*!
     Gets the name of the database
 
     \return A string representing the name of the database.
 */
 QString DBStore::getName()
 {
-        return name;
+    return name;
 }
 
 /*!
-    Retrieves a pointer to the key representation of the database for 
+    Retrieves a pointer to the key representation of the database for
     other classes to use as reference.
 
     \return a pointer to the databases key representaion
 */
 KeyList *DBStore::getKeys()
 {
@@ -232,21 +232,21 @@ KeyList *DBStore::getKeys()
 void DBStore::setKeys(KeyList *k)
 {
     kRep = k;
 }
 
 /*!
-    Sets the current element to the first element of the database 
+    Sets the current element to the first element of the database
 */
 void DBStore::first()
 {
     current_elem = 0;
 }
 
 /*!
-    Sets the current element to the last element of the database 
+    Sets the current element to the last element of the database
 */
 void DBStore::last()
 {
     current_elem = number_elems - 1;
 }
 
@@ -254,13 +254,13 @@ void DBStore::last()
     Sets the current element to the next element of the database if
     there exists an element after the current one.
 */
 bool DBStore::next()
 {
     unsigned int new_current_elem = current_elem + 1;
-    if (current_elem < number_elems) 
+    if (current_elem < number_elems)
         /* was valid before inc (it is possible but unlikely that inc current
            elem will change it from invalid to valid) */
         if (new_current_elem < number_elems) {
             /* is valid after inc */
             current_elem = new_current_elem;
             return true;
@@ -275,27 +275,27 @@ bool DBStore::next()
 bool DBStore::previous()
 {
     unsigned int new_current_elem = current_elem -1;
     if (current_elem < number_elems)
         /* was valid */
         if (new_current_elem < number_elems) {
-            /* still is (if was 0, then now -1, but as is unsigned will wrap 
+            /* still is (if was 0, then now -1, but as is unsigned will wrap
                and hence be invalid */
             current_elem = new_current_elem;
             return true;
         }
     return false;
 }
 
 /*!
     Returns the current data element in the database.  Which element is current
-    is affected by newly added items, findItem, next, previous, first and 
+    is affected by newly added items, findItem, next, previous, first and
     last functions
 
     \return a pointer to the current data element
 */
-DataElem *DBStore::getCurrentData() 
+DataElem *DBStore::getCurrentData()
 {
-    if (current_elem >= number_elems) 
+    if (current_elem >= number_elems)
         return NULL;
     return master_table[current_elem];
 }
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
@@ -24,15 +24,21 @@
  * 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:
@@ -42,18 +48,18 @@ public:
 
     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;
@@ -67,13 +73,13 @@ public:
     bool openSource(QIODevice *, const QString &source);
     bool saveSource(QIODevice *, const QString &source);
 
     // Add an item
     void addItem(DataElem *);
     void addItemInternal(DataElem *);
-        void removeItem(DataElem *);
+    void removeItem(DataElem *);
 
     // Set the name of the database
     void setName(const QString &name);
 
     // Get the name of the database
     QString getName();
@@ -103,28 +109,28 @@ public:
 
 // Access functions.. iterator type stuff
 
     void first();
     void last();
 
-        bool next();
-        bool previous();
+    bool next();
+    bool previous();
 
-        DataElem* getCurrentData();
+    DataElem* getCurrentData();
 
 private:
     /* does the work of freeing used memory */
     void freeTable();
-        QString name;
+    QString name;
 
     QVector<DataElem> master_table;
     DBAccess *archive;
 
     KeyList *kRep;
 
     unsigned int number_elems;
     unsigned int table_size; /* should always be a power of 2 */
-    bool full; /* since because we are using an int for indexing there is 
+    bool full; /* since because we are using an int for indexing there is
                   an upper limit on the number of items we can store. */
     unsigned int current_elem;
 };
 #endif
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
@@ -13,39 +13,39 @@
 **
 ** 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 
+    Constructs the widget
 */
 TVBrowseKeyEntry::TVBrowseKeyEntry(QWidget *parent, const char *name, WFlags f)
     : QWidget(parent, name, f)
 {
     QHBoxLayout *h_layout = new QHBoxLayout(this);
 
@@ -70,42 +70,42 @@ TVBrowseKeyEntry::TVBrowseKeyEntry(QWidget *parent, const char *name, WFlags f)
     ws->addWidget(textKey, TVVariant::String);
     ws->addWidget(intKey, TVVariant::Int);
     ws->addWidget(timeKey, TVVariant::Time);
     ws->addWidget(dateKey, TVVariant::Date);
 
     ws->raiseWidget(TVVariant::String);
-   
+
     // TODO connect slots and signals....
-    connect(changeKeyButton, SIGNAL(clicked()), 
+    connect(changeKeyButton, SIGNAL(clicked()),
             this, SLOT(changeKeyMenuSlot()));
 
-    connect(resetButton, SIGNAL(clicked()), 
+    connect(resetButton, SIGNAL(clicked()),
             textKey, SLOT(clear()));
-    connect(resetButton, SIGNAL(clicked()), 
+    connect(resetButton, SIGNAL(clicked()),
             intKey, SLOT(clear()));
-    connect(resetButton, SIGNAL(clicked()), 
+    connect(resetButton, SIGNAL(clicked()),
             dateKey, SLOT(clear()));
-    connect(resetButton, SIGNAL(clicked()), 
+    connect(resetButton, SIGNAL(clicked()),
             timeKey, SLOT(clear()));
 
     h_layout->addWidget(ws);
     h_layout->addWidget(resetButton);
     h_layout->addWidget(changeKeyButton);
 
-    connect(textKey, SIGNAL(textChanged(const QString&)), 
+    connect(textKey, SIGNAL(textChanged(const QString&)),
             this, SLOT(searchOnText()));
-    connect(intKey, SIGNAL(valueChanged(int)), 
+    connect(intKey, SIGNAL(valueChanged(int)),
             this, SLOT(searchOnText()));
-    connect(dateKey, SIGNAL(valueChanged(const QDate&)), 
+    connect(dateKey, SIGNAL(valueChanged(const QDate&)),
             this, SLOT(searchOnText()));
-    connect(timeKey, SIGNAL(valueChanged(const QTime&)), 
+    connect(timeKey, SIGNAL(valueChanged(const QTime&)),
             this, SLOT(searchOnText()));
 }
 
 /*!
-    Destructs the widget 
+    Destructs the widget
 */
 TVBrowseKeyEntry::~TVBrowseKeyEntry()
 {
 }
 
 /*!
@@ -123,13 +123,13 @@ void TVBrowseKeyEntry::changeKeySlot(int id_param)
 
 /*!
     Opens the change key menu
 */
 void TVBrowseKeyEntry::changeKeyMenuSlot()
 {
-    if(ts) 
+    if(ts)
         keyMenu->exec(changeKeyButton->mapToGlobal(QPoint(0,0)));
 }
 
 
 void TVBrowseKeyEntry::setTableState(TableState *t) {
     ts = t;
@@ -143,13 +143,13 @@ void TVBrowseKeyEntry::rebuildKeys() {
     /* clear the old */
     keyMenu->clear();
 
     KeyListIterator it(*ts->kRep);
 
     for (i = 0; i < ts->kRep->getNumFields(); i++) {
-        keyMenu->insertItem(it.current()->name(), this, 
+        keyMenu->insertItem(it.current()->name(), this,
                 SLOT(changeKeySlot(int)), 0, i);
         keyMenu->setItemParameter(i, it.currentKey());
         ++it;
     }
 }
 
@@ -160,14 +160,14 @@ void TVBrowseKeyEntry::reset()
     dateKey->clear();
     timeKey->clear();
 
     keyMenu->clear();
 }
 /*!
-    Searches on the current value of the key entry provided that the 
-    current key is of type text WARNING, TODO fix memory leaks 
+    Searches on the current value of the key entry provided that the
+    current key is of type text WARNING, TODO fix memory leaks
 */
 void TVBrowseKeyEntry::searchOnText()
 {
     TVVariant sendkey;
 
     if (!ts)
@@ -186,21 +186,20 @@ void TVBrowseKeyEntry::searchOnText()
             break;
         }
         case TVVariant::Date: {
             sendkey = TVVariant(QDate(dateKey->date()));
             break;
         }
-        case TVVariant::Invalid:
-            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
@@ -13,16 +13,21 @@
 **
 ** 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>
@@ -95,19 +100,19 @@ TVFilterKeyEntry::TVFilterKeyEntry(QWidget *parent, const char *name, WFlags f)
     ws->addWidget(textEntry, TVVariant::String);
     ws->addWidget(intEntry, TVVariant::Int);
     ws->addWidget(timeEntry, TVVariant::Time);
     ws->addWidget(dateEntry, TVVariant::Date);
 
     /* connect the signals down */
-    connect(textKey, SIGNAL(textChanged(const QString&)), 
+    connect(textKey, SIGNAL(textChanged(const QString&)),
             this, SIGNAL(valueChanged()));
-    connect(intKey, SIGNAL(valueChanged(int)), 
+    connect(intKey, SIGNAL(valueChanged(int)),
             this, SIGNAL(valueChanged()));
-    connect(dateKey, SIGNAL(valueChanged(const QDate&)), 
+    connect(dateKey, SIGNAL(valueChanged(const QDate&)),
             this, SIGNAL(valueChanged()));
-    connect(timeKey, SIGNAL(valueChanged(const QTime&)), 
+    connect(timeKey, SIGNAL(valueChanged(const QTime&)),
             this, SIGNAL(valueChanged()));
 
     connect(intCombo, SIGNAL(activated(int)), this, SIGNAL(valueChanged()));
     connect(textCombo, SIGNAL(activated(int)), this, SIGNAL(valueChanged()));
     connect(timeCombo, SIGNAL(activated(int)), this, SIGNAL(valueChanged()));
     connect(dateCombo, SIGNAL(activated(int)), this, SIGNAL(valueChanged()));
@@ -116,19 +121,19 @@ TVFilterKeyEntry::TVFilterKeyEntry(QWidget *parent, const char *name, WFlags f)
     layout->addWidget(ws);
 
     current_type = TVVariant::String;
 }
 
 /*!
-    Destructs the widget 
+    Destructs the widget
 */
 TVFilterKeyEntry::~TVFilterKeyEntry()
 {
 }
 
-void TVFilterKeyEntry::setKey(int i) 
+void TVFilterKeyEntry::setKey(int i)
 {
 
     if (!ts) return;
     if (!ts->kRep) return;
 
     /* set up to raise appropriate widget set */
@@ -180,29 +185,28 @@ CmpType TVFilterKeyEntry::getCompareType()
 TVVariant TVFilterKeyEntry::getCompareValue()
 {
     TVVariant sendkey;
     int tmp;
 
     switch(current_type) {
-        case TVVariant::String: 
-            sendkey = TVVariant(QString(textKey->text())); 
-            break; 
-        case TVVariant::Int: { 
+        case TVVariant::String:
+            sendkey = TVVariant(QString(textKey->text()));
+            break;
+        case TVVariant::Int: {
             sendkey = TVVariant(intKey->value());
-            break; 
-        } 
+            break;
+        }
         case TVVariant::Time: {
-            sendkey = TVVariant(QTime(timeKey->time())); 
-            break; 
+            sendkey = TVVariant(QTime(timeKey->time()));
+            break;
         }
         case TVVariant::Date: {
-            sendkey = TVVariant(QDate(dateKey->date())); 
-            break; 
+            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
@@ -15,27 +15,33 @@
 **
 ** 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" );
+    if ( !name )
+    setName( "Filter View" );
 
     QVBoxLayout *vlayout = new QVBoxLayout(this);
 
     display = new QListView(this, "display");
     display->addColumn("Key");
     display->addColumn("Constraint");
@@ -85,27 +91,27 @@ TVFilterView::TVFilterView(TableState *t, QWidget* parent,
     connect(deleteFilterButton, SIGNAL( clicked() ), this, SLOT( deleteTerm()));
     connect(clearFilterButton, SIGNAL( clicked() ), this, SLOT( clearTerms()));
 
     connect(keyEntry, SIGNAL(valueChanged()), this, SLOT( updateTerm() ));
     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;
     current = 0;
     terms.setAutoDelete(true);
     do_filter = false;
 
 #ifdef Q_WS_QWS
     QPEApplication::showDialog( this );
 #endif
 }
 
 /*!
-    Destroys the TVFilterView widget 
+    Destroys the TVFilterView widget
 */
 TVFilterView::~TVFilterView()
 {
 }
 
 void TVFilterView::rebuildData()
@@ -115,41 +121,41 @@ void TVFilterView::rebuildData()
 void TVFilterView::reset()
 {
     keyNameCombo->clear();
     keyIds.clear();
 }
 
-void TVFilterView::rebuildKeys() 
+void TVFilterView::rebuildKeys()
 {
     int i;
 
     if (!ts) return;
     if(!ts->kRep) return;
     keyEntry->setTableState(ts);
-    
+
     /* set up the list of keys that can be compared on */
     keyNameCombo->clear();
     KeyListIterator it(*ts->kRep);
 
     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;
     }
 }
 
 bool TVFilterView::passesFilter(DataElem *d) {
     if (!filterActive()) return true;
 
 
     FilterTerm *t;
-    
+
     for (t = terms.first(); t != 0; t = terms.next() ) {
         /* check against filter */
         switch(t->ct) {
             case ct_less:
                 if (!d->lessThan(t->keyIndex, t->value))
                     return false;
@@ -172,14 +178,13 @@ bool TVFilterView::passesFilter(DataElem *d) {
                 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;
 }
 
@@ -191,13 +196,13 @@ bool TVFilterView::filterActive() const
     if (terms.isEmpty())
         return false;
     return true;
 }
 
 /* SLOTS */
-void TVFilterView::newTerm() 
+void TVFilterView::newTerm()
 {
     if (!ts) return;
 
     FilterTerm *term = new FilterTerm;
     current = term;
 
@@ -209,13 +214,13 @@ void TVFilterView::newTerm()
     terms.append(term);
 
     keyEntry->setEnabled(true);
     keyNameCombo->setEnabled(true);
 }
 
-void TVFilterView::updateTerm() 
+void TVFilterView::updateTerm()
 {
     FilterTerm *term;
     /* Read the widget values (keyname, compare type, value)
      * and build the lists */
     if (!ts) return;
     if (!current) return;
@@ -228,13 +233,13 @@ void TVFilterView::updateTerm()
 
     /* create new list item, set initial values, enable widgets */
     term->keyIndex = keyIds[keyNameCombo->currentItem()];
     keyEntry->setKey(term->keyIndex); /* so the next two items make sense */
     term->ct = keyEntry->getCompareType(),
     term->value = keyEntry->getCompareValue();
-   
+
     keyString = keyNameCombo->currentText();
 
     switch(term->ct) {
         case ct_less:
             cmpString = " less than ";
             break;
@@ -257,20 +262,20 @@ void TVFilterView::updateTerm()
             cmpString = " ERROR ";
     }
 
     vString = term->value.toString();
 
     /* remove old view */
-    if (term->view) 
+    if (term->view)
         delete(term->view);
     term->view = new QListViewItem(display, 0, keyString, cmpString, vString);
     display->setSelected(term->view, true);
 }
 
 /* deletes current term */
-void TVFilterView::deleteTerm() 
+void TVFilterView::deleteTerm()
 {
     if(!current) return;
     if (current->view)
         delete(current->view);
 
     terms.removeRef(current);
@@ -281,26 +286,26 @@ void TVFilterView::deleteTerm()
         keyEntry->setEnabled(false);
         keyNameCombo->setEnabled(false);
     }
 }
 
 /* clears all terminations */
-void TVFilterView::clearTerms() 
+void TVFilterView::clearTerms()
 {
     while(current)
         deleteTerm();
 }
 
 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;
 
     for (current = terms.first(); current != 0; current = terms.next() )
         if (current->view == target)
             break;
 
     if (!current) {
-        current = term; 
+        current = term;
     }
 }
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp
index 782b629..4b8ce78 100644
--- a/noncore/apps/tinykate/libkate/kateconfig.cpp
+++ b/noncore/apps/tinykate/libkate/kateconfig.cpp
@@ -21,12 +21,13 @@
 #define QTOPIA_INTERNAL_LANGLIST
 #include "kateconfig.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/global.h>
+using namespace Opie::Core;
 
 /* QT */
 #include <qdir.h>
 #include <qmessagebox.h>
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include <qtextcodec.h>
@@ -553,14 +554,13 @@ void KateConfig::write( const QString &fn )
     return;
     }
 
     f.close();
     // now rename the file...
     if ( rename( strNewFile, filename ) < 0 ) {
-    qWarning( "problem renaming the file %s to %s", strNewFile.latin1(),
-          filename.latin1() );
+    owarn << "problem renaming the file " << strNewFile.latin1() << " to " << filename.latin1() << oendl;
     QFile::remove( strNewFile );
     }
 }
 
 /*!
   Returns whether the KateConfig is in a valid state.
diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp
index 4fe319b..5f48f77 100644
--- a/noncore/apps/zsafe/main.cpp
+++ b/noncore/apps/zsafe/main.cpp
@@ -5,17 +5,25 @@
 **
 ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html
 */
 
 
 #include "zsafe.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #ifdef DESKTOP
 #include <qapplication.h>
 #else
 #include <qpe/qpeapplication.h>
 #endif
+
+/* STD */
 #include <stdio.h>
 #include <signal.h>
 
 ZSafe *zs;
 #ifdef DESKTOP
 QApplication   *appl;
@@ -55,41 +63,38 @@ int main( int argc, char ** argv )
     if (argc >= 3)
     {
 #ifndef WIN32
        DeskW = atoi(argv[1]);
        DeskH = atoi(argv[2]);
 #else
-           int w, h;
-           sscanf (argv[1], "%d", &w);
-           sscanf (argv[2], "%d", &h);
-           DeskW = w;
+       int w, h;
+       sscanf (argv[1], "%d", &w);
+       sscanf (argv[2], "%d", &h);
+       DeskW = w;
        DeskH = h;
 #endif
     }
     else
     {
        DeskW = 600;
        DeskH = 400;
     }
 #else
     DeskW = a.desktop()->width();
     DeskH = a.desktop()->height();
 
-    char buf[128];
-    sprintf (buf, "Width: %d Height: %d\n", DeskW, DeskH);
-    qWarning (buf);
+    owarn << "Width: " << DeskW << " Height: " << DeskH << oendl;
 
 #ifdef JPATCH_HDE
     // nothings
 #else
-    if (DeskW > 240) 
+    if (DeskW > 240)
     {
        DeskW -= 20;
        DeskH += 25;
-       sprintf (buf, "Changed width: %d Height: %d\n", DeskW, DeskH);
-       qWarning (buf);
+       owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl;
     }
 #endif
 
 #endif
 
     ZSafe mw;
diff --git a/noncore/apps/zsafe/zlistview.cpp b/noncore/apps/zsafe/zlistview.cpp
index ba02a15..7d0b8c2 100644
--- a/noncore/apps/zsafe/zlistview.cpp
+++ b/noncore/apps/zsafe/zlistview.cpp
@@ -1,29 +1,32 @@
 /*
 ** $Id$
 */
 
 #include "zlistview.h"
-#include <stdio.h>
 #include "zsafe.h"
 
+/* OPIE */
+//#include <opie2/odebug.h>
+
+/* STD */
+#include <stdio.h>
+
 ZListView::ZListView (ZSafe *zsafe, const char *id) : QListView(zsafe, id)
 {
    zs = zsafe;
 }
 
 ZListView::~ZListView()
 {
 }
 
 void ZListView::keyPressEvent ( QKeyEvent *e )
 {
 /*
-   char buf[64];
-   sprintf (buf, "key: %d\n", e->key());
-   qWarning (buf);
+   owarn << "key: " << e->key() << oendl;
 */
 
    switch (e->key())
    {
       case 32: // middle cursor key pressed
          zs->showInfo (zs->selectedItem);
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 6ff05ac..ca3ff52 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -878,13 +878,13 @@ void ZSafe::findPwd()
     QString comment;
     if (result == Accepted)
     {
        name = dialog->NameField->text();
        username = dialog->UsernameField->text();
        comment = dialog->CommentField->text();
-       qWarning (name);
+       owarn << name << oendl;
     }
     else
     {
        delete dialog;
        return;
     }
@@ -924,13 +924,13 @@ void ZSafe::findPwd()
      else
        i = ListView->firstChild();
     for (;
          i != NULL;
          i = i->nextSibling())
     {
-       qWarning (i->text(0));
+       owarn << i->text(0) << oendl;
        i->setSelected(FALSE);
 
        // step through all subitems
        QListViewItem *si;
        if (lastSearchedItem)
           si = lastSearchedItem;
@@ -938,13 +938,13 @@ void ZSafe::findPwd()
           si = i->firstChild();
        // for (si = i->firstChild();
        for (;
             si != NULL;
             si = si->nextSibling())
        {
-          qWarning (si->text(0));
+          owarn << si->text(0) << oendl;
           if (si->isSelected())
              si->setSelected(FALSE);
           // ListView->repaintItem(si);
 
           bool n=TRUE;
           bool u=TRUE;
@@ -955,13 +955,13 @@ void ZSafe::findPwd()
              u = (si->text(1)).contains (username, FALSE);
           if (!comment.isEmpty())
              c = (si->text(3)).contains (comment, FALSE);
 
           if ((n && u && c ) && !found)
           {
-             qWarning ("Found");
+             owarn << "Found" << oendl;
              selectedItem = si;
              si->setSelected(TRUE);
              ListView->setCurrentItem(si);
              ListView->ensureItemVisible(si);
              ListView->triggerUpdate();
 
@@ -1225,14 +1225,13 @@ void ZSafe::removeAsciiFile()
 
   if (fn && fn.length() > 0 )
   {
     QFile f( fn );
     if ( !f.remove() )
     {
-        qWarning( QString("Could not remove file %1").arg(fn),
-                      2000 );
+        owarn << "Could not remove file " << fn << oendl;
         QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not remove text file.") );
         return;
     }
   }
 }
@@ -1275,14 +1274,13 @@ void ZSafe::writeAllEntries()
 
    // open the new document
    if (fn && fn.length() > 0 )
    {
     QFile f( fn );
     if ( !f.open( IO_WriteOnly ) ) {
-        qWarning( QString("Could not write to file %1").arg(fn),
-                      2000 );
+        owarn << "Could not write to file " << fn << oendl;
         QMessageBox::critical( 0, "ZSafe",
                   QString("Could not export to text file.") );
         return;
     }
     QTextStream t( &f );
 
@@ -1319,16 +1317,16 @@ void ZSafe::writeAllEntries()
           oneEntry += "\"";
           oneEntry += si->text(4);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(5);
           oneEntry += "\"";
-          // qWarning (oneEntry);
+          // owarn << oneEntry << oendl;
           t << oneEntry << endl;
 
-          // qWarning (si->text(0));
+          // owarn << si->text(0) << oendl;
        }
     }
     f.close();
    }
 }
 
@@ -1370,14 +1368,13 @@ void ZSafe::readAllEntries()
 
   if (fn && fn.length() > 0 )
   {
    QFile f( fn );
    if ( !f.open( IO_ReadOnly ) )
    {
-      qWarning( QString("Could not read file %1").arg(fn),
-                      2000 );
+      owarn << "Could not read file " << fn << oendl;
       QMessageBox::critical( 0, "ZSafe",
                   QString("Could not import text file.") );
       return;
    }
 
    modified = true;
@@ -1400,13 +1397,13 @@ void ZSafe::readAllEntries()
           si = si->nextSibling();
           i->takeItem(_si); // remove from view list
           if (_si) delete _si;
       }
    }
 
-   qWarning ("ReadAllEntries(): ");
+   owarn << "ReadAllEntries(): " << oendl;
 
    QTextStream t(&f);
    while ( !t.eof() )
    {
       QString s = t.readLine();
       s.replace (QRegExp("\";\""), "\"|\"");
@@ -1551,14 +1548,13 @@ void ZSafe::readAllEntries()
 void ZSafe::writeAllEntries()
 {
     // open the file for writing
     QString fn = filename + ".txt";
     QFile f( fn );
     if ( !f.open( IO_WriteOnly ) ) {
-        qWarning( QString("Could not write to file %1").arg(fn),
-                      2000 );
+        owarn << "Could not write to file " << fn << oendl;
         QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not export to text file.") );
         return;
     }
     QTextStream t( &f );
 
@@ -1590,29 +1586,28 @@ void ZSafe::writeAllEntries()
           oneEntry += "\"";
           // oneEntry += si->text(3);
           QString comment = si->text(3);
           comment.replace (QRegExp("\n"), "<br>");
           oneEntry += comment;
           oneEntry += "\"";
-          // qWarning (oneEntry);
+          // owarn << oneEntry << oendl;
           t << oneEntry << endl;
 
-          // qWarning (si->text(0));
+          // owarn << si->text(0) << oendl;
        }
     }
     f.close();
 }
 
 void ZSafe::readAllEntries()
 {
    QString fn = filename + ".txt";
    QFile f( fn );
    if ( !f.open( IO_ReadOnly ) )
    {
-      qWarning( QString("Could not read file %1").arg(fn),
-                      2000 );
+      owarn << "Could not read file " << fn << oendl;
       QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not import text file.") );
       return;
    }
 
    modified = true;
@@ -1635,13 +1630,13 @@ void ZSafe::readAllEntries()
           si = si->nextSibling();
           i->takeItem(_si); // remove from view list
           if (_si) delete _si;
       }
    }
 
-   qWarning ("ReadAllEntries(): ");
+   owarn << "ReadAllEntries(): " << oendl;
 
    QTextStream t(&f);
    while ( !t.eof() )
    {
       QString s = t.readLine();
       s.replace (QRegExp("\";\""), "\"|\"");
@@ -1759,13 +1754,13 @@ void ZSafe::readAllEntries()
 
 }
 #endif // UNUSED
 
 void ZSafe::resume(int)
 {
-   qWarning ("Resume");
+   owarn << "Resume" << oendl;
    // hide the main window
 
    infoForm->hide();
    // open zsafe again
    m_password = "";
    selectedItem = NULL;
@@ -1815,22 +1810,22 @@ bool ZSafe::openDocument(const char* _filename, const char* )
         {
            // ask with a dialog for the password
        if (m_password.isEmpty())
           getDocPassword(tr("Enter Password"));
        if (m_password.isEmpty() && validationFlag == 0)
            {
-              qWarning ("Wrong password");
+              owarn << "Wrong password" << oendl;
               QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Wrong password.\n\nZSafe will now exit.") );
               exitZs (1);
            }
 
        retval = loadInit(_filename, m_password);
        if (retval != PWERR_GOOD)
            {
-                qWarning ("Error loading Document");
+                owarn << "Error loading Document" << oendl;
         return false;
        }
         }
         else
         {
 #ifdef WIN32
@@ -2298,13 +2293,13 @@ void ZSafe::setPasswordDialogDone()
    newPwdDialogResult = true;
    newPwdDialog->close();
 }
 
 void ZSafe::getDocPassword(QString title)
 {
-qWarning ("getDocPassword");
+    owarn << "getDocPassword" << oendl;
     // open the 'Password' dialog
     PasswordForm *dialog = new PasswordForm(this, title, TRUE);
     newPwdDialog = dialog;
     newPwdDialogResult = false;
 
     connect( dialog->PasswordField, SIGNAL( returnPressed() ),
@@ -2477,13 +2472,13 @@ int ZSafe::saveFinalize(void)
     free(buffer);
     return retval;
 }
 
 void ZSafe::quitMe ()
 {
-    qWarning ("QUIT...");
+    owarn << "QUIT..." << oendl;
 
     if (modified)
     {
       switch( QMessageBox::information( this, tr("ZSafe"),
                                       tr("Do you want to save\nbefore exiting?"),
                                       tr("&Save"),
@@ -2681,13 +2676,13 @@ void ZSafe::addCategory()
         if (result == Accepted)
         {
            modified = true;
            category = dialog->CategoryField->currentText();
            icon = dialog->IconField->currentText()+".png";
 
-           qWarning (category);
+           owarn << category << oendl;
 
            QListViewItem *li = new ShadedListItem( 1, ListView );
            Category *c1 = new Category();
            c1->setCategoryName(category);
 
            // if (!icon.isEmpty() && !icon.isNull())
@@ -3189,13 +3184,13 @@ void ZSafe::editCategory()
               }
 
               // change the category name of the selected category
               QListViewItem *catItem = cat->getListItem();
               if (catItem)
               {
-                 qWarning (category);
+                 owarn << category << oendl;
                  catItem->setText( 0, tr( category ) );
                  cat->setCategoryName (tr(category));
 
                  cat->initListItem();
                  categories.insert (category, cat);
               }
@@ -3590,13 +3585,13 @@ void ZSafe::paintEvent( QPaintEvent * )
          infoForm->raise();
    }
 }
 
 void ZSafe::resizeEvent ( QResizeEvent * )
 {
-   // qWarning ("resizeEvent");
+   // owarn << "resizeEvent" << oendl;
 #ifndef DESKTOP
    DeskW = appl->desktop()->width();
    DeskH = appl->desktop()->height();
 #else
    DeskW = this->width();
    DeskH = this->height();
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index d61433f..837fcc5 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -22,15 +22,15 @@ const int endianTest = 1;
 
 #define Swap16IfLE(s) \
     (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
 
 #define Swap32IfLE(l) \
     (*(char *)&endianTest ? ((((l) & 0xff000000) >> 24) | \
-                             (((l) & 0x00ff0000) >> 8)  | \
-                             (((l) & 0x0000ff00) << 8)  | \
-                             (((l) & 0x000000ff) << 24))  : (l))
+                 (((l) & 0x00ff0000) >> 8)  | \
+                 (((l) & 0x0000ff00) << 8)  | \
+                 (((l) & 0x000000ff) << 24))  : (l))
 
 //
 // The lengths of the messages we need to wait for
 //
 const int ServerInitLength = 24;
 const int UpdateHeaderLength = 4;
@@ -137,25 +137,25 @@ void KRFBDecoder::start()
 
 void KRFBDecoder::sendClientInit()
 {
   con->write( &( con->options()->shared ), 1 );
 
   // Wait for server init
-  owarn << "Waiting for server init" << oendl; 
+  owarn << "Waiting for server init" << oendl;
 
   static QString statusMsg = tr( "Waiting for server initialization..." );
   emit status( statusMsg );
 
   currentState = AwaitingServerInit;
   connect( con, SIGNAL( gotEnoughData() ), SLOT( gotServerInit() ) );
   con->waitForData( ServerInitLength );
 }
 
 void KRFBDecoder::gotServerInit()
 {
-  owarn << "Got server init" << oendl; 
+  owarn << "Got server init" << oendl;
   disconnect( con, SIGNAL( gotEnoughData() ), this, SLOT( gotServerInit() ) );
 
   if ( info )
     delete info;
   info = new KRFBServerInfo;
   CHECK_PTR( info );
@@ -183,24 +183,23 @@ void KRFBDecoder::gotServerInit()
 
   con->read( info->padding, 3 );
 
   con->read( &(info->nameLength), 4 );
   info->nameLength = Swap32IfLE( info->nameLength );
 
-  owarn << "Width = " << info->width << ", Height = " << info->height << "" << oendl; 
-  qWarning( "Bpp = %d, Depth = %d, Big = %d, True = %d",
-           info->bpp, info->depth, info->bigEndian, info->trueColor );
-  qWarning( "RedMax = %d, GreenMax = %d, BlueMax = %d",
-           info->redMax, info->greenMax, info->blueMax );
-  qWarning( "RedShift = %d, GreenShift = %d, BlueShift = %d",
-           info->redShift, info->greenShift,info-> blueShift );
+  owarn << "Width = " << info->width << ", Height = " << info->height << "" << oendl;
+  owarn << "Bpp = " << info->bpp << ", Depth = " << info->depth << ", Big = " << info->bigEndian
+        << ", True = " << info->trueColor << oendl;
+  owarn << "RedMax = " << info->redMax << ", GreenMax = " << info->greenMax << ", BlueMax = " << info->blueMax << oendl;
+  owarn << "RedShift = " << info->redShift << ", GreenShift = " << info->greenShift
+        << ", BlueShift = " << info-> blueShift << oendl;
 
   buf->resize( info->width/con->options()->scaleFactor, info->height /con->options()->scaleFactor);
 
   // Wait for desktop name
-  owarn << "Waiting for desktop name" << oendl; 
+  owarn << "Waiting for desktop name" << oendl;
 
   static QString statusMsg = tr( "Waiting for desktop name..." );
   emit status( statusMsg );
 
   currentState = AwaitingDesktopName;
   connect( con, SIGNAL( gotEnoughData() ), SLOT( gotDesktopName() ) );
@@ -209,25 +208,25 @@ void KRFBDecoder::gotServerInit()
 
 void KRFBDecoder::gotDesktopName()
 {
   assert( info );
   assert( currentState == AwaitingDesktopName );
 
-  owarn << "Got desktop name" << oendl; 
+  owarn << "Got desktop name" << oendl;
 
   disconnect( con, SIGNAL( gotEnoughData() ),
-              this, SLOT( gotDesktopName() ) );
+          this, SLOT( gotDesktopName() ) );
 
   char *buf = new char[ info->nameLength + 1 ];
   CHECK_PTR( buf );
 
   con->read( buf, info->nameLength );
   buf[ info->nameLength ] = '\0';
   info->name = buf;
 
-  owarn << "Desktop: " << info->name.latin1() << "" << oendl; 
+  owarn << "Desktop: " << info->name.latin1() << "" << oendl;
 
   delete buf;
 
   // Get the format we'll really use and tell the server
   decidePixelFormat();
   sendPixelFormat();
@@ -261,18 +260,15 @@ void KRFBDecoder::decidePixelFormat()
 
   if ( con->options()->colors256 )
     chosenDepth = 8;
   else
     chosenDepth = bestDepth;
 
-  qWarning( "Screen depth=%d, server depth=%d, best depth=%d, " \
-           "eight bit %d, chosenDepth=%d",
-           screenDepth,
-           info->depth,
-           bestDepth,
-           con->options()->colors256, chosenDepth );
+  owarn << "Screen depth=" << screenDepth << ", server depth=" << info->depth
+        << ", best depth=" << bestDepth << "eight bit " << con->options()->colors256
+        << ", chosenDepth=" << chosenDepth << oendl;
 
   format->depth = chosenDepth;
 
   // If we're using the servers native depth
   if ( chosenDepth == info->depth ) {
     // Use the servers native format
@@ -373,16 +369,16 @@ void KRFBDecoder::sendUpdateRequest( bool incremental )
 }
 
 void KRFBDecoder::gotUpdateHeader()
 {
   assert( currentState == AwaitingUpdate );
 
-  //  owarn << "Got update header" << oendl; 
+  //  owarn << "Got update header" << oendl;
 
   disconnect( con, SIGNAL( gotEnoughData() ),
-              this, SLOT( gotUpdateHeader() ) );
+          this, SLOT( gotUpdateHeader() ) );
 
   CARD8 msgType;
   con->read( &msgType, 1 );
 
   if ( msgType != UpdateId ) {
     // We might have a bell or server cut
@@ -408,28 +404,28 @@ void KRFBDecoder::gotUpdateHeader()
   CARD8 padding;
   con->read( &padding, 1 );
 
   con->read( &noRects, 2 );
   noRects = Swap16IfLE( noRects );
 
-  //  owarn << "Expecting " << noRects << " rects" << oendl; 
+  //  owarn << "Expecting " << noRects << " rects" << oendl;
 
   // Now wait for the data
   currentState = AwaitingRectHeader;
   connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) );
   con->waitForData( RectHeaderLength );
 }
 
 void KRFBDecoder::gotRectHeader()
 {
   assert( currentState == AwaitingRectHeader );
 
-  //  owarn << "Got rect header" << oendl; 
+  //  owarn << "Got rect header" << oendl;
 
   disconnect( con, SIGNAL( gotEnoughData() ),
-              this, SLOT( gotRectHeader() ) );
+          this, SLOT( gotRectHeader() ) );
 
   con->read( &x, 2 );
   x = Swap16IfLE( x );
   con->read( &y, 2 );
   y = Swap16IfLE( y );
 
@@ -438,47 +434,47 @@ void KRFBDecoder::gotRectHeader()
   con->read( &h, 2 );
   h = Swap16IfLE( h );
 
   con->read( &encoding, 4 );
 
   //  CARD32 encodingLocal = Swap32IfLE( encoding );
-  //  qWarning( "Rect: x=%d, y= %d, w=%d, h=%d, encoding=%ld",
-          //   x, y, w, h, encodingLocal );
+  //  owarn << "Rect: x=" << x << ", y= " << y << ", w=" << w << ", h=" << h
+  //        << ", encoding= " << encodingLocal << oendl;
 
   //
   // Each encoding needs to be handled differently. Some require
   // waiting for more data, but others like a copyrect do not.
   // Our constants have already been byte swapped, so we use
   // the remote value as is.
   //
   if ( encoding == RawEncoding ) {
-      //    owarn << "Raw encoding" << oendl; 
+      //    owarn << "Raw encoding" << oendl;
     handleRawRect();
   }
   else if ( encoding == CopyRectEncoding ) {
-//    owarn << "CopyRect encoding" << oendl; 
+//    owarn << "CopyRect encoding" << oendl;
     handleCopyRect();
   }
   else if ( encoding == RreEncoding ) {
-    owarn << "RRE encoding" << oendl; 
+    owarn << "RRE encoding" << oendl;
     handleRRERect();
   }
   else if ( encoding == CorreEncoding ) {
-    owarn << "CoRRE encoding" << oendl; 
+    owarn << "CoRRE encoding" << oendl;
     handleCoRRERect();
   }
   else if ( encoding == HexTileEncoding ) {
-    owarn << "HexTile encoding" << oendl; 
+    owarn << "HexTile encoding" << oendl;
     handleHexTileRect();
   }
   else {
     int msg = Swap32IfLE( encoding );
     QString protocolError = tr( "Protocol Error: An unknown encoding was "
-                                  "used by the server %1" ).arg( msg );
+                  "used by the server %1" ).arg( msg );
     currentState = Error;
-    owarn << "Unknown encoding, " << msg << "" << oendl; 
+    owarn << "Unknown encoding, " << msg << "" << oendl;
     emit error( protocolError );
     return;
   }
 }
 
 //
@@ -488,13 +484,13 @@ void KRFBDecoder::gotRectHeader()
 void KRFBDecoder::handleRawRect()
 {
   // We need something a bit cleverer here to handle large
   // rectanges nicely. The chunking should be based on the
   // overall size (but has to be in complete lines).
 
-    //  owarn << "Handling a raw rect chunk" << oendl; 
+    //  owarn << "Handling a raw rect chunk" << oendl;
 
     //  CARD32 lineCount = w * format->bpp / 8;
 
   if ( h > RectChunkSize ) {
     //    if ( con->sock->size() / lineCount ) {
     //      getRawRectChunk( con->sock->size() / lineCount );
@@ -511,13 +507,13 @@ void KRFBDecoder::handleRawRect()
 void KRFBDecoder::getRawRectChunk( int lines )
 {
   this->lines = lines;
   CARD32 count = lines * w * format->bpp / 8;
 
   // Wait for server init
-  //  owarn << "Waiting for raw rect chunk, " << count << "" << oendl; 
+  //  owarn << "Waiting for raw rect chunk, " << count << "" << oendl;
 
   currentState = AwaitingRawRectChunk;
   connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRawRectChunk() ) );
   con->waitForData( count );
 }
 
@@ -525,13 +521,13 @@ void KRFBDecoder::gotRawRectChunk()
 {
   assert( currentState == AwaitingRawRectChunk );
 
   disconnect( con, SIGNAL( gotEnoughData() ),
               this, SLOT( gotRawRectChunk() ) );
 
-  //  owarn << "Got raw rect chunk" << oendl; 
+  //  owarn << "Got raw rect chunk" << oendl;
 
   //
   // Read the rect data and copy it to the buffer.
   //
 
   // TODO: Replace this!
@@ -548,13 +544,13 @@ void KRFBDecoder::gotRawRectChunk()
   if ( h > 0 ) {
     handleRawRect();
   }
   else {
     noRects--;
 
-    //    owarn << "There are " << noRects << " rects left" << oendl; 
+    //    owarn << "There are " << noRects << " rects left" << oendl;
 
     if ( noRects ) {
       currentState = AwaitingRectHeader;
       connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) );
       con->waitForData( RectHeaderLength );
     }
@@ -592,36 +588,36 @@ void KRFBDecoder::gotCopyRectPos()
   srcY = Swap16IfLE( srcY );
 
   buf->copyRect( srcX, srcY, x, y, w, h );
 
   noRects--;
 
-  //    owarn << "There are " << noRects << " rects left" << oendl; 
+  //    owarn << "There are " << noRects << " rects left" << oendl;
 
   if ( noRects ) {
     currentState = AwaitingRectHeader;
     connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) );
     con->waitForData( RectHeaderLength );
   }
   else
     currentState = Idle;
 }
 
 void KRFBDecoder::handleRRERect()
 {
-  owarn << "RRE not implemented" << oendl; 
+  owarn << "RRE not implemented" << oendl;
 }
 
 void KRFBDecoder::handleCoRRERect()
 {
-  owarn << "CoRRE not implemented" << oendl; 
+  owarn << "CoRRE not implemented" << oendl;
 }
 
 void KRFBDecoder::handleHexTileRect()
 {
-  owarn << "HexTile not implemented" << oendl; 
+  owarn << "HexTile not implemented" << oendl;
 }
 
 void KRFBDecoder::sendMouseEvent( QMouseEvent *e )
 {
   // Deal with the buttons
   if ( e->type() != QEvent::MouseMove ) {
@@ -641,15 +637,15 @@ void KRFBDecoder::sendMouseEvent( QMouseEvent *e )
         buttonMask |= 0x03;
       if ( e->button() & RightButton )
         buttonMask |= 0x05;
     }
   }
 
-        // HACK: Scaling
+    // HACK: Scaling
   CARD16 x = Swap16IfLE( e->x() * con->options()->scaleFactor );
-          CARD16 y = Swap16IfLE( e->y() *con->options()->scaleFactor );
+  CARD16 y = Swap16IfLE( e->y() *   con->options()->scaleFactor );
 
   con->write( &PointerEventId, 1 );
   con->write( &buttonMask, 1 );
   con->write( &x, 2 );
   con->write( &y, 2 );
 }
@@ -675,13 +671,13 @@ void KRFBDecoder::sendCutEvent( const QString &unicode )
   con->write( &length, 4 );
   con->write( text.data(), length );
 }
 
 void KRFBDecoder::gotServerCut()
 {
-  owarn << "Got server cut" << oendl; 
+  owarn << "Got server cut" << oendl;
 
   currentState = AwaitingServerCutLength;
   connect( con, SIGNAL( gotEnoughData() ), SLOT( gotServerCutLength() ) );
   con->waitForData( ServerCutLenLength );
 }
 
@@ -723,13 +719,13 @@ void KRFBDecoder::gotServerCutText()
 
   con->read( cutbuf, serverCutTextLen );
   cutbuf[ serverCutTextLen ] = '\0';
 
   /* For some reason QApplication::clipboard()->setText() segfaults when called
    * from within keypebble's mass of signals and slots
-  owarn << "Server cut: " << cutbuf << "" << oendl; 
+  owarn << "Server cut: " << cutbuf << "" << oendl;
 
   QString cutText( cutbuf ); // DANGER!!
   qApp->clipboard()->setText( cutText );
   */
 
   delete cutbuf;
@@ -740,33 +736,33 @@ void KRFBDecoder::gotServerCutText()
     con->waitForData( UpdateHeaderLength );
   }
   else if ( oldState == Idle ) {
     currentState = Idle;
   }
   else {
-    owarn << "Async handled in weird state" << oendl; 
+    owarn << "Async handled in weird state" << oendl;
     currentState = oldState;
   };
 }
 
 void KRFBDecoder::gotBell()
 {
-  owarn << "Got server bell" << oendl; 
+  owarn << "Got server bell" << oendl;
   buf->soundBell();
 
   // Now wait for the update (again)
   if ( oldState == AwaitingUpdate ) {
     currentState = AwaitingUpdate;
     connect( con, SIGNAL( gotEnoughData() ), SLOT( gotUpdateHeader() ) );
     con->waitForData( UpdateHeaderLength );
   }
   else if ( oldState == Idle ) {
     currentState = Idle;
   }
   else {
-    owarn << "Async handled in weird state" << oendl; 
+    owarn << "Async handled in weird state" << oendl;
     currentState = oldState;
   };
 }
 
 void KRFBDecoder::sendKeyPressEvent( QKeyEvent *event )
 {
@@ -816,17 +812,17 @@ int KRFBDecoder::toKeySym( QKeyEvent *k )
 {
 
     //
     // Try and map these "other common keys" first.
     //
     if ((k->key() >= Qt::Key_Escape) && (k->key() <= Qt::Key_F12)) {
-        for(int i = 0; keyMap[i].keycode != 0; i++) {
-            if (k->key() == keyMap[i].keycode) {
-                return keyMap[i].keysym;
-            }
-        }
+    for(int i = 0; keyMap[i].keycode != 0; i++) {
+        if (k->key() == keyMap[i].keycode) {
+        return keyMap[i].keysym;
+        }
+    }
     }
 
     //
     // If these keys aren't matched, return the ascii code and let the
     // server figure it out.  We don't return k->key(), as the data in
     // key differs between input methods, and we don't want special cases.
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 6c5f5ea..211314b 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -107,15 +107,15 @@ namespace {
     {
         m_Pixset = true;
         calcRect(text());
     }
 
     inline QPixmap* IconViewItem::pixmap()const {
-//      qWarning(  "Name is " + m_path.right( 15 ) + " rect is %d %d %d %d | %d %d",
-//                 rect().x(),rect().y(),rect().width(),rect().height(),
-//                 iconView()->contentsX(), iconView()->contentsY());
+//      owarn << "Name is " << m_path.right( 15 ) << " rect is " << rect().x() << " " << rect().y()
+//            << " " << rect().width() << " " << rect().height() << " | " << iconView()->contentsX()
+//            << " " << iconView()->contentsY() << oendl;
 
         if (textOnly()&&!m_isDir) {
             if (!_emptyPix) _emptyPix = new QPixmap(0,0,1);
             return _emptyPix;
         }
         if ( m_isDir )
diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
index 36e5dcf..aa15d31 100644
--- a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
+++ b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
@@ -1,10 +1,13 @@
 #include "viewmodebutton.h"
 
+/* OPIE */
 #include <opie2/odebug.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qtoolbar.h>
 #include <qpopupmenu.h>
 
 ViewModeButton::ViewModeButton( QToolBar* bar,int def )
     : QToolButton( bar )
 {
@@ -37,9 +40,9 @@ void ViewModeButton::slotChange( int i ) {
         break;
     case 3:
         name = "opie-eye/opie-eye-textview";
         break;
     }
 
-    qWarning("foo %d" +name, i );
+    owarn << "foo " << name << oendl;
     setIconSet( Resource::loadIconSet( name ) );
 }
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc
index 04c50d9..f81066e 100644
--- a/noncore/net/opietooth/lib/device.cc
+++ b/noncore/net/opietooth/lib/device.cc
@@ -1,152 +1,157 @@
 
-#include <signal.h>
+#include "device.h"
 
+/* OPIE */
 #include <opie2/oprocess.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* STD */
+#include <signal.h>
 
-#include "device.h"
 
 using namespace OpieTooth;
 
 using Opie::Core::OProcess;
 namespace {
   int parsePid( const QCString& par ){
     int id=0;
     QString string( par );
     QStringList list =  QStringList::split( '\n', string );
     for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){
-    qWarning("parsePID: %s", (*it).latin1() );
+    owarn << "parsePID: " << (*it).latin1() << oendl;
       if( !(*it).startsWith("CSR") ){
-        id = (*it).toInt();
-        break;
+    id = (*it).toInt();
+    break;
       }
     }
     return id;
   }
 }
 
 Device::Device(const QString &device, const QString &mode, const QString &speed )
   : QObject(0, "device") {
 
-  qWarning("OpieTooth::Device create" );
+  owarn << "OpieTooth::Device create" << oendl;
   m_hci = 0;
   m_process = 0;
   m_attached = false;
   m_device = device;
   m_mode = mode;
   m_speed = speed;
   attach();
 }
 Device::~Device(){
   detach();
 }
 void Device::attach(){
-  qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() );
+  owarn << "attaching " << m_device.latin1() << " " << m_mode.latin1() << " " << m_speed.latin1() << oendl;
   if(m_process == 0 ){
     m_output.resize(0);
-    qWarning("new process to create" );
+    owarn << "new process to create" << oendl;
     m_process = new OProcess();
     *m_process << "hciattach";
     *m_process << "-p";
     *m_process << m_device << m_mode << m_speed;
     connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),
             this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
     connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ),
             this, SLOT(slotStdOut(Opie::Core::OProcess*,char*,int ) ) );
     connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ),
             this, SLOT(slotStdErr(Opie::Core::OProcess*,char*,int) ) );
     if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){
-      qWarning("Could not start" );
+      owarn << "Could not start" << oendl;
       delete m_process;
       m_process = 0;
     }
   };
 }
 void Device::detach(){
   delete m_hci;
   delete m_process;
   // kill the pid we got
   if(m_attached ){
     //kill the pid
-    qWarning( "killing" );
+    warn << "killing" << oendl;
     kill(pid, 9);
   }
-  qWarning("detached" );
+  owarn << "detached" << oendl;
 }
 bool Device::isLoaded()const{
   return m_attached;
 }
 QString Device::devName()const {
   return QString::fromLatin1("hci0");
 };
 void Device::slotExited( OProcess* proc)
 {
-  qWarning("prcess exited" );
+  owarn << "prcess exited" << oendl;
   if(proc== m_process ){
-    qWarning("proc == m_process" );
+    owarn << "proc == m_process" << oendl;
     if( m_process->normalExit() ){ // normal exit
-      qWarning("normalExit" );
+      owarn << "normalExit" << oendl;
       int ret = m_process->exitStatus();
       if( ret == 0 ){ // attached
-        qWarning("attached" );
-        qWarning("Output: %s", m_output.data() );
-        pid = parsePid( m_output );
-        qWarning("Pid = %d", pid );
-        // now hciconfig hci0 up ( determine hciX FIXME)
-        // and call hciconfig hci0 up
-        // FIXME hardcoded to hci0 now :(
-        m_hci = new OProcess( );
-        *m_hci << "hciconfig";
-        *m_hci << "hci0 up";
-        connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ),
+    owarn << "attached" << oendl;
+    owarn << "Output: " << m_output.data() << oendl;
+    pid = parsePid( m_output );
+    owarn << "Pid = " << pid << oendl;
+    // now hciconfig hci0 up ( determine hciX FIXME)
+    // and call hciconfig hci0 up
+    // FIXME hardcoded to hci0 now :(
+    m_hci = new OProcess( );
+    *m_hci << "hciconfig";
+    *m_hci << "hci0 up";
+    connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ),
                 this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
-        if(!m_hci->start() ){
-          qWarning("could not start" );
-          m_attached = false;
-          emit device("hci0", false );
-        }
+    if(!m_hci->start() ){
+      owarn << "could not start" << oendl;
+      m_attached = false;
+      emit device("hci0", false );
+    }
       }else{
-        qWarning("crass" );
-        m_attached = false;
-        emit device("hci0", false );
+        owarn << "crass" << oendl;
+    m_attached = false;
+    emit device("hci0", false );
 
       }
     }
     delete m_process;
     m_process = 0;
   }else if(proc== m_hci ){
-    qWarning("M HCI exited" );
+    owarn << "M HCI exited" << oendl;
     if( m_hci->normalExit() ){
-      qWarning("normal exit" );
+      owarn << "normal exit" << oendl;
       int ret = m_hci->exitStatus();
       if( ret == 0 ){
-        qWarning("attached really really attached" );
-        m_attached = true;
-        emit device("hci0", true );
+    owarn << "attached really really attached" << oendl;
+    m_attached = true;
+    emit device("hci0", true );
       }else{
-        qWarning( "failed" );
-        emit device("hci0", false );
-        m_attached = false;
+    owarn << "failed" << oendl;
+    emit device("hci0", false );
+    m_attached = false;
       }
     }// normal exit
     delete m_hci;
     m_hci = 0;
   }
 }
 void Device::slotStdOut(OProcess* proc, char* chars, int len)
 {
-  qWarning("std out" );
+  owarn << "std out" << oendl;
   if( len <1 ){
-    qWarning( "len < 1 " );
+    owarn << "len < 1 " << oendl;
     return;
   }
   if(proc == m_process ){
     QCString string( chars, len+1 ); // \0 == +1
-    qWarning("output: %s", string.data() );
+    owarn << "output: " << string.data() << oendl;
     m_output.append( string.data() );
   }
 }
 void Device::slotStdErr(OProcess* proc, char* chars, int len)
 {
-  qWarning("std err" );
+  owarn << "std err" << oendl;
   slotStdOut( proc, chars, len );
 }
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 18e1df9..76d9127 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -1,21 +1,22 @@
 
-
-#include <opie2/oprocess.h>
-
 #include "parser.h"
 #include "manager.h"
 
+#include <opie2/oprocess.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 
 using namespace OpieTooth;
 
 using Opie::Core::OProcess;
 Manager::Manager( const QString& dev )
   : QObject()
 {
-    qWarning("created");
+    owarn << "created" << oendl;
     m_device = dev;
     m_hcitool = 0;
     m_sdp = 0;
 }
 Manager::Manager( Device* /*dev*/ )
   : QObject()
@@ -54,22 +55,22 @@ void Manager::isAvailable( const QString& device ){
 
 void Manager::isAvailable( Device* /*dev*/ ){
 
 
 }
 void Manager::searchDevices( const QString& device ){
-    qWarning("search devices");
+    owarn << "search devices" << oendl;
     OProcess* hcitool = new OProcess();
     hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() );
     *hcitool << "hcitool" << "scan";
     connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) ,
              this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) );
     connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
              this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) );
     if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        qWarning("could not start");
+        owarn << "could not start" << oendl;
         RemoteDevice::ValueList list;
         emit foundDevices( device, list );
         delete hcitool;
     }
 }
 
@@ -104,19 +105,19 @@ void Manager::removeServices( const QStringList& list){
         removeService( (*it) );
 }
 void Manager::searchServices( const QString& remDevice ){
     OProcess *m_sdp =new OProcess();
     *m_sdp << "sdptool" << "browse" << remDevice;
     m_sdp->setName( remDevice.latin1() );
-    qWarning("search Services for %s", remDevice.latin1() );
+    owarn << "search Services for " << remDevice.latin1() << oendl;
     connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ),
             this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) );
     connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
             this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) );
     if (!m_sdp->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
-        qWarning("could not start sdptool" );
+        owarn << "could not start sdptool" << oendl;
         delete m_sdp;
         Services::ValueList list;
         emit foundServices( remDevice, list );
     }
 }
 void Manager::searchServices( const RemoteDevice& dev){
@@ -137,91 +138,91 @@ void Manager::slotProcessExited(OProcess* proc ) {
     emit available( name, conn );
     delete proc;
 }
 void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
 {
     QCString str(ch,  len+1 );
-    qWarning("SDP:%s", str.data() );
+    owarn << "SDP:" << str.data() << oendl;
     QMap<QString, QString>::Iterator it;
     it = m_out.find(proc->name() );
     QString string;
     if ( it != m_out.end() ) {
         string = it.data();
     }
     string.append( str );
     m_out.replace( proc->name(), string );
 
 }
 void Manager::slotSDPExited( OProcess* proc)
 {
-    qWarning("proc name %s", proc->name() );
+    owarn << "proc name " << proc->name() << oendl;
     Services::ValueList  list;
     if (proc->normalExit()  ) {
         QMap<QString, QString>::Iterator it = m_out.find( proc->name() );
         if ( it != m_out.end() ) {
-            qWarning("found process" );
+        owarn << "found process" << oendl;
             list = parseSDPOutput( it.data() );
             m_out.remove( it );
         }
     }
     emit foundServices( proc->name(), list );
     delete proc;
 }
 Services::ValueList Manager::parseSDPOutput( const QString& out ) {
     Services::ValueList list;
-    qWarning("parsing output" );
+    owarn << "parsing output" << oendl;
     Parser parser( out );
     list = parser.services();
     return list;
 }
 
 void Manager::slotHCIExited(OProcess* proc ) {
-    qWarning("process exited");
+    owarn << "process exited" << oendl;
     RemoteDevice::ValueList list;
     if (proc->normalExit() ) {
-        qWarning("normalExit %s",  proc->name() );
+        owarn << "normalExit " << proc->name() << oendl;
         QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
         if (it != m_devices.end() ) {
-            qWarning("!= end ;)");
+            owarn << "!= end ;)" << oendl;
             list = parseHCIOutput( it.data() );
             m_devices.remove( it );
         }
     }
     emit foundDevices( proc->name(), list );
     delete proc;
 }
 void Manager::slotHCIOut(OProcess* proc,  char* ch,  int len) {
     QCString str( ch, len+1 );
-    qWarning("hci: %s",  str.data() );
+    owarn << "hci: " << str.data() oendl;
     QMap<QString, QString>::Iterator it;
     it = m_devices.find( proc->name() );
-    qWarning("proc->name %s", proc->name() );
+    owarn << "proc->name " << proc->name() << oendl;
     QString string;
     if (it != m_devices.end() ) {
-        qWarning("slotHCIOut ");
+        owarn << "slotHCIOut " << oendl;
         string = it.data();
     }
     string.append( str );
 
     m_devices.replace( proc->name(),  string );
 }
 RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
-    qWarning("parseHCI %s",  output.latin1() );
+    owarn << "parseHCI " << output.latin1() << oendl;
     RemoteDevice::ValueList list;
     QStringList strList = QStringList::split('\n',  output );
     QStringList::Iterator it;
     QString str;
     for ( it = strList.begin(); it != strList.end(); ++it ) {
         str = (*it).stripWhiteSpace();
-        qWarning("OpieTooth %s", str.latin1() );
+        owarn << "OpieTooth " << str.latin1() << oendl;
         int pos = str.findRev(':' );
         if ( pos > 0 ) {
             QString mac = str.left(17 );
             str.remove( 0,  17 );
-            qWarning("mac %s",  mac.latin1() );
-            qWarning("rest:%s",  str.latin1() );
+            owarn << "mac " << mac.latin1() << oendl;
+            owarn << "rest: " << str.latin1() << oendl;
             RemoteDevice rem( mac , str.stripWhiteSpace() );
             list.append( rem );
         }
     }
     return list;
 }
@@ -240,13 +241,13 @@ void Manager::connectTo( const QString& mac) {
     proc << mac;
     proc.start(OProcess::DontCare); // the lib does not care at this point
 }
 
 
 void Manager::searchConnections() {
-    qWarning("searching connections?");
+    owarn << "searching connections?" << oendl;
     OProcess* proc = new OProcess();
     m_hcitoolCon = QString::null;
 
     connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ),
             this, SLOT(slotConnectionExited( Opie::Core::OProcess*) ) );
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ),
@@ -278,21 +279,21 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) {
     // remove the first line ( "Connections:")
     it = list.begin();
     it = list.remove( it );
     for (; it != list.end(); ++it ) {
         QString row = (*it).stripWhiteSpace();
         QStringList value = QStringList::split(' ', row );
-        qWarning("0: %s", value[0].latin1() );
-        qWarning("1: %s", value[1].latin1() );
-        qWarning("2: %s", value[2].latin1() );
-        qWarning("3: %s", value[3].latin1() );
-        qWarning("4: %s", value[4].latin1() );
-        qWarning("5: %s", value[5].latin1() );
-        qWarning("6: %s", value[6].latin1() );
-        qWarning("7: %s", value[7].latin1() );
-        qWarning("8: %s", value[8].latin1() );
+        owan << "0: %s" << value[0].latin1() << oendl;
+        owan << "1: %s" << value[1].latin1() << oendl;
+        owan << "2: %s" << value[2].latin1() << oendl;
+        owan << "3: %s" << value[3].latin1() << oendl;
+        owan << "4: %s" << value[4].latin1() << oendl;
+        owan << "5: %s" << value[5].latin1() << oendl;
+        owan << "6: %s" << value[6].latin1() << oendl;
+        owan << "7: %s" << value[7].latin1() << oendl;
+        owan << "8: %s" << value[8].latin1() << oendl;
         ConnectionState con;
         con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming );
         con.setConnectionMode( value[1] );
         con.setMac( value[2] );
         con.setHandle( value[4].toInt() );
         con.setState( value[6].toInt() );
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc
index 8baf284..7e95907 100644
--- a/noncore/net/opietooth/lib/parser.cc
+++ b/noncore/net/opietooth/lib/parser.cc
@@ -1,44 +1,50 @@
 
+#include "parser.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qstringlist.h>
 
-#include "parser.h"
 
 using namespace OpieTooth;
 
 namespace {
 
 
     // "Test Foo Bar" (0x3456)
     // @param ret Test Foo Bar
     // @eturn 13398
     // tactic find " (
 int convert( const QString& line, QString& ret ) {
-//    qWarning("called");
+//    owarn << "called" << oendl;
     ret = QString::null;
     int i = 0;
     int pos = line.findRev("\" (");
     if ( pos > 0 ) { // it shouldn't be at pos 0
         ret = line.left(pos ).stripWhiteSpace();
-        //      qWarning("ret: %s",  ret.latin1() );
+        //      owarn << "ret: " << ret.latin1() << oendl;
         ret = ret.replace(QRegExp("[\"]"), "");
-        //qWarning("ret: %s", ret.latin1() );
+        //owarn << "ret: " << ret.latin1() << oendl;
         QString dummy = line.mid(pos + 5 );
-        //qWarning("dummy: %s",  dummy.latin1() );
+        //owarn << "dummy: " << dummy.latin1() << oendl;
         dummy = dummy.replace(QRegExp("[)]"), "");
-        //qWarning("dummy: %s", dummy.latin1() );
+        //owarn << "dummy: " << dummy.latin1() << oendl;
 //        dummy = dummy.remove( dummy.length() -2, 1 ); // remove the )
         bool ok;
         i = dummy.toInt(&ok, 16 );
         //if (ok ) {
-        //     qWarning("converted %d",  i);
-        //}else qWarning("failed" );
-        //qWarning("exiting");
+        //     owarn << "converted " << i << oendl;
+        //}else owarn << "failed" << oendl;
+        //owarn << "exiting" << oendl;
         return i;
     }
-    //qWarning("output %d", i );
+    //owarn << "output " << i << oendl;
     return i;
 }
 
 };
 
 
@@ -54,17 +60,17 @@ Services::ValueList Parser::services() const {
 void Parser::parse( const QString& string) {
     m_list.clear();
     m_complete = true;
     QStringList list = QStringList::split('\n', string,TRUE );
     QStringList::Iterator it;
     for (it = list.begin(); it != list.end(); ++it ) {
-        //qWarning("line:%s:line", (*it).latin1() );
+        //owarn << "line:" << (*it).latin1() << oendl;
         if ( (*it).startsWith("Browsing") ) continue;
 
         if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins
-            qWarning("could add");
+            owarn << "could add" << oendl;
             // now see if complete and add
             if (m_complete ) {
                 if (!m_item.serviceName().isEmpty() )
                     m_list.append( m_item );
                 Services serv;
                 m_item = serv;
@@ -77,95 +83,95 @@ void Parser::parse( const QString& string) {
         if (parseClassId(   (*it) ) ) ;//continue;
         if (parseProtocol(  (*it) ) ) ;//continue;
         if (parseProfile(   (*it) ) ) ;//continue;
     }
     // missed the last one
     if (m_complete) {
-//        qWarning("adding");
+//        owarn << "adding" << oendl;
         if (!m_item.serviceName().isEmpty() )
             m_list.append(m_item );
     }
     QValueList<Services>::Iterator it2;
 
     if (m_list.isEmpty() )
-        qWarning("m_list is empty");
+        owarn << "m_list is empty" << oendl;
     for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) {
-        qWarning("name %s", (*it2).serviceName().latin1() );
+        owarn << "name " << (*it2).serviceName().latin1() << oendl;
     }
 }
 bool Parser::parseName( const QString& str) {
     if (str.startsWith("Service Name:") ) {
         m_item.setServiceName( str.mid(13).stripWhiteSpace() );
-        qWarning(m_item.serviceName() );
+        owarn << m_item.serviceName() << oendl;
         return true;
     }
     return false;
 }
 bool Parser::parseRecHandle( const QString& str) {
     if (str.startsWith("Service RecHandle:" ) ) {
         QString out = str.mid(18 ).stripWhiteSpace();
-        qWarning("out %s", out.latin1() );
+        owarn << "out " << out.latin1() << oendl;
         int value = out.mid(2).toInt(&m_ok, 16 );
         if (m_ok && (value != -1) )
             m_complete = true;
         else
             m_complete = false;
-        qWarning("rec handle %d",  value);
+        owarn << "rec handle " << value << oendl;
         m_item.setRecHandle( value );
         return true;
 
     }
     return false;
 }
 bool Parser::parseClassId( const QString& str) {
     if (str.startsWith("Service Class ID List:") ) {
-        qWarning("found class id" );
-        qWarning("line:%s", str.latin1() );
+        owarn << "found class id" << oendl;
+        owarn << "line: " << str.latin1() << oendl;
         m_classOver = true;
         return true;
     }else if ( m_classOver && str.startsWith("  " )  ){ // ok now are the informations in place
-        qWarning("line with class id" );
-        qWarning("%s",str.latin1() );
+        owarn << "line with class id" << oendl;
+        owarn << str.latin1() << oendl;
 
         // "Obex Object Push" (0x1105)
         //  find backwards the " and the from 0 to pos and the mid pos+1
         // then stripWhiteSpace add name replace '"' with ""
         // and then convert 0x1105 toInt()
         QString classes;
         int ids;
         ids = convert( str, classes );
-        qWarning("ids %d", ids );
+        owarn << "ids " << ids << oendl;
         m_item.insertClassId( ids, classes );
 
         return true;
     }else{
-        qWarning("Else %d", m_classOver );
+        owarn << "Else " << m_classOver << oendl;
         m_classOver = false;
     }
     return false;
 }
 bool Parser::parseProtocol( const QString& str) {
     if (str.startsWith("Protocol Descriptor List:") ) {
         m_protocolOver = true;
         m_protocolAdded = false;
         return true;
 
     }else if (m_protocolOver && str.startsWith("  ") ) { // "L2CAP" (0x0100)
-        qWarning("double protocol filter");
+        owarn << "double protocol filter" << oendl;
 
         if (!m_protocolAdded ) { // the protocol does neither supply a channel nor port so add it now
             Services::ProtocolDescriptor desc(  m_protName,  m_protId );
             m_item.insertProtocolDescriptor( desc );
         }
         m_protocolAdded = false;
         { // the find function
             m_protId = convert(str, m_protName );
         }
         return true;
     }else if (m_protocolOver && str.startsWith("   ") ) {
-        qWarning("tripple protocol filter");
+        owarn << "tripple protocol filter" << oendl;
         m_protocolAdded = true;
         QString dummy = str.stripWhiteSpace();
         int pos = dummy.findRev(':');
         if ( pos > -1 ) {
             int port = dummy.mid(pos+1 ).stripWhiteSpace().toInt();
             Services::ProtocolDescriptor desc(  m_protName,  m_protId, port );
@@ -184,13 +190,13 @@ bool Parser::parseProfile( const QString& str) {
         m_profId = convert( str,  m_profName );
     }else if ( m_profOver && str.startsWith("   ") ) {
     //  now find
         int pos = str.findRev(':');
         if ( pos > 0 ) {
             int dummy = str.mid(pos+1 ).stripWhiteSpace().toInt();
-            qWarning("dummyInt:%d",  dummy );
+            owarn << "dummyInt: " << dummy << oendl;
             Services::ProfileDescriptor desc( m_profName, m_profId, dummy );
             m_item.insertProfileDescriptor(desc);
         }
     }else
         m_profOver = false;
 
diff --git a/noncore/settings/mediummount/mediumglobal.cc b/noncore/settings/mediummount/mediumglobal.cc
index ab0b3af..0c6cf12 100644
--- a/noncore/settings/mediummount/mediumglobal.cc
+++ b/noncore/settings/mediummount/mediumglobal.cc
@@ -1,20 +1,25 @@
 
+#include "mediumglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+#include <qpe/config.h>
 
+/* QT */
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qabstractlayout.h> // spacer item
 #include <qlayout.h>
 #include <qframe.h>
 #include <qgroupbox.h>
 #include <qwhatsthis.h>
 
-#include <qpe/config.h>
 
-#include "mediumglobal.h"
 
 using namespace MediumMountSetting;
 
 /* TRANSLATOR MediumMountSetting::MediumGlobalWidget */
 
 MediumGlobalWidget::MediumGlobalWidget(QWidget *wid, const char *name )
@@ -149,13 +154,13 @@ void MediumGlobalWidget::slotGlobalChanged()
   int mode = GLOBAL_DISABLED;
   bool enabled = false;
   if( ( enabled =m_useglobal->isChecked() ) ){
     mode = GLOBAL_ENABLED;
   }else
     mode = GLOBAL_DISABLED;
-  qWarning("enabled = %d", enabled );
+  owarn << "enabled = " << enabled << oendl;
   m_all->setEnabled  ( enabled );
   m_audio->setEnabled( enabled );
   m_image->setEnabled( enabled );
   m_text->setEnabled ( enabled );
   m_video->setEnabled ( enabled );
   slotAllChanged();
diff --git a/noncore/styles/theme/othemebase.h b/noncore/styles/theme/othemebase.h
index e691692..5519798 100644
--- a/noncore/styles/theme/othemebase.h
+++ b/noncore/styles/theme/othemebase.h
@@ -15,12 +15,17 @@
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 #ifndef __OTHEMEBASE_H
 #define __OTHEMEBASE_H
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qdatetime.h>
 #include <qtimer.h>
 #include <qwindowsstyle.h>
 #include <qpixmap.h>
 #include <qpe/config.h>
 #include <qimage.h>
@@ -36,54 +41,54 @@
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
 class OThemePixmap : public QPixmap
 {
 public:
-        enum BorderType{Top = 0, Bottom, Left, Right, TopLeft, TopRight, BottomLeft,
-                        BottomRight};
-
-        OThemePixmap( bool timer = true );
-        OThemePixmap( const OThemePixmap &p );
-        ~OThemePixmap();
-        QPixmap* border( BorderType type );
-        void setBorder( BorderType type, const QPixmap &p );
-        void updateAccessed();
-        bool isOld();
+    enum BorderType{Top = 0, Bottom, Left, Right, TopLeft, TopRight, BottomLeft,
+                    BottomRight};
+
+    OThemePixmap( bool timer = true );
+    OThemePixmap( const OThemePixmap &p );
+    ~OThemePixmap();
+    QPixmap* border( BorderType type );
+    void setBorder( BorderType type, const QPixmap &p );
+    void updateAccessed();
+    bool isOld();
 protected:
-        QTime *t;
-        QPixmap *b[ 8 ];
+    QTime *t;
+    QPixmap *b[ 8 ];
 
 private:
-        class OThemePixmapPrivate;
-        OThemePixmapPrivate *d;
+    class OThemePixmapPrivate;
+    OThemePixmapPrivate *d;
 };
 
 inline QPixmap* OThemePixmap::border( BorderType type )
 {
-        return ( b[ type ] );
+    return ( b[ type ] );
 }
 
 inline void OThemePixmap::setBorder( BorderType type, const QPixmap &p )
 {
-        if ( b[ type ] ) {
-                qWarning( "OThemePixmap: Overwriting existing border!" );
-                delete( b[ type ] );
-        }
-        b[ type ] = new QPixmap( p );
+    if ( b[ type ] ) {
+        owarn << "OThemePixmap: Overwriting existing border!" << oendl;
+        delete( b[ type ] );
+    }
+    b[ type ] = new QPixmap( p );
 }
 
 inline void OThemePixmap::updateAccessed()
 {
-        if (t)
-            t->start();
+    if (t)
+        t->start();
 }
 
 inline bool OThemePixmap::isOld()
 {
-        return ( t ? t->elapsed() >= 300000 : false );
+    return ( t ? t->elapsed() >= 300000 : false );
 }
 
 /**
  * A very simple pixmap cache for theme plugins. QPixmapCache is not used
  * since it uses QString keys which are not needed. All the information we
  * need can be encoded in a numeric key. Using QIntCache instead allows us to
@@ -103,78 +108,78 @@ inline bool OThemePixmap::isOld()
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  *
  */
 class OThemeCache : public QObject
 {
-        Q_OBJECT
+    Q_OBJECT
 public:
-        /**
-         * The scale hints supported by the cache. Note that Tiled is not here
-         * since tiled pixmaps are kept only once in OThemeBase.
-         */
-        enum ScaleHint{FullScale, HorizontalScale, VerticalScale};
-        /**
-         * The constructor.
-         *
-         * @param maxSize The maximum size of the cache in kilobytes.
-         */
-        OThemeCache( int maxSize, QObject *parent = 0, const char *name = 0 );
-        /**
-         * Inserts a new pixmap into the cache.
-         *
-         * @param pixmap The pixmap to insert.
-         * @param scale The scaling type of the pixmap.
-         * @param widgetID The widget ID of the pixmap, usually from OThemeBase's
-         * WidgetType enum.
-         *
-         * @return True if the insert was successful, false otherwise.
-         */
-        bool insert( OThemePixmap *pixmap, ScaleHint scale, int widgetID,
-                     bool border = false, bool mask = false );
-        /**
-         * Returns a fully scaled pixmap.
-         *
-         * @param w The pixmap width to search for.
-         * @param h The pixmap height to search for.
-         * @param widgetID The widget ID to search for.
-         *
-         * @return True if a pixmap matching the width, height, and widget ID of
-         * the pixmap exists, NULL otherwise.
-         */
-        OThemePixmap* pixmap( int w, int h, int widgetID, bool border = false,
-                              bool mask = false );
-        /**
-         * Returns a horizontally scaled pixmap.
-         *
-         * @param w The pixmap width to search for.
-         * @param widgetID The widget ID to search for.
-         *
-         * @return True if a pixmap matching the width and widget ID of
-         * the pixmap exists, NULL otherwise.
-         */
-        OThemePixmap* horizontalPixmap( int w, int widgetID );
-        /**
-         * Returns a vertically scaled pixmap.
-         *
-         * @param h The pixmap height to search for.
-         * @param widgetID The widget ID to search for.
-         *
-         * @return True if a pixmap matching the height and widget ID of
-         * the pixmap exists, NULL otherwise.
-         */
-        OThemePixmap* verticalPixmap( int h, int widgetID );
+    /**
+     * The scale hints supported by the cache. Note that Tiled is not here
+     * since tiled pixmaps are kept only once in OThemeBase.
+     */
+    enum ScaleHint{FullScale, HorizontalScale, VerticalScale};
+    /**
+     * The constructor.
+     *
+     * @param maxSize The maximum size of the cache in kilobytes.
+     */
+    OThemeCache( int maxSize, QObject *parent = 0, const char *name = 0 );
+    /**
+     * Inserts a new pixmap into the cache.
+     *
+     * @param pixmap The pixmap to insert.
+     * @param scale The scaling type of the pixmap.
+     * @param widgetID The widget ID of the pixmap, usually from OThemeBase's
+     * WidgetType enum.
+     *
+     * @return True if the insert was successful, false otherwise.
+     */
+    bool insert( OThemePixmap *pixmap, ScaleHint scale, int widgetID,
+                 bool border = false, bool mask = false );
+    /**
+     * Returns a fully scaled pixmap.
+     *
+     * @param w The pixmap width to search for.
+     * @param h The pixmap height to search for.
+     * @param widgetID The widget ID to search for.
+     *
+     * @return True if a pixmap matching the width, height, and widget ID of
+     * the pixmap exists, NULL otherwise.
+     */
+    OThemePixmap* pixmap( int w, int h, int widgetID, bool border = false,
+                          bool mask = false );
+    /**
+     * Returns a horizontally scaled pixmap.
+     *
+     * @param w The pixmap width to search for.
+     * @param widgetID The widget ID to search for.
+     *
+     * @return True if a pixmap matching the width and widget ID of
+     * the pixmap exists, NULL otherwise.
+     */
+    OThemePixmap* horizontalPixmap( int w, int widgetID );
+    /**
+     * Returns a vertically scaled pixmap.
+     *
+     * @param h The pixmap height to search for.
+     * @param widgetID The widget ID to search for.
+     *
+     * @return True if a pixmap matching the height and widget ID of
+     * the pixmap exists, NULL otherwise.
+     */
+    OThemePixmap* verticalPixmap( int h, int widgetID );
 protected slots:
-        void flushTimeout();
+    void flushTimeout();
 protected:
-        QIntCache<OThemePixmap> cache;
-        QTimer flushTimer;
+    QIntCache<OThemePixmap> cache;
+    QTimer flushTimer;
 
 private:
-        class OThemeCachePrivate;
-        OThemeCachePrivate *d;
+    class OThemeCachePrivate;
+    OThemeCachePrivate *d;
 };
 
 
 /**
  * This is a base class for KDE themed styles. It implements a cache,
  * configuration file parsing, pixmap scaling, gradients, and a lot
@@ -186,554 +191,554 @@ private:
  * refer to OThemeStyle for a fully themed style you can derive from.
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
 class OThemeBase: public QWindowsStyle
 {
-        Q_OBJECT
+    Q_OBJECT
 public:
-        /**
-         * Constructs a new OThemeBase object.
-         */
-        OThemeBase( const QString &configFile );
-        ~OThemeBase();
-        /**
-         * Describes if a pixmap should be scaled fully, horizontally, vertically,
-         * or not at all and tiled.
-         */
-        enum ScaleHint{FullScale, HorizontalScale, VerticalScale, TileScale};
-        /**
-         * The default arrow types.
-         */
-        enum ArrowStyle{MotifArrow, LargeArrow, SmallArrow};
-        /**
-         * The default frame shading styles.
-         */
-        enum ShadeStyle{Motif, Windows, Next, KDE};
-        /**
-         * The default scrollbar button layout. BottomLeft is like what Next
-         * uses, BottomRight is like Platinum, and Opposite it like Windows and
-         * Motif.
-         */
-        enum SButton{SBBottomLeft, SBBottomRight, SBOpposite};
-        /**
-         * The gradient types. Horizontal is left to right, Vertical is top to
-         * bottom, and diagonal is upper-left to bottom-right.
-         */
-        enum Gradient{GrNone, GrHorizontal, GrVertical, GrDiagonal, GrPyramid,
-                      GrRectangle, GrElliptic, GrReverseBevel};
-        /**
-         * This provides a list of widget types that OThemeBase recognizes.
-         */
-        /* Internal note: The order here is important. Some widgets inherit
-         * properties. This is usually for when you have two settings for the
-         * same widget, ie: on(sunken), and off. The on settings will inherit
-         * the properties of the off one when nothing is specified in the config.
-         *
-         * In order to be able to handle this while still having everything in
-         * one group that is easy to loop from we have the following order:
-         * unsunked(off) items, sunken(on)items, and then the ones that don't
-         * matter. INHERIT_ITEMS define the number of widgets that have inheritence
-         * so if 0 == PushButtonOff then INHERIT_ITEMS should == PushButtonOn
-         * and so on. WIDGETS define the total number of widgets.
-         */
-        enum WidgetType{
-            // Off (unsunken widgets)
-            PushButton = 0, ComboBox, HScrollBarSlider, VScrollBarSlider, Bevel,
-            ToolButton, ScrollButton, HScrollDeco, VScrollDeco,
-            ComboDeco, MenuItem, InactiveTab, ArrowUp, ArrowDown, ArrowLeft,
-            ArrowRight,
-            // On (sunken widgets)
-            PushButtonDown, ComboBoxDown, HScrollBarSliderDown,
-            VScrollBarSliderDown, BevelDown, ToolButtonDown, ScrollButtonDown,
-            HScrollDecoDown, VScrollDecoDown, ComboDecoDown, MenuItemDown,
-            ActiveTab, SunkenArrowUp, SunkenArrowDown, SunkenArrowLeft,
-            SunkenArrowRight,
-            // Everything else (indicators must have separate settings)
-            HScrollGroove, VScrollGroove, Slider, SliderGroove, IndicatorOn,
-            IndicatorOff, ExIndicatorOn, ExIndicatorOff, HBarHandle, VBarHandle,
-            ToolBar, Splitter, CheckMark, MenuBar, DisArrowUp, DisArrowDown,
-            DisArrowLeft, DisArrowRight, ProgressBar, ProgressBg, MenuBarItem,
-            Background};
-
-        /**
-         * The scaling type specified by the Config file.
-         *
-         * @param widget A Widgets enum value.
-         *
-         * @return A ScaleHint enum value.
-         */
-        ScaleHint scaleHint( WidgetType widget ) const;
-        /**
-         * The gradient type specified by the KConfig file.
-         *
-         * @param widget A Widgets enum value.
-         *
-         * @return A Gradient enum value.
-         */
-        Gradient gradientHint( WidgetType widget ) const;
-        /**
-         * The color group specified for a given widget.
-         * If a color group is set in the theme configuration
-         * that is used, otherwise defaultColor is returned.
-         *
-         * @param defaultColor The colorGroup to set if one is available.
-         *
-         * @param widget The widget whose color group to retrieve.
-         *
-         */
-        const QColorGroup* colorGroup( const QColorGroup &defaultGroup,
-                                       WidgetType widget ) const;
-
-        QBrush pixmapBrush( const QColorGroup &group, QColorGroup::ColorRole role,
-                            int w, int h, WidgetType widget );
-        /**
-         * True if the widget has a pixmap or gradient specified.
-         */
-        bool isPixmap( WidgetType widget ) const;
-        /**
-         * True if the widget has a color group specified.
-         */
-        bool isColor( WidgetType widget ) const;
-        /**
-         * True if the user specified a 3D focus rectangle
-         */
-        bool is3DFocus() const;
-        /**
-         * If the user specified a 3D focus rectangle, they may also specify an
-         * offset from the default rectangle to use when drawing it. This returns
-         * the specified offset.
-         */
-        int focusOffset() const;
-        /**
-         * The border width of the specified widget.
-         */
-        int borderWidth( WidgetType widget ) const;
-        /**
-         * Pixmap border width of the specified widget.
-         */
-        int pixBorderWidth( WidgetType widget ) const;
-        /**
-         * Returns the border pixmap if enabled for the specified widget. This
-         * will contain the originial pixmap, plus the edges separated in
-         * OThemePixmap::border() if valid. If invalid it will return NULL.
-         */
-        OThemePixmap* borderPixmap( WidgetType widget );
-        /**
-         * The highlight width of the specified widget.
-         */
-        int highlightWidth( WidgetType widget ) const;
-        /**
-         * The border plus highlight width of the widget.
-         */
-        int decoWidth( WidgetType widget ) const;
-        /**
-         * The extent (width for vertical, height for horizontal) requested
-         * for the scrollbars.
-         */
-        int getSBExtent() const;
-        /**
-         * The scrollbar button layout.
-         */
-        SButton scrollBarLayout() const;
-        /**
-         * The arrow type.
-         */
-        ArrowStyle arrowType() const;
-        /**
-         * The shading type.
-         */
-        ShadeStyle shade() const;
-        /**
-         * The frame width.
-         */
-        int frameWidth() const;
-        /**
-         * The splitter width.
-         */
-        int splitWidth() const;
-        /**
-         * The contrast for some bevel effects such as reverse gradient.
-         */
-        int bevelContrast( WidgetType widget ) const;
-        /**
-         * The button text X shift.
-         */
-        int buttonXShift() const;
-        /**
-         * The button text Y shift.
-         */
-        int buttonYShift() const;
-        /**
-         * Returns either the slider length of the slider pixmap if available,
-         * otherwise the length specified in the config file.
-         */
-        int sliderButtonLength() const;
-        /**
-         * True if rounded buttons are requested.
-         */
-        bool roundButton() const;
-        /**
-         * True if rounded comboboxes are requested.
-         */
-        bool roundComboBox() const;
-        /**
-         * True if rounded slider grooves are requested.
-         */
-        bool roundSlider() const;
-        /**
-         * True if a line should be drawn on the bottom of active tabs.
-         */
-        bool activeTabLine() const;
-        /**
-         * True if a line should be drawn on the bottom of inactive tabs.
-         */
-        bool inactiveTabLine() const;
-        /**
-         * Returns the current uncached pixmap for the given widget. This will
-         * usually be either the last scaled or gradient pixmap if those have
-         * been specified in the config file, the original pixmap if not, or NULL
-         * if no pixmap has been specified.
-         */
-        OThemePixmap* uncached( WidgetType widget ) const;
-        /**
-         * Returns the pixmap for the given widget at the specified width and
-         * height. This will return NULL if no pixmap or gradient is specified.
-         * It may also return a different sized pixmap if the scaling
-         * is set to Tiled. When using this method, you should call it using
-         * the needed width and height then use QPainter::drawTiledPixmap to
-         * paint it. Doing this, if the pixmap is scaled it will be the proper
-         * size, otherwise it will be tiled.
-         *
-         * @param w Requested width.
-         * @param h Requested height.
-         * @param widget Widget type.
-         * @return The pixmap or NULL if one is not specified.
-         */
-        virtual OThemePixmap *scalePixmap( int w, int h, WidgetType widget );
-        /**
-         * This method reads a configuration file and applies it to the user's
-         * kstylerc file. It does not signal applications to reload via the
-         * KDEChangeGeneral atom, if you want to do this you must do so yourself.
-         * See kcmdisplay's general.cpp for an example.
-         *
-         * @param file The configuration file to apply.
-         */
-        static void applyConfigFile( const QString &file );
+    /**
+     * Constructs a new OThemeBase object.
+     */
+    OThemeBase( const QString &configFile );
+    ~OThemeBase();
+    /**
+     * Describes if a pixmap should be scaled fully, horizontally, vertically,
+     * or not at all and tiled.
+     */
+    enum ScaleHint{FullScale, HorizontalScale, VerticalScale, TileScale};
+    /**
+     * The default arrow types.
+     */
+    enum ArrowStyle{MotifArrow, LargeArrow, SmallArrow};
+    /**
+     * The default frame shading styles.
+     */
+    enum ShadeStyle{Motif, Windows, Next, KDE};
+    /**
+     * The default scrollbar button layout. BottomLeft is like what Next
+     * uses, BottomRight is like Platinum, and Opposite it like Windows and
+     * Motif.
+     */
+    enum SButton{SBBottomLeft, SBBottomRight, SBOpposite};
+    /**
+     * The gradient types. Horizontal is left to right, Vertical is top to
+     * bottom, and diagonal is upper-left to bottom-right.
+     */
+    enum Gradient{GrNone, GrHorizontal, GrVertical, GrDiagonal, GrPyramid,
+                  GrRectangle, GrElliptic, GrReverseBevel};
+    /**
+     * This provides a list of widget types that OThemeBase recognizes.
+     */
+    /* Internal note: The order here is important. Some widgets inherit
+     * properties. This is usually for when you have two settings for the
+     * same widget, ie: on(sunken), and off. The on settings will inherit
+     * the properties of the off one when nothing is specified in the config.
+     *
+     * In order to be able to handle this while still having everything in
+     * one group that is easy to loop from we have the following order:
+     * unsunked(off) items, sunken(on)items, and then the ones that don't
+     * matter. INHERIT_ITEMS define the number of widgets that have inheritence
+     * so if 0 == PushButtonOff then INHERIT_ITEMS should == PushButtonOn
+     * and so on. WIDGETS define the total number of widgets.
+     */
+    enum WidgetType{
+        // Off (unsunken widgets)
+        PushButton = 0, ComboBox, HScrollBarSlider, VScrollBarSlider, Bevel,
+        ToolButton, ScrollButton, HScrollDeco, VScrollDeco,
+        ComboDeco, MenuItem, InactiveTab, ArrowUp, ArrowDown, ArrowLeft,
+        ArrowRight,
+        // On (sunken widgets)
+        PushButtonDown, ComboBoxDown, HScrollBarSliderDown,
+        VScrollBarSliderDown, BevelDown, ToolButtonDown, ScrollButtonDown,
+        HScrollDecoDown, VScrollDecoDown, ComboDecoDown, MenuItemDown,
+        ActiveTab, SunkenArrowUp, SunkenArrowDown, SunkenArrowLeft,
+        SunkenArrowRight,
+        // Everything else (indicators must have separate settings)
+        HScrollGroove, VScrollGroove, Slider, SliderGroove, IndicatorOn,
+        IndicatorOff, ExIndicatorOn, ExIndicatorOff, HBarHandle, VBarHandle,
+        ToolBar, Splitter, CheckMark, MenuBar, DisArrowUp, DisArrowDown,
+        DisArrowLeft, DisArrowRight, ProgressBar, ProgressBg, MenuBarItem,
+        Background};
+
+    /**
+     * The scaling type specified by the Config file.
+     *
+     * @param widget A Widgets enum value.
+     *
+     * @return A ScaleHint enum value.
+     */
+    ScaleHint scaleHint( WidgetType widget ) const;
+    /**
+     * The gradient type specified by the KConfig file.
+     *
+     * @param widget A Widgets enum value.
+     *
+     * @return A Gradient enum value.
+     */
+    Gradient gradientHint( WidgetType widget ) const;
+    /**
+     * The color group specified for a given widget.
+     * If a color group is set in the theme configuration
+     * that is used, otherwise defaultColor is returned.
+     *
+     * @param defaultColor The colorGroup to set if one is available.
+     *
+     * @param widget The widget whose color group to retrieve.
+     *
+     */
+    const QColorGroup* colorGroup( const QColorGroup &defaultGroup,
+                                   WidgetType widget ) const;
+
+    QBrush pixmapBrush( const QColorGroup &group, QColorGroup::ColorRole role,
+                        int w, int h, WidgetType widget );
+    /**
+     * True if the widget has a pixmap or gradient specified.
+     */
+    bool isPixmap( WidgetType widget ) const;
+    /**
+     * True if the widget has a color group specified.
+     */
+    bool isColor( WidgetType widget ) const;
+    /**
+     * True if the user specified a 3D focus rectangle
+     */
+    bool is3DFocus() const;
+    /**
+     * If the user specified a 3D focus rectangle, they may also specify an
+     * offset from the default rectangle to use when drawing it. This returns
+     * the specified offset.
+     */
+    int focusOffset() const;
+    /**
+     * The border width of the specified widget.
+     */
+    int borderWidth( WidgetType widget ) const;
+    /**
+     * Pixmap border width of the specified widget.
+     */
+    int pixBorderWidth( WidgetType widget ) const;
+    /**
+     * Returns the border pixmap if enabled for the specified widget. This
+     * will contain the originial pixmap, plus the edges separated in
+     * OThemePixmap::border() if valid. If invalid it will return NULL.
+     */
+    OThemePixmap* borderPixmap( WidgetType widget );
+    /**
+     * The highlight width of the specified widget.
+     */
+    int highlightWidth( WidgetType widget ) const;
+    /**
+     * The border plus highlight width of the widget.
+     */
+    int decoWidth( WidgetType widget ) const;
+    /**
+     * The extent (width for vertical, height for horizontal) requested
+     * for the scrollbars.
+     */
+    int getSBExtent() const;
+    /**
+     * The scrollbar button layout.
+     */
+    SButton scrollBarLayout() const;
+    /**
+     * The arrow type.
+     */
+    ArrowStyle arrowType() const;
+    /**
+     * The shading type.
+     */
+    ShadeStyle shade() const;
+    /**
+     * The frame width.
+     */
+    int frameWidth() const;
+    /**
+     * The splitter width.
+     */
+    int splitWidth() const;
+    /**
+     * The contrast for some bevel effects such as reverse gradient.
+     */
+    int bevelContrast( WidgetType widget ) const;
+    /**
+     * The button text X shift.
+     */
+    int buttonXShift() const;
+    /**
+     * The button text Y shift.
+     */
+    int buttonYShift() const;
+    /**
+     * Returns either the slider length of the slider pixmap if available,
+     * otherwise the length specified in the config file.
+     */
+    int sliderButtonLength() const;
+    /**
+     * True if rounded buttons are requested.
+     */
+    bool roundButton() const;
+    /**
+     * True if rounded comboboxes are requested.
+     */
+    bool roundComboBox() const;
+    /**
+     * True if rounded slider grooves are requested.
+     */
+    bool roundSlider() const;
+    /**
+     * True if a line should be drawn on the bottom of active tabs.
+     */
+    bool activeTabLine() const;
+    /**
+     * True if a line should be drawn on the bottom of inactive tabs.
+     */
+    bool inactiveTabLine() const;
+    /**
+     * Returns the current uncached pixmap for the given widget. This will
+     * usually be either the last scaled or gradient pixmap if those have
+     * been specified in the config file, the original pixmap if not, or NULL
+     * if no pixmap has been specified.
+     */
+    OThemePixmap* uncached( WidgetType widget ) const;
+    /**
+     * Returns the pixmap for the given widget at the specified width and
+     * height. This will return NULL if no pixmap or gradient is specified.
+     * It may also return a different sized pixmap if the scaling
+     * is set to Tiled. When using this method, you should call it using
+     * the needed width and height then use QPainter::drawTiledPixmap to
+     * paint it. Doing this, if the pixmap is scaled it will be the proper
+     * size, otherwise it will be tiled.
+     *
+     * @param w Requested width.
+     * @param h Requested height.
+     * @param widget Widget type.
+     * @return The pixmap or NULL if one is not specified.
+     */
+    virtual OThemePixmap *scalePixmap( int w, int h, WidgetType widget );
+    /**
+     * This method reads a configuration file and applies it to the user's
+     * kstylerc file. It does not signal applications to reload via the
+     * KDEChangeGeneral atom, if you want to do this you must do so yourself.
+     * See kcmdisplay's general.cpp for an example.
+     *
+     * @param file The configuration file to apply.
+     */
+    static void applyConfigFile( const QString &file );
 protected:
-        /**
-         * Returns a QImage for the given widget if the widget is scaled, NULL
-         * otherwise. QImages of the original pixmap are stored for scaled
-         * widgets in order to facilitate fast and accurate smooth-scaling. This
-         * also saves us a conversion from a pixmap to an image then back again.
-         */
-        QImage* image( WidgetType widget ) const;
-        /**
-         * Returns the gradient high color if one is specified, NULL otherwise.
-         */
-        QColor* gradientHigh( WidgetType widget ) const;
-        /**
-         * Returns the gradient low color if one is specified, NULL otherwise.
-         */
-        QColor* gradientLow( WidgetType widget ) const;
-        /**
-         * Reads in all the configuration file entries supported.
-         *
-         * @param colorStyle The style for the color groups. In KDE, colors were
-         * calculated a little differently for Motif vs Windows styles. This
-         * is obsolete.
-         */
-        void readConfig( Qt::GUIStyle colorStyle = Qt::WindowsStyle );
-        void readWidgetConfig( int i, Config *config, QString *pixnames,
-                               QString *brdnames, bool *loadArray );
-        void copyWidgetConfig( int sourceID, int destID, QString *pixnames,
-                               QString *brdnames );
-        /**
-         * Makes a full color group based on the given foreground and background
-         * colors. This is the same code used by KDE (kapp.cpp) in previous
-         * versions.
-         */
-        QColorGroup* makeColorGroup( QColor &fg, QColor &bg,
-                                     Qt::GUIStyle style = Qt::WindowsStyle );
-        OThemePixmap* scale( int w, int h, WidgetType widget );
-        OThemePixmap* scaleBorder( int w, int h, WidgetType type );
-        OThemePixmap* gradient( int w, int h, WidgetType widget );
-        OThemePixmap* blend( WidgetType widget );
-        void generateBorderPix( int i );
-        void applyResourceGroup( Config *config, int i, QString *copyfrom, QString *pixnames, QString *brdnames );
-        void applyMiscResourceGroup( Config *config );
-        void readResourceGroup( int i, QString *copyfrom, QString *pixnames, QString *brdnames,
-                                bool *loadArray );
-        void readMiscResourceGroup();
-        /**
-         * Attempts to load a pixmap from the default OThemeBase locations.
-         */
-        OThemePixmap* loadPixmap( QString &name );
-        /**
-         * Attempts to load a image from the default OThemeBase locations.
-         */
-        QImage* loadImage( QString &name );
+    /**
+     * Returns a QImage for the given widget if the widget is scaled, NULL
+     * otherwise. QImages of the original pixmap are stored for scaled
+     * widgets in order to facilitate fast and accurate smooth-scaling. This
+     * also saves us a conversion from a pixmap to an image then back again.
+     */
+    QImage* image( WidgetType widget ) const;
+    /**
+     * Returns the gradient high color if one is specified, NULL otherwise.
+     */
+    QColor* gradientHigh( WidgetType widget ) const;
+    /**
+     * Returns the gradient low color if one is specified, NULL otherwise.
+     */
+    QColor* gradientLow( WidgetType widget ) const;
+    /**
+     * Reads in all the configuration file entries supported.
+     *
+     * @param colorStyle The style for the color groups. In KDE, colors were
+     * calculated a little differently for Motif vs Windows styles. This
+     * is obsolete.
+     */
+    void readConfig( Qt::GUIStyle colorStyle = Qt::WindowsStyle );
+    void readWidgetConfig( int i, Config *config, QString *pixnames,
+                           QString *brdnames, bool *loadArray );
+    void copyWidgetConfig( int sourceID, int destID, QString *pixnames,
+                           QString *brdnames );
+    /**
+     * Makes a full color group based on the given foreground and background
+     * colors. This is the same code used by KDE (kapp.cpp) in previous
+     * versions.
+     */
+    QColorGroup* makeColorGroup( QColor &fg, QColor &bg,
+                                 Qt::GUIStyle style = Qt::WindowsStyle );
+    OThemePixmap* scale( int w, int h, WidgetType widget );
+    OThemePixmap* scaleBorder( int w, int h, WidgetType type );
+    OThemePixmap* gradient( int w, int h, WidgetType widget );
+    OThemePixmap* blend( WidgetType widget );
+    void generateBorderPix( int i );
+    void applyResourceGroup( Config *config, int i, QString *copyfrom, QString *pixnames, QString *brdnames );
+    void applyMiscResourceGroup( Config *config );
+    void readResourceGroup( int i, QString *copyfrom, QString *pixnames, QString *brdnames,
+                            bool *loadArray );
+    void readMiscResourceGroup();
+    /**
+     * Attempts to load a pixmap from the default OThemeBase locations.
+     */
+    OThemePixmap* loadPixmap( QString &name );
+    /**
+     * Attempts to load a image from the default OThemeBase locations.
+     */
+    QImage* loadImage( QString &name );
 private:
-        SButton sbPlacement;
-        ArrowStyle arrowStyle;
-        ShadeStyle shading;
-        int defaultFrame;
-        int btnXShift, btnYShift;
-        int sliderLen;
-        int splitterWidth;
-        int focus3DOffset;
-        int sbExtent;
-        bool smallGroove;
-        bool roundedButton, roundedCombo, roundedSlider;
-        bool aTabLine, iTabLine;
-        bool focus3D;
-        OThemeCache *cache;
-        int cacheSize;
-        QString configFileName;
-        QString configFilePath;
+    SButton sbPlacement;
+    ArrowStyle arrowStyle;
+    ShadeStyle shading;
+    int defaultFrame;
+    int btnXShift, btnYShift;
+    int sliderLen;
+    int splitterWidth;
+    int focus3DOffset;
+    int sbExtent;
+    bool smallGroove;
+    bool roundedButton, roundedCombo, roundedSlider;
+    bool aTabLine, iTabLine;
+    bool focus3D;
+    OThemeCache *cache;
+    int cacheSize;
+    QString configFileName;
+    QString configFilePath;
 
 protected:
-        QColor fgcolor, bgcolor, selfgcolor, selbgcolor, winfgcolor, winbgcolor;
+    QColor fgcolor, bgcolor, selfgcolor, selbgcolor, winfgcolor, winbgcolor;
 
 private:
-        /**
-         * The theme pixmaps. Many of these may be NULL if no pixmap is specified.
-         * There may also be duplicate pixmap pointers if more than one widget
-         * uses the same tiled pixmap. If a pixmap is tiled, it is kept here and
-         * this acts as a cache. Otherwise this will hold whatever the last scaled
-         * pixmap was.
-         */
-        OThemePixmap *pixmaps[ WIDGETS ];
-        /**
-         * The theme images. These are for scaled images and are kept in order
-         * to maintain fast smoothscaling.
-         */
-        QImage *images[ WIDGETS ];
-        /**
-         * The border widths
-         */
-        unsigned char borders[ WIDGETS ];
-        /**
-         * The highlight widths
-         */
-        unsigned char highlights[ WIDGETS ];
-        /**
-         * The scale hints for pixmaps and gradients.
-         */
-        ScaleHint scaleHints[ WIDGETS ];
-        /**
-         * All the color groups.
-         */
-        QColorGroup *colors[ WIDGETS ];
-        /**
-         * Gradient low colors (or blend background).
-         */
-        QColor *grLowColors[ WIDGETS ];
-        /**
-         * Gradient high colors.
-         */
-        QColor *grHighColors[ WIDGETS ];
-        /**
-         * Gradient types.
-         */
-        Gradient gradients[ WIDGETS ];
-        /**
-         * Blend intensity factors
-         */
-        float blends[ WIDGETS ];
-        /**
-         * Bevel contrasts
-         */
-        unsigned char bContrasts[ WIDGETS ];
-        /**
-         * Duplicate pixmap entries (used during destruction).
-         */
-        bool duplicate[ WIDGETS ];
-        /**
-         * Pixmapped border widths
-         */
-        int pbWidth[ WIDGETS ];
-        /**
-         * Pixmapped borders
-         */
-        OThemePixmap *pbPixmaps[ WIDGETS ];
-        /**
-         * Duplicate border pixmapped border entries
-         */
-        bool pbDuplicate[ WIDGETS ];
+    /**
+     * The theme pixmaps. Many of these may be NULL if no pixmap is specified.
+     * There may also be duplicate pixmap pointers if more than one widget
+     * uses the same tiled pixmap. If a pixmap is tiled, it is kept here and
+     * this acts as a cache. Otherwise this will hold whatever the last scaled
+     * pixmap was.
+     */
+    OThemePixmap *pixmaps[ WIDGETS ];
+    /**
+     * The theme images. These are for scaled images and are kept in order
+     * to maintain fast smoothscaling.
+     */
+    QImage *images[ WIDGETS ];
+    /**
+     * The border widths
+     */
+    unsigned char borders[ WIDGETS ];
+    /**
+     * The highlight widths
+     */
+    unsigned char highlights[ WIDGETS ];
+    /**
+     * The scale hints for pixmaps and gradients.
+     */
+    ScaleHint scaleHints[ WIDGETS ];
+    /**
+     * All the color groups.
+     */
+    QColorGroup *colors[ WIDGETS ];
+    /**
+     * Gradient low colors (or blend background).
+     */
+    QColor *grLowColors[ WIDGETS ];
+    /**
+     * Gradient high colors.
+     */
+    QColor *grHighColors[ WIDGETS ];
+    /**
+     * Gradient types.
+     */
+    Gradient gradients[ WIDGETS ];
+    /**
+     * Blend intensity factors
+     */
+    float blends[ WIDGETS ];
+    /**
+     * Bevel contrasts
+     */
+    unsigned char bContrasts[ WIDGETS ];
+    /**
+     * Duplicate pixmap entries (used during destruction).
+     */
+    bool duplicate[ WIDGETS ];
+    /**
+     * Pixmapped border widths
+     */
+    int pbWidth[ WIDGETS ];
+    /**
+     * Pixmapped borders
+     */
+    OThemePixmap *pbPixmaps[ WIDGETS ];
+    /**
+     * Duplicate border pixmapped border entries
+     */
+    bool pbDuplicate[ WIDGETS ];
 
 private:
-        class OThemeBasePrivate;
-        OThemeBasePrivate *d;
+    class OThemeBasePrivate;
+    OThemeBasePrivate *d;
 
 };
 
 inline bool OThemeBase::isPixmap( WidgetType widget ) const
 {
-        return ( pixmaps[ widget ] != NULL || gradients[ widget ] != GrNone );
+    return ( pixmaps[ widget ] != NULL || gradients[ widget ] != GrNone );
 }
 
 inline bool OThemeBase::isColor( WidgetType widget ) const
 {
-        return ( colors[ widget ] != NULL );
+    return ( colors[ widget ] != NULL );
 }
 
 inline bool OThemeBase::is3DFocus() const
 {
-        return ( focus3D );
+    return ( focus3D );
 }
 
 inline int OThemeBase::focusOffset() const
 {
-        return ( focus3DOffset );
+    return ( focus3DOffset );
 }
 
 inline int OThemeBase::bevelContrast( WidgetType widget ) const
 {
-        return ( bContrasts[ widget ] );
+    return ( bContrasts[ widget ] );
 }
 
 inline OThemeBase::ScaleHint OThemeBase::scaleHint( WidgetType widget ) const
 {
-        return ( ( widget < WIDGETS ) ? scaleHints[ widget ] : TileScale );
+    return ( ( widget < WIDGETS ) ? scaleHints[ widget ] : TileScale );
 }
 
 inline OThemeBase::Gradient OThemeBase::gradientHint( WidgetType widget ) const
 {
-        return ( ( widget < WIDGETS ) ? gradients[ widget ] : GrNone );
+    return ( ( widget < WIDGETS ) ? gradients[ widget ] : GrNone );
 }
 
 inline OThemePixmap* OThemeBase::uncached( WidgetType widget ) const
 {
-        return ( pixmaps[ widget ] );
+    return ( pixmaps[ widget ] );
 }
 
 inline QBrush OThemeBase::pixmapBrush( const QColorGroup &group,
                                        QColorGroup::ColorRole role,
                                        int w, int h, WidgetType widget )
 {
-        if ( pixmaps[ widget ] || images[ widget ] )
-                return ( QBrush( group.color( role ), *scalePixmap( w, h, widget ) ) );
-        else
-                return ( group.color( role ) );
+    if ( pixmaps[ widget ] || images[ widget ] )
+        return ( QBrush( group.color( role ), *scalePixmap( w, h, widget ) ) );
+    else
+        return ( group.color( role ) );
 }
 
 inline const QColorGroup* OThemeBase::colorGroup( const QColorGroup &defaultGroup,
         WidgetType widget ) const
 {
-        return ( ( colors[ widget ] ) ? colors[ widget ] : &defaultGroup );
+    return ( ( colors[ widget ] ) ? colors[ widget ] : &defaultGroup );
 }
 
 inline int OThemeBase::borderWidth( WidgetType widget ) const
 {
-        return ( pbWidth[ widget ] ? pbWidth[ widget ] : borders[ widget ] );
+    return ( pbWidth[ widget ] ? pbWidth[ widget ] : borders[ widget ] );
 }
 
 inline int OThemeBase::pixBorderWidth( WidgetType widget ) const
 {
-        return ( pbWidth[ widget ] );
+    return ( pbWidth[ widget ] );
 }
 
 inline int OThemeBase::highlightWidth( WidgetType widget ) const
 {
-        return ( pbWidth[ widget ] ? 0 : highlights[ widget ] );
+    return ( pbWidth[ widget ] ? 0 : highlights[ widget ] );
 }
 
 inline int OThemeBase::decoWidth( WidgetType widget ) const
 {
-        return ( pbWidth[ widget ] ? pbWidth[ widget ] : borders[ widget ] + highlights[ widget ] );
+    return ( pbWidth[ widget ] ? pbWidth[ widget ] : borders[ widget ] + highlights[ widget ] );
 }
 
 inline QColor* OThemeBase::gradientHigh( WidgetType widget ) const
 {
-        return ( grHighColors[ widget ] );
+    return ( grHighColors[ widget ] );
 }
 
 inline QColor* OThemeBase::gradientLow( WidgetType widget ) const
 {
-        return ( grLowColors[ widget ] );
+    return ( grLowColors[ widget ] );
 }
 
 inline QImage* OThemeBase::image( WidgetType widget ) const
 {
-        return ( images[ widget ] );
+    return ( images[ widget ] );
 }
 
 inline OThemeBase::SButton OThemeBase::scrollBarLayout() const
 {
-        return ( sbPlacement );
+    return ( sbPlacement );
 }
 
 inline OThemeBase::ArrowStyle OThemeBase::arrowType() const
 {
-        return ( arrowStyle );
+    return ( arrowStyle );
 }
 
 inline OThemeBase::ShadeStyle OThemeBase::shade() const
 {
-        return ( shading );
+    return ( shading );
 }
 
 inline int OThemeBase::frameWidth() const
 {
-        return ( defaultFrame );
+    return ( defaultFrame );
 }
 
 inline int OThemeBase::buttonXShift() const
 {
-        return ( btnXShift );
+    return ( btnXShift );
 }
 
 inline int OThemeBase::splitWidth() const
 {
-        return ( splitterWidth );
+    return ( splitterWidth );
 }
 
 inline int OThemeBase::buttonYShift() const
 {
-        return ( btnYShift );
+    return ( btnYShift );
 }
 
 inline int OThemeBase::sliderButtonLength() const
 {
-        if ( isPixmap( Slider ) )
-                return ( uncached( Slider ) ->width() );
-        else
-                return ( sliderLen );
+    if ( isPixmap( Slider ) )
+        return ( uncached( Slider ) ->width() );
+    else
+        return ( sliderLen );
 }
 
 inline bool OThemeBase::roundButton() const
 {
-        return ( roundedButton );
+    return ( roundedButton );
 }
 
 inline bool OThemeBase::roundComboBox() const
 {
-        return ( roundedCombo );
+    return ( roundedCombo );
 }
 
 inline bool OThemeBase::roundSlider() const
 {
-        return ( roundedSlider );
+    return ( roundedSlider );
 }
 
 inline bool OThemeBase::activeTabLine() const
 {
-        return ( aTabLine );
+    return ( aTabLine );
 }
 
 inline bool OThemeBase::inactiveTabLine() const
 {
-        return ( iTabLine );
+    return ( iTabLine );
 }
 
 inline int OThemeBase::getSBExtent() const
 {
-        return ( sbExtent );
+    return ( sbExtent );
 }
 
 inline OThemePixmap* OThemeBase::borderPixmap( WidgetType widget )
 {
-        return ( pbPixmaps[ widget ] );
+    return ( pbPixmaps[ widget ] );
 }
 
 #endif