1 files changed, 3 insertions, 3 deletions

diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index e869317..77e1790 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -67,195 +67,195 @@ FormatterApp::FormatterApp( QWidget* parent,  const char* name, WFlags fl, bool
     FormatterAppLayout->setSpacing( 2);
     FormatterAppLayout->setMargin( 2 );
 
     TabWidget = new QTabWidget( this, "TabWidget" );
 
     tab = new QWidget( TabWidget, "tab" );
     tabLayout = new QGridLayout( tab );
     tabLayout->setSpacing( 3);
     tabLayout->setMargin( 2);
 
     storageComboBox = new QComboBox( FALSE, tab, "storageComboBox" );
     storageComboBox->setMaximumWidth(220);
 
     tabLayout->addMultiCellWidget( storageComboBox, 0, 0, 0, 1);
 
     TextLabel4 = new QLabel( tab, "TextLabel4" );
     TextLabel4->setText( tr( "Storage Type" ) );
 
     tabLayout->addMultiCellWidget( TextLabel4, 1, 1, 0, 1);
 
     TextLabel2 = new QLabel( tab, "TextLabel2" );
     TextLabel2->setText( tr( "File Systems" ) );
 
     tabLayout->addMultiCellWidget( TextLabel2, 4, 4, 0, 1);
 
     fileSystemsCombo = new QComboBox( FALSE, tab, "fileSystemsCombo" );
     fileSystemsCombo->setMaximumWidth(220);
 
     tabLayout->addMultiCellWidget( fileSystemsCombo, 3, 3, 0, 1);
     QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum );
     tabLayout->addItem( spacer, 2, 0 );
 
     formatPushButton = new QPushButton( tab, "formatPushButton" );
     formatPushButton->setText( tr( "Format" ) );
     formatPushButton->setMaximumWidth(170);
 
     tabLayout->addMultiCellWidget( formatPushButton, 6, 6, 0, 1);
     QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum );
     tabLayout->addItem( spacer_2, 5, 0 );
 
     TabWidget->insertTab( tab, tr( "Main" ) );
 
     tab_2 = new QWidget( TabWidget, "tab_2" );
     tabLayout_2 = new QGridLayout( tab_2 );
     tabLayout_2->setSpacing(3);
     tabLayout_2->setMargin(2);
 
     mountPointLineEdit = new QLineEdit( tab_2, "mountPointLineEdit" );
 
     tabLayout_2->addMultiCellWidget( mountPointLineEdit, 0, 0, 0, 1);
 
     deviceComboBox = new QComboBox( FALSE, tab_2, "deviceComboBox" );
 
     tabLayout_2->addMultiCellWidget( deviceComboBox, 3, 3, 0, 1);
 
     TextLabel5 = new QLabel( tab_2, "TextLabel5" );
     TextLabel5->setText( tr( "CAUTION:\n"
                              "Changing parameters on this\n"
                              "page may cause your system\n"
                              "to stop functioning properly!" ) );//idiot message
 
     tabLayout_2->addMultiCellWidget( TextLabel5, 6, 6, 0, 1);
 
     editPushButton = new QPushButton( tab_2, "editPushButton" );
     editPushButton->setText( tr( "Edit fstab" ) );
     editPushButton->setMaximumWidth(100);
 
     tabLayout_2->addMultiCellWidget( editPushButton, 7, 7, 0, 0 );
 
     fsckButton = new QPushButton( tab_2, "fsckPushButton" );
     fsckButton->setText( tr( "Check Disk" ) );
     fsckButton->setMaximumWidth(100);
 
     tabLayout_2->addMultiCellWidget( fsckButton, 7, 7, 1, 1);
 
     TextLabel3 = new QLabel( tab_2, "TextLabel3" );
     TextLabel3->setText( tr( "Device" ) );
 
     tabLayout_2->addMultiCellWidget( TextLabel3, 4, 4, 0, 1 );
     QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     tabLayout_2->addItem( spacer_3, 5, 0 );
 
     TextLabel1 = new QLabel( tab_2, "TextLabel1" );
     TextLabel1->setText( tr( "Mount Point" ) );
 
     tabLayout_2->addMultiCellWidget( TextLabel1, 1, 1, 0, 1 );
     QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     tabLayout_2->addItem( spacer_4, 2, 1 );
     TabWidget->insertTab( tab_2, tr( "Advanced" ) );
 
     FormatterAppLayout->addWidget( TabWidget, 0, 1 );
 
     connect( formatPushButton ,SIGNAL(released()),this,SLOT( doFormat()) );
     connect( editPushButton ,SIGNAL(released()),this,SLOT( editFstab()) );
     connect( fsckButton ,SIGNAL(released()),this,SLOT( doFsck()) );
 
