s/QPEToolBar/QToolBar:

 - remove usage of deprecated classses
 - makes it easier to migrate to OToolBar in the future

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp
index de1dcf3..5cdcccf 100644
--- a/noncore/unsupported/qpdf/qpdf.cpp
+++ b/noncore/unsupported/qpdf/qpdf.cpp
@@ -1,121 +1,121 @@
 //========================================================================
 //
 // qpdf.cc
 //
 // Copyright 2001 Robert Griebl
 //
 //========================================================================
 
 #include "aconf.h"
 #include "GString.h"
 #include "PDFDoc.h"
 #include "TextOutputDev.h"
 
 #include "QPEOutputDev.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 
 
 #include <qclipboard.h>
 #include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qwidgetstack.h>
 #include <qtimer.h>
 #include <qfileinfo.h>
 #include <qstring.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qlayout.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 
 #include "qpdf.h"
 
 #ifdef QPDF_QPE_ONLY
 #include <qpe/fileselector.h>
 #else
 #include <opie/ofileselector.h>
 #endif
 
 
 int main ( int argc, char **argv ) 
 {
 	QPEApplication app ( argc, argv );
 
 	// read config file
 	globalParams = new GlobalParams ( "" );
 	globalParams-> setErrQuiet ( true );
 
 	QPdfDlg *dlg = new QPdfDlg ( );				
 	app. showMainDocumentWidget ( dlg );
 
 	if (( app. argc ( ) == 3 ) && ( app. argv ( ) [1] == QCString ( "-f" )))
 		dlg-> openFile ( app. argv ( ) [2] );
 
 	return app. exec ( );
 }
 
 
 QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
 {
 	setCaption ( tr( "QPdf" ));
 	setIcon ( Resource::loadPixmap ( "qpdf_icon" ));
 	
 	m_busy = false;
 	
 	m_doc = 0;
 	m_pages = 0;
 	m_zoom = 72;
 	m_currentpage = 0;	
 
 	m_fullscreen = false;
 	m_renderok = false;
 		
 	
 	setToolBarsMovable ( false );
 
 	m_stack = new QWidgetStack ( this );
 	m_stack-> setSizePolicy ( QSizePolicy ( QSizePolicy::Expanding, QSizePolicy::Expanding ));
 	setCentralWidget ( m_stack );
 
 	m_outdev = new QPEOutputDev ( m_stack );
 	connect ( m_outdev, SIGNAL( selectionChanged ( const QRect & )), this, SLOT( copyToClipboard ( const QRect & )));
 
 #ifdef QPDF_QPE_ONLY
 	m_filesel = new FileSelector ( "application/pdf", m_stack, "fs", false, true );
 #else
 	m_filesel = new OFileSelector ( "application/pdf", m_stack, "fs", false, true );
 #endif
 
 	connect ( m_filesel, SIGNAL( closeMe ( )), this, SLOT( closeFileSelector ( )));
 	connect ( m_filesel, SIGNAL( fileSelected ( const DocLnk & )), this, SLOT( openFile ( const DocLnk & )));
 
 	m_tb_menu = new QToolBar ( this );
 	m_tb_menu-> setHorizontalStretchable ( true );
 
 	QMenuBar *mb = new QMenuBar ( m_tb_menu );
 
 	m_pm_zoom = new QPopupMenu ( mb );
 	m_pm_zoom-> setCheckable ( true );
 
 	mb-> insertItem ( tr( "Zoom" ), m_pm_zoom );
 
 	m_pm_zoom-> insertItem ( tr( "Fit to width" ), 1 );
 	m_pm_zoom-> insertItem ( tr( "Fit to page" ),  2 );
 	m_pm_zoom-> insertSeparator ( );
 	m_pm_zoom-> insertItem ( tr( "50%" ),   50 );
 	m_pm_zoom-> insertItem ( tr( "75%" ),   75 );
 	m_pm_zoom-> insertItem ( tr( "100%" ), 100 );
 	m_pm_zoom-> insertItem ( tr( "125%" ), 125 );
 	m_pm_zoom-> insertItem ( tr( "150%" ), 150 );
 	m_pm_zoom-> insertItem ( tr( "200%" ), 200 );
 	
 	connect ( m_pm_zoom, SIGNAL( activated ( int )), this, SLOT( setZoom ( int )));
 
 	m_tb_tool = new QToolBar ( this );