Port to xpdf 1.01

1 files changed, 12 insertions, 1 deletions

diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp
index 6c268ec..f338509 100644
--- a/noncore/unsupported/qpdf/qpdf.cpp
+++ b/noncore/unsupported/qpdf/qpdf.cpp
@@ -13,18 +13,18 @@
 
 #include "QPEOutputDev.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
-#include <qpe/fileselector.h>
 #include <qpe/qcopenvelope_qws.h>
 
 
 #include <qclipboard.h>
 #include <qtoolbar.h>
+#include <qtoolbutton.h>
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qwidgetstack.h>
 #include <qtimer.h>
 #include <qfileinfo.h>
 #include <qstring.h>
@@ -34,12 +34,18 @@
 #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
@@ -78,13 +84,18 @@ QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
 	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 );