summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/qpdf/qpdf.cpp10
-rw-r--r--noncore/unsupported/qpdf/qpdf.h2
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
@@ -19,11 +19,11 @@
#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>
@@ -98,9 +98,9 @@ QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
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 );
@@ -117,9 +117,9 @@ QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
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" );
@@ -133,9 +133,9 @@ QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
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 ( );
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
@@ -4,9 +4,9 @@
#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;