s/QPEToolBar/QToolBar:

- remove usage of deprecated classses - makes it easier to migrate to OToolBar in the future
author: mickeyl <mickeyl> 2003-12-07 14:06:21 (UTC)
committer: mickeyl <mickeyl> 2003-12-07 14:06:21 (UTC)
commit: 4518f62746143246d29eb9f08030e241ac33eeb7 (patch) (unidiff)
tree: beda04d2c1ddadefd4d0dc2bb18774a15da03bf2 /noncore/net
parent: c648101ca50a9782911b58b5158b31e1d0427ab3 (diff)
download: opie-4518f62746143246d29eb9f08030e241ac33eeb7.zip
opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.gz
opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.bz2
5 files changed, 6 insertions, 6 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 48629bf..3250627 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -21,3 +21,3 @@ extern "C" {
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpeapplication.h>
@@ -71,3 +71,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
    QMenuBar *menuBar = new QMenuBar(this);
-//     QPEToolBar *menuBar = new QPEToolBar(this);
+//     QToolBar *menuBar = new QToolBar(this);
 //     menuBar->setHorizontalStretchable( TRUE );
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index f58778a..076a906 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -33,3 +33,3 @@ class QTabWidget;
 class QWidget;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index 95fbdcd..be6f8ed 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -1,2 +1,2 @@
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp
index 0d3f171..f299b54 100644
--- a/noncore/net/ubrowser/mainview.cpp
+++ b/noncore/net/ubrowser/mainview.cpp
@@ -26,3 +26,3 @@ MainView::MainView(QWidget *parent, const char *name, WFlags fl) : QMainWindow(p
-        QPEToolBar *toolbar = new QPEToolBar(this, "toolbar");
+        QToolBar *toolbar = new QToolBar(this, "toolbar");
        back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back");
diff --git a/noncore/net/ubrowser/mainview.h b/noncore/net/ubrowser/mainview.h
index cc63729..7ce890c 100644
--- a/noncore/net/ubrowser/mainview.h
+++ b/noncore/net/ubrowser/mainview.h
@@ -17,3 +17,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <qpe/resource.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/applnk.h>
author	mickeyl <mickeyl>	2003-12-07 14:06:21 (UTC)
committer	mickeyl <mickeyl>	2003-12-07 14:06:21 (UTC)
commit	4518f62746143246d29eb9f08030e241ac33eeb7 (patch) (unidiff)
tree	beda04d2c1ddadefd4d0dc2bb18774a15da03bf2 /noncore/net
parent	c648101ca50a9782911b58b5158b31e1d0427ab3 (diff)
download	opie-4518f62746143246d29eb9f08030e241ac33eeb7.zip opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.gz opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.bz2

diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 48629bf..3250627 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp
@@ -21,3 +21,3 @@ extern "C" {
21		21
22	#include <qpe/qpemenubar.h>	22	#include <qmenubar.h>
23	#include <qpe/qpeapplication.h>	23	#include <qpe/qpeapplication.h>
@@ -71,3 +71,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
71	QMenuBar *menuBar = new QMenuBar(this);	71	QMenuBar *menuBar = new QMenuBar(this);
72	// QPEToolBar *menuBar = new QPEToolBar(this);	72	// QToolBar *menuBar = new QToolBar(this);
73	// menuBar->setHorizontalStretchable( TRUE );	73	// menuBar->setHorizontalStretchable( TRUE );


diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h index f58778a..076a906 100644 --- a/noncore/net/opieftp/opieftp.h +++ b/noncore/net/opieftp/opieftp.h
@@ -33,3 +33,3 @@ class QTabWidget;
33	class QWidget;	33	class QWidget;
34	class QPEToolBar;	34	class QToolBar;
35	class QMenuBar;	35	class QMenuBar;


diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp index 95fbdcd..be6f8ed 100644 --- a/noncore/net/opieirc/mainwindow.cpp +++ b/noncore/net/opieirc/mainwindow.cpp
@@ -1,2 +1,2 @@
1	#include <qpe/qpemenubar.h>	1	#include <qmenubar.h>
2	#include <qpe/resource.h>	2	#include <qpe/resource.h>


diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp index 0d3f171..f299b54 100644 --- a/noncore/net/ubrowser/mainview.cpp +++ b/noncore/net/ubrowser/mainview.cpp
@@ -26,3 +26,3 @@ MainView::MainView(QWidget parent, const char name, WFlags fl) : QMainWindow(p
26		26
27	QPEToolBar *toolbar = new QPEToolBar(this, "toolbar");	27	QToolBar *toolbar = new QToolBar(this, "toolbar");
28	back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back");	28	back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back");


diff --git a/noncore/net/ubrowser/mainview.h b/noncore/net/ubrowser/mainview.h index cc63729..7ce890c 100644 --- a/noncore/net/ubrowser/mainview.h +++ b/noncore/net/ubrowser/mainview.h
@@ -17,3 +17,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17	#include <qpe/resource.h>	17	#include <qpe/resource.h>
18	#include <qpe/qpetoolbar.h>	18	#include <qtoolbar.h>
19	#include <qpe/applnk.h>	19	#include <qpe/applnk.h>