fix includes

28 files changed, 1 insertions, 74 deletions

diff --git a/library/alarmserver.cpp b/library/alarmserver.cpp
index 6f6f32d..48ab9c1 100644
--- a/library/alarmserver.cpp
+++ b/library/alarmserver.cpp
@@ -1,77 +1,72 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #include <qdir.h>
-#include <qfile.h>
-#include <qmessagebox.h>
-#include <qtextstream.h>
 
 
 #include <qpe/qpeapplication.h>
-#include "global.h"
-#include "resource.h"
 
 #include <qpe/qcopenvelope_qws.h>
 #include "alarmserver.h"
 #include <qpe/timeconversion.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 
 
 #undef USE_ATD   // not used anymore -- we run opie-alarm on suspend/resume
 
 
 struct timerEventItem
 {
         time_t UTCtime;
         QCString channel, message;
         int data;
         bool operator==( const timerEventItem &right ) const
         {
                 return ( UTCtime == right.UTCtime
                          && channel == right.channel
                          && message == right.message
                          && data == right.data );
         }
 };
 
 class TimerReceiverObject : public QObject
 {
 public:
         TimerReceiverObject()
         { }
         ~TimerReceiverObject()
         { }
         void resetTimer();
         void setTimerEventItem();
         void deleteTimer();
 protected:
         void timerEvent( QTimerEvent *te );
 
 #ifdef USE_ATD
 private:
         QString atfilename;
 #endif
 };
 
diff --git a/library/applnk.cpp b/library/applnk.cpp
index 8763eb2..9c60f1a 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -1,89 +1,85 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_MIMEEXT
 #define QTOPIA_INTERNAL_PRELOADACCESS
 #define QTOPIA_INTERNAL_APPLNKASSIGN
 
 #include "applnk.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/global.h>
 #include <qpe/mimetype.h>
 #include <qpe/config.h>
 #include <qpe/storage.h>
 #include <qpe/resource.h>
 
-#include <qdict.h>
 #include <qdir.h>
-#include <qregexp.h>
 
