1 files changed, 3 insertions, 3 deletions

diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/multimedia/showimg/showimg.h
index da4c0b6..9cf9bfd 100644
--- a/noncore/multimedia/showimg/showimg.h
+++ b/noncore/multimedia/showimg/showimg.h
@@ -1,85 +1,85 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef SHOWIMG_H
 #define SHOWIMG_H
 
 #include <qwidget.h>
 #include <qmainwindow.h>
 #include <qimage.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qscrollview.h>
 #include <qdialog.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 #include <qwmatrix.h>
 
 
 class QAction;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
 class QPopupMenu;
 class QWidgetStack;
 class FileSelector;
 class DocLnk;
 class QLabel;
 class QAction;
 class QSpinBox;
 class ImageFileSelector;
 class QTimer;
 
 
 class ImageWidget : public QWidget
 {
     Q_OBJECT
  public:
     ImageWidget( QWidget *parent=0 )
         : QWidget( parent )   {
         setBackgroundMode(NoBackground);        
     }
     ~ImageWidget() {  }
 
     void setPixmap( const QPixmap &pm )  {
         pixmap = pm;
         show();
     }
 
 signals:
     void clicked();
 
 protected:
     void paintEvent( QPaintEvent * );
     void mouseReleaseEvent(QMouseEvent* event);
 
 private:
     QPixmap pixmap;
 };
 
 class InfoDialog:public QDialog
 {
     Q_OBJECT
 
 public:
 
     static void displayInfo(const QString &caption, const QStringList text, QWidget *parent); 
 
 private:
 
@@ -203,87 +203,87 @@ private:
     void updateImageInfo(QString &filePath);
     void switchToFileSelector();
     void switchToImageView();
 
     void updateImage();
 
 private slots:
 
     void slideShow( bool on );
     void help(); 
     void slideUpdate();
     bool nextImage();
     bool prevImage();
     void settings();
 
     void switchThumbView();
     void switchSizeToScreen();
     void setDocument(const QString& fileref);
     void doDelayedLoad();
     void openFile( const DocLnk &file );
     void openFile();
     void open();
     void closeFileSelector();
     void hFlip();
     void vFlip();
     void rot180();
     void rot90();
     void rot270();
     void normalView();
     void fullScreen();
     void stopSlideShow();
     void blackAndWhite();
     void displayInfoDialog();
     void displayControlsDialog();
 private:
     QWMatrix matrix;
     bool rotated90;
     enum MENU_ITEMS  {
         SHOW_THUMBNAILS,
         SIZE_TO_SCREEN,
         BLACKANDWHITE
     };
 
     QString filename;
     QString delayLoad;
     QImage image;           // the loaded image
     QPixmap pm;         // the converted pixmap
     QPixmap pmScaled;       // the scaled pixmap
-    QPEToolBar  *toolBar;
-    QPEToolBar  *iconToolBar;
+    QToolBar  *toolBar;
+    QToolBar  *iconToolBar;
     QMenuBar  *menuBar;
     QMenuBar  *current;
 
 
     QPopupMenu  *fileMenuFile;
     QPopupMenu  *viewMenuFile;
     QPopupMenu  *optionsMenuFile;
     QPopupMenu  *fileMenuView;
     QPopupMenu  *viewMenuView;
 
     QAction     *sss;                // scale to screen size
 
     QLabel      *lab;
     ImagePane *imagePanel;
     QWidgetStack *stack;
     //FileSelector *fileSelector;
     ImageFileSelector *fileSelector;
     bool isFullScreen;
     bool isSized;                   // true if image is to be resized to fit the window size
     bool bFromDocView;              // a flag to indicate whether or not we were 
                                     // launched from the document view...
 
     int slideDelay;
     bool slideRepeat;
     bool slideReverse;      // show slideshow in reverse order
     bool rotateOnLoad;      // rotate by 90 degrees on loading
     bool fastLoad;
     QTimer *slideTimer;
     QValueList<DocLnk> imageList;
     QAction *slideAction;
     
 
     QString imageInfo[LAST];
 };
 
 
 #endif // SHOWIMG_H