summaryrefslogtreecommitdiff
authordrw <drw>2005-05-23 23:49:14 (UTC)
committer drw <drw>2005-05-23 23:49:14 (UTC)
commitf5d45036d2a444f9ee27311895c430babcf947e5 (patch) (unidiff)
tree69a1ba1227931cccce2d916c6e0fd7dcc6ccd003
parenta04b6cb80be1c2df466b69ed40450820056aff06 (diff)
downloadopie-f5d45036d2a444f9ee27311895c430babcf947e5.zip
opie-f5d45036d2a444f9ee27311895c430babcf947e5.tar.gz
opie-f5d45036d2a444f9ee27311895c430babcf947e5.tar.bz2
Remove unnecessary include and fix compiler warning
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/formatter/formatter.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index 642196e..2b8cca2 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -1,155 +1,154 @@
1/**************************************************************************** 1/****************************************************************************
2 ** formatter.cpp 2 ** formatter.cpp
3 ** 3 **
4 ** Copyright: Thu Apr 11 11:01:13 2002 4 ** Copyright: Thu Apr 11 11:01:13 2002
5 ** by: L. J. Potter 5 ** by: L. J. Potter
6 ** 6 **
7 ****************************************************************************/ 7 ****************************************************************************/
8 8
9#include "formatter.h" 9#include "formatter.h"
10#include "inputDialog.h" 10#include "inputDialog.h"
11#include "output.h" 11#include "output.h"
12 12
13/* OPIE */ 13/* OPIE */
14#include <opie2/odebug.h> 14#include <opie2/odebug.h>
15#include <qpe/qpeapplication.h> 15#include <qpe/qpeapplication.h>
16#include <qpe/resource.h>
17#include <qpe/config.h> 16#include <qpe/config.h>
18#include <qpe/mimetype.h> 17#include <qpe/mimetype.h>
19#include <qpe/qcopenvelope_qws.h> 18#include <qpe/qcopenvelope_qws.h>
20#include <qpe/storage.h> 19#include <qpe/storage.h>
21using namespace Opie::Core; 20using namespace Opie::Core;
22 21
23/* QT */ 22/* QT */
24#include <qmenubar.h> 23#include <qmenubar.h>
25#include <qmultilineedit.h> 24#include <qmultilineedit.h>
26#include <qstring.h> 25#include <qstring.h>
27#include <qlist.h> 26#include <qlist.h>
28#include <qstringlist.h> 27#include <qstringlist.h>
29#include <qdir.h> 28#include <qdir.h>
30#include <qfile.h> 29#include <qfile.h>
31#include <qtstream.h> 30#include <qtstream.h>
32#include <qcombobox.h> 31#include <qcombobox.h>
33#include <qpopupmenu.h> 32#include <qpopupmenu.h>
34#include <qmessagebox.h> 33#include <qmessagebox.h>
35#include <qregexp.h> 34#include <qregexp.h>
36#include <qlabel.h> 35#include <qlabel.h>
37#include <qlineedit.h> 36#include <qlineedit.h>
38#include <qpushbutton.h> 37#include <qpushbutton.h>
39#include <qtoolbar.h> 38#include <qtoolbar.h>
40#include <qtabwidget.h> 39#include <qtabwidget.h>
41#include <qwidget.h> 40#include <qwidget.h>
42#include <qlayout.h> 41#include <qlayout.h>
43#include <qvariant.h> 42#include <qvariant.h>
44 43
45/* STD */ 44/* STD */
46#include <unistd.h> 45#include <unistd.h>
47#include <stdio.h> 46#include <stdio.h>
48#include <stdlib.h> 47#include <stdlib.h>
49#include <sys/vfs.h> 48#include <sys/vfs.h>
50#include <mntent.h> 49#include <mntent.h>
51#include <string.h> 50#include <string.h>
52#include <errno.h> 51#include <errno.h>
53 52
54#define BLANK ' ' 53#define BLANK ' '
55#define DELIMITER '#' 54#define DELIMITER '#'
56 55
57/* 56/*
58 Blah blah blah blah */ 57 Blah blah blah blah */
59FormatterApp::FormatterApp( QWidget* parent, const char* name, WFlags fl, bool modal ) 58FormatterApp::FormatterApp( QWidget* parent, const char* name, WFlags fl, bool /*modal*/ )
60 : QMainWindow( parent, name, fl ) 59 : QMainWindow( parent, name, fl )
61 // : QDialog( parent, name, modal, fl ) 60 // : QDialog( parent, name, modal, fl )
62{ 61{
63 if ( !name ) 62 if ( !name )
64 setName( "FormatterApp" ); 63 setName( "FormatterApp" );
65 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 64 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
66 65
67 setCaption( tr( "Formatter" ) ); 66 setCaption( tr( "Formatter" ) );
68 FormatterAppLayout = new QGridLayout( this ); 67 FormatterAppLayout = new QGridLayout( this );
69 FormatterAppLayout->setSpacing( 2); 68 FormatterAppLayout->setSpacing( 2);
70 FormatterAppLayout->setMargin( 2 ); 69 FormatterAppLayout->setMargin( 2 );
71 70
72 TabWidget = new QTabWidget( this, "TabWidget" ); 71 TabWidget = new QTabWidget( this, "TabWidget" );
73 72
74 tab = new QWidget( TabWidget, "tab" ); 73 tab = new QWidget( TabWidget, "tab" );
75 tabLayout = new QGridLayout( tab ); 74 tabLayout = new QGridLayout( tab );
76 tabLayout->setSpacing( 3); 75 tabLayout->setSpacing( 3);
77 tabLayout->setMargin( 2); 76 tabLayout->setMargin( 2);
78 77
79 storageComboBox = new QComboBox( FALSE, tab, "storageComboBox" ); 78 storageComboBox = new QComboBox( FALSE, tab, "storageComboBox" );
80 storageComboBox->setMaximumWidth(220); 79 storageComboBox->setMaximumWidth(220);
81 80
82 tabLayout->addMultiCellWidget( storageComboBox, 0, 0, 0, 1); 81 tabLayout->addMultiCellWidget( storageComboBox, 0, 0, 0, 1);
83 82
84 TextLabel4 = new QLabel( tab, "TextLabel4" ); 83 TextLabel4 = new QLabel( tab, "TextLabel4" );
85 TextLabel4->setText( tr( "Storage Type" ) ); 84 TextLabel4->setText( tr( "Storage Type" ) );
86 85
87 tabLayout->addMultiCellWidget( TextLabel4, 1, 1, 0, 1); 86 tabLayout->addMultiCellWidget( TextLabel4, 1, 1, 0, 1);
88 87
89 TextLabel2 = new QLabel( tab, "TextLabel2" ); 88 TextLabel2 = new QLabel( tab, "TextLabel2" );
90 TextLabel2->setText( tr( "File Systems" ) ); 89 TextLabel2->setText( tr( "File Systems" ) );
91 90
92 tabLayout->addMultiCellWidget( TextLabel2, 4, 4, 0, 1); 91 tabLayout->addMultiCellWidget( TextLabel2, 4, 4, 0, 1);
93 92
94 fileSystemsCombo = new QComboBox( FALSE, tab, "fileSystemsCombo" ); 93 fileSystemsCombo = new QComboBox( FALSE, tab, "fileSystemsCombo" );
95 fileSystemsCombo->setMaximumWidth(220); 94 fileSystemsCombo->setMaximumWidth(220);
96 95
97 tabLayout->addMultiCellWidget( fileSystemsCombo, 3, 3, 0, 1); 96 tabLayout->addMultiCellWidget( fileSystemsCombo, 3, 3, 0, 1);
98 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum ); 97 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum );
99 tabLayout->addItem( spacer, 2, 0 ); 98 tabLayout->addItem( spacer, 2, 0 );
100 99
101 formatPushButton = new QPushButton( tab, "formatPushButton" ); 100 formatPushButton = new QPushButton( tab, "formatPushButton" );
102 formatPushButton->setText( tr( "Format" ) ); 101 formatPushButton->setText( tr( "Format" ) );
103 formatPushButton->setMaximumWidth(170); 102 formatPushButton->setMaximumWidth(170);
104 103
105 tabLayout->addMultiCellWidget( formatPushButton, 6, 6, 0, 1); 104 tabLayout->addMultiCellWidget( formatPushButton, 6, 6, 0, 1);
106 QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum ); 105 QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum );
107 tabLayout->addItem( spacer_2, 5, 0 ); 106 tabLayout->addItem( spacer_2, 5, 0 );
108 107
109 TabWidget->insertTab( tab, tr( "Main" ) ); 108 TabWidget->insertTab( tab, tr( "Main" ) );
110 109
111 tab_2 = new QWidget( TabWidget, "tab_2" ); 110 tab_2 = new QWidget( TabWidget, "tab_2" );
112 tabLayout_2 = new QGridLayout( tab_2 ); 111 tabLayout_2 = new QGridLayout( tab_2 );
113 tabLayout_2->setSpacing(3); 112 tabLayout_2->setSpacing(3);
114 tabLayout_2->setMargin(2); 113 tabLayout_2->setMargin(2);
115 114
116 mountPointLineEdit = new QLineEdit( tab_2, "mountPointLineEdit" ); 115 mountPointLineEdit = new QLineEdit( tab_2, "mountPointLineEdit" );
117 116
118 tabLayout_2->addMultiCellWidget( mountPointLineEdit, 0, 0, 0, 1); 117 tabLayout_2->addMultiCellWidget( mountPointLineEdit, 0, 0, 0, 1);
119 118
120 deviceComboBox = new QComboBox( FALSE, tab_2, "deviceComboBox" ); 119 deviceComboBox = new QComboBox( FALSE, tab_2, "deviceComboBox" );
121 120
122 tabLayout_2->addMultiCellWidget( deviceComboBox, 3, 3, 0, 1); 121 tabLayout_2->addMultiCellWidget( deviceComboBox, 3, 3, 0, 1);
123 122
124 TextLabel5 = new QLabel( tab_2, "TextLabel5" ); 123 TextLabel5 = new QLabel( tab_2, "TextLabel5" );
125 TextLabel5->setText( tr( "CAUTION:\n" 124 TextLabel5->setText( tr( "CAUTION:\n"
126 "Changing parameters on this\n" 125 "Changing parameters on this\n"
127 "page may cause your system\n" 126 "page may cause your system\n"
128 "to stop functioning properly!" ) );//idiot message 127 "to stop functioning properly!" ) );//idiot message
129 128
130 tabLayout_2->addMultiCellWidget( TextLabel5, 6, 6, 0, 1); 129 tabLayout_2->addMultiCellWidget( TextLabel5, 6, 6, 0, 1);
131 130
132 editPushButton = new QPushButton( tab_2, "editPushButton" ); 131 editPushButton = new QPushButton( tab_2, "editPushButton" );
133 editPushButton->setText( tr( "Edit fstab" ) ); 132 editPushButton->setText( tr( "Edit fstab" ) );
134 editPushButton->setMaximumWidth(100); 133 editPushButton->setMaximumWidth(100);
135 134
136 tabLayout_2->addMultiCellWidget( editPushButton, 7, 7, 0, 0 ); 135 tabLayout_2->addMultiCellWidget( editPushButton, 7, 7, 0, 0 );
137 136
138 fsckButton = new QPushButton( tab_2, "fsckPushButton" ); 137 fsckButton = new QPushButton( tab_2, "fsckPushButton" );
139 fsckButton->setText( tr( "Check Disk" ) ); 138 fsckButton->setText( tr( "Check Disk" ) );
140 fsckButton->setMaximumWidth(100); 139 fsckButton->setMaximumWidth(100);
141 140
142 tabLayout_2->addMultiCellWidget( fsckButton, 7, 7, 1, 1); 141 tabLayout_2->addMultiCellWidget( fsckButton, 7, 7, 1, 1);
143 142
144 TextLabel3 = new QLabel( tab_2, "TextLabel3" ); 143 TextLabel3 = new QLabel( tab_2, "TextLabel3" );
145 TextLabel3->setText( tr( "Device" ) ); 144 TextLabel3->setText( tr( "Device" ) );
146 145
147 tabLayout_2->addMultiCellWidget( TextLabel3, 4, 4, 0, 1 ); 146 tabLayout_2->addMultiCellWidget( TextLabel3, 4, 4, 0, 1 );
148 QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); 147 QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
149 tabLayout_2->addItem( spacer_3, 5, 0 ); 148 tabLayout_2->addItem( spacer_3, 5, 0 );
150 149
151 TextLabel1 = new QLabel( tab_2, "TextLabel1" ); 150 TextLabel1 = new QLabel( tab_2, "TextLabel1" );
152 TextLabel1->setText( tr( "Mount Point" ) ); 151 TextLabel1->setText( tr( "Mount Point" ) );
153 152
154 tabLayout_2->addMultiCellWidget( TextLabel1, 1, 1, 0, 1 ); 153 tabLayout_2->addMultiCellWidget( TextLabel1, 1, 1, 0, 1 );
155 QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); 154 QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );