backout the QTool/MenuBar changes ... the bug is in libqpe

1 files changed, 3 insertions, 3 deletions

diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp
index e78f081..61f097b 100644
--- a/noncore/unsupported/qpdf/qpdf.cpp
+++ b/noncore/unsupported/qpdf/qpdf.cpp
@@ -96,13 +96,13 @@ QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
         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 QPEMenuBar ( m_tb_menu );
+        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 );
 
@@ -115,13 +115,13 @@ QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
         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 QPEToolBar ( this );
+        m_tb_tool = new QToolBar ( 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 ( );
@@ -131,13 +131,13 @@ QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
         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 QPEToolBar ( this );
+        m_tb_find = new QToolBar ( 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 );