21 files changed, 0 insertions, 102 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 5148172..c44d387 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -3,47 +3,37 @@
   -------------------
   ** Created: Sat Mar 9 23:33:09 2002
     copyright            : (C) 2002 by ljp
     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.                                   *
     ***************************************************************************/
 #define DEVELOPERS_VERSION
 #include "advancedfm.h"
 
-#include <qpe/filemanager.h>
-#include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
-#include <qpe/ir.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
-#include <qdatetime.h>
-#include <qfile.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
-#include <qlabel.h>
-#include <qwidget.h>
-#include <qlayout.h>
-#include <qimage.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 
-#include <qpe/qpemessagebox.h>
 
 #include <sys/stat.h>
 #include <time.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 
 #ifdef NOQUICKLAUNCH
 AdvancedFm::AdvancedFm( )
 #else
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 18bbd43..9ad1146 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -6,41 +6,30 @@
     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.                                   *

     ***************************************************************************/

 #include "advancedfm.h"

 #include "output.h"

 #include "filePermissions.h"

 

 #include <qpe/lnkproperties.h>

 #include <qpe/qpeapplication.h>

-#include <qpe/resource.h>

-#include <qpe/qcopenvelope_qws.h>

 #include <qpe/applnk.h>

-#include <qpe/ir.h>

 

 #include <qmessagebox.h>

-#include <qmultilineedit.h>

 

-#include <qstring.h>

 

-#include <qlayout.h>

-#include <qpixmap.h>

-#include <qcombobox.h>

 #include <qpopupmenu.h>

-#include <qtabwidget.h>

-#include <qtoolbutton.h>

