-QFileDialog is not used in opentext.cpp so remove it from its header file

-Help Window eventually uses QFileDialog, better include it then as well...

2 files changed, 4 insertions, 3 deletions

diff --git a/noncore/apps/opie-gutenbrowser/helpwindow.cpp b/noncore/apps/opie-gutenbrowser/helpwindow.cpp
index ffdc9f0..57b1e74 100644
--- a/noncore/apps/opie-gutenbrowser/helpwindow.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpwindow.cpp
@@ -1,116 +1,120 @@
 /****************************************************************************
 ** $Id$
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
     copyright            : (C) 2000 -2004 by llornkcor
     email                : ljp@llornkcor.com
 *****************************************************************************/
 
 #include "helpwindow.h"
 #include <qstatusbar.h>
 
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qcombobox.h>
 
+#ifndef QT_NO_FILEDIALOG
+#include <qfiledialog.h>
+#endif
+
 #include <ctype.h>
 
 HelpWindow::HelpWindow( const QString& home_, const QString&, QWidget* parent, const char *name )
     : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL()
 {
    QString local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
 //        readHistory();
 //        readBookmarks();
 
     browser = new QTextBrowser( this );
     QStringList Strlist;
     Strlist.append( home_);
     browser->mimeSourceFactory()->setFilePath( Strlist );
 
     browser->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 
     connect(browser,SIGNAL(textChanged()),this,SLOT(textChanged()));
 
     setCentralWidget( browser );
 
     if ( !home_.isEmpty() )
 
 ////////////////////////////////
         browser->setSource( home_ );
 
 ////////////////////////////////
     connect( browser, SIGNAL( highlighted( const QString&) ),
        statusBar(), SLOT( message( const QString&)) );
 
 //    resize( 640,600 );
 #ifdef Q_WS_QWS
     setGeometry( 0,0,236,280);
 #else
     setGeometry( 10,30,520,420 );
 //  resize(520,420);
 #endif
 
     QPopupMenu* file = new QPopupMenu( this );
 //    file->insertItem( tr("&New Window"), this, SLOT( newWindow() ), ALT | Key_N );
     file->insertItem( tr("&Open File"), this, SLOT( openFile() ), ALT | Key_O );
 //    file->insertItem( tr("&Print"), this, SLOT( print() ), ALT | Key_P );
     file->insertSeparator();
     file->insertItem( tr("&Close"), this, SLOT( close() ), ALT | Key_Q );
 //    file->insertItem( tr("E&xit"), qApp, SLOT( closeAllWindows() ), ALT | Key_X );
 
     // The same three icons are used twice each.
 ////F FIXME
     QString pixs=(QDir::homeDirPath ()) +"/Applications/gutenbrowser/pix/";
     QIconSet icon_back( QPixmap(pixs+"back.png") );
     QIconSet icon_forward( QPixmap(pixs+"forward.png") );
     QIconSet icon_home( QPixmap(pixs+"home.png") );
 
     QPopupMenu* go = new QPopupMenu( this );
     backwardId = go->insertItem( icon_back, tr("&Backward"), browser, SLOT( backward() ), ALT | Key_Left );
     forwardId = go->insertItem( icon_forward, tr("&Forward"), browser, SLOT( forward() ), ALT | Key_Right );
     go->insertItem( icon_home, tr("&Home"), browser, SLOT( home() ) );
 
 //      QPopupMenu* help = new QPopupMenu( this );
 //      help->insertItem( tr("&About ..."), this, SLOT( about() ) );
 //    help->insertItem( tr("About &Qt ..."), this, SLOT( aboutQt() ) );
 
 
     hist = new QPopupMenu( this );
     QStringList::Iterator it = history.begin();
     for ( ; it != history.end(); ++it )
   mHistory[ hist->insertItem( *it ) ] = *it;
     connect( hist, SIGNAL( activated( int ) ), this, SLOT( histChosen( int ) ) );
 
     bookm = new QPopupMenu( this );
     bookm->insertItem( tr( "Add Bookmark" ), this, SLOT( addBookmark() ) );
     bookm->insertSeparator();
 
     QStringList::Iterator it2 = bookmarks.begin();
     for ( ; it2 != bookmarks.end(); ++it2 )
   mBookmarks[ bookm->insertItem( *it2 ) ] = *it2;
     connect( bookm, SIGNAL( activated( int ) ),
        this, SLOT( bookmChosen( int ) ) );
 
     menuBar()->insertItem( tr("&File"), file );
     menuBar()->insertItem( tr("&Go"), go );
     menuBar()->insertItem( tr( "History" ), hist );
     menuBar()->insertItem( tr( "Bookmarks" ), bookm );
 //      menuBar()->insertSeparator();
 //      menuBar()->insertItem( tr("&Help"), help );
 
     menuBar()->setItemEnabled( forwardId, FALSE);
     menuBar()->setItemEnabled( backwardId, FALSE);
     connect( browser, SIGNAL( backwardAvailable( bool ) ), this, SLOT( setBackwardAvailable( bool ) ) );
     connect( browser, SIGNAL( forwardAvailable( bool ) ), this, SLOT( setForwardAvailable( bool ) ) );
 
 
     QToolBar* toolbar = new QToolBar( this );
     addToolBar( toolbar, "Toolbar");
     QToolButton* button;
 
     button = new QToolButton( icon_back, tr("Backward"), "", browser, SLOT(backward()), toolbar );
diff --git a/noncore/apps/opie-gutenbrowser/openetext.h b/noncore/apps/opie-gutenbrowser/openetext.h
index 6db71c4..ecc0bbd 100644
--- a/noncore/apps/opie-gutenbrowser/openetext.h
+++ b/noncore/apps/opie-gutenbrowser/openetext.h
@@ -1,82 +1,79 @@
 /***************************************************************************
                           openetext.h  -  description
                              -------------------
     begin                : Tue Jul 25 2000
     copyright            : (C) 2000 -2004 by llornkcor
     email                : ljp@llornkcor.com
  ***************************************************************************/
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef OPENETEXT_H
 #define OPENETEXT_H
 #include "gutenbrowser.h"
 #include <qdialog.h>
 #include <qstringlist.h> 
-#ifndef Q_WS_QWS
-#include <qfiledialog.h>
-#endif
 //#include <fileselector.h>
 #include <qlabel.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qstrlist.h>
 #include <qwidget.h>
 //#include "CConfigFile.h"
 
 /**
   *@author llornkcor
   */
 
 class OpenEtext : public QDialog  {
    Q_OBJECT
 public: 
   OpenEtext(QWidget *parent, QString name);
   ~OpenEtext();
 
     QPushButton* RemoveButton, * OpenFileButton, * OpenButton, *scanButton, *editButton; 
   void getTitles();
     QString title;
   QString file;
   QString selFile;
   QString s_numofFiles;
   QString fileName;
   QString name;
   QString openFileTitle;
   QStringList fileList;
   QString  local_library;
   QString  local_index;
   QString title_text;
   void remFile();
     void removeSelection();
     QString titleFromLibrary( const QString fileName);
     bool FindTitle( const QString filename);
     bool checkConf();
 //    CConfigFile *config;
 
 protected: 
 
     void initDialog();
   QListBox *QListBox_1;
   QPushButton *QPushButton_OK;
   QPushButton *QPushButton_Cancel;
   QLabel *QLabel_1;
 
 private:
 private slots:
 
   virtual void select_title(int index );
   virtual void remove();
   virtual void scan();
   virtual void open();
   virtual void OpenTitle();
   virtual void editTitle();
 };
 
 #endif