1 files changed, 9 insertions, 2 deletions

diff --git a/noncore/tools/calculator/calculatorimpl.cpp b/noncore/tools/calculator/calculatorimpl.cpp
index dead03d..05cb9b5 100644
--- a/noncore/tools/calculator/calculatorimpl.cpp
+++ b/noncore/tools/calculator/calculatorimpl.cpp
@@ -23,26 +23,33 @@
  * Added support for Temperature conversions.
  */
 // Sat 03-09-2002 L.J. Potter added the inlined pixmaps here
 
 #include "calculatorimpl.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/resource.h>
 #include <qpe/qmath.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qfont.h>
 #include <qlayout.h>
 #include <qstringlist.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
+
+/* STD */
 #include <math.h>
+
 /* XPM */
 static char *oneoverx_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    13    11        2            1",
 /* colors */
 ". c None",
@@ -230,13 +237,13 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name,
     // now add in the conversion modes
     // when the menu gets done, these should be in a submenu
     QString tmp = QPEApplication::qpeDir();
     tmp += "etc/unit_conversion.dat";
     QFile myfile(tmp);
     if ( !myfile.open( IO_Translate | IO_ReadOnly ) ) {
-        qDebug("Data file unit_conversion.dat not found\nNo conversion features will be available\n"+tmp);
+        odebug << "Data file unit_conversion.dat not found\nNo conversion features will be available\n"+tmp << oendl; 
         // disable the f button if no conv file available
         ComboBoxFunction->setEnabled(FALSE);
     }
     else {
         QString line, line2;
         QTextStream ts(&myfile);
@@ -504,13 +511,13 @@ void CalculatorImpl::execOp( Operation i )
   }
   case oCloseBrace: {
       if ( numOpenBraces == 0 )
     return;
       processStack( oAdd );
       if ( operationStack.top().operation != oOpenBrace )
-    qDebug( "Calculator: internal Error" );
+    odebug << "Calculator: internal Error" << oendl; 
       operationStack.pop();
       state = sNewNumber;
       numOpenBraces--;
       break;
   }