-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 12 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index 6930d60..a09bc30 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <qpe/qpemessagebox.h> | 17 | #include <qpe/qpemessagebox.h> |
18 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | #include <qpe/qpetoolbar.h> | 20 | #include <qtoolbar.h> |
21 | #include <qpe/qcopenvelope_qws.h> | 21 | #include <qpe/qcopenvelope_qws.h> |
22 | #include <qaction.h> | 22 | #include <qaction.h> |
23 | #include <qmessagebox.h> | 23 | #include <qmessagebox.h> |
@@ -82,7 +82,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
82 | void MainWindow::makeMenu() | 82 | void MainWindow::makeMenu() |
83 | { | 83 | { |
84 | 84 | ||
85 | QPEToolBar *toolBar = new QPEToolBar( this ); | 85 | QToolBar *toolBar = new QToolBar( this ); |
86 | QMenuBar *menuBar = new QMenuBar( toolBar ); | 86 | QMenuBar *menuBar = new QMenuBar( toolBar ); |
87 | QPopupMenu *srvMenu = new QPopupMenu( menuBar ); | 87 | QPopupMenu *srvMenu = new QPopupMenu( menuBar ); |
88 | QPopupMenu *viewMenu = new QPopupMenu( menuBar ); | 88 | QPopupMenu *viewMenu = new QPopupMenu( menuBar ); |
@@ -142,7 +142,7 @@ void MainWindow::makeMenu() | |||
142 | QAction *a; | 142 | QAction *a; |
143 | 143 | ||
144 | // SECTIONS | 144 | // SECTIONS |
145 | sectionBar = new QPEToolBar( this ); | 145 | sectionBar = new QToolBar( this ); |
146 | addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE ); | 146 | addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE ); |
147 | sectionBar->setHorizontalStretchable( true ); | 147 | sectionBar->setHorizontalStretchable( true ); |
148 | QLabel *label = new QLabel( sectionBar, "section" ); | 148 | QLabel *label = new QLabel( sectionBar, "section" ); |
@@ -169,7 +169,7 @@ void MainWindow::makeMenu() | |||
169 | // sectionBar->setStretchableWidget( section ); | 169 | // sectionBar->setStretchableWidget( section ); |
170 | 170 | ||
171 | //FIND | 171 | //FIND |
172 | findBar = new QPEToolBar(this); | 172 | findBar = new QToolBar(this); |
173 | addToolBar( findBar, "Filter", QMainWindow::Top, TRUE ); | 173 | addToolBar( findBar, "Filter", QMainWindow::Top, TRUE ); |
174 | label = new QLabel( tr("Filter: "), findBar ); | 174 | label = new QLabel( tr("Filter: "), findBar ); |
175 | // label->setBackgroundMode( PaletteForeground ); | 175 | // label->setBackgroundMode( PaletteForeground ); |
@@ -190,7 +190,7 @@ void MainWindow::makeMenu() | |||
190 | findAction->addTo( viewMenu ); | 190 | findAction->addTo( viewMenu ); |
191 | 191 | ||
192 | //SEARCH | 192 | //SEARCH |
193 | searchBar = new QPEToolBar(this); | 193 | searchBar = new QToolBar(this); |
194 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); | 194 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); |
195 | label = new QLabel( tr("Search: "), searchBar ); | 195 | label = new QLabel( tr("Search: "), searchBar ); |
196 | // label->setBackgroundMode( PaletteForeground ); | 196 | // label->setBackgroundMode( PaletteForeground ); |
@@ -214,7 +214,7 @@ void MainWindow::makeMenu() | |||
214 | searchAction->addTo( viewMenu ); | 214 | searchAction->addTo( viewMenu ); |
215 | 215 | ||
216 | //DEST | 216 | //DEST |
217 | destBar = new QPEToolBar(this); | 217 | destBar = new QToolBar(this); |
218 | addToolBar( destBar, "Destination", QMainWindow::Top, TRUE ); | 218 | addToolBar( destBar, "Destination", QMainWindow::Top, TRUE ); |
219 | label = new QLabel( tr("Destination: "), destBar ); | 219 | label = new QLabel( tr("Destination: "), destBar ); |
220 | // label->setBackgroundMode( PaletteForeground ); | 220 | // label->setBackgroundMode( PaletteForeground ); |
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h index 7446135..ae9fd0c 100644 --- a/noncore/unsupported/oipkg/mainwindow.h +++ b/noncore/unsupported/oipkg/mainwindow.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "packagelistview.h" | 28 | #include "packagelistview.h" |
29 | 29 | ||
30 | class QComboBox; | 30 | class QComboBox; |
31 | class QPEToolBar; | 31 | class QToolBar; |
32 | class QLineEdit; | 32 | class QLineEdit; |
33 | class PackageListItem; | 33 | class PackageListItem; |
34 | class QCopChannel; | 34 | class QCopChannel; |
@@ -89,18 +89,18 @@ private: | |||
89 | QAction *runAction; | 89 | QAction *runAction; |
90 | QAction *updateAction; | 90 | QAction *updateAction; |
91 | QAction *findAction; | 91 | QAction *findAction; |
92 | QPEToolBar *findBar; | 92 | QToolBar *findBar; |
93 | QLineEdit *findEdit; | 93 | QLineEdit *findEdit; |
94 | QAction *searchAction; | 94 | QAction *searchAction; |
95 | QAction *searchCommit; | 95 | QAction *searchCommit; |
96 | QPEToolBar *searchBar; | 96 | QToolBar *searchBar; |
97 | QLineEdit *searchEdit; | 97 | QLineEdit *searchEdit; |
98 | QAction *sectionAction; | 98 | QAction *sectionAction; |
99 | QPEToolBar *sectionBar; | 99 | QToolBar *sectionBar; |
100 | QComboBox *section; | 100 | QComboBox *section; |
101 | QComboBox *subsection; | 101 | QComboBox *subsection; |
102 | QAction *destAction; | 102 | QAction *destAction; |
103 | QPEToolBar *destBar; | 103 | QToolBar *destBar; |
104 | QComboBox *destination; | 104 | QComboBox *destination; |
105 | QCheckBox* CheckBoxLink; | 105 | QCheckBox* CheckBoxLink; |
106 | }; | 106 | }; |