-#include <qgfx_qws.h>
 
 #include <stdlib.h>
 
 int AppLnk::lastId = 5000;
 
 static int smallSize = 14;
 static int bigSize = 32;
 
 static QString safeFileName(const QString& n)
 {
  QString safename=n;
     safename.replace(QRegExp("[^0-9A-Za-z.]"),"_");
     safename.replace(QRegExp("^[^A-Za-z]*"),"");
     if ( safename.isEmpty() )
   safename = "_";
     return safename;
 }
 
 static bool prepareDirectories(const QString& lf)
 {
     if ( !QFile::exists(lf) ) {
   // May need to create directories
   QFileInfo fi(lf);
   if ( system(("mkdir -p "+fi.dirPath(TRUE))) )
       return FALSE;
     }
     return TRUE;
 }
 
 class AppLnkPrivate
 {
 public:
     /* the size of the Pixmap */
     enum Size {Normal = 0, Big };
     AppLnkPrivate() {
         /* we want one normal and one big item */
 
         QPixmap pix;
         mPixmaps.insert(0, pix );
         mPixmaps.insert(1,  pix);
     }
 
     QStringList mCatList; // always correct
     QArray<int> mCat; // cached value; correct if not empty
     QMap<int,  QPixmap> mPixmaps;
 
     void updateCatListFromArray()
     {
diff --git a/library/categoryedit_p.cpp b/library/categoryedit_p.cpp
index 9321259..14ac2e1 100644
--- a/library/categoryedit_p.cpp
+++ b/library/categoryedit_p.cpp
@@ -1,78 +1,75 @@
 /**********************************************************************
 ** Copyright (C) 2001 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.
 **
 **********************************************************************/
 
 #include "categoryedit_p.h"
 
 #include <qpe/categories.h>
 
 #include <qdir.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
-#include <qlistview.h>
-#include <qstringlist.h>
-#include <qtoolbutton.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <stdlib.h>
 
 
 using namespace Qtopia;
 
 class CategoryEditPrivate
 {
 public:
     CategoryEditPrivate( QWidget *parent, const QString &appName )
         : mCategories( parent, "" ),
           mStrApp( appName )
     {
         editItem = 0;
         mCategories.load( categoryFileName() );
     }
     Categories mCategories;
     QListViewItem *editItem;
     QString mStrApp;
     QString mVisible;
 };
 
 CategoryEdit::CategoryEdit( QWidget *parent, const char *name )
     : CategoryEditBase( parent, name )
 {
     d = 0;
 }
 
 CategoryEdit::CategoryEdit( const QArray<int> &recCats,
                             const QString &appName, const QString &visibleName,
                             QWidget *parent, const char *name )
     : CategoryEditBase( parent, name )
 {
     d = 0;
     setCategories( recCats, appName, visibleName );
 }
 
 void CategoryEdit::setCategories( const QArray<int> &recCats,
                                   const QString &appName, const QString &visibleName )
 {
     if ( !d )
         d = new CategoryEditPrivate( (QWidget*)parent(), name()  );
     d->mStrApp = appName;
     d->mVisible = visibleName;
 
diff --git a/library/categorymenu.cpp b/library/categorymenu.cpp
index 5d7adf7..9bbb448 100644
--- a/library/categorymenu.cpp
+++ b/library/categorymenu.cpp
@@ -1,73 +1,71 @@
 /**********************************************************************
 ** Copyright (C) 2001 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.
 **
 **********************************************************************/
 
 #include "categorymenu.h"
 #include "backend/categories.h"
 #include "categoryselect.h"
-#include <qstring.h>
-#include <qmap.h>
 
 /*!
   \class CategoryMenu
   \brief The CategoryMenu widget aids in filtering records or files by Category.
 
   The CategoryMenu widget provides a popup menu that will make filtering records
   or files by category much easier.  The widget will lookup the available
   categories for an application, populate the menu, and keep a track of which
   categories are being filtered against.  A set of categories can be tested
   by the isSelected() function to see if a record or file containing those
   categories would be allowed through by the filter.
 
   \warning Currently this class is not suitable for extending.
 
   \ingroup qtopiaemb
 */
 
 /*!
   \fn void CategoryMenu::categoryChange()
   This signal is emitted when the user selects a different category in the
   menu, hence changing what records or files should be selected.
 */
 
 /*!
   Creates a new CategoryMenu with \a parent and \a name.  The menu will be
   populated with the available categories for \a application.
 
   If \a globals is TRUE then it will also poplulate the menu with the
   global categories.
 */
 CategoryMenu::CategoryMenu( const QString &n, bool ig = TRUE,
         QWidget *parent, const char *name ) :
     QPopupMenu(parent, name),
         appName(n),
         includeGlobal(ig)
 {
     currentMid = 1;
     reload();
     connect(this, SIGNAL(activated(int)), this, SLOT(mapMenuId(int)));
 }
 
 /*!
   Destroys a CategoryMenu.
 */
 CategoryMenu::~CategoryMenu( )
 {
 }
 
diff --git a/library/config.cpp b/library/config.cpp
index b28c771..8b60f60 100644
--- a/library/config.cpp
+++ b/library/config.cpp
@@ -1,71 +1,69 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
 #include <qmessagebox.h>
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include <qtextcodec.h>
 #endif
 #include <qtextstream.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #define QTOPIA_INTERNAL_LANGLIST
 #include "config.h"
 #include "global.h"
 
 
 /*!
   \internal
 */
 QString Config::configFilename(const QString& name, Domain d)
 {
     switch (d) {
         case File:
             return name;
         case User: {
             QDir dir = (QString(getenv("HOME")) + "/Settings");
             if ( !dir.exists() )
                 mkdir(dir.path().local8Bit(),0700);
             return dir.path() + "/" + name + ".conf";
         }
     }
     return name;
 }
 
 /*!
   \class Config config.h
   \brief The Config class provides for saving application cofniguration state.
 
   You should keep a Config in existence only while you do not want others
   to be able to change the state. There is no locking currently, but there
   may be in the future.
 */
 
 /*!
   \enum Config::ConfigGroup
   \internal
 */
diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp
index 188d8e1..e4ec2bf 100644
--- a/library/datebookdb.cpp
+++ b/library/datebookdb.cpp
@@ -1,81 +1,76 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include <qasciidict.h>
-#include <qfile.h>
 #include <qmessagebox.h>
-#include <qstring.h>
-#include <qtextcodec.h>
-#include <qtextstream.h>
 #include <qtl.h>
 
 #include <qpe/alarmserver.h>
 #include <qpe/global.h>
 #include "datebookdb.h"
 #include <qpe/stringutil.h>
-#include <qpe/timeconversion.h>
 
 #include <errno.h>
 #include <stdlib.h>
 
 
 class DateBookDBPrivate
 {
 public:
     bool clean;  // indcate whether we need to write to disk...
 };
 
 
 // Helper functions
 
 static QString dateBookJournalFile()
 {
     QString str = getenv("HOME");
     return QString( str +"/.caljournal" );
 }
 
 static QString dateBookFilename()
 {
     return Global::applicationFileName("datebook","datebook.xml");
 }
 
 /* Calculating the next event of a recuring event is actually
    computationally inexpensive, esp. compared to checking each day
    individually.  There are bad worse cases for say the 29th of
    february or the 31st of some other months.  However
    these are still bounded */
 bool nextOccurance(const Event &e, const QDate &from, QDateTime &next)
 {
     // easy checks, first are we too far in the future or too far in the past?
     QDate tmpDate;
     int freq = e.repeatPattern().frequency;
     int diff, diff2, a;
     int iday, imonth, iyear;
     int dayOfWeek = 0;
     int firstOfWeek = 0;
     int weekOfMonth;
 
 
     if (e.repeatPattern().hasEndDate && e.repeatPattern().endDate() < from)
         return FALSE;
 
     if (e.start() >= from) {
         next = e.start();
         return TRUE;
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index 728045f..76e022f 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -1,81 +1,76 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 #include "config.h"
 #include "datebookmonth.h"
 #include "datebookdb.h"
-#include <qtopia/private/event.h>
 #include "resource.h"
 #include <qpe/qpeapplication.h>
-#include "timestring.h"
 
 #include <qtoolbutton.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
-#include <qdatetime.h>
-#include <qpainter.h>
-#include <qpopupmenu.h>
 #include <qvaluestack.h>
 #include <qwhatsthis.h>
 
 
 DateBookMonthHeader::DateBookMonthHeader( QWidget *parent, const char *name )
     : QHBox( parent, name )
 {
     setBackgroundMode( PaletteButton );
 
     begin = new QToolButton( this );
     begin->setFocusPolicy(NoFocus);
     begin->setPixmap( Resource::loadPixmap( "start" ) );
     begin->setAutoRaise( TRUE );
     begin->setFixedSize( begin->sizeHint() );
     QWhatsThis::add( begin, tr("Show January in the selected year") );
 
     back = new QToolButton( this );
     back->setFocusPolicy(NoFocus);
     back->setPixmap( Resource::loadPixmap( "back" ) );
     back->setAutoRaise( TRUE );
     back->setFixedSize( back->sizeHint() );
     QWhatsThis::add( back, tr("Show the previous month") );
 
     month = new QComboBox( FALSE, this );
     for ( int i = 0; i < 12; ++i )
         month->insertItem( Calendar::nameOfMonth( i + 1 ) );
 
     year = new QSpinBox( 1752, 8000, 1, this );
 
     next = new QToolButton( this );
     next->setFocusPolicy(NoFocus);
     next->setPixmap( Resource::loadPixmap( "forward" ) );
     next->setAutoRaise( TRUE );
     next->setFixedSize( next->sizeHint() );
     QWhatsThis::add( next, tr("Show the next month") );
 
     end = new QToolButton( this );
     end->setFocusPolicy(NoFocus);
     end->setPixmap( Resource::loadPixmap( "finish" ) );
     end->setAutoRaise( TRUE );
     end->setFixedSize( end->sizeHint() );
     QWhatsThis::add( end, tr("Show December in the selected year") );
 
     connect( month, SIGNAL( activated( int ) ),
              this, SLOT( updateDate() ) );
     connect( year, SIGNAL( valueChanged( int ) ),
              this, SLOT( updateDate() ) );
     connect( begin, SIGNAL( clicked() ),
diff --git a/library/filemanager.cpp b/library/filemanager.cpp
index 408be20..1e7384e 100644
--- a/library/filemanager.cpp
+++ b/library/filemanager.cpp
@@ -1,75 +1,72 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #include "filemanager.h"
 #include "applnk.h"
 
-#include <qdir.h>
-#include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
-#include <qtextcodec.h>
 
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #ifdef Q_OS_MACX
 // MacOS X does not have sendfile.. :(
 // But maybe in the future.. !?
 #  ifdef SENDFILE
 #    include <sys/types.h>
 #    include <sys/socket.h>
 #  endif
 #else
 #  include <sys/sendfile.h>
 #endif /* Q_OS_MACX */
 #include <fcntl.h>
 
 /*!
   \class FileManager
   \brief The FileManager class assists with AppLnk input/output.
 */
 
 /*!
   Constructs a FileManager.
 */
 FileManager::FileManager()
 {
 }
 
 /*!
   Destroys a FileManager.
 */
 FileManager::~FileManager()
 {
 
 }
 
 /*!
   Saves \a data as the document specified by \a f.
 
   Returns whether the operation succeeded.
 */
 bool FileManager::saveFile( const DocLnk &f, const QByteArray &data )
 {
  QString fn = f.file() + ".new";
     ensurePathExists( fn );
     QFile fl( fn );
diff --git a/library/fileselector.cpp b/library/fileselector.cpp
index 4039243..7c29aba 100644
--- a/library/fileselector.cpp
+++ b/library/fileselector.cpp
@@ -1,83 +1,81 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
 //      have this class.
 #define QTOPIA_INTERNAL_FSLP
 
 #include "fileselector.h"
 #include "fileselector_p.h"
 #include "global.h"
 #include "resource.h"
 #include "config.h"
-#include "applnk.h"
 #include "storage.h"
 #include "qpemenubar.h"
 #include <qcopchannel_qws.h>
 #include "lnkproperties.h"
-#include "applnk.h"
 #include <qpe/qpeapplication.h>
 #include "categorymenu.h"
 #include "categoryselect.h"
 #include "mimetype.h"
 #include <qpe/categories.h>
 
 #include <stdlib.h>
 
 #include <qdir.h>
 #include <qwidget.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qheader.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 
 class TypeCombo : public QComboBox
 {
     Q_OBJECT
 public:
     TypeCombo( QWidget *parent, const char *name=0 )
         : QComboBox( parent, name )
     {
         connect( this, SIGNAL(activated(int)), this, SLOT(selectType(int)) );
     }
 
     void reread( DocLnkSet &files, const QString &filter );
 
 signals:
     void selected( const QString & );
 
 protected slots:
     void selectType( int idx ) {
         emit selected( typelist[idx] );
     }
 
 protected:
     QStringList typelist;
     QString prev;
 };
 
 void TypeCombo::reread( DocLnkSet &files, const QString &filter )
 {
     typelist.clear();
     QStringList filters = QStringList::split( ';', filter );
     int pos = filter.find( '/' );
     //### do for each filter
diff --git a/library/finddialog.cpp b/library/finddialog.cpp
index ddf41a7..64487c9 100644
--- a/library/finddialog.cpp
+++ b/library/finddialog.cpp
@@ -1,77 +1,76 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
 //      have this class.
 #define QTOPIA_INTERNAL_FD
 
 #include "finddialog.h"
 #include "findwidget_p.h"
 
 #include <qlayout.h>
-#include <qpushbutton.h>
 
 /*!
   \class FindDialog finddialog.h
   \brief A simple FindDialog
 
   A find dialog. FIXME!!!!
 
 */
 FindDialog::FindDialog( const QString &appName, QWidget *parent,
                         const char *name, bool modal )
     : QDialog( parent, name, modal )
 {
     setCaption( tr("Find") );
     QVBoxLayout *vb;
     vb = new QVBoxLayout( this );
     fw = new FindWidget( appName, this, "Find Widget" );
     vb->addWidget( fw );
     QObject::connect( fw, SIGNAL(signalFindClicked(const QString&,
                                                    bool,bool,int)),
                       this, SIGNAL(signalFindClicked(const QString&,
                                                      bool,bool,int)) );
     QObject::connect( fw, SIGNAL(signalFindClicked(const QString&,const QDate&,
                                                    bool,bool,int)),
                       this, SIGNAL(signalFindClicked(const QString&,
                                                      const QDate&,bool,bool,int)) );
     d = 0;
 }
 
 FindDialog::~FindDialog()
 {
 }
 
 QString FindDialog::findText() const
 {
     return fw->findText();
 }
 
 void FindDialog::setUseDate( bool show )
 {
     fw->setUseDate( show );
 }
 
 void FindDialog::setDate( const QDate &dt )
 {
     fw->setDate( dt );
 }
 
 void FindDialog::slotNotFound()
diff --git a/library/findwidget_p.cpp b/library/findwidget_p.cpp
index 287e125..e91d789 100644
--- a/library/findwidget_p.cpp
+++ b/library/findwidget_p.cpp
@@ -1,82 +1,76 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #include "findwidget_p.h"
 
-#include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 #include <qpe/datebookmonth.h>
-#include <qpe/timestring.h>
 
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <qmessagebox.h>
-#include <qpushbutton.h>
-#include <qpopupmenu.h>
-#include <qtoolbutton.h>
 
 FindWidget::FindWidget( const QString &appName, QWidget *parent,
                         const char *name )
     : FindWidgetBase( parent, name ),
       mStrApp( appName ),
       mDate( QDate::currentDate() )
 {
     setMaximumSize( sizeHint() );
     QArray<int> vl(0);
     cmbCat->setCategories( vl, mStrApp );
     cmbCat->setRemoveCategoryEdit( TRUE );
     cmbCat->setAllCategories( TRUE );
     // hide junk for the moment...
     lblStartDate->hide();
     cmdStartDate->hide();
     QPopupMenu *m1 = new QPopupMenu( this );
     dtPicker = new DateBookMonth( m1, 0, TRUE );
     dtPicker->setDate( mDate.year(), mDate.month(), mDate.day() );
     m1->insertItem( dtPicker );
     cmdStartDate->setPopup( m1 );
     cmdStartDate->setText( TimeString::shortDate(mDate) );
     QObject::connect( dtPicker, SIGNAL(dateClicked(int, int, int)),
                       this, SLOT(slotDateChanged(int, int, int)) );
 
     QObject::connect( cmdFind, SIGNAL(clicked()),
                       this, SLOT(slotFindClicked()) );
 }
 
 FindWidget::~FindWidget()
 {
 }
 
 QString FindWidget::findText() const
 {
     return txtFind->text();
 }
 
 void FindWidget::slotFindClicked()
 {
     lblStatus->setText( "" );
     if ( cmdStartDate->isVisible() )
         emit signalFindClicked( findText(),
                                 mDate,
                                 chkCase->isChecked(),
                                 chkBackwards->isChecked(),
                                 cmbCat->currentCategory() );
     else
         emit signalFindClicked( findText(), chkCase->isChecked(),
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp
index 2ad8e95..d94e338 100644
--- a/library/fontdatabase.cpp
+++ b/library/fontdatabase.cpp
@@ -1,77 +1,75 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #include <qpe/qpeapplication.h>
-#include "fontfactoryinterface.h"
 #include "fontdatabase.h"
 
 #include <qpe/qlibrary.h>
 
 #include <qfontmanager_qws.h>
 #include <qdir.h>
-#include <qdict.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 static QString fontDir()
 {
     QString qtdir = getenv("QTDIR");
     if ( qtdir.isEmpty() ) qtdir = "/usr/local/qt-embedded";
     return qtdir+"/lib/fonts/";
 }
 
 #ifdef QT_NO_FONTDATABASE
 static QString fontFamily( const QString& key )
 {
     int u0 = key.find('_');
     int u1 = key.find('_',u0+1);
     int u2 = key.find('_',u1+1);
     QString family = key.left(u0);
     //int pointSize = key.mid(u0+1,u1-u0-1).toInt();
     //int weight = key.mid(u1+1,u2-u1-1).toInt();
     //bool italic = key.mid(u2-1,1) == "i";
     // #### ignores _t and _I fields
     return family;
 }
 #endif
 
 
 QValueList<FontFactory> *FontDatabase::factoryList = 0;
 /*!
   \class FontDatabase fontdatabase.h
   \brief The FontDatabase class provides information about available fonts.
 
   Most often you will simply want to query the database for the
   available font families().
 
   Use FontDatabase rather than QFontDatabase when you may need access
   to fonts that are not normally available. For example, if the
   freetype library and the Qtopia freetype plugin are installed,
   TrueType fonts will be available to your application. Font renderer
   plugins have greater resource requirements than system fonts so they
   should be used only when necessary. You can force the loading of
   font renderer plugins with loadRenderers().
 
   \ingroup qtopiaemb
 */
 
 /*!
   Constructs a FontDatabase object.
 */
diff --git a/library/global.cpp b/library/global.cpp
index a627348..5ac969b 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -1,99 +1,97 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 #define QTOPIA_INTERNAL_LANGLIST
 #include <qpe/qpedebug.h>
 #include <qpe/global.h>
 #include <qpe/qdawg.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 
-#include <qfile.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qmap.h>
 #include <qdict.h>
 #include <qdir.h>
 #include <qmessagebox.h>
 #include <qregexp.h>
 
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 
 #include <qwindowsystem_qws.h> // for qwsServer
 #include <qdatetime.h>
 
-#include <qfile.h>
 
 //#include "quickexec_p.h"
 
 class Emitter : public QObject {
     Q_OBJECT
 public:
     Emitter( QWidget* receiver, const QString& document )
     {
     connect(this, SIGNAL(setDocument(const QString&)),
         receiver, SLOT(setDocument(const QString&)));
     emit setDocument(document);
     disconnect(this, SIGNAL(setDocument(const QString&)),
            receiver, SLOT(setDocument(const QString&)));
     }
 
 signals:
     void setDocument(const QString&);
 };
 
 
 class StartingAppList : public QObject {
     Q_OBJECT
 public:
     static void add( const QString& name );
     static bool isStarting( const QString name );
 private slots:
     void handleNewChannel( const QString &);
 private:
     StartingAppList( QObject *parent=0, const char* name=0 ) ;
 
     QDict<QTime> dict;
     static StartingAppList *appl;
 };
 
 StartingAppList* StartingAppList::appl = 0;
 
 StartingAppList::StartingAppList( QObject *parent, const char* name )
     :QObject( parent, name )
 {
 #if QT_VERSION >= 232 && defined(QWS)
     connect( qwsServer, SIGNAL( newChannel(const QString&)),
          this, SLOT( handleNewChannel(const QString&)) );
 #endif
     dict.setAutoDelete( TRUE );
 }
 
 void StartingAppList::add( const QString& name )
 {
diff --git a/library/imageedit.cpp b/library/imageedit.cpp
index caa538a..3a559f4 100644
--- a/library/imageedit.cpp
+++ b/library/imageedit.cpp
@@ -1,69 +1,68 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 #include "imageedit.h"
-#include <qpainter.h>
 
 ImageEdit::ImageEdit( QWidget *parent, const char *name)
     : QScrollView( parent, name, WNorthWestGravity | WResizeNoErase ), buffer()
 {
     buffer.resize( size() );
     buffer.fill( colorGroup().color( QColorGroup::Base ) );
 }
 
 ImageEdit::~ImageEdit()
 {
     
 }
 
 void ImageEdit::contentsMousePressEvent( QMouseEvent *e )
 {
     lastPos = e->pos();
 }
 
 void ImageEdit::contentsMouseMoveEvent( QMouseEvent *e )
 {
     QPainter pw( viewport() );
     QPainter pb( &buffer );
     pb.drawLine( lastPos, e->pos() );
     pw.drawLine( contentsToViewport( lastPos ),
                  contentsToViewport( e->pos() ) );
     lastPos = e->pos();
 }
 
 void ImageEdit::contentsMouseReleaseEvent( QMouseEvent * )
 {
 }
 
 void ImageEdit::viewportResizeEvent( QResizeEvent *e )
 {
     enlargeBuffer(e->size());
 }
 
 void ImageEdit::enlargeBuffer( const QSize& sz )
 {
     QSize osz = buffer.size();
     QSize nsz( QMAX( osz.width(), sz.width() ), QMAX( osz.height(), sz.height() ) );
     buffer.resize( nsz.width(), nsz.height() );
     // clear new area
     QPainter p( &buffer );
     if ( sz.width() > osz.width() )
         p.fillRect( osz.width(), 0, sz.width() - osz.width(), nsz.height(), colorGroup().color( QColorGroup::Base ) );
     if ( sz.height() > osz.height() )
         p.fillRect( 0, osz.height(), nsz.width(), sz.height() - osz.height(), colorGroup().color( QColorGroup::Base ) );
diff --git a/library/ir.cpp b/library/ir.cpp
index b5b726d..32c0925 100644
--- a/library/ir.cpp
+++ b/library/ir.cpp
@@ -1,73 +1,71 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #include "ir.h"
 
-#include <qstring.h>
 #include "qcopenvelope_qws.h"
-#include <qcopchannel_qws.h>
 #include "applnk.h"
 
 /*!
   \class Ir ir.h
   \brief The Ir class implements basic support for sending objects over an
   infrared communication link.
 
   Both \link doclnk.html DocLnk\endlink objects and files can be
   sent to another device via the infrared link using the send()
   function. When the send has completed the done() signal is
   emitted.
 
   The supported() function returns whether the device supports
   infrared communication or not.
 
   \ingroup qtopiaemb
 */
 
 /*!
   Constructs an Ir object. The \a parent and \a name classes are the
   standard QObject parameters.
 */
 Ir::Ir( QObject *parent, const char *name )
     : QObject( parent, name )
 {
 #ifndef QT_NO_COP
     ch = new QCopChannel( "QPE/Obex" );
     connect( ch, SIGNAL(received(const QCString &, const QByteArray &)),
              this, SLOT(obexMessage( const QCString &, const QByteArray &)) );
 #endif
 }
 
 /*!
   Returns TRUE if the system supports infrared communication;
   otherwise returns FALSE.
 */
 bool Ir::supported()
 {
 #ifndef QT_NO_COP
     return QCopChannel::isRegistered( "QPE/Obex" );
 #endif
 }
 
 /*!
   Sends the object in file \a fn over the infrared link. The \a
   description is used in the text shown to the user while sending
   is in progress. The optional \a mimetype parameter specifies the
   mimetype of the object. If this parameter is not set, it is
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index 8dca4ab..0661423 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -1,74 +1,73 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
 //      have this class.
 #define QTOPIA_INTERNAL_FSLP
-#include "lnkproperties.h"
-#include "lnkproperties.h"
 #include "lnkpropertiesbase_p.h"
+#include "lnkproperties.h"
 #include "ir.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 #include <qpe/global.h>
 #include <qpe/categorywidget.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/filemanager.h>
 #include <qpe/config.h>
 #include <qpe/storage.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/mimetype.h>
 
 #include <qlineedit.h>
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qmessagebox.h>
 #include <qsize.h>
 #include <qcombobox.h>
 #include <qregexp.h>
 #include <qbuttongroup.h>
 
 #include <stdlib.h>
 
 LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
     : QDialog( parent, 0, TRUE ), lnk(l), fileSize( 0 )
 {
     setCaption( tr("Properties") );
 
     QVBoxLayout *vbox = new QVBoxLayout( this );
     d = new LnkPropertiesBase( this );
     vbox->add( d );
 
     // hide custom rotation feature for now, need a new implementation to fit quicklauch,
     // is confusing for the user and doubtable useful since life rotation
     d->rotate->hide();
     d->rotateButtons->hide();
 
     d->docname->setText(l->name());
     QString inf;
     if ( l->type().isEmpty() ) {
         d->type->hide();
diff --git a/library/mimetype.cpp b/library/mimetype.cpp
index d0a578e..23de70b 100644
--- a/library/mimetype.cpp
+++ b/library/mimetype.cpp
@@ -1,81 +1,77 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_MIMEEXT
 #include "mimetype.h"
 #include "applnk.h"
 #include "resource.h"
 #include <qpe/qpeapplication.h>
 #include "config.h"
 
 #include <qfile.h>
-#include <qdict.h>
-#include <qregexp.h>
-#include <qstringlist.h>
 #include <qtextstream.h>
-#include <qmap.h>
 
 
 static void cleanupMime()
 {
     MimeType::clear();
 }
 
 class MimeTypeData {
 public:
     MimeTypeData(const QString& i) :
         id(i)
     {
         apps.setAutoDelete(TRUE);
     }
     QString id;
     QString extension;
     QList<AppLnk> apps;
 
     QString description()
     {
         if ( desc.isEmpty() )
             desc = QPEApplication::tr("%1 document").arg(apps.first()->name());
         return desc;
     }
 
     QPixmap regIcon()
     {
         if ( regicon.isNull() )
             loadPixmaps();
         return regicon;
     }
 
     QPixmap bigIcon()
     {
         if ( bigicon.isNull() )
             loadPixmaps();
         return bigicon;
     }
 
 private:
     void loadPixmaps()
     {
         if ( apps.count() ) {
             QString icon;
             for (AppLnk* lnk = apps.first(); icon.isNull() && lnk; lnk=apps.next()) {
                 QStringList icons = lnk->mimeTypeIcons();
                 if ( icons.count() ) {
                     QStringList types = lnk->mimeTypes();
diff --git a/library/qcopenvelope_qws.cpp b/library/qcopenvelope_qws.cpp
index 0aac32b..8f58787 100644
--- a/library/qcopenvelope_qws.cpp
+++ b/library/qcopenvelope_qws.cpp
@@ -1,74 +1,72 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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 QT_NO_COP
 #include "qcopenvelope_qws.h"
 #endif
-#include "global.h"
 #include <qbuffer.h>
-#include <qdatastream.h>
 #include <qfile.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/file.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <time.h>
 
 #ifndef QT_NO_COP
 
 /*!
   \class QCopEnvelope qcopenvelope_qws.h
   \brief The QCopEnvelope class encapsulates and sends QCop messages
   over QCopChannels.
 
   QCop messages allow applications to communicate with each other.
   These messages are sent using QCopEnvelope, and received by connecting
   to a QCopChannel.
 
   To send a message, use the following protocol:
 
   \code
      QCopEnvelope e(channelname, messagename);
      e << parameter1 << parameter2 << ...;
   \endcode
 
   For messages without parameters, simply use:
 
   \code
      QCopEnvelope e(channelname, messagename);
   \endcode
 
   (Do not try to simplify this further as it may confuse some
   compilers.)
 
   The \c{channelname} of channels within Qtopia all start with "QPE/".
   The \c{messagename} is a function identifier followed by a list of types
   in parentheses. There is no whitespace in the message name.
 
   To receive a message, you will generally just use your application's
   predefined QPE/Application/\e{appname} channel
   (see QPEApplication::appMessage()), but you can make another channel
   and connect it to a slot like this:
 
   \code
       myChannel = new QCopChannel( "QPE/FooBar", this );
       connect( myChannel, SIGNAL(received(const QCString &, const QByteArray &)),
                this, SLOT(fooBarMessage( const QCString &, const QByteArray &)) );
diff --git a/library/qdawg.cpp b/library/qdawg.cpp
index af5dc82..2ea5734 100644
--- a/library/qdawg.cpp
+++ b/library/qdawg.cpp
@@ -1,71 +1,69 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 #include "qdawg.h"
 #include <qintdict.h>
-#include <qvaluelist.h>
-#include <qtextstream.h>
 #include <qfile.h>
 #include <qtl.h>
 
 #include <limits.h>
 #include <stdio.h>
 
 // for mmap
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
 
 class QDawgPrivate;
 class QTrie;
 
 typedef QValueList<QTrie*> TrieClub;
 typedef QIntDict<TrieClub> TrieClubDirectory;
 
 class TriePtr {
 public:
     QChar letter;
     QTrie* p;
     int operator <(const TriePtr& o) const;
     int operator >(const TriePtr& o) const;
     int operator <=(const TriePtr& o) const;
 };
 
 class TrieList : public QValueList<TriePtr> {
     bool sorted;
 public:
     TrieList()
     {
         sorted=TRUE;
     }
 
     QTrie* findAdd(QChar c);
     bool equal(TrieList& l);
 
     void sort()
     {
         if ( !sorted ) {
             qHeapSort(*this);
             sorted = TRUE;
         }
     }
 };
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index c7ef2b7..262221e 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1057,97 +1057,96 @@ static int deforient = -1;
 
 /*!
   \internal
 */
 int QPEApplication::defaultRotation()
 {
         if ( deforient < 0 ) {
                 QString d = getenv( "QWS_DISPLAY" );
                 if ( d.contains( "Rot90" ) ) {
                         deforient = 90;
                 }
                 else if ( d.contains( "Rot180" ) ) {
                         deforient = 180;
                 }
                 else if ( d.contains( "Rot270" ) ) {
                         deforient = 270;
                 }
                 else {
                         deforient = 0;
                 }
         }
         return deforient;
 }
 
 /*!
   \internal
 */
 void QPEApplication::setDefaultRotation( int r )
 {
         if ( qApp->type() == GuiServer ) {
                 deforient = r;
                 setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
                 Config config("qpe");
                 config.setGroup( "Rotation" );
                 config.writeEntry( "Rot", r );
         }
         else {
 #ifndef QT_NO_COP
                 { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
                         e << r;
                 }
 #endif
 
         }
 }
 
 #include <qgfx_qws.h>
 #include <qwindowsystem_qws.h>
-#include <qpixmapcache.h>
 
 extern void qws_clearLoadedFonts();
 
 void QPEApplication::setCurrentMode( int x, int y, int depth )
 {
     // Reset the caches
     qws_clearLoadedFonts();
     QPixmapCache::clear();
 
     // Change the screen mode
     qt_screen->setMode(x, y, depth);
 
     if ( qApp->type() == GuiServer ) {
         // Reconfigure the GuiServer
         qwsServer->beginDisplayReconfigure();
         qwsServer->endDisplayReconfigure();
 
         // Get all the running apps to reset
         QCopEnvelope env( "QPE/System", "reset()" );
     }
 }
 
 void QPEApplication::reset() {
     // Reconnect to the screen
     qt_screen->disconnect();
     qt_screen->connect( QString::null );
 
     // Redraw everything
     applyStyle();
 }
 
 /*!
   \internal
 */
 void QPEApplication::applyStyle()
 {
         Config config( "qpe" );
         config.setGroup( "Appearance" );
 
 #if QT_VERSION > 233
 #if !defined(OPIE_NO_OVERRIDE_QT)
         // don't block ourselves ...
         Opie::force_appearance = 0;
 
         static QString appname = Opie::binaryName ( );
 
         QStringList ex = config. readListEntry ( "NoStyle", ';' );
         int nostyle = 0;
diff --git a/library/qpemenubar.cpp b/library/qpemenubar.cpp
index 3e5bad5..1d8eff4 100644
--- a/library/qpemenubar.cpp
+++ b/library/qpemenubar.cpp
@@ -1,73 +1,72 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #define INCLUDE_MENUITEM_DEF
 
 #include "qpemenubar.h"
 #include <qapplication.h>
-#include <qguardedptr.h>
 #include <qtimer.h>
 
 
 class QMenuBarHack : public QMenuBar
 {
 public:
     int activeItem() const { return actItem; }
 
     void goodbye()
     {
         activateItemAt(-1);
         for ( unsigned int i = 0; i < count(); i++ ) {
             QMenuItem *mi = findItem( idAt(i) );
             if ( mi->popup() ) {
                 mi->popup()->hide();
             }
         }
     }
 };
 
 
 // Sharp ROM compatibility
 void QPEMenuToolFocusManager::setMenukeyEnabled ( bool )
 {
 }
 int QPEMenuBar::getOldFocus ( )
 {
         return 0;
 }
 
 QPEMenuToolFocusManager *QPEMenuToolFocusManager::me = 0;
 
 QPEMenuToolFocusManager::QPEMenuToolFocusManager() : QObject()
 {
     qApp->installEventFilter( this );
 }
 
 void QPEMenuToolFocusManager::addWidget( QWidget *w )
 {
     list.append( GuardedWidget(w) );
 }
 
 void QPEMenuToolFocusManager::removeWidget( QWidget *w )
 {
     list.remove( GuardedWidget(w) );
 }
 
 void QPEMenuToolFocusManager::setActive( bool a )
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index 665910c..b61ada4 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -1,73 +1,70 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include "qpestyle.h"
-#include <qpe/qpeapplication.h>
-#include <qpushbutton.h>
 
-#include <qpainter.h>
 
 #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
 
 #if QT_VERSION >= 300
 
 #include <qdrawutil.h>
 #include <qcombobox.h>
 #include <qtabbar.h>
 
 QPEStyle::QPEStyle()
 {
 }
 
 QPEStyle::~QPEStyle()
 {
 }
 
 void QPEStyle::drawPrimitive( PrimitiveElement pe, QPainter *p, const QRect &r,
                               const QColorGroup &cg, SFlags flags, const QStyleOption &data) const
 {
     switch ( pe ) {
     case PE_ButtonTool:
         {
             QColorGroup mycg = cg;
             if ( flags & Style_On ) {
                 QBrush fill( cg.mid(), Dense4Pattern );
                 mycg.setBrush( QColorGroup::Button, fill );
             }
             drawPrimitive( PE_ButtonBevel, p, r, mycg, flags, data );
             break;
         }
     case PE_ButtonCommand:
     case PE_ButtonDefault:
     case PE_ButtonBevel:
     case PE_HeaderSection:
         {
             QPen oldPen = p->pen();
             p->fillRect( r.x()+1, r.y()+1, r.width()-2, r.height()-2, cg.brush(QColorGroup::Button) );
 
             int x2 = r.right();
             int y2 = r.bottom();
 
             if ( flags & (Style_Sunken | Style_Down | Style_On) )
                 p->setPen( cg.dark() );
             else
                 p->setPen( cg.light() );
             p->drawLine( r.x(), r.y()+1, r.x(), y2-1 );
             p->drawLine( r.x()+1, r.y(), x2-1, r.y() );
diff --git a/library/qpetoolbar.cpp b/library/qpetoolbar.cpp
index 7f95eda..bd2c9b7 100644
--- a/library/qpetoolbar.cpp
+++ b/library/qpetoolbar.cpp
@@ -1,52 +1,50 @@
 /**********************************************************************
 ** Copyright (C) 2001 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.
 **
 **********************************************************************/
 
 #include "qpetoolbar.h"
-#include "qpemenubar.h"
-#include <qtoolbutton.h>
 
 /*!
   \class QPEToolBar qpemenubar.h
   \brief The QPEToolBar class is obsolete.  Use QToolBar instead.
 
   \obsolete
 
   The QPEToolBar class is obsolete.  Use QToolBar instead.
 
   \sa QToolBar
  */
 
 /*!
   Constructs a QPEToolBar just as you would construct
   a QToolBar, passing \a parent and \a name.
  */
 QPEToolBar::QPEToolBar( QMainWindow *parent, const char *name )
     : QToolBar( parent, name )
 {
 }
 
 /*!
   \internal
 */
 void QPEToolBar::childEvent( QChildEvent *e )
 {
     QToolBar::childEvent( e );
 }
 
diff --git a/library/qt_override.cpp b/library/qt_override.cpp
index df5a419..4d1f475 100644
--- a/library/qt_override.cpp
+++ b/library/qt_override.cpp
@@ -1,52 +1,50 @@
 
 #include <qpe/qpeapplication.h>
-#include <qwsdecoration_qws.h>
-#include <qcommonstyle.h>
 #include <qfontdatabase.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
 #include <sys/param.h> // for toolchains with old libc headers
 
 #include "qt_override_p.h"
 
 #if QT_VERSION > 233
 
 struct color_fix_t {
         char *m_app;
         char *m_class;
         char *m_name;
         QColorGroup::ColorRole m_set;
         QColorGroup::ColorRole m_get;
 };
 
 #ifndef OPIE_NO_OVERRIDE_QT
 
 static const color_fix_t apps_that_need_special_colors [] = {
         { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base },
         { "neocal", "Display", 0, QColorGroup::Background, QColorGroup::Base },
 
         { 0, 0, 0, QColorGroup::Base, QColorGroup::Base }
 };
 
 static const char * const apps_that_need_pointsizes_times_10 [] = {
         "HancomMobileWord",
         "hancomsheet",
         "HancomPresenterViewer",
 
         0
 };
 
 
 
 
 int Opie::force_appearance = 0;
 
 
 // Return the *real* name of the binary - not just a quick guess
 // by looking at argv [0] (which could be anything)
 
 static void binaryNameFree ( )
 {
diff --git a/library/resource.cpp b/library/resource.cpp
index f70658d..cfa0d26 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -1,77 +1,74 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_MIMEEXT
 #include <qpe/qpeapplication.h>
 #include "resource.h"
 #include "mimetype.h"
 #include <qdir.h>
-#include <qfile.h>
-#include <qregexp.h>
 #include <qpixmapcache.h>
-#include <qpainter.h>
 
 // this namespace is just a workaround for a gcc bug
 // gcc exports inline functions in the generated file
 // inlinepics_p.h
 
 namespace {
 #include "inlinepics_p.h"
 }
 
 static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET");
 
 /*!
   \class Resource resource.h
   \brief The Resource class provides access to named resources.
 
   The resources may be provided from files or other sources.
 
   The allSounds() function returns a list of all the sounds available.
   A particular sound can be searched for using findSound().
 
   Images can be loaded with loadImage(), loadPixmap(), loadBitmap()
   and loadIconSet().
 
   \ingroup qtopiaemb
 */
 
 /*!
   \fn Resource::Resource()
   \internal
 */
 
 /*!
   Returns the QPixmap called \a pix. You should avoid including
   any filename type extension (e.g. .png, .xpm).
 */
 QPixmap Resource::loadPixmap( const QString &pix )
 {
     QPixmap pm;
     QString key="QPE_"+pix;
     if ( !QPixmapCache::find(key,pm) ) {
         pm.convertFromImage(loadImage(pix));
         QPixmapCache::insert(key,pm);
     }
     return pm;
 }
 
 /*!
   Returns the QBitmap called \a pix. You should avoid including
diff --git a/library/sound.cpp b/library/sound.cpp
index 5b67995..ee2aabc 100644
--- a/library/sound.cpp
+++ b/library/sound.cpp
@@ -1,85 +1,83 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qsound.h>
 #include <qfile.h>
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
 #ifndef QT_NO_SOUND
 #include <sys/soundcard.h>
 #endif
 
-#include "config.h"
-#include <qmessagebox.h>
 #ifndef QT_NO_SOUND
 static int WAVsoundDuration(const QString& filename)
 {
     // bad solution
 
     // most of this is copied from qsoundqss.cpp
 
     QFile input(filename);
     if ( !input.open(IO_ReadOnly) )
         return 0;
 
     struct QRiffChunk {
         char id[4];
         Q_UINT32 size;
         char data[4/*size*/];
     } chunk;
 
     struct {
         Q_INT16 formatTag;
         Q_INT16 channels;
         Q_INT32 samplesPerSec;
         Q_INT32 avgBytesPerSec;
         Q_INT16 blockAlign;
         Q_INT16 wBitsPerSample;
     } chunkdata;
 
     int total = 0;
 
     while(1) {
         // Keep reading chunks...
         const int n = sizeof(chunk)-sizeof(chunk.data);
         if ( input.readBlock((char*)&chunk,n) != n )
             break;
         if ( qstrncmp(chunk.id,"data",4) == 0 ) {
             total += chunkdata.avgBytesPerSec ?
                 chunk.size * 1000 / chunkdata.avgBytesPerSec : 0;
 //qDebug("%d bytes of PCM (%dms)", chunk.size,chunkdata.avgBytesPerSec ?  chunk.size * 1000 / chunkdata.avgBytesPerSec : 0);
             input.at(input.at()+chunk.size-4);
         } else if ( qstrncmp(chunk.id,"RIFF",4) == 0 ) {
             char d[4];
             if ( input.readBlock(d,4) != 4 )
                 return 0;
             if ( qstrncmp(d,"WAVE",4) != 0 ) {
                 // skip
 //qDebug("skip %.4s RIFF chunk",d);
                 if ( chunk.size < 10000000 )
                     (void)input.at(input.at()+chunk.size-4);
             }
diff --git a/library/storage.cpp b/library/storage.cpp
index d98139b..0ea465b 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -1,93 +1,89 @@
 /**********************************************************************
 ** Copyright (C) Holger 'zecke' Freyther <freyther@kde.org>
 ** Copyright (C) Lorn Potter <llornkcor@handhelds.org>
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Opie 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.
 **
 **********************************************************************/
 
 #include <qpe/storage.h>
-#include <qpe/custom.h>
 
-#include <qfile.h>
-#include <qtimer.h>
 #include <qcopchannel_qws.h>
 
 #include <stdio.h>
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 #ifdef Q_OS_MACX
 #  include <sys/param.h>
 #  include <sys/ucred.h>
 #  include <sys/mount.h>
 #  include <stdio.h>  // For strerror()
 #  include <errno.h>
 #endif /* Q_OS_MACX */
 
-#include <qstringlist.h>
 
 // Shouldn't be here ! (eilers)
 // #include <sys/vfs.h>
 // #include <mntent.h>
 
 
 static bool isCF(const QString& m)
 {
 
 #ifndef Q_OS_MACX
     FILE* f = fopen("/var/run/stab", "r");
     if (!f) f = fopen("/var/state/pcmcia/stab", "r");
     if (!f) f = fopen("/var/lib/pcmcia/stab", "r");
     if ( f )
     {
         char line[1024];
         char devtype[80];
         char devname[80];
         while ( fgets( line, 1024, f ) )
         {
             // 0       ide     ide-cs  0       hda     3       0
             if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 )
             {
                 if ( QString(devtype) == "ide" && m.find(devname)>0 )
                 {
                     fclose(f);
                     return TRUE;
                 }
             }
         }
         fclose(f);
     }
 #endif /* Q_OS_MACX */
     return FALSE;
 }
 
 /*! \class StorageInfo storage.h
   \brief The StorageInfo class describes the disks mounted on the file system.
  
   This class provides access to the mount information for the Linux
   filesystem. Each mount point is represented by the FileSystem class.
   To ensure this class has the most up to date size information, call
   the update() method. Note that this will automatically be signaled
   by the operating system when a disk has been mounted or unmounted.
 
   \ingroup qtopiaemb
 */
 
diff --git a/library/tzselect.cpp b/library/tzselect.cpp
index 4343eab..f28100b 100644
--- a/library/tzselect.cpp
+++ b/library/tzselect.cpp
@@ -1,73 +1,72 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_TZSELECT_INC_LOCAL
 
 #include "tzselect.h"
 #include "resource.h"
-#include "global.h"
 #include "config.h"
 #include <qtoolbutton.h>
 #include <qfile.h>
 #include <stdlib.h>
 
 #include <qcopchannel_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qmessagebox.h>
 
 /*!
   \class TimeZoneSelector
 
   \brief The TimeZoneSelector widget allows users to configure their time zone information.
 
   \ingroup qtopiaemb
 */
 
 class TimeZoneSelectorPrivate
 {
 public:
     TimeZoneSelectorPrivate() : includeLocal(FALSE) {}
     bool includeLocal;
 };
 
 TZCombo::TZCombo( QWidget *p, const char* n )
     : QComboBox( p, n )
 {
     updateZones();
     // check to see if TZ is set, if it is set the current item to that
     QString tz = getenv("TZ");
     if (parent()->inherits("TimeZoneSelector")) {
   if ( ((TimeZoneSelector *)parent())->localIncluded() ) {
       // overide to the 'local' type.
       tz = "None";
   }
     }
     if ( !tz.isNull() ) {
   int n = 0,
             index = 0;
         for ( QStringList::Iterator it=identifiers.begin();
         it!=identifiers.end(); ++it) {
       if ( *it == tz )
     index = n;
       n++;
   }
   setCurrentItem(index);
     } else {
   setCurrentItem(0);