5 files changed, 37 insertions, 25 deletions

diff --git a/noncore/apps/opie-write/mainwindow.cpp b/noncore/apps/opie-write/mainwindow.cpp
index 90e1a70..aa03060 100644
--- a/noncore/apps/opie-write/mainwindow.cpp
+++ b/noncore/apps/opie-write/mainwindow.cpp
@@ -11,30 +11,34 @@
 ** THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 ** PURPOSE.
 **
 ** email sales@trolltech.com for information about Qtopia License
 ** Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "mainwindow.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/fileselector.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/fontdatabase.h>
+using namespace Opie::Core;
 
-//#include "qspellchecker.h"
+/* QT */
 #include "qtextedit.h"
 #include <qaction.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qapplication.h>
 #include <qfontdatabase.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 #include <qfiledialog.h>
@@ -435,56 +439,56 @@ void MainWindow::fileOpen()
 {
     save();
     editorStack->raiseWidget( fileSelector );
     fileSelector->reread();
     hideEditTools();
     fileSelector->setNewVisible( TRUE );
     clear();
     updateCaption();
 }
 
 void MainWindow::fileRevert()
 {
-    qDebug( "QMainWindow::fileRevert needs to be done" );
+    odebug << "QMainWindow::fileRevert needs to be done" << oendl; 
 }
 
 void MainWindow::fileNew()
 {
     editor->setTextFormat( Qt::RichText );
     save();
     newFile(DocLnk());
 }
 
 void MainWindow::insertTable()
 {
-    qDebug( "MainWindow::insertTable() needs to be done" );
+    odebug << "MainWindow::insertTable() needs to be done" << oendl; 
 }
 
 void MainWindow::newFile( const DocLnk &dl )
 {
     DocLnk nf = dl;
     nf.setType( "text/html" );
     clear();
     editorStack->raiseWidget( editor );
     editor->viewport()->setFocus();
     doc = new DocLnk( nf );
     updateCaption();
 }
 
 void MainWindow::openFile( const DocLnk &dl )
 {
     FileManager fm;
     QString txt;
     if ( !fm.loadFile( dl, txt ) )
-  qDebug( "couldn't open file" );
+  odebug << "couldn't open file" << oendl; 
     clear();
     editorStack->raiseWidget( editor );
     editor->viewport()->setFocus();
     doc = new DocLnk( dl );
     editor->setText( txt );
     editor->setModified( FALSE );
     updateCaption();
 }
 
 void MainWindow::showEditTools( void )
 {
     tbMenu->show();
diff --git a/noncore/apps/opie-write/opie-write.pro b/noncore/apps/opie-write/opie-write.pro
index 044ce7e..8e514d4 100644
--- a/noncore/apps/opie-write/opie-write.pro
+++ b/noncore/apps/opie-write/opie-write.pro
@@ -1,15 +1,14 @@
 
-CONFIG        += qt warn on  quick-app
-
+CONFIG        += qt warn on quick-app
 
 HEADERS    =    qcleanuphandler.h \
         qcomplextext_p.h \
         qrichtext_p.h \
         qstylesheet.h \
         qtextedit.h \
         mainwindow.h
 
 SOURCES    =    qcomplextext.cpp \
         qstylesheet.cpp \
         qrichtext_p.cpp \
         qrichtext.cpp \
diff --git a/noncore/apps/opie-write/qcomplextext.cpp b/noncore/apps/opie-write/qcomplextext.cpp
index 473f184..00a91c5 100644
--- a/noncore/apps/opie-write/qcomplextext.cpp
+++ b/noncore/apps/opie-write/qcomplextext.cpp
@@ -97,43 +97,43 @@ QBidiContext::~QBidiContext()
    previous and left with next in the above rules ;-)
 */
 
 /*
   Two small helper functions for arabic shaping. They get the next shape causing character on either
   side of the char in question. Implements rule R1.
 
   leftChar() returns true if the char to the left is a left join-causing char
   rightChar() returns true if the char to the right is a right join-causing char
 */
 static inline const QChar *prevChar( const QString &str, int pos )
 {
-    //qDebug("leftChar: pos=%d", pos);
+    //odebug << "leftChar: pos=" << pos << "" << oendl; 
     pos--;
     const QChar *ch = str.unicode() + pos;
     while( pos > -1 ) {
         if( !ch->isMark() )
             return ch;
         pos--;
         ch--;
     }
     return &QChar::replacement;
 }
 
 static inline const QChar *nextChar( const QString &str, int pos)
 {
     pos++;
     int len = str.length();
     const QChar *ch = str.unicode() + pos;
     while( pos < len ) {
-        //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
+        //odebug << "rightChar: " << pos << " isLetter=" << ch.isLetter() << ", joining=" << ch.joining() << "" << oendl; 
         if( !ch->isMark() )
             return ch;
         // assume it's a transparent char, this might not be 100% correct
         pos++;
         ch++;
     }
     return &QChar::replacement;
 }
 
 static inline bool prevVisualCharJoins( const QString &str, int pos)
 {
     return (     prevChar( str, pos )->joining() != QChar::OtherJoining );
diff --git a/noncore/apps/opie-write/qrichtext.cpp b/noncore/apps/opie-write/qrichtext.cpp
index b77a0fc..c27eb1e 100644
--- a/noncore/apps/opie-write/qrichtext.cpp
+++ b/noncore/apps/opie-write/qrichtext.cpp
@@ -28,29 +28,35 @@
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
 ** See http://www.trolltech.com/qpl/ for QPL licensing information.
 ** 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 "qrichtext_p.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include "qdragobject.h"
 #include "qpaintdevicemetrics.h"
 #include "qdrawutil.h"
 #include "qcleanuphandler.h"
 
+/* STD */
 #include <stdlib.h>
 
 using namespace Qt3;
 
 static QTextCursor* richTextExportStart = 0;
 static QTextCursor* richTextExportEnd = 0;
 
 static QTextFormatCollection *qFormatCollection = 0;
 
 const int border_tolerance = 2;
 
 #ifdef Q_WS_WIN
@@ -175,25 +181,25 @@ QTextDeleteCommand::~QTextDeleteCommand()
 {
     for ( int i = 0; i < (int)text.size(); ++i ) {
         if ( text[ i ].format() )
             text[ i ].format()->removeRef();
     }
     text.resize( 0 );
 }
 
 QTextCursor *QTextDeleteCommand::execute( QTextCursor *c )
 {
     QTextParagraph *s = doc ? doc->paragAt( id ) : parag;
     if ( !s ) {
-        qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() );
+        owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; 
         return 0;
     }
 
     cursor.setParagraph( s );
     cursor.setIndex( index );
     int len = text.size();
     if ( c )
         *c = cursor;
     if ( doc ) {
         doc->setSelectionStart( QTextDocument::Temp, cursor );
         for ( int i = 0; i < len; ++i )
             cursor.gotoNextLetter();
@@ -203,25 +209,25 @@ QTextCursor *QTextDeleteCommand::execute( QTextCursor *c )
             *c = cursor;
     } else {
         s->remove( index, len );
     }
 
     return c;
 }
 
 QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c )
 {
     QTextParagraph *s = doc ? doc->paragAt( id ) : parag;
     if ( !s ) {
-        qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() );
+        owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; 
         return 0;
     }
 
     cursor.setParagraph( s );
     cursor.setIndex( index );
     QString str = QTextString::toString( text );
     cursor.insert( str, TRUE, &text );
     cursor.setParagraph( s );
     cursor.setIndex( index );
     if ( c ) {
         c->setParagraph( s );
         c->setIndex( index );
@@ -1535,28 +1541,28 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso
                         curpar->setAlignment( curtag.alignment );
                         custom = parseTable( attr, format, doc, length, pos, curpar );
                     } else if ( tagname == "qt" || tagname == "body" ) {
                         if ( attr.contains( "bgcolor" ) ) {
                             QBrush *b = new QBrush( QColor( attr["bgcolor"] ) );
                             setPaper( b );
                         }
                         if ( attr.contains( "background" ) ) {
                             QImage img;
                             QString bg = attr["background"];
                             const QMimeSource* m = factory_->data( bg, contxt );
                             if ( !m ) {
-                                qWarning("QRichText: no mimesource for %s", bg.latin1() );
+                                owarn << "QRichText: no mimesource for " << bg.latin1() << "" << oendl; 
                             } else {
                                 if ( !QImageDrag::decode( m, img ) ) {
-                                    qWarning("QTextImage: cannot decode %s", bg.latin1() );
+                                    owarn << "QTextImage: cannot decode " << bg.latin1() << "" << oendl; 
                                 }
                             }
                             if ( !img.isNull() ) {
                                 QPixmap pm;
                                 pm.convertFromImage( img );
                                 QBrush *b = new QBrush( QColor(), pm );
                                 setPaper( b );
                             }
                         }
                         if ( attr.contains( "text" ) ) {
                             QColor c( attr["text"] );
                             if ( formatCollection()->defaultFormat()->color() != c ) {
@@ -2143,25 +2149,25 @@ QString QTextDocument::richText() const
         s += QString::number( formatCollection()->defaultFormat()->font().pointSize() );
         s += "pt;font-family:";
         s += formatCollection()->defaultFormat()->font().family();
         s +="\">";
     }
     QTextParagraph* p = fParag;
 
     QStyleSheetItem* item_p = styleSheet()->item("p");
     QStyleSheetItem* item_ul = styleSheet()->item("ul");
     QStyleSheetItem* item_ol = styleSheet()->item("ol");
     QStyleSheetItem* item_li = styleSheet()->item("li");
     if ( !item_p || !item_ul || !item_ol || !item_li ) {
-        qWarning( "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, ul, ol, or li)" );
+        owarn << "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, ul, ol, or li)" << oendl; 
         return QString::null;
     }
     int pastListDepth = 0;
     int listDepth = 0;
     int futureListDepth = 0;
     QMemArray<int> listStyles(10);
 
     while ( p ) {
         listDepth = p->listDepth();
         if ( listDepth < pastListDepth )  {
             for ( int i = listDepth+1; i <= pastListDepth; i++ )
                 s += list_is_ordered( listStyles[i] ) ? "</ol>" : "</ul>";
@@ -4087,25 +4093,25 @@ int QTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const
         if ( i >= it.key() ) {
             if ( bl )
                 *bl = ( *it )->baseLine;
             if ( y )
                 *y = ( *it )->y;
             return ( *it )->h;
         }
         if ( it == lineStarts.begin() )
             break;
         --it;
     }
 
-    qWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i );
+    owarn << "QTextParagraph::lineHeightOfChar: couldn't find lh for " << i << "" << oendl; 
     return 15;
 }
 
 QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line ) const
 {
     if ( !isValid() )
         ( (QTextParagraph*)this )->format();
 
     int l = (int)lineStarts.count() - 1;
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.end();
     --it;
     for ( ;; ) {
@@ -4113,25 +4119,25 @@ QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line )
             if ( index )
                 *index = it.key();
             if ( line )
                 *line = l;
             return &str->at( it.key() );
         }
         if ( it == lineStarts.begin() )
             break;
         --it;
         --l;
     }
 
