-rw-r--r-- | core/apps/embeddedkonsole/commandeditdialog.cpp | 2 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 8 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.h | 4 | ||||
-rw-r--r-- | core/apps/helpbrowser/helpbrowser.cpp | 6 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 8 |
5 files changed, 14 insertions, 14 deletions
diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp index 97b0a9e..dd35466 100644 --- a/core/apps/embeddedkonsole/commandeditdialog.cpp +++ b/core/apps/embeddedkonsole/commandeditdialog.cpp | |||
@@ -3,9 +3,9 @@ | |||
3 | #include "commandeditdialog.h" | 3 | #include "commandeditdialog.h" |
4 | #include "playlistselection.h" | 4 | #include "playlistselection.h" |
5 | #include <qstring.h> | 5 | #include <qstring.h> |
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | #include <qpe/qpetoolbar.h> | 7 | #include <qtoolbar.h> |
8 | #include <qwidget.h> | 8 | #include <qwidget.h> |
9 | #include <qmenubar.h> | 9 | #include <qmenubar.h> |
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
11 | #include <qlist.h> | 11 | #include <qlist.h> |
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index d855d90..fff2f68 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -27,9 +27,9 @@ | |||
27 | #include <qevent.h> | 27 | #include <qevent.h> |
28 | #include <qdragobject.h> | 28 | #include <qdragobject.h> |
29 | #include <qobjectlist.h> | 29 | #include <qobjectlist.h> |
30 | #include <qtoolbutton.h> | 30 | #include <qtoolbutton.h> |
31 | #include <qpe/qpetoolbar.h> | 31 | #include <qtoolbar.h> |
32 | #include <qpushbutton.h> | 32 | #include <qpushbutton.h> |
33 | #include <qfontdialog.h> | 33 | #include <qfontdialog.h> |
34 | #include <qglobal.h> | 34 | #include <qglobal.h> |
35 | #include <qpainter.h> | 35 | #include <qpainter.h> |
@@ -281,9 +281,9 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
281 | connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*))); | 281 | connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*))); |
282 | 282 | ||
283 | // create terminal toolbar //////////////////////////////////////////////// | 283 | // create terminal toolbar //////////////////////////////////////////////// |
284 | setToolBarsMovable( FALSE ); | 284 | setToolBarsMovable( FALSE ); |
285 | QPEToolBar *menuToolBar = new QPEToolBar( this ); | 285 | QToolBar *menuToolBar = new QToolBar( this ); |
286 | menuToolBar->setHorizontalStretchable( TRUE ); | 286 | menuToolBar->setHorizontalStretchable( TRUE ); |
287 | 287 | ||
288 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); | 288 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); |
289 | 289 | ||
@@ -350,9 +350,9 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
350 | connect(editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int))); | 350 | connect(editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int))); |
351 | 351 | ||
352 | menuBar->insertItem( tr("Options"), configMenu ); | 352 | menuBar->insertItem( tr("Options"), configMenu ); |
353 | 353 | ||
354 | QPEToolBar *toolbar = new QPEToolBar( this ); | 354 | QToolBar *toolbar = new QToolBar( this ); |
355 | 355 | ||
356 | QAction *a; | 356 | QAction *a; |
357 | 357 | ||
358 | // Button Commands | 358 | // Button Commands |
@@ -376,9 +376,9 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
376 | a = new QAction( tr("Down"), Resource::loadPixmap( "down" ), QString::null, 0, this, 0 ); | 376 | a = new QAction( tr("Down"), Resource::loadPixmap( "down" ), QString::null, 0, this, 0 ); |
377 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar ); | 377 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar ); |
378 | */ | 378 | */ |
379 | 379 | ||
380 | secondToolBar = new QPEToolBar( this ); | 380 | secondToolBar = new QToolBar( this ); |
381 | secondToolBar->setHorizontalStretchable( TRUE ); | 381 | secondToolBar->setHorizontalStretchable( TRUE ); |
382 | 382 | ||
383 | commonCombo = new QComboBox( secondToolBar ); | 383 | commonCombo = new QComboBox( secondToolBar ); |
384 | commonCombo->setMaximumWidth(236); | 384 | commonCombo->setMaximumWidth(236); |
diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h index e9d0e4b..7d5a908 100644 --- a/core/apps/embeddedkonsole/konsole.h +++ b/core/apps/embeddedkonsole/konsole.h | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <qstrlist.h> | 29 | #include <qstrlist.h> |
30 | #include <qintdict.h> | 30 | #include <qintdict.h> |
31 | #include <qptrdict.h> | 31 | #include <qptrdict.h> |
32 | #include <qtabwidget.h> | 32 | #include <qtabwidget.h> |
33 | #include <qpe/qpetoolbar.h> | 33 | #include <qtoolbar.h> |
34 | #include <qcombobox.h> | 34 | #include <qcombobox.h> |
35 | #include <qcolor.h> | 35 | #include <qcolor.h> |
36 | 36 | ||
37 | #include "MyPty.h" | 37 | #include "MyPty.h" |
@@ -50,9 +50,9 @@ public: | |||
50 | 50 | ||
51 | Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); | 51 | Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); |
52 | ~Konsole(); | 52 | ~Konsole(); |
53 | void setColLin(int columns, int lines); | 53 | void setColLin(int columns, int lines); |
54 | QPEToolBar *secondToolBar; | 54 | QToolBar *secondToolBar; |
55 | void show(); | 55 | void show(); |
56 | void setColor(); | 56 | void setColor(); |
57 | int lastSelectedMenu; | 57 | int lastSelectedMenu; |
58 | int startUp; | 58 | int startUp; |
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp index ed1c165..6f84ae2 100644 --- a/core/apps/helpbrowser/helpbrowser.cpp +++ b/core/apps/helpbrowser/helpbrowser.cpp | |||
@@ -32,9 +32,9 @@ | |||
32 | #include <qdragobject.h> | 32 | #include <qdragobject.h> |
33 | #include <qpixmap.h> | 33 | #include <qpixmap.h> |
34 | #include <qpopupmenu.h> | 34 | #include <qpopupmenu.h> |
35 | #include <qmenubar.h> | 35 | #include <qmenubar.h> |
36 | #include <qpe/qpetoolbar.h> | 36 | #include <qtoolbar.h> |
37 | #include <qpe/qcopenvelope_qws.h> | 37 | #include <qpe/qcopenvelope_qws.h> |
38 | #include <qtoolbutton.h> | 38 | #include <qtoolbutton.h> |
39 | #include <qiconset.h> | 39 | #include <qiconset.h> |
40 | #include <qfile.h> | 40 | #include <qfile.h> |
@@ -81,13 +81,13 @@ void HelpBrowser::init( const QString& _home ) | |||
81 | 81 | ||
82 | if ( !_home.isEmpty() ) | 82 | if ( !_home.isEmpty() ) |
83 | browser->setSource( _home ); | 83 | browser->setSource( _home ); |
84 | 84 | ||
85 | QPEToolBar* toolbar = new QPEToolBar( this ); | 85 | QToolBar* toolbar = new QToolBar( this ); |
86 | toolbar->setHorizontalStretchable( TRUE ); | 86 | toolbar->setHorizontalStretchable( TRUE ); |
87 | QMenuBar *menu = new QMenuBar( toolbar ); | 87 | QMenuBar *menu = new QMenuBar( toolbar ); |
88 | 88 | ||
89 | toolbar = new QPEToolBar( this ); | 89 | toolbar = new QToolBar( this ); |
90 | // addToolBar( toolbar, "Toolbar"); | 90 | // addToolBar( toolbar, "Toolbar"); |
91 | 91 | ||
92 | QPopupMenu* go = new QPopupMenu( this ); | 92 | QPopupMenu* go = new QPopupMenu( this ); |
93 | backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 ); | 93 | backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 ); |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 0e3254f..be18140 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -26,9 +26,9 @@ | |||
26 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
28 | #include <qpe/qpeapplication.h> | 28 | #include <qpe/qpeapplication.h> |
29 | #include <qmenubar.h> | 29 | #include <qmenubar.h> |
30 | #include <qpe/qpetoolbar.h> | 30 | #include <qtoolbar.h> |
31 | #include <qpe/qcopenvelope_qws.h> | 31 | #include <qpe/qcopenvelope_qws.h> |
32 | 32 | ||
33 | #include <qpoint.h> | 33 | #include <qpoint.h> |
34 | #include <qtextstream.h> | 34 | #include <qtextstream.h> |
@@ -181,9 +181,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
181 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 181 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
182 | 182 | ||
183 | setIcon( Resource::loadPixmap( "TextEditor" ) ); | 183 | setIcon( Resource::loadPixmap( "TextEditor" ) ); |
184 | 184 | ||
185 | QPEToolBar *bar = new QPEToolBar( this ); | 185 | QToolBar *bar = new QToolBar( this ); |
186 | bar->setHorizontalStretchable( true ); | 186 | bar->setHorizontalStretchable( true ); |
187 | menu = bar; | 187 | menu = bar; |
188 | 188 | ||
189 | QMenuBar *mb = new QMenuBar( bar ); | 189 | QMenuBar *mb = new QMenuBar( bar ); |
@@ -192,9 +192,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
192 | QPopupMenu *advancedMenu = new QPopupMenu(this); | 192 | QPopupMenu *advancedMenu = new QPopupMenu(this); |
193 | 193 | ||
194 | font = new QPopupMenu( this ); | 194 | font = new QPopupMenu( this ); |
195 | 195 | ||
196 | bar = new QPEToolBar( this ); | 196 | bar = new QToolBar( this ); |
197 | editBar = bar; | 197 | editBar = bar; |
198 | 198 | ||
199 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), | 199 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), |
200 | QString::null, 0, this, 0 ); | 200 | QString::null, 0, this, 0 ); |
@@ -331,9 +331,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
331 | mb->insertItem( tr( "File" ), file ); | 331 | mb->insertItem( tr( "File" ), file ); |
332 | mb->insertItem( tr( "Edit" ), edit ); | 332 | mb->insertItem( tr( "Edit" ), edit ); |
333 | mb->insertItem( tr( "View" ), font ); | 333 | mb->insertItem( tr( "View" ), font ); |
334 | 334 | ||
335 | searchBar = new QPEToolBar(this); | 335 | searchBar = new QToolBar(this); |
336 | addToolBar( searchBar, "Search", QMainWindow::Top, true ); | 336 | addToolBar( searchBar, "Search", QMainWindow::Top, true ); |
337 | 337 | ||
338 | searchBar->setHorizontalStretchable( true ); | 338 | searchBar->setHorizontalStretchable( true ); |
339 | 339 | ||