1 files changed, 1 insertions, 2 deletions

diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index 79a7f9e..cca0c26 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -1,125 +1,124 @@
 /****************************************************************************
  ** formatter.cpp
  **
  ** Copyright: Thu Apr 11 11:01:13 2002
  **      by:  L. J. Potter
  **
  ****************************************************************************/
 
 #include "formatter.h"
 #include "inputDialog.h"
 #include "output.h"
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.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>
 
 #include <qmultilineedit.h>
 #include <qstring.h>
-#include <qlist.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qfile.h>
 
-#include <qtstream.h>
+#include <qtextstream.h>
 
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 #include <qregexp.h>
 
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qvariant.h>
 
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #include <string.h>
 #include <errno.h>
 
 #define BLANK ' '
 #define DELIMITER '#'
 
 /* 
    Blah blah blah blah */
 FormatterApp::FormatterApp( QWidget* parent,  const char* name, bool modal, WFlags fl )
         : QMainWindow( parent, name, fl )
 //    : QDialog( parent, name, modal, fl )
 {
     if ( !name )
         setName( "FormatterApp" );
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     setCaption( tr( "Formatter" ) );
     FormatterAppLayout = new QGridLayout( this ); 
     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"