-    qWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i );
+    owarn << "QTextParagraph::lineStartOfChar: couldn't find " << i << "" << oendl; 
     return 0;
 }
 
 int QTextParagraph::lines() const
 {
     if ( !isValid() )
         ( (QTextParagraph*)this )->format();
 
     return (int)lineStarts.count();
 }
 
 QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const
@@ -4140,25 +4146,25 @@ QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const
         ( (QTextParagraph*)this )->format();
 
     if ( line >= 0 && line < (int)lineStarts.count() ) {
         QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
         while ( line-- > 0 )
             ++it;
         int i = it.key();
         if ( index )
             *index = i;
         return &str->at( i );
     }
 
-    qWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line );
+    owarn << "QTextParagraph::lineStartOfLine: couldn't find " << line << "" << oendl; 
     return 0;
 }
 
 int QTextParagraph::leftGap() const
 {
     if ( !isValid() )
         ( (QTextParagraph*)this )->format();
 
     int line = 0;
     int x = str->at(0).x;  /* set x to x of first char */
     if ( str->isBidi() ) {
         for ( int i = 1; i < str->length()-1; ++i )
@@ -5688,25 +5694,25 @@ QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c )
     if ( cachedFormat ) {
         cachedFormat->addRef();
         return cachedFormat;
     }
 
     if ( key == defFormat->key() )
         return defFormat;
 
     cachedFormat = createFormat( f, c );
     cachedFormat->collection = this;
     cKey.insert( cachedFormat->key(), cachedFormat );
     if ( cachedFormat->key() != key )
-        qWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() );
+        owarn << "ASSERT: keys for format not identical: '" << cachedFormat->key().latin1() << " '" << key.latin1() << "'" << oendl; 
     return cachedFormat;
 }
 
 void QTextFormatCollection::remove( QTextFormat *f )
 {
     if ( lastFormat == f )
         lastFormat = 0;
     if ( cres == f )
         cres = 0;
     if ( cachedFormat == f )
         cachedFormat = 0;
     cKey.remove( f->key() );
@@ -6074,29 +6080,29 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
             pixmap_map = new QMap<QString, QPixmapInt>;
         if ( pixmap_map->contains( imgId ) ) {
             QPixmapInt& pmi = pixmap_map->operator[](imgId);
             pm = pmi.pm;
             pmi.ref++;
             width = pm.width();
             height = pm.height();
         } else {
             QImage img;
             const QMimeSource* m =
                 factory.data( imageName, context );
             if ( !m ) {
-                qWarning("QTextImage: no mimesource for %s", imageName.latin1() );
+                owarn << "QTextImage: no mimesource for " << imageName.latin1() << "" << oendl; 
             }
             else {
                 if ( !QImageDrag::decode( m, img ) ) {
-                    qWarning("QTextImage: cannot decode %s", imageName.latin1() );
+                    owarn << "QTextImage: cannot decode " << imageName.latin1() << "" << oendl; 
                 }
             }
 
             if ( !img.isNull() ) {
                 if ( width == 0 ) {
                     width = img.width();
                     if ( height != 0 ) {
                         width = img.width() * height / img.height();
                     }
                 }
                 if ( height == 0 ) {
                     height = img.height();
diff --git a/noncore/apps/opie-write/qrichtext_p.cpp b/noncore/apps/opie-write/qrichtext_p.cpp
index 6783e0b..2e8b09c 100644
--- a/noncore/apps/opie-write/qrichtext_p.cpp
+++ b/noncore/apps/opie-write/qrichtext_p.cpp
@@ -26,24 +26,27 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
 ** See http://www.trolltech.com/qpl/ for QPL licensing information.
 ** 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 <opie2/odebug.h>
+using namespace Opie::Core;
+
 #include "qrichtext_p.h"
 
 using namespace Qt3;
 
 QTextCommand::~QTextCommand() {}
 QTextCommand::Commands QTextCommand::type() const { return Invalid; }
 
 
 QTextCustomItem::~QTextCustomItem() {}
 void QTextCustomItem::adjustToPainter( QPainter* p){ if ( p ) width = 0; }
 QTextCustomItem::Placement QTextCustomItem::placement() const { return PlaceInline; }
 
@@ -128,25 +131,25 @@ QTextDocument *QTextCursor::document() const
 }
 
 void QTextCursor::gotoPosition( QTextParagraph* p, int index )
 {
     if ( para && p != para ) {
         while ( para->document() != p->document() && !indices.isEmpty() )
             pop();
         Q_ASSERT( indices.isEmpty() || para->document() == p->document() );
     }
     para = p;
     if ( index < 0 || index >= para->length() ) {
 #if defined(QT_CHECK_RANGE)
-        qWarning( "QTextCursor::gotoParagraph Index: %d out of range", index );
+        owarn << "QTextCursor::gotoParagraph Index: " << index << " out of range" << oendl; 
 #endif
         index = index < 0 ? 0 : para->length() - 1;
     }
 
     tmpIndex = -1;
     idx = index;
 }
 
 bool QTextDocument::hasSelection( int id, bool visible ) const
 {
     return ( selections.find( id ) != selections.end() &&
              ( !visible ||
@@ -468,74 +471,74 @@ bool QTextParagraph::fullSelected( int id ) const
 {
     if ( !mSelections )
         return FALSE;
     QMap<int, QTextParagraphSelection>::ConstIterator it = mSelections->find( id );
     if ( it == mSelections->end() )
         return FALSE;
     return ( *it ).start == 0 && ( *it ).end == str->length() - 1;
 }
 
 int QTextParagraph::lineY( int l ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParagraph::lineY: line %d out of range!", l );
+        owarn << "QTextParagraph::lineY: line " << l << " out of range!" << oendl; 
         return 0;
     }
 
     if ( !isValid() )
         ( (QTextParagraph*)this )->format();
 
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     return ( *it )->y;
 }
 
 int QTextParagraph::lineBaseLine( int l ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParagraph::lineBaseLine: line %d out of range!", l );
+        owarn << "QTextParagraph::lineBaseLine: line " << l << " out of range!" << oendl; 
         return 10;
     }
 
     if ( !isValid() )
         ( (QTextParagraph*)this )->format();
 
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     return ( *it )->baseLine;
 }
 
 int QTextParagraph::lineHeight( int l ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParagraph::lineHeight: line %d out of range!", l );
+        owarn << "QTextParagraph::lineHeight: line " << l << " out of range!" << oendl; 
         return 15;
     }
 
     if ( !isValid() )
         ( (QTextParagraph*)this )->format();
 
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     return ( *it )->h;
 }
 
 void QTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParagraph::lineInfo: line %d out of range!", l );
-        qDebug( "%d %d", (int)lineStarts.count() - 1, l );
+        owarn << "QTextParagraph::lineInfo: line " << l << " out of range!" << oendl; 
+        odebug << "" << (int)lineStarts.count() - 1 << " " << l << "" << oendl; 
         y = 0;
         h = 15;
         bl = 10;
         return;
     }
 
     if ( !isValid() )
         ( (QTextParagraph*)this )->format();
 
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;