-#include <qlineedit.h>

 #include <qlistview.h>

 

 #include <errno.h>

 #include <stdlib.h>

 #include <unistd.h>

 #include <sys/stat.h>

 #include <dirent.h>

 #include <sys/sendfile.h>

 #include <fcntl.h>

 

 

 void AdvancedFm::doDirChange() {

diff --git a/noncore/apps/checkbook/cfg.cpp b/noncore/apps/checkbook/cfg.cpp
index 0d5d9ed..24fa4cb 100644
--- a/noncore/apps/checkbook/cfg.cpp
+++ b/noncore/apps/checkbook/cfg.cpp
@@ -19,28 +19,25 @@
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <stdio.h>
 
-#include <qstring.h>
-#include <qstringlist.h>
 #include <qwidget.h>
-#include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include "cfg.h"
 
 // --- Cfg --------------------------------------------------------------------
 Cfg::Cfg()
 {
     _currencySymbol="$";
     _showLocks=FALSE;
     _showBalances=FALSE;
     _pCategories=new CategoryList();
     _bDirty=false;
diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index 4ca764f..26b2533 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -24,25 +24,24 @@
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "checkbook.h"
 #include "cbinfo.h"
 #include "transaction.h"
 #include "traninfo.h"
 #include "graph.h"
 #include "graphinfo.h"
 #include "password.h"
-#include "mainwindow.h"
 #include "cfg.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
diff --git a/noncore/apps/checkbook/configuration.cpp b/noncore/apps/checkbook/configuration.cpp
index dfae446..872d9b2 100644
--- a/noncore/apps/checkbook/configuration.cpp
+++ b/noncore/apps/checkbook/configuration.cpp
@@ -18,37 +18,33 @@
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "configuration.h"
-#include "mainwindow.h"
 #include "listedit.h"
-#include "tabledef.h"
 
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qwhatsthis.h>
 #include <qlistview.h>
-#include <qpushbutton.h>
 #include <qtabwidget.h>
-#include <qpe/resource.h>
 
 Configuration::Configuration( QWidget *parent, Cfg &cfg )
         : QDialog( parent, 0, TRUE, WStyle_ContextHelp )
 {
         setCaption( tr( "Configure Checkbook" ) );
 
     // Setup layout to make everything pretty
         QVBoxLayout *layout = new QVBoxLayout( this );
         layout->setMargin( 2 );
         layout->setSpacing( 4 );
 
         // Setup tabs for all info
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index 60aea42..d0fac3b 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -22,38 +22,34 @@
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "mainwindow.h"
 #include "cbinfo.h"
 #include "configuration.h"
 #include "password.h"
 #include "checkbook.h"
-#include "listedit.h"
 
 #include <qpe/config.h>
-#include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 
 #include <qmenubar.h>
 #include <qaction.h>
-#include <qcheckbox.h>
 #include <qdir.h>
-#include <qlineedit.h>
 #include <qwhatsthis.h>
 
 
 MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /*fl*/ )
     : QMainWindow( parent, name, WStyle_ContextHelp )
 {
     setCaption( tr( "Checkbook" ) );
 
     cbDir = Global::applicationFileName( "checkbook", "" );
     lockIcon = Resource::loadPixmap( "locked" );
 
     // Load configuration options
diff --git a/noncore/apps/checkbook/tabledef.cpp b/noncore/apps/checkbook/tabledef.cpp
index 13edded..9a42308 100644
--- a/noncore/apps/checkbook/tabledef.cpp
+++ b/noncore/apps/checkbook/tabledef.cpp
@@ -19,26 +19,24 @@
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "tabledef.h"
 
-#include <qstring.h>
-#include <qpe/resource.h>
 
 // --- ColumnDef --------------------------------------------------------------
 ColumnDef::ColumnDef(const char *sName, ColumnType type, const char *sNewValue)
 {
     _sName=sName;
     _type=type;
     _sNewValue=sNewValue;
 }
 
 
 // --- addColumnValue ---------------------------------------------------------
 void ColumnDef::addColumnValue(const QString &sValue)
diff --git a/noncore/apps/checkbook/transaction.cpp b/noncore/apps/checkbook/transaction.cpp
index 9379da0..a72a48b 100644
--- a/noncore/apps/checkbook/transaction.cpp
+++ b/noncore/apps/checkbook/transaction.cpp
@@ -23,25 +23,24 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "transaction.h"
 #include "traninfo.h"
 #include "cfg.h"
 #include "checkbook.h"
 
 #include <qpe/datebookmonth.h>
-#include <qpe/resource.h>
 
 #include <qbuttongroup.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qradiobutton.h>
 #include <qwhatsthis.h>
 
 Transaction::Transaction( QWidget *parent, bool bNew, const QString &acctname,
                                                          TranInfo *info, Cfg *pCfg )
diff --git a/noncore/apps/confedit/editwidget.cpp b/noncore/apps/confedit/editwidget.cpp
index f7dc408..21f69c7 100644
--- a/noncore/apps/confedit/editwidget.cpp
+++ b/noncore/apps/confedit/editwidget.cpp
@@ -1,25 +1,17 @@
 #include "editwidget.h"
 
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <qpushbutton.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qtimer.h>
-#include <qpopupmenu.h>
-#include <qaction.h>
-#include "listviewitemconfigentry.h"
 
 EditWidget::EditWidget( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
 
     EditWidgetLayout = new QGridLayout( this );
     EditWidgetLayout->setSpacing( 0 );
     EditWidgetLayout->setMargin( 0 );
 //    setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) );
 
     TextLabelFileName = new QLabel( this, "TextLabelFileName" );
     TextLabelFileName->setText( tr( "File Name:" ) );
diff --git a/noncore/apps/confedit/listviewitemconffile.cpp b/noncore/apps/confedit/listviewitemconffile.cpp
index ce6504c..1ff2c44 100644
--- a/noncore/apps/confedit/listviewitemconffile.cpp
+++ b/noncore/apps/confedit/listviewitemconffile.cpp
@@ -2,25 +2,24 @@
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
 #include "listviewitemconffile.h"
 #include <qmessagebox.h>
 #include <qtextstream.h>
-#include <qstring.h>
 #include "listviewitemconfigentry.h"
 
 #define tr QObject::tr
 
 ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent)
    : ListViewItemConf(parent), _valid(false)
 {
   confFileInfo = file;
 //  parseFile();
   displayText();
 }
 
diff --git a/noncore/apps/confedit/listviewitemconfigentry.cpp b/noncore/apps/confedit/listviewitemconfigentry.cpp
index 5ef9f61..0970125 100644
--- a/noncore/apps/confedit/listviewitemconfigentry.cpp
+++ b/noncore/apps/confedit/listviewitemconfigentry.cpp
@@ -1,24 +1,23 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
   // (c) 2002 Patrick S. Vogtp <tille@handhelds.org>
 
 #include "listviewitemconfigentry.h"
-#include "listviewitemconffile.h"
 #include <qtextstream.h>
 
 ListViewItemConfigEntry::ListViewItemConfigEntry(ListViewItemConfFile *parent, QString group, QString key)
    : ListViewItemConf(parent)
 {
         _fileItem = parent;
         _file = parent->fileName();
          _group = group;
         setKey(key);
          _groupOrig = group;
   _keyOrig = _key;
   _valueOrig = _value;
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp
index 4fe45ba..5f7ad50 100644
--- a/noncore/apps/confedit/mainwindow.cpp
+++ b/noncore/apps/confedit/mainwindow.cpp
@@ -3,38 +3,29 @@
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
 
 #include "mainwindow.h"
 
-#include <qaction.h>
-#include <qmessagebox.h>
-#include <qpopupmenu.h>
-#include <qtoolbutton.h>
-#include <qstring.h>
 #include <qlabel.h>
-#include <qfile.h>
-#include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlineedit.h>
-#include <qcursor.h>
 
 #include "listviewconfdir.h"
-#include "listviewitemconf.h"
 #include "listviewitemconfigentry.h"
 
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0)
 {
   setCaption( tr("Conf File Editor") );
 
         //setBaseSize(  qApp->globalStrut() );
   setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
 
   mainLayout = new QVBoxLayout( this );
diff --git a/noncore/apps/keyz-cfg/main.cpp b/noncore/apps/keyz-cfg/main.cpp
index 264db20..55cc23e 100644
--- a/noncore/apps/keyz-cfg/main.cpp
+++ b/noncore/apps/keyz-cfg/main.cpp
@@ -1,18 +1,16 @@
 #include <stdio.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
 #include <qmainwindow.h>
 
-#include "cfgfile.h"
 #include "cfgdlg.h"
 
 int main( int argc, char **argv ) {
         QPEApplication app(argc, argv);
         CfgFile cfile;
         CfgParser cp;
         cp.load(QPEApplication::qpeDir()+"/share/zkb/zkb.xml", cfile);
 
         QMainWindow m;
         CfgDlg c(&m, &cfile, &app);
         app.showMainWidget(&m);
         m.hide();
diff --git a/noncore/apps/keyz-cfg/zkb.cpp b/noncore/apps/keyz-cfg/zkb.cpp
index abe1f5f..f315d4b 100644
--- a/noncore/apps/keyz-cfg/zkb.cpp
+++ b/noncore/apps/keyz-cfg/zkb.cpp
@@ -1,13 +1,12 @@
-#include <qnamespace.h>
 #include "zkb.h"
 #include <stdio.h>
 
 // Implementation of Action class
 Action::Action():state(0), keycode(0), unicode(0), flags(0) {
 }
 
 Action::Action(State* s, ushort kc, ushort uni, int f):
         state(s), keycode(kc), unicode(uni), flags(f) {
 }
 
 Action::~Action() {
diff --git a/noncore/apps/keyz-cfg/zkbnames.cpp b/noncore/apps/keyz-cfg/zkbnames.cpp
index c20a114..b2180ba 100644
--- a/noncore/apps/keyz-cfg/zkbnames.cpp
+++ b/noncore/apps/keyz-cfg/zkbnames.cpp
@@ -1,14 +1,13 @@
 #include <qmap.h>
-#include <qstring.h>
 
 #include "zkbnames.h"
 
 QString Null_String((const char*) 0);
 
 // Implementation of KeyNames
 static struct {
         int key;
         char *name;
 } Key_Names[] = {
         { 32, "Space" },
         { 39, "Apostrophe" },
diff --git a/noncore/apps/opie-bartender/bac.cpp b/noncore/apps/opie-bartender/bac.cpp
index ac8a83e..c97a253 100644
--- a/noncore/apps/opie-bartender/bac.cpp
+++ b/noncore/apps/opie-bartender/bac.cpp
@@ -8,27 +8,24 @@
     *   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.                                   *
     ***************************************************************************/
 #include "bac.h"
 
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlcdnumber.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
 BacDialog::BacDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
   setName( "BacDialog" );
     setCaption( tr( "Blood Alcohol Estimator" ) );
 
     Layout7 = new QVBoxLayout( this); 
     Layout7->setSpacing( 6 );
     Layout7->setMargin( 0 );
 
     Layout1 = new QHBoxLayout; 
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index 740478f..3c010e9 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -2,57 +2,46 @@
 **
 ** Created: Sat Jul 20 08:10:53 2002
 **      by:  L.J. Potter <ljp@llornkcor.com>
 **     copyright            : (C) 2002 by ljp
     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.                                   *
     ***************************************************************************/
 
 #include "bartender.h"
-#include "newdrinks.h"
 #include "showdrinks.h"
 #include "inputDialog.h"
 #include "searchresults.h"
 #include "bac.h"
 
 #include <qpe/qpetoolbar.h>
 #include <qmenubar.h>
 //#include <opie2/colorpopupmenu.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
-#include <qcstring.h>
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
-#include <qstringlist.h>
 #include <qmultilineedit.h>
 #include <qmessagebox.h>
-#include <qfile.h>
 #include <qtextstream.h>
-#include <qfile.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qlistview.h>
-#include <qwidget.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qimage.h>
-#include <qpixmap.h>
 
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 
 
 Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     : QMainWindow( parent, name, fl ) {
     if ( !name )
   setName( "Bartender" );
diff --git a/noncore/apps/opie-bartender/inputDialog.cpp b/noncore/apps/opie-bartender/inputDialog.cpp
index 4f4cb84..29643ff 100644
--- a/noncore/apps/opie-bartender/inputDialog.cpp
+++ b/noncore/apps/opie-bartender/inputDialog.cpp
@@ -7,28 +7,24 @@
 **      by:  L.J. Potter <ljp@llornkcor.com>
 **     copyright            : (C) 2002 by ljp
     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.                                   *
     ***************************************************************************/
 
 #include "inputDialog.h"
 
 #include <qlineedit.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
 
 
 InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
         setName( "InputDialog" );
     resize( 234, 50 ); 
     setMaximumSize( QSize( 240, 50 ) );
     setCaption( tr(name ) );
 
     LineEdit1 = new QLineEdit( this, "LineEdit1" );
diff --git a/noncore/apps/opie-bartender/newdrinks.cpp b/noncore/apps/opie-bartender/newdrinks.cpp
index 86bcc3c..a7ada3a 100644
--- a/noncore/apps/opie-bartender/newdrinks.cpp
+++ b/noncore/apps/opie-bartender/newdrinks.cpp
@@ -1,36 +1,29 @@
 /****************************************************************************
 ** Created: Sat Jul 20 08:23:27 2002
 **      by:  L.J. Potter <ljp@llornkcor.com>
 **     copyright            : (C) 2002 by ljp
     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.                                   *
     ***************************************************************************/
 #include "newdrinks.h"
 
-#include <qpe/resource.h>
 
-#include <qaction.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
-#include <qpushbutton.h>
-#include <qwidget.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
 
 New_Drink::New_Drink( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
 {
     QString drinkName = name;
     if ( !name )
         setName( drinkName );
     setCaption( drinkName);
 
     Layout5 = new QGridLayout( this); 
     Layout5->setSpacing( 6 );
     Layout5->setMargin( 4 );
diff --git a/noncore/apps/opie-bartender/searchresults.cpp b/noncore/apps/opie-bartender/searchresults.cpp
index 1a82c6c..4900d1f 100644
--- a/noncore/apps/opie-bartender/searchresults.cpp
+++ b/noncore/apps/opie-bartender/searchresults.cpp
@@ -1,36 +1,27 @@
 /****************************************************************************
 ** Created: Sat Jul 20 08:23:27 2002
 **      by:  L.J. Potter <ljp@llornkcor.com>
 **     copyright            : (C) 2002 by ljp
     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.                                   *
     ***************************************************************************/
 #include "searchresults.h"
 
-#include <qpe/resource.h>
 
-#include <qaction.h>
-#include <qlabel.h>
-#include <qlineedit.h>
 #include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qwidget.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
 
 Search_Results::Search_Results( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ) {
     if ( !name )
     setName( drinkName);
 
     drinkName = name;
     setCaption( drinkName );
 
     Layout5 = new QGridLayout( this ); 
     Layout5->setSpacing( 6 );
     Layout5->setMargin( 4 );
diff --git a/noncore/apps/opie-bartender/showdrinks.cpp b/noncore/apps/opie-bartender/showdrinks.cpp
index 745f7db..dcfce16 100644
--- a/noncore/apps/opie-bartender/showdrinks.cpp
+++ b/noncore/apps/opie-bartender/showdrinks.cpp
@@ -1,37 +1,28 @@
 /****************************************************************************
 ** Created: Sat Jul 20 08:23:27 2002
 **      by:  L.J. Potter <ljp@llornkcor.com>
 **     copyright            : (C) 2002 by ljp
     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.                                   *
     ***************************************************************************/
 #include "showdrinks.h"
-#include "bartender.h"
 
-#include <qpe/resource.h>
 
-#include <qaction.h>
-#include <qlabel.h>
-#include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
-#include <qwidget.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
 
 //extern Bartender  *bart;
 
 Show_Drink::Show_Drink( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ) {
     if ( !name )
     setName( drinkName);
 
     drinkName = name;
     setCaption( drinkName );
 
     Layout5 = new QGridLayout( this);