-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 @@ -4,7 +4,7 @@ #include "playlistselection.h" #include <qstring.h> #include <qpe/config.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qwidget.h> #include <qmenubar.h> #include <qpe/resource.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 @@ -28,7 +28,7 @@ #include <qdragobject.h> #include <qobjectlist.h> #include <qtoolbutton.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpushbutton.h> #include <qfontdialog.h> #include <qglobal.h> @@ -282,7 +282,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) // create terminal toolbar //////////////////////////////////////////////// setToolBarsMovable( FALSE ); - QPEToolBar *menuToolBar = new QPEToolBar( this ); + QToolBar *menuToolBar = new QToolBar( this ); menuToolBar->setHorizontalStretchable( TRUE ); QMenuBar *menuBar = new QMenuBar( menuToolBar ); @@ -351,7 +351,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) menuBar->insertItem( tr("Options"), configMenu ); - QPEToolBar *toolbar = new QPEToolBar( this ); + QToolBar *toolbar = new QToolBar( this ); QAction *a; @@ -377,7 +377,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar ); */ - secondToolBar = new QPEToolBar( this ); + secondToolBar = new QToolBar( this ); secondToolBar->setHorizontalStretchable( TRUE ); commonCombo = new QComboBox( secondToolBar ); 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 @@ -30,7 +30,7 @@ #include <qintdict.h> #include <qptrdict.h> #include <qtabwidget.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qcombobox.h> #include <qcolor.h> @@ -51,7 +51,7 @@ public: Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); ~Konsole(); void setColLin(int columns, int lines); - QPEToolBar *secondToolBar; + QToolBar *secondToolBar; void show(); void setColor(); int lastSelectedMenu; 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 @@ -33,7 +33,7 @@ #include <qpixmap.h> #include <qpopupmenu.h> #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qcopenvelope_qws.h> #include <qtoolbutton.h> #include <qiconset.h> @@ -82,11 +82,11 @@ void HelpBrowser::init( const QString& _home ) if ( !_home.isEmpty() ) browser->setSource( _home ); - QPEToolBar* toolbar = new QPEToolBar( this ); + QToolBar* toolbar = new QToolBar( this ); toolbar->setHorizontalStretchable( TRUE ); QMenuBar *menu = new QMenuBar( toolbar ); - toolbar = new QPEToolBar( this ); + toolbar = new QToolBar( this ); // addToolBar( toolbar, "Toolbar"); QPopupMenu* go = new QPopupMenu( this ); 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 @@ -27,7 +27,7 @@ #include <qpe/config.h> #include <qpe/qpeapplication.h> #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qcopenvelope_qws.h> #include <qpoint.h> @@ -182,7 +182,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) setIcon( Resource::loadPixmap( "TextEditor" ) ); - QPEToolBar *bar = new QPEToolBar( this ); + QToolBar *bar = new QToolBar( this ); bar->setHorizontalStretchable( true ); menu = bar; @@ -193,7 +193,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) font = new QPopupMenu( this ); - bar = new QPEToolBar( this ); + bar = new QToolBar( this ); editBar = bar; QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), @@ -332,7 +332,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) mb->insertItem( tr( "Edit" ), edit ); mb->insertItem( tr( "View" ), font ); - searchBar = new QPEToolBar(this); + searchBar = new QToolBar(this); addToolBar( searchBar, "Search", QMainWindow::Top, true ); searchBar->setHorizontalStretchable( true ); |