- uses OFileSelector now

- menu/toolbars are now QPE variants

2 files changed, 6 insertions, 6 deletions

diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp
index f338509..e78f081 100644
--- a/noncore/unsupported/qpdf/qpdf.cpp
+++ b/noncore/unsupported/qpdf/qpdf.cpp
@@ -15,19 +15,19 @@
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 
 
 #include <qclipboard.h>
-#include <qtoolbar.h>
+#include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
-#include <qmenubar.h>
+#include <qpe/qpemenubar.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>
@@ -94,17 +94,17 @@ QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
 #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 );
+	QMenuBar *mb = new QPEMenuBar ( 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 );
@@ -113,33 +113,33 @@ QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
 	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 );
+	m_tb_tool = new QPEToolBar ( this );
 		
 	new QToolButton ( Resource::loadIconSet ( "fileopen" ),    tr( "Open..." ),       QString::null, this, SLOT( openFile ( )),  m_tb_tool, "open" );
 	m_tb_tool-> addSeparator ( );
 	m_to_find = new QToolButton ( Resource::loadIconSet ( "find" ),        tr( "Find..." ),       QString::null, this, SLOT( toggleFindBar ( )),     m_tb_tool, "find" );
 	m_to_find-> setToggleButton ( true );
 	m_tb_tool-> addSeparator ( );
 	m_to_full = new QToolButton ( Resource::loadIconSet ( "fullscreen" ),  tr( "Fullscreen" ),    QString::null, this, SLOT( toggleFullscreen ( )),  m_tb_tool, "fullscreen" );
 	m_to_full-> setToggleButton ( true );
 	m_tb_tool-> addSeparator ( );
 	new QToolButton ( Resource::loadIconSet ( "fastback" ),    tr( "First page" ),    QString::null, this, SLOT( firstPage ( )), m_tb_tool, "first" );
 	new QToolButton ( Resource::loadIconSet ( "back" ),        tr( "Previous page" ), QString::null, this, SLOT( prevPage ( )),  m_tb_tool, "prev" );
 	new QToolButton ( Resource::loadIconSet ( "down" ),        tr( "Goto page..." ),  QString::null, this, SLOT( gotoPageDialog ( )),  m_tb_tool, "goto" );
 	new QToolButton ( Resource::loadIconSet ( "forward" ),     tr( "Next page" ),     QString::null, this, SLOT( nextPage ( )),  m_tb_tool, "next" );
 	new QToolButton ( Resource::loadIconSet ( "fastforward" ), tr( "Last page" ),     QString::null, this, SLOT( lastPage ( )),  m_tb_tool, "last" );
 
-	m_tb_find = new QToolBar ( this );
+	m_tb_find = new QPEToolBar ( this );
 	addToolBar ( m_tb_find, "Search", QMainWindow::Top, true );
 	m_tb_find-> setHorizontalStretchable ( true );
 	m_tb_find-> hide ( );
 
 	m_findedit = new QLineEdit ( m_tb_find, "findedit" );
 	m_tb_find-> setStretchableWidget ( m_findedit );
 	connect ( m_findedit, SIGNAL( textChanged ( const QString & )), this, SLOT( findText ( const QString & )));
 
diff --git a/noncore/unsupported/qpdf/qpdf.h b/noncore/unsupported/qpdf/qpdf.h
index 8b3cff9..fd4f013 100644
--- a/noncore/unsupported/qpdf/qpdf.h
+++ b/noncore/unsupported/qpdf/qpdf.h
@@ -1,16 +1,16 @@
 #ifndef __QPDF_H__
 #define __QPDF_H__
 
 #include "aconf.h"
 
 #include <qmainwindow.h>
 
-#define QPDF_QPE_ONLY 1 // ofileselector does not work right currently
+//#define QPDF_QPE_ONLY 1
 
 class QPEOutputDev;
 class PDFDoc;
 
 class DocLnk;
 class FileSelector;
 class OFileSelector;
 class QWidgetStack;