-    connect( fileSystemsCombo,SIGNAL(activated(int)),this,SLOT( fsComboSelected(int ) ));
-    connect( storageComboBox,SIGNAL(activated(int)),this,SLOT( storageComboSelected(int ) ));
-    connect( deviceComboBox,SIGNAL(activated(int)),this,SLOT( deviceComboSelected(int ) ));
+    connect( fileSystemsCombo,SIGNAL(activated(int)),this,SLOT( fsComboSelected(int) ));
+    connect( storageComboBox,SIGNAL(activated(int)),this,SLOT( storageComboSelected(int) ));
+    connect( deviceComboBox,SIGNAL(activated(int)),this,SLOT( deviceComboSelected(int) ));
 
 
     fillCombos();
 }
 
 FormatterApp::~FormatterApp()
 {}
 
 void FormatterApp::doFormat()
 {
     int err=0;
     Output *outDlg;
     QString umountS, remountS;
     QString text =  storageComboBox->currentText();
     QString currentText = storageComboBox->currentText();
     QString cmd;
     QString diskDevice = currentText.right( currentText.length() - currentText.find(" -> ",0,TRUE) - 4);
     QString diskName =  currentText.left(currentText.find(" -> ",0,TRUE));
     QString fs = fileSystemsCombo->currentText();
 
 #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) // lets test on something cheap
 #else
     currentText  = diskDevice  = "/dev/fd0";
     umountS = "umount -v /floppy 2>&1";
     remountS = "mount -v /floppy 2>&1";
 #endif
 
     if( currentText.find("CF",0,TRUE) != -1)
     {
         umountS = "umount ";
         remountS = "mount ";
 
         //         umountS = "/sbin/cardctl eject";
         //         remountS = "/sbin/cardctl insert";
     }
     if( currentText.find("SD",0,TRUE) != -1)
     {
         umountS = "umount ";
         remountS = "mount ";
         //         umountS = "/etc/sdcontrol compeject";
         //         remountS = "/etc/sdcontrol insert";
     }
 
     switch ( QMessageBox::warning(this,tr("Format?")
                                   , tr("Really format\n") +diskName+" "+ currentText +
                                   tr("\nwith %1 filesystem?\nYou will loose all data!!").arg( fs )
                                   ,tr("Yes")
                                   ,tr("No")
                                   ,0
                                   ,1
                                   ,1) )
     {
     case 0:
         {
             if(fs == "vfat")
                 cmd = "mkdosfs -v " + diskDevice+" 2>&1";
             else if(fs == "ext2")
                 cmd = "mke2fs -v " + diskDevice+" 2>&1";
             else
             {
                 QMessageBox::warning(this, tr("Formatter"),tr("Could not format.\nUnknown type"), tr("Ok"));
                 break;
             }
             //          cmd = "ls -l";
             outDlg = new Output(this, tr("Formatter Output"),FALSE);
             QPEApplication::showDialog( outDlg);
             qApp->processEvents();
             FILE *fp;
             char line[130];
 
 
             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);
             fp = popen(  (const char *) umountS, "r");
             //          qDebug("%d", fp);
             if ( !fp )
             {
                 qDebug("Could not execute '" + umountS + "'! err=%d\n" +(QString)strerror(errno), err);
                 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);
                         QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") );
                         pclose(fp);