5 files changed, 40 insertions, 31 deletions

diff --git a/noncore/tools/calc2/engine.cpp b/noncore/tools/calc2/engine.cpp
index a9a47c4..e843e29 100644
--- a/noncore/tools/calc2/engine.cpp
+++ b/noncore/tools/calc2/engine.cpp
@@ -98,13 +98,13 @@ void Engine::pushValue (char v)
         default:
             displayString.append(v);
             num.i=displayString.toInt(&ok, calcBase());
     };
     if (!ok) {
         state = sError;
-        qDebug("pushValue() - num->string conversion");
+        odebug << "pushValue() - num->string conversion" << oendl; 
     } else {
         const QString constString = displayString;
         emit(display(constString));
     };
 
   } else if (state == sStart) {
@@ -124,35 +124,35 @@ void Engine::del ()
     switch (currentRep) {
         case rDouble:
             displayString.truncate(displayString.length());
             num.dbl=displayString.toDouble(&ok);
             break;
         case rFraction:
-            qDebug("not available");
+            odebug << "not available" << oendl; 
             break;
         default:
             displayString.truncate(displayString.length());
             num.i = displayString.toInt(&ok, calcBase());
     };
 
     if (!ok) {
         state = sError;
-        qDebug("del() - num->string conversion");
+        odebug << "del() - num->string conversion" << oendl; 
     } else {
         const QString constString = displayString;
         emit(display(constString));
     };
 }
 
 void Engine::displayData(Data d) {
     switch (currentRep) {
         case rDouble:
             displayString.setNum(d.dbl);
             break;
         case rFraction:
-            qDebug("fractional display not yet impl");
+            odebug << "fractional display not yet impl" << oendl; 
             break;
         default:
             displayString.setNum(d.i, calcBase());
             break;
     };
     const QString constString= displayString;
@@ -169,13 +169,13 @@ int Engine::calcBase () {
         case rDec:
             return 10;
         case rHex:
             return 16;
         default:
             state = sError;
-            qDebug("Error - attempt to calc base for non-integer");
+            odebug << "Error - attempt to calc base for non-integer" << oendl; 
             return 10;
     };
 }
 
 // Special instruction for internal use only
 class iOpenBrace:public Instruction {
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index ae6a666..78d4519 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -1,11 +1,11 @@
-        CONFIG  = qt warn_on  quick-app
+        CONFIG  = qt warn_on quick-app
         HEADERS         = calculatorimpl.h
         SOURCES         = calculatorimpl.cpp \
                   main.cpp
-INCLUDEPATH += $(OPIEDIR)/include
+INCLUDEPATH     += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
         INTERFACES= calculator.ui
         TARGET  = calculator
 
 include ( $(OPIEDIR)/include.pro )
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;
   }
 
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index 4204d73..642196e 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -8,19 +8,20 @@
 
 #include "formatter.h"
 #include "inputDialog.h"
 #include "output.h"
 
 /* OPIE */
-#include <qtoolbar.h>
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/storage.h>
+using namespace Opie::Core;
 
 /* QT */
 #include <qmenubar.h>
 #include <qmultilineedit.h>
 #include <qstring.h>
 #include <qlist.h>
@@ -32,12 +33,13 @@
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 #include <qregexp.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
+#include <qtoolbar.h>
 #include <qtabwidget.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qvariant.h>
 
 /* STD */
@@ -235,31 +237,31 @@ void FormatterApp::doFormat()
 
 
             outDlg->OutputEdit->append( tr("Trying to umount %1.").arg( currentText) );
             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 
             sleep(1);
-            qDebug("Command is "+umountS);
+            odebug << "Command is "+umountS << oendl; 
             fp = popen(  (const char *) umountS, "r");
-            //          qDebug("%d", fp);
+            //          odebug << "" << fp << "" << oendl; 
             if ( !fp )
             {
-                qDebug("Could not execute '" + umountS + "'! err=%d\n" +(QString)strerror(errno), err);
+                odebug << "Could not execute '" + umountS + "'! err=" << err << "\n" +(QString)strerror(errno) << oendl; 
                 QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") );
                 pclose(fp);
                 return;
             }
             else
             {
                 //               outDlg->OutputEdit->append( currentText + tr("\nhas been successfully umounted."));
                 //             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
                 while ( fgets( line, sizeof line, fp))
                 {
                     if( ((QString)line).find("busy",0,TRUE) != -1)
                     {
-                        qDebug("Could not find '" + umountS);
+                        odebug << "Could not find '" + umountS << oendl; 
                         QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") );
                         pclose(fp);
                         return;
                     }
                     else
                     {
@@ -269,22 +271,22 @@ void FormatterApp::doFormat()
                         outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
                     }
                 }
             }
             pclose(fp);
 
