convert to Opie Debugging Framework

1 files changed, 17 insertions, 11 deletions

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
@@ -39,2 +39,7 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include "qdragobject.h"
@@ -44,2 +49,3 @@
 
+/* STD */
 #include <stdlib.h>
@@ -186,3 +192,3 @@ QTextCursor *QTextDeleteCommand::execute( QTextCursor *c )
     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;
@@ -214,3 +220,3 @@ QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c )
     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;
@@ -1546,6 +1552,6 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso
 			    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; 
 				}
@@ -2154,3 +2160,3 @@ QString QTextDocument::richText() const
     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;
@@ -4098,3 +4104,3 @@ int QTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const
 
-    qWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i );
+    owarn << "QTextParagraph::lineHeightOfChar: couldn't find lh for " << i << "" << oendl; 
     return 15;
@@ -4124,3 +4130,3 @@ QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line )
 
-    qWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i );
+    owarn << "QTextParagraph::lineStartOfChar: couldn't find " << i << "" << oendl; 
     return 0;
@@ -4151,3 +4157,3 @@ QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const
 
-    qWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line );
+    owarn << "QTextParagraph::lineStartOfLine: couldn't find " << line << "" << oendl; 
     return 0;
@@ -5699,3 +5705,3 @@ QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c )
     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;
@@ -6085,3 +6091,3 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
 	    if ( !m ) {
-		qWarning("QTextImage: no mimesource for %s", imageName.latin1() );
+		owarn << "QTextImage: no mimesource for " << imageName.latin1() << "" << oendl; 
 	    }
@@ -6089,3 +6095,3 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
 		if ( !QImageDrag::decode( m, img ) ) {
-		    qWarning("QTextImage: cannot decode %s", imageName.latin1() );
+		    owarn << "QTextImage: cannot decode " << imageName.latin1() << "" << oendl; 
 		}