Diffstat (limited to 'noncore/tools/formatter/formatter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/tools/formatter/formatter.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
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 | |||
@@ -13,3 +13,3 @@ | |||
13 | /* OPIE */ | 13 | /* OPIE */ |
14 | #include <qtoolbar.h> | 14 | #include <opie2/odebug.h> |
15 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
@@ -20,2 +20,3 @@ | |||
20 | #include <qpe/storage.h> | 20 | #include <qpe/storage.h> |
21 | using namespace Opie::Core; | ||
21 | 22 | ||
@@ -37,2 +38,3 @@ | |||
37 | #include <qpushbutton.h> | 38 | #include <qpushbutton.h> |
39 | #include <qtoolbar.h> | ||
38 | #include <qtabwidget.h> | 40 | #include <qtabwidget.h> |
@@ -240,8 +242,8 @@ void FormatterApp::doFormat() | |||
240 | sleep(1); | 242 | sleep(1); |
241 | qDebug("Command is "+umountS); | 243 | odebug << "Command is "+umountS << oendl; |
242 | fp = popen( (const char *) umountS, "r"); | 244 | fp = popen( (const char *) umountS, "r"); |
243 | // qDebug("%d", fp); | 245 | // odebug << "" << fp << "" << oendl; |
244 | if ( !fp ) | 246 | if ( !fp ) |
245 | { | 247 | { |
246 | qDebug("Could not execute '" + umountS + "'! err=%d\n" +(QString)strerror(errno), err); | 248 | odebug << "Could not execute '" + umountS + "'! err=" << err << "\n" +(QString)strerror(errno) << oendl; |
247 | QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); | 249 | QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); |
@@ -258,3 +260,3 @@ void FormatterApp::doFormat() | |||
258 | { | 260 | { |
259 | qDebug("Could not find '" + umountS); | 261 | odebug << "Could not find '" + umountS << oendl; |
260 | QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") ); | 262 | QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") ); |
@@ -274,3 +276,3 @@ void FormatterApp::doFormat() | |||
274 | 276 | ||
275 | qDebug("Command would be: "+cmd); | 277 | odebug << "Command would be: "+cmd << oendl; |
276 | outDlg->OutputEdit->append( tr("Trying to format.") ); | 278 | outDlg->OutputEdit->append( tr("Trying to format.") ); |
@@ -283,3 +285,3 @@ void FormatterApp::doFormat() | |||
283 | { | 285 | { |
284 | qDebug("No such device '" + umountS); | 286 | odebug << "No such device '" + umountS << oendl; |
285 | QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); | 287 | QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); |
@@ -307,3 +309,3 @@ void FormatterApp::doFormat() | |||
307 | { | 309 | { |
308 | qDebug("Could not execute '" + remountS + "'! err=%d\n" +(QString)strerror(errno), err); | 310 | odebug << "Could not execute '" + remountS + "'! err=" << err << "\n" +(QString)strerror(errno) << oendl; |
309 | QMessageBox::warning( this, tr("Formatter"), tr("Card mount failed!"), tr("&OK") ); | 311 | QMessageBox::warning( this, tr("Formatter"), tr("Card mount failed!"), tr("&OK") ); |
@@ -382,3 +384,3 @@ void FormatterApp::storageComboSelected(int index ) | |||
382 | QString fsType = getFileSystemType((const QString &) currentText); | 384 | QString fsType = getFileSystemType((const QString &) currentText); |
383 | // qDebug(fsType); | 385 | // odebug << fsType << oendl; |
384 | for(int i = 0; i < fileSystemsCombo->count(); i++) | 386 | for(int i = 0; i < fileSystemsCombo->count(); i++) |
@@ -466,3 +468,3 @@ void FormatterApp::parsetab(const QString &fileName) | |||
466 | deviceList << deviceName; | 468 | deviceList << deviceName; |
467 | qDebug(deviceName+"::"+filesystemType); | 469 | odebug << deviceName+"::"+filesystemType << oendl; |
468 | fileSystemTypeList << deviceName+"::"+filesystemType; | 470 | fileSystemTypeList << deviceName+"::"+filesystemType; |
@@ -508,3 +510,3 @@ QString FormatterApp::getFileSystemType(const QString ¤tText) | |||
508 | return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); | 510 | return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); |
509 | // qDebug(fsType); | 511 | // odebug << fsType << oendl; |
510 | } | 512 | } |
@@ -535,3 +537,3 @@ bool FormatterApp::doFsck() | |||
535 | QString cmd; | 537 | QString cmd; |
536 | qDebug( selectedDevice +" "+ fsType); | 538 | odebug << selectedDevice +" "+ fsType << oendl; |
537 | if(fsType == "vfat") cmd = "dosfsck -vy "; | 539 | if(fsType == "vfat") cmd = "dosfsck -vy "; |
@@ -549,8 +551,8 @@ bool FormatterApp::doFsck() | |||
549 | sleep(1); | 551 | sleep(1); |
550 | // qDebug("Command is "+umountS); | 552 | // odebug << "Command is "+umountS << oendl; |
551 | fp = popen( (const char *) umountS, "r"); | 553 | fp = popen( (const char *) umountS, "r"); |
552 | // qDebug("%d", fp); | 554 | // odebug << "" << fp << "" << oendl; |
553 | if ( !fp ) | 555 | if ( !fp ) |
554 | { | 556 | { |
555 | qDebug("Could not execute '" + umountS + "'!\n" +(QString)strerror(errno)); | 557 | odebug << "Could not execute '" + umountS + "'!\n" +(QString)strerror(errno) << oendl; |
556 | QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); | 558 | QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); |
@@ -567,3 +569,3 @@ bool FormatterApp::doFsck() | |||
567 | { | 569 | { |
568 | qDebug("Could not find '" + umountS); | 570 | odebug << "Could not find '" + umountS << oendl; |
569 | QMessageBox::warning( this, tr("Formatter"), | 571 | QMessageBox::warning( this, tr("Formatter"), |
@@ -589,3 +591,3 @@ bool FormatterApp::doFsck() | |||
589 | { | 591 | { |
590 | qDebug("No such device '" + umountS); | 592 | odebug << "No such device '" + umountS << oendl; |
591 | QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); | 593 | QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); |