1 files changed, 70 insertions, 63 deletions

diff --git a/noncore/tools/calc2/engine.cpp b/noncore/tools/calc2/engine.cpp
index e843e29..74cd701 100644
--- a/noncore/tools/calc2/engine.cpp
+++ b/noncore/tools/calc2/engine.cpp
@@ -19,10 +19,17 @@
 **********************************************************************/
 
 #include "engine.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qstring.h>
-#include <math.h>
 #include <qlcdnumber.h>
 
+/* STD */
+#include <math.h>
+
 Data Engine::evalStack (Data num, bool inbrace = FALSE)
 {
   if (state != sError) {
@@ -34,18 +41,18 @@ Data Engine::evalStack (Data num, bool inbrace = FALSE)
 
 // Check this ops prec vs next ops prec
       if (!stack.isEmpty ())
-        if (i->precedence <= stack.top()->precedence)
-          i->acc = evalStack (i->acc, inbrace);
+    if (i->precedence <= stack.top()->precedence)
+      i->acc = evalStack (i->acc, inbrace);
 
 // Evaluate this instruction
       num = i->eval (num);
 
 // Error-check ( change this to work for all types )
       if (isnan (num.dbl) || isinf (num.dbl)) {
-        qDebug ("bad result from operation");
-        state = sError;
-        clearData(&num);
-        return num;
+    odebug << "bad result from operation" << oendl;
+    state = sError;
+    clearData(&num);
+    return num;
       }
     }
   }
@@ -89,22 +96,22 @@ void Engine::pushValue (char v)
   if (state == sAppend) {
     bool ok = FALSE;
     switch (currentRep) {
-        case rDouble:
-            displayString.append(v);
-            num.dbl=displayString.toDouble(&ok);
-            break;
-        case rFraction:
-            break;
-        default:
-            displayString.append(v);
-            num.i=displayString.toInt(&ok, calcBase());
+    case rDouble:
+        displayString.append(v);
+        num.dbl=displayString.toDouble(&ok);
+        break;
+    case rFraction:
+        break;
+    default:
+        displayString.append(v);
+        num.i=displayString.toInt(&ok, calcBase());
     };
     if (!ok) {
-        state = sError;
-        odebug << "pushValue() - num->string conversion" << oendl; 
+    state = sError;
+    odebug << "pushValue() - num->string conversion" << oendl;
     } else {
-        const QString constString = displayString;
-        emit(display(constString));
+    const QString constString = displayString;
+    emit(display(constString));
     };
 
   } else if (state == sStart) {
@@ -113,7 +120,7 @@ void Engine::pushValue (char v)
     state = sAppend;
     pushValue (v);
   } else if (state == sError) {
-    qDebug ("in error state");
+    odebug << "in error state" << oendl;
     return;
   }
 }
@@ -122,38 +129,38 @@ void Engine::del ()
 {
     bool ok;
     switch (currentRep) {
-        case rDouble:
-            displayString.truncate(displayString.length());
-            num.dbl=displayString.toDouble(&ok);
-            break;
-        case rFraction:
-            odebug << "not available" << oendl; 
-            break;
-        default:
-            displayString.truncate(displayString.length());
-            num.i = displayString.toInt(&ok, calcBase());
+    case rDouble:
+        displayString.truncate(displayString.length());
+        num.dbl=displayString.toDouble(&ok);
+        break;
+    case rFraction:
+        odebug << "not available" << oendl;
+        break;
+    default:
+        displayString.truncate(displayString.length());
+        num.i = displayString.toInt(&ok, calcBase());
     };
 
     if (!ok) {
-        state = sError;
-        odebug << "del() - num->string conversion" << oendl; 
+    state = sError;
+    odebug << "del() - num->string conversion" << oendl;
     } else {
-        const QString constString = displayString;
-        emit(display(constString));
+    const QString constString = displayString;
+    emit(display(constString));
     };
 }
 
 void Engine::displayData(Data d) {
     switch (currentRep) {
-        case rDouble:
-            displayString.setNum(d.dbl);
-            break;
-        case rFraction:
-            odebug << "fractional display not yet impl" << oendl; 
-            break;
-        default:
-            displayString.setNum(d.i, calcBase());
-            break;
+    case rDouble:
+        displayString.setNum(d.dbl);
+        break;
+    case rFraction:
+        odebug << "fractional display not yet impl" << oendl;
+        break;
+    default:
+        displayString.setNum(d.i, calcBase());
+        break;
     };
     const QString constString= displayString;
     emit(display(constString));
@@ -162,33 +169,33 @@ void Engine::displayData(Data d) {
 // Returns the base when Rep is an integer type
 int Engine::calcBase () {
     switch (currentRep) {
-        case rBin:
-            return 2;
-        case rOct:
-            return 8;
-        case rDec:
-            return 10;
-        case rHex:
-            return 16;
-        default:
-            state = sError;
-            odebug << "Error - attempt to calc base for non-integer" << oendl; 
-            return 10;
+    case rBin:
+        return 2;
+    case rOct:
+        return 8;
+    case rDec:
+        return 10;
+    case rHex:
+        return 16;
+    default:
+        state = sError;
+        odebug << "Error - attempt to calc base for non-integer" << oendl;
+        return 10;
     };
 }
 
 // Special instruction for internal use only
 class iOpenBrace:public Instruction {
     public:
-        iOpenBrace (Engine *e):Instruction (100) {engine = e;};
-        ~iOpenBrace () {};
+    iOpenBrace (Engine *e):Instruction (100) {engine = e;};
+    ~iOpenBrace () {};
 
-        Data eval (Data num) {
-            engine->decBraces();
-            return num;
-        };
+    Data eval (Data num) {
+        engine->decBraces();
+        return num;
+    };
     private:
-        Engine *engine;
+    Engine *engine;
 };
 
 void Engine::openBrace() {