-            qDebug("Command would be: "+cmd);
+            odebug << "Command would be: "+cmd << oendl; 
             outDlg->OutputEdit->append( tr("Trying to format.") );
             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 
             fp = popen(  (const char *) cmd, "r");
             while ( fgets( line, sizeof line, fp))
             {
                 if( ((QString)line).find("No such device",0,TRUE) != -1)
                 {
-                    qDebug("No such device '" + umountS);
+                    odebug << "No such device '" + umountS << oendl; 
                     QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") );
                     pclose(fp);
                     //               outDlg->OutputEdit->append("No such device");
                     //             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
                     return;
                 }
@@ -302,13 +304,13 @@ void FormatterApp::doFormat()
 
             outDlg->OutputEdit->append( tr("Trying to mount %1.").arg( currentText) );
             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
             fp = popen(  (const char *) remountS, "r");
             if ( !fp)
             {
-                qDebug("Could not execute '" + remountS + "'! err=%d\n" +(QString)strerror(errno), err);
+                odebug << "Could not execute '" + remountS + "'! err=" << err << "\n" +(QString)strerror(errno) << oendl; 
                 QMessageBox::warning( this, tr("Formatter"), tr("Card mount failed!"), tr("&OK") );
 
             }
             else
             {
                 outDlg->OutputEdit->append(tr("%1\nhas been successfully mounted.").arg( currentText ));
@@ -377,13 +379,13 @@ void FormatterApp::storageComboSelected(int index )
     QString nameS = currentText.left( currentText.find("->",0,TRUE));
 
     TextLabel4->setText( tr( "Storage Type: %1").arg( nameS) );
     currentText = currentText.right( currentText.length() - currentText.find(" -> ",0,TRUE) - 4);
 
     QString fsType = getFileSystemType((const QString &) currentText);
-    //    qDebug(fsType);
+    //    odebug << fsType << oendl; 
     for(int i = 0; i < fileSystemsCombo->count(); i++)
     {
         if( fsType == fileSystemsCombo->text(i))
             fileSystemsCombo->setCurrentItem(i);
     }
     //    deviceComboSelected(index);
@@ -461,13 +463,13 @@ void FormatterApp::parsetab(const QString &fileName)
                 if( fsList.contains(filesystemType) == 0
                         & filesystemType.find("proc",0,TRUE) == -1
                         & filesystemType.find("cramfs",0,TRUE) == -1
                         & filesystemType.find("auto",0,TRUE) == -1)
                     fsList << filesystemType;
                 deviceList << deviceName;
-                qDebug(deviceName+"::"+filesystemType);
+                odebug << deviceName+"::"+filesystemType << oendl; 
                 fileSystemTypeList << deviceName+"::"+filesystemType;
             }
         }
     }
     endmntent( mntfp );
     //  } else if(fileName == "/etc/fstab") {
@@ -503,13 +505,13 @@ QString FormatterApp::getFileSystemType(const QString &currentText)
     for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it )
     {
         QString temp = (*it);
         if( temp.find( currentText,0,TRUE) != -1)
         {
             return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
-            //                qDebug(fsType);
+            //                odebug << fsType << oendl; 
         }
     }
     return "";
 }
 
 bool FormatterApp::doFsck()
@@ -530,13 +532,13 @@ bool FormatterApp::doFsck()
     //     selectedDevice ="/dev/fd0";
 
     // #endif
 
     QString fsType = getFileSystemType((const QString &)selectedDevice);
     QString cmd;
-    qDebug( selectedDevice +" "+ fsType);
+    odebug << selectedDevice +" "+ fsType << oendl; 
     if(fsType == "vfat") cmd = "dosfsck -vy ";
     if(fsType == "ext2") cmd = "e2fsck -cpvy ";
     cmd += selectedDevice + " 2>&1";
 
     outDlg = new Output(this, tr("Formatter Output"),FALSE);
     QPEApplication::showDialog( outDlg );
@@ -544,31 +546,31 @@ bool FormatterApp::doFsck()
     FILE *fp;
     char line[130];
     outDlg->OutputEdit->append( tr("Trying to umount."));
     outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 
     sleep(1);
-    //          qDebug("Command is "+umountS);
+    //          odebug << "Command is "+umountS << oendl; 
     fp = popen(  (const char *) umountS, "r");
-    //          qDebug("%d", fp);
+    //          odebug << "" << fp << "" << oendl; 
     if ( !fp )
     {
-        qDebug("Could not execute '" + umountS + "'!\n" +(QString)strerror(errno));
+        odebug << "Could not execute '" + umountS + "'!\n" +(QString)strerror(errno) << oendl; 
         QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") );
         pclose(fp);
         return false;
     }
     else
     {
         //             outDlg->OutputEdit->append( currentText + tr("\nhas been successfully umounted."));
         //             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
         while ( fgets( line, sizeof line, fp))
         {
             if( ((QString)line).find("busy",0,TRUE) != -1)
             {
-                qDebug("Could not find '" + umountS);
+                odebug << "Could not find '" + umountS << oendl; 
                 QMessageBox::warning( this, tr("Formatter"),
                                       tr("Could not umount.\nDevice is busy!"), tr("&OK") );
                 pclose(fp);
                 return false;
             }
             else
@@ -584,13 +586,13 @@ bool FormatterApp::doFsck()
     /////////////////////////////////////
     fp = popen(  (const char *) cmd, "r");
     while ( fgets( line, sizeof line, fp))
     {
         if( ((QString)line).find("No such device",0,TRUE) != -1)
         {
-            qDebug("No such device '" + umountS);
+            odebug << "No such device '" + umountS << oendl; 
             QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") );
             pclose(fp);
             //               outDlg->OutputEdit->append("No such device");
             //             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
             return false;
         }
diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro
index 913cca8..f6d34c7 100644
--- a/noncore/tools/formatter/formatter.pro
+++ b/noncore/tools/formatter/formatter.pro
@@ -1,9 +1,9 @@
-CONFIG    += qt warn_on  quick-app
-HEADERS   = formatter.h inputDialog.h output.h
-SOURCES   = formatter.cpp inputDialog.cpp output.cpp main.cpp
-TARGET    = formatter
+CONFIG      += qt warn_on quick-app
+HEADERS     = formatter.h inputDialog.h output.h
+SOURCES     = formatter.cpp inputDialog.cpp output.cpp main.cpp
+TARGET      = formatter
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lopiecore2
+LIBS        += -lqpe -lopiecore2
 
 include ( $(OPIEDIR)/include.pro )