fix includes

author: chicken <chicken> 2004-03-01 20:30:56 (UTC)
committer: chicken <chicken> 2004-03-01 20:30:56 (UTC)
commit: 7b0bdb05e4ae29b2643d73e3b8f20a86a86dcccc (patch) (unidiff)
tree: 0ec283bce345770910a2630e868afcde3d7c3dc9 /noncore/games
parent: 054b3c3e032bdb0a6061a3345487b4ff877eebfd (diff)
download: opie-7b0bdb05e4ae29b2643d73e3b8f20a86a86dcccc.zip
opie-7b0bdb05e4ae29b2643d73e3b8f20a86a86dcccc.tar.gz
opie-7b0bdb05e4ae29b2643d73e3b8f20a86a86dcccc.tar.bz2
77 files changed, 2 insertions, 223 deletions
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp
index e9e5467..51020a0 100644
--- a/noncore/games/backgammon/backgammon.cpp
+++ b/noncore/games/backgammon/backgammon.cpp
@@ -1,39 +1,36 @@
 #include "backgammon.h"
 #include "aidialog.h"
 #include "filedialog.h"
 #include "playerdialog.h"
 #include "rulesdialog.h"
 #include "themedialog.h"
-#include <qdatetime.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
-#include <qstring.h>
 #include <qtimer.h>
-#include <qmainwindow.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
 #include <stdlib.h>
 BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
        : QMainWindow(parent, name, fl)
 {
    if (!name) setName("BackGammon");
    setCaption(tr( "Backgammon") );
    setIcon( Resource::loadPixmap( "backgammon" ) );
    //general counter varaible
    int a=0;
    //the game engine
    move=new MoveEngine();
    //load the default theme
    Config conf("backgammon");
    if(!conf.isValid())
    {
        qDebug("config file does not exist");
diff --git a/noncore/games/backgammon/filedialog.cpp b/noncore/games/backgammon/filedialog.cpp
index a5e71c9..e0a2914 100644
--- a/noncore/games/backgammon/filedialog.cpp
+++ b/noncore/games/backgammon/filedialog.cpp
@@ -1,31 +1,27 @@
 #include "filedialog.h"
 #include <qdir.h>
-#include <qfileinfo.h>
-#include <qmessagebox.h>
-#include <qpixmap.h>
-#include <qpushbutton.h>
 #include <qpe/qpeapplication.h>
 FileDialog::FileDialog(QWidget* parent,QString header,QString extension,const char* name,bool modal,WFlags f)
        :QDialog(parent,name,modal,f)
 {
    setCaption(header);
    ext=extension;
    dirselector=new QListView(this);
    dirselector->setGeometry(1,10,235,200);
    dirselector->addColumn("Files");
    connect(dirselector,SIGNAL(clicked(QListViewItem*)),this,SLOT(selectorclicked(QListViewItem*)));
    getCurrentDir();
    file_name="user";
    fileinput=new QLineEdit(file_name,this);
    fileinput->setGeometry(1,220,235,20);
    QPEApplication::showDialog( this );
 }
 FileDialog::~FileDialog()
 {}
diff --git a/noncore/games/backgammon/main.cpp b/noncore/games/backgammon/main.cpp
index 58ced10..6316040 100644
--- a/noncore/games/backgammon/main.cpp
+++ b/noncore/games/backgammon/main.cpp
@@ -1,8 +1,7 @@
-#include <qpe/qpeapplication.h>
 #include "backgammon.h"
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<BackGammon> )
diff --git a/noncore/games/backgammon/moveengine.cpp b/noncore/games/backgammon/moveengine.cpp
index 37b73a6..7de7147 100644
--- a/noncore/games/backgammon/moveengine.cpp
+++ b/noncore/games/backgammon/moveengine.cpp
@@ -1,27 +1,26 @@
 #include "moveengine.h"
-#include <qmessagebox.h>
 #include <qtimer.h>
 #include <stdlib.h>
 MoveEngine::MoveEngine()
        : QObject()
 {
    int offset=7;
    int a=0; //counter variable
    int xfill[]={210,185,170,155,140,125,110,85,70,55,40,25,10,10,25,40,55,70,85,110,125,140,155,170,185,210};
    for(a=0;a<26;a++)
    {
        x_coord[a]=xfill[a];
    }
    int yfill[]={10,25,40,55,70,10+offset,25+offset,40+offset,55+offset,25,40,55, 25+offset,40+offset,40};
    int zfill[]={1,1,1,1,1,2,2,2,2,3,3,3,4,4,5};
    for(a=0;a<15;a++)
    {
        yup_coord[a]=yfill[a];
        ylow_coord[a]=185-(yfill[a]);
        z_coord[a]=zfill[a];
    }
    for(a=0;a<5;a++)
    {
diff --git a/noncore/games/backgammon/themedialog.cpp b/noncore/games/backgammon/themedialog.cpp
index f342381..afd6a1b 100644
--- a/noncore/games/backgammon/themedialog.cpp
+++ b/noncore/games/backgammon/themedialog.cpp
@@ -1,30 +1,28 @@
 #include "themedialog.h"
 #include <qdir.h>
-#include <qfileinfo.h>
 #include <qlabel.h>
-#include <qpushbutton.h>
 #include <qpe/qpeapplication.h>
 ThemeDialog::ThemeDialog(QWidget* parent,const char* name,bool modal,WFlags f)
        :QDialog(parent,name,modal,f)
 {
    setCaption("Theme Dialog");
    QLabel* labelname=new QLabel("name",this);
    labelname->setGeometry(0,5,40,20);
    lineName=new QLineEdit("user",this);
    lineName->setGeometry(40,5,195,20);
    QLabel* labelboard=new QLabel("board",this);
    labelboard->setGeometry(0,30,40,20);
    boxboard=new QComboBox(this,"");
    boxboard->setGeometry(40,30,195,20);
    fillBox("boards",boxboard);
    QLabel* labelpiecesA=new QLabel("pieces1",this);
    labelpiecesA->setGeometry(0,70,40,20);
    boxpiecesA=new QComboBox(this);
    boxpiecesA->setGeometry(40,70,195,20);
    fillBox("pieces",boxpiecesA);
diff --git a/noncore/games/bounce/game.cpp b/noncore/games/bounce/game.cpp
index 6ded218..c07f453 100644
--- a/noncore/games/bounce/game.cpp
+++ b/noncore/games/bounce/game.cpp
@@ -1,47 +1,46 @@
 /*
 * Copyright (C) 2000 Stefan Schimanski <1Stein@gmx.de>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Library General Public
 * License along with this program; if not, write to the Free
 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <stdlib.h>
 #include <qtimer.h>
 #include <qpe/qpeapplication.h>
-#include <qimage.h>
 #include "game.h"
 #define TILE_SIZE 9 
 #define TILE_FIRST ((FIELD_WIDTH-2)*(FIELD_HEIGHT-2))
 #define TILE_FREE (TILE_FIRST + 0)
 #define TILE_BORDER (TILE_FIRST + 1)
 #define TILE_WALLEND (TILE_FIRST + 2)
 #define TILE_WALLUP (TILE_FIRST + 3)
 #define TILE_WALLDOWN (TILE_FIRST + 4)
 #define TILE_WALLLEFT (TILE_FIRST + 5)
 #define TILE_WALLRIGHT (TILE_FIRST + 6)
 #define GAME_DELAY 15
 #define BALL_ANIM_DELAY 60
 #define WALL_DELAY 100
 #define MS2TICKS( ms ) ((ms)/GAME_DELAY)
 Arrow::Arrow(QCanvasPixmapArray* array, QCanvas* canvas)
    : QCanvasSprite( array, canvas )
 {
        m_vertical = true;
diff --git a/noncore/games/bounce/kbounce.cpp b/noncore/games/bounce/kbounce.cpp
index 211f0ff..3b0cb6f 100644
--- a/noncore/games/bounce/kbounce.cpp
+++ b/noncore/games/bounce/kbounce.cpp
@@ -1,52 +1,48 @@
 /*
 * Copyright (C) 2000 Stefan Schimanski <1Stein@gmx.de>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License,Life or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Library General Public
 * License along with this program; if not, write to the Free
 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <qlayout.h>
 #include <qtimer.h>
-#include <qlcdnumber.h>
 #include <qmessagebox.h>
-#include <qmainwindow.h>
-#include <qpe/qpeapplication.h>
 #include "kbounce.h"
 #include "game.h"
-#include <qlabel.h>
 KJezzball::KJezzball(QWidget *p, const char* n, WFlags f) 
    : QMainWindow(p,n,f), m_gameWidget( 0 )
 {
        setCaption(tr("Bounce"));
        // setup variables
        m_game.level = 1;
        m_game.score = 0;
        m_state = Idle;
        menu = menuBar();
        game = new QPopupMenu;
        game->insertItem(tr("&New game"), this, SLOT(newGame()), Key_N );
        game->insertItem(tr("&Pause game"), this, SLOT(pauseGame()), Key_P );
        game->insertSeparator();
        game->insertItem(tr("&About"), this, SLOT(about()));
        menu->insertItem( tr("&Game"), game );
        // create widgets
        m_view = new QWidget( this, "m_view" );
        setCentralWidget( m_view );
        m_layout = new QGridLayout( m_view );
diff --git a/noncore/games/bounce/main.cpp b/noncore/games/bounce/main.cpp
index 9ea86a6..a070c4b 100644
--- a/noncore/games/bounce/main.cpp
+++ b/noncore/games/bounce/main.cpp
@@ -1,24 +1,23 @@
 /*
 * Copyright (C) 2000 Stefan Schimanski <schimmi@kde.org>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Library General Public
 * License along with this program; if not, write to the Free
 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <qpe/qpeapplication.h>
 #include "kbounce.h"
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<KJezzball> )
diff --git a/noncore/games/buzzword/buzzword.cpp b/noncore/games/buzzword/buzzword.cpp
index f746065..13eb481 100644
--- a/noncore/games/buzzword/buzzword.cpp
+++ b/noncore/games/buzzword/buzzword.cpp
@@ -1,44 +1,43 @@
 /*
 * Copyright (C) 2002 Martin Imobersteg <imm@gmx.ch>
 *
 * 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,Life or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Library General Public
 * License along with this program; if not, write to the Free
 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <qlayout.h>
-#include <qmessagebox.h>
 #include <qmainwindow.h>
 #include <qlabel.h>
 #include <qgrid.h>
 #include <qcolor.h>
 #include <qbutton.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qmessagebox.h>
 #include <qdir.h>
 #include <math.h>
 #include <stdlib.h>
 #include <qpe/qpeapplication.h>
 #include "buzzword.h"
 BuzzLabel::BuzzLabel( QWidget *parent, const char *name )
 : QLabel( parent, name )
 {
 }
 void BuzzLabel::mousePressEvent(QMouseEvent *e)
diff --git a/noncore/games/buzzword/main.cpp b/noncore/games/buzzword/main.cpp
index 67f2c26..95b3176 100644
--- a/noncore/games/buzzword/main.cpp
+++ b/noncore/games/buzzword/main.cpp
@@ -1,24 +1,23 @@
 /*
 * Copyright (C) 2002 Martin Imobersteg <imm@gmx.ch>
 *
 * 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,Life or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Library General Public
 * License along with this program; if not, write to the Free
 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 #include "buzzword.h"
 OPIE_EXPORT_APP( OApplicationFactory<BuzzWord> )
diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp
index b4e0308..506e87a 100644
--- a/noncore/games/fifteen/fifteen.cpp
+++ b/noncore/games/fifteen/fifteen.cpp
@@ -4,57 +4,52 @@
 ** 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 "fifteen.h"
 #include <qtopia/resource.h>
 #include <qtopia/config.h>
 #include <qvbox.h>
 #include <qaction.h>
-#include <qlayout.h>
 #include <qpainter.h>
-#include <qpopupmenu.h>
 #include <qmessagebox.h>
 #include <qtoolbar.h>
 #include <qmenubar.h>
-#include <qstringlist.h>
-#include <qapplication.h>
-#include <qtoolbutton.h>
 #include <stdlib.h>
 #include <time.h>
 FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags fl)
  : QMainWindow( parent, name, fl )
 {
  // random seed
  srand(time(0));
  setCaption( tr("Fifteen Pieces") );
  QToolBar *toolbar = new QToolBar(this);
  toolbar->setHorizontalStretchable( FALSE );
  QMenuBar *menubar = new QMenuBar( toolbar );
  menubar->setMargin(0);
  QPopupMenu *game = new QPopupMenu( this );
  QWidget *spacer = new QWidget( toolbar );
  spacer->setBackgroundMode( PaletteButton );
  toolbar->setStretchableWidget( spacer );
  setToolBarsMovable( FALSE );
  QVBox *vbox = new QVBox( this );
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index cf89267..79820b1 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -3,60 +3,56 @@
 **
 ** 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 "gowidget.h"
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpainter.h>
-#include <qpixmap.h>
 #include <qpe/qpetoolbar.h>
 #include <qmenubar.h>
-#include <qpopupmenu.h>
 #include <qaction.h>
 #include <qapplication.h> //processEvents()
 #include <qlabel.h>
 //#include <stdio.h>
-#include "amigo.h"
-#include "goplayutils.h"
 static const enum bVal computer_color = BLACK;
 static int current_handicap = 1;
 static QBrush *goBrush;
 //static QImage *newBlackStone;
 //static QImage *blackStone;
 //static QImage *whiteStone;
 static QPixmap *newBlackStone;
 static QPixmap *blackStone;
 static QPixmap *whiteStone;
 static bool smallStones = FALSE;
 GoMainWidget::GoMainWidget( QWidget *parent, const char* name, WFlags fl) :
        QMainWindow( parent, name, fl )
 {
     setToolBarsMovable( FALSE );
    GoWidget *go = new GoWidget(this);
    setCentralWidget(go);
    toolbar = new QToolBar(this);
    toolbar->setHorizontalStretchable( TRUE );
diff --git a/noncore/games/go/main.cpp b/noncore/games/go/main.cpp
index f24e3c3..66f34ab 100644
--- a/noncore/games/go/main.cpp
+++ b/noncore/games/go/main.cpp
@@ -1,28 +1,27 @@
 /**********************************************************************
 ** 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 "gowidget.h"
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<GoMainWidget> )
diff --git a/noncore/games/kbill/MCursor.cc b/noncore/games/kbill/MCursor.cc
index a3cb340..c581693 100644
--- a/noncore/games/kbill/MCursor.cc
+++ b/noncore/games/kbill/MCursor.cc
@@ -1,47 +1,42 @@
 /***************************************************************************
                          MCursor.cc  -  description
                             -------------------
    begin                : Thu Dec 30 1999
    copyright            : (C) 1999 by Jurrien Loonstra
    email                : j.h.loonstra@st.hanze.nl
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 "MCursor.h"
-#include "objects.h"
-#include <qcursor.h>
-#include <qbitmap.h>
-#include <qwidget.h>
-#include <qstring.h>
 #ifdef KDEVER
 #include <kapp.h>
 #include <kstandarddirs.h>
 #endif
 #include <iostream>
 #include <qpe/resource.h>
 MCursor::~MCursor() {
        delete cursor;
 }
 void MCursor::load(const char *name, int masked) {
        
        #ifdef KDEVER
        QString file, mfile;
        KStandardDirs dirs;
        file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name)  + ".xbm");
        QBitmap bitmap, mask;
        if (bitmap.load(file) == FALSE) {
                std::cerr << "cannot open " << file << std::endl;
                exit(1);
        }
diff --git a/noncore/games/kbill/Picture.cc b/noncore/games/kbill/Picture.cc
index fe0eff8..9d46257 100644
--- a/noncore/games/kbill/Picture.cc
+++ b/noncore/games/kbill/Picture.cc
@@ -1,46 +1,44 @@
 /***************************************************************************
                          Picture.cc  -  description
                             -------------------
    begin                : Thu Dec 30 1999
    copyright            : (C) 1999 by Jurrien Loonstra
    email                : j.h.loonstra@st.hanze.nl
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 "Picture.h"
-#include "objects.h"
 #include <iostream>
-#include <qstring.h>
 #include <qpe/resource.h>
 #ifdef KDEVER
 #include <kapp.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #endif
 void Picture::load(const char *name, int index) {
        //QString dir = KApplication::kde_datadir(), file;
        // QString dir = locate("data",""),file;
        // dir += "/kbill/";
        // if (index>=0)
        //      file.sprintf ("%spixmaps/%s_%d.xpm", (const char *)dir, name, index);
        // else
        //      file.sprintf("%spixmaps/%s.xpm", (const char *)dir, name);
 #ifdef KDEVER
        KStandardDirs dirs;
        QString file;
        if (index>=0) {
        //kdDebug() << "Here";
        QString sindex;
        sindex.setNum(index);
         // kdDebug() << "kbill/pixmaps/" + QString::fromLocal8Bit(name) + "_" + sindex + ".xpm";
           file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + "_" + sindex + ".xpm");
diff --git a/noncore/games/kbill/UI.cpp b/noncore/games/kbill/UI.cpp
index 2afaf9b..611cebf 100644
--- a/noncore/games/kbill/UI.cpp
+++ b/noncore/games/kbill/UI.cpp
@@ -1,49 +1,46 @@
 /***************************************************************************
                          UI.cc  -  description
                             -------------------
    begin                : Thu Dec 30 1999
    copyright            : (C) 1999 by Jurrien Loonstra
    email                : j.h.loonstra@st.hanze.nl
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 "kbill.h"
 #include "objects.h"
 #include "Strings.h"
 #ifdef KDEVER
 #include <kapplication.h>
 #endif
-#include <qpixmap.h>
 #include <qmessagebox.h>
-#include <qnamespace.h>
 #include "inputbox.h"
 /**************************/
 /* Timer control routines */
 /**************************/
 UI::~UI() {
        paint.end();
        delete pix;
 }
 void UI::restart_timer() {
        field->startTimer();
 }
 void UI::kill_timer() {
        field->stopTimer();
 }
 /*******************/
 /* Window routines */
 /*******************/
diff --git a/noncore/games/kbill/field.cpp b/noncore/games/kbill/field.cpp
index a1b3560..a974ab2 100644
--- a/noncore/games/kbill/field.cpp
+++ b/noncore/games/kbill/field.cpp
@@ -1,42 +1,41 @@
 /***************************************************************************
                          field.cpp  -  description
                             -------------------
    begin                : Thu Dec 30 1999
    copyright            : (C) 1999 by Jurrien Loonstra
    email                : j.h.loonstra@st.hanze.nl
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 <qpainter.h>
 #include "objects.h"
 #include "field.h"
 Field::Field(QWidget *parent, const char *name ) : QWidget(parent,name) {
        setFixedSize(game.scrwidth, game.scrheight);
        setBackgroundColor(white);
        timer = new QTimer(this);
        playing = false;
        connect(timer, SIGNAL(timeout()), SLOT(Timer()));
 }
 Field::~Field(){
        delete timer;
 }
 void Field::setPixmap(QPixmap *pix) {
        this->pix = pix;
 }
 // --------------------------------------------------------
diff --git a/noncore/games/kbill/inputbox.cpp b/noncore/games/kbill/inputbox.cpp
index b191ea8..5087fbb 100644
--- a/noncore/games/kbill/inputbox.cpp
+++ b/noncore/games/kbill/inputbox.cpp
@@ -1,43 +1,42 @@
 /***************************************************************************
                          inputbox.cpp  -  description
                             -------------------
    begin                : Sat Jan 1 2000
    copyright            : (C) 2000 by Jurrien Loonstra
    email                : j.h.loonstra@st.hanze.nl
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 "inputbox.h"
-#include <qdialog.h>
 InputBox::InputBox(QWidget *parent, const char *name, const char *caption, const char *text) : QDialog(parent, name, TRUE) {
        // setCaption(caption);
 // 
        // question = new QLabel(this);
        // question->setText(text);
        // question->setGeometry(10, 10, 240, 50);
 // 
        // input = new QLineEdit(this);
 //   input->setGeometry(10, 60, 240, 30);
        // input->setFocus();
        // input->setMaxLength(19);
 // 
 //   ok = new QPushButton( "Ok", this );
 //   ok->setGeometry(10, 100, 100,30 );
        // ok->setDefault(TRUE);
 //   connect( ok, SIGNAL(clicked()), SLOT(accept()) );
 // 
 //   cancel = new QPushButton( "Cancel", this );
 //   cancel->setGeometry(150, 100, 100,30 );
 //   connect( cancel, SIGNAL(clicked()), SLOT(reject()) );
 }
 InputBox::~InputBox(){
        delete ok;
diff --git a/noncore/games/kbill/kbill.cpp b/noncore/games/kbill/kbill.cpp
index 18a6875..74d7c75 100644
--- a/noncore/games/kbill/kbill.cpp
+++ b/noncore/games/kbill/kbill.cpp
@@ -1,49 +1,45 @@
 /***************************************************************************
                          kbill.cpp  -  description
                             -------------------
    begin                : Thu Dec 30 16:55:55 CET 1999
    copyright            : (C) 1999 by Jurrien Loonstra
    email                : j.h.loonstra@st.hanze.nl
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 <qmessagebox.h>
-#include <qmultilinedit.h>
 #include <qmenubar.h>
 #include <qtextbrowser.h>
-#include <qfont.h>
-#include <qwidget.h>
 #include "kbill.h"
-#include "inputbox.h"
 #include "helpdialog.h"
 #include "objects.h"
 #include "Strings.h"
 KBill::KBill() : QMainWindow() {
        setCaption(tr("kBill"));
        file = new QPopupMenu();
        file->insertItem(tr("New game"), this, SLOT(NewGame()));
        pauseid = file->insertItem(tr("Pause game"), this, SLOT(Pause()));
        //these are dissabled until I fix them
        //file->insertItem(tr("Warp to level..."), this, SLOT(WarpTo()));
        //file->insertItem(tr("View high scores"), this, SLOT(ViewHighScores()));
        
        help = new QPopupMenu();
        help->insertItem(tr("Story of kBill"), this, SLOT(Story()));
        help->insertItem(tr("Rules"), this, SLOT(Rules()));
        menu = new QMenuBar(this);
        menu->insertItem(tr("&File"), file);
        menu->insertSeparator();
        menu->insertItem(tr("&Help"), help);
diff --git a/noncore/games/kcheckers/kcheckers.cpp b/noncore/games/kcheckers/kcheckers.cpp
index 2eb37e5..a27dd18 100644
--- a/noncore/games/kcheckers/kcheckers.cpp
+++ b/noncore/games/kcheckers/kcheckers.cpp
@@ -1,27 +1,26 @@
 #include <qimage.h>
-#include <qframe.h>
 #include <qlayout.h>
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qpe/config.h>
 #include <qwhatsthis.h>
 #include <qtoolbutton.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include "kcheckers.h"
 #include "echeckers.h"
 #include "rcheckers.h"
 #include "pics/logo.xpm"
 #include "pics/undo.xpm"
 #include "pics/exit.xpm"
 #include "pics/help.xpm"
 #include "pics/wood1.xpm"
 #include "pics/wood2.xpm"
 #include "pics/wood3.xpm"
 #include "pics/green1.xpm"
 #include "pics/green2.xpm"
 #include "pics/green3.xpm"
 #include "pics/marble1.xpm"
diff --git a/noncore/games/kcheckers/main.cpp b/noncore/games/kcheckers/main.cpp
index 6ac570a..e22dbcc 100644
--- a/noncore/games/kcheckers/main.cpp
+++ b/noncore/games/kcheckers/main.cpp
@@ -1,10 +1,8 @@
-#include <qpe/qpeapplication.h>
-#include <qfont.h>
 #include "kcheckers.h"
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<KCheckers> )
diff --git a/noncore/games/kpacman/board.cpp b/noncore/games/kpacman/board.cpp
index f95f699..f82b5f9 100644
--- a/noncore/games/kpacman/board.cpp
+++ b/noncore/games/kpacman/board.cpp
@@ -1,34 +1,31 @@
-#include "portable.h"
 #if defined( KDE2_PORT )
 #include <kapp.h>
 #include <klocale.h>
 #endif
-#include <qrect.h>
-#include <qregexp.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include "board.h"
 #include "bitmaps.h"
 Board::Board(int size) : QArray<int> (size)
 {
    sz = size;                          // set size of board
    map = "";                   
    mapName = "";                       // no map loaded so far
    init(None);                         // initialize varibales
 }
 void Board::init(Image image, QString levelName)
 {
    prisonEntry = OUT;
    prisonExit = OUT;
    fruitHome = OUT;
    fruitPosition = OUT;
    pacmanHome = OUT;
diff --git a/noncore/games/kpacman/keys.cpp b/noncore/games/kpacman/keys.cpp
index 07ce135..5200bc2 100644
--- a/noncore/games/kpacman/keys.cpp
+++ b/noncore/games/kpacman/keys.cpp
@@ -1,49 +1,44 @@
 #include "portable.h"
 #if defined( KDE2_PORT )
 #include <kapp.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kstddirs.h>
 #include <kaccel.h>
 #include <keys.h>
 #include <keys.moc>
 #elif defined( QPE_PORT )
 #include <qaccel.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include "keys.h"
 #endif
 #include <qpushbt.h>
-#include <qlabel.h>
-#include <qframe.h>
-#include <qkeycode.h>
-#include <qpixmap.h>
-#include <qstring.h>
 Keys::Keys( QWidget *parent, const char *name)
    : QDialog( parent, name, TRUE )
 {
    //KStandardDirs *dirs = KGlobal::dirs();
    QPushButton *okButton  = new QPushButton(this);
    okButton->setText(tr("Ok"));
    okButton->setFixedSize(okButton->size());
    connect( okButton, SIGNAL(clicked()),this, SLOT(ok()) );
    okButton->move(20,210);
    QPushButton *defaultButton  = new QPushButton(this);
    defaultButton->setText(tr("Defaults"));
    defaultButton->setFixedSize(defaultButton->size());
    connect( defaultButton, SIGNAL(clicked()),this, SLOT(defaults()) );
    defaultButton->move(140,210);
    QPushButton *cancelButton  = new QPushButton(this);
    cancelButton->setText(tr("Cancel"));
    cancelButton->setFixedSize(cancelButton->size());
    connect( cancelButton, SIGNAL(clicked()),this, SLOT(reject()) );
    cancelButton->move(260,210);
diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp
index df27c76..be2e46d 100644
--- a/noncore/games/kpacman/kpacman.cpp
+++ b/noncore/games/kpacman/kpacman.cpp
@@ -1,43 +1,38 @@
 #include "portable.h"
 #if defined( KDE2_PORT )
 #include <kpacman.h>
 #include <kpacman.moc>
 #include <kcolordlg.h>
 #elif defined( QPE_PORT )
 #include <qmenubar.h>
 #include <qpe/config.h>
 #include <qapplication.h>
 #include "kpacman.h"
 #endif
-#include <qkeycode.h>
-#include <qcolor.h>
-#include <qstring.h>
-#include <qpopmenu.h>
-#include <qmsgbox.h>
 Kpacman::Kpacman(QWidget *parent, const char *name)
        : KTMainWindow(parent, name)
 {
    schemesPopup = new QList<QPopupMenu>;
    schemesPopup->setAutoDelete(TRUE);
    menu();
        m_view = new QWidget( this, "m_view" );
    m_view->setBackgroundColor( black );
        m_layout = new QGridLayout( m_view );
        m_layout->setMargin( 7 );
        view = new KpacmanWidget( this, QString(name)+"widget");
        m_layout->addWidget( view, 0, 0 );
    setCaption( tr("KPacman") );
    view->referee->setFocus();
    connect(view->referee, SIGNAL(setScore(int, int)),
            view->score, SLOT(setScore(int, int)));
    connect(view->referee, SIGNAL(setPoints(int)),
diff --git a/noncore/games/kpacman/kpacmanwidget.cpp b/noncore/games/kpacman/kpacmanwidget.cpp
index 823d2bf..9631495 100644
--- a/noncore/games/kpacman/kpacmanwidget.cpp
+++ b/noncore/games/kpacman/kpacmanwidget.cpp
@@ -1,45 +1,40 @@
 #include "portable.h"
 #if defined( KDE2_PORT )
 #include <kapp.h>
 #include <kconfig.h>
 #include <kstddirs.h>
 #include <kpacmanwidget.h>
 #include <kpacmanwidget.moc>
 #elif defined( QPE_PORT )
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include "kpacmanwidget.h"
 #endif
-#include <qmessagebox.h>
-#include "bitfont.h"
-#include "score.h"
-#include "referee.h"
-#include "status.h"
 KpacmanWidget::KpacmanWidget( QWidget *parent, const char *name)
        : QWidget( parent, name )
 {
    score = 0l;
    referee = 0l;
    status = 0l;
    bitfont = NULL;
    fontName = "";
    scheme = mode = -1;
    confScheme();
    score = new Score(this, name, scheme, mode, bitfont);
    referee = new Referee( this, name, scheme, mode, bitfont);
    status = new Status(this, name, scheme, mode);
    setBackgroundColor( black );
 }
 KpacmanWidget::~KpacmanWidget()
 {
 }
diff --git a/noncore/games/kpacman/monster.cpp b/noncore/games/kpacman/monster.cpp
index 2f402b4..80b4655 100644
--- a/noncore/games/kpacman/monster.cpp
+++ b/noncore/games/kpacman/monster.cpp
@@ -1,26 +1,25 @@
 #include "monster.h"
-#include "board.h"
 Monster::Monster(Board *b, int mid)
 {
    board = b;
    ID = mid;
    setREM(0);
    setHarmless(0, 0, 0);
    setArrested(0, 0);
    setFreedom(board->position(prisonexit));
    if (mid == 0)
        setPrison(board->position(prisonentry));
    else
        setPrison(board->position(monsterhome, mid));
   
    actualPosition = lastPosition = OUT;
    feetPosition = 0;
    IQ = 0;
    maxBodyPixmaps = 0;
    maxEyesPixmaps = 0;
 }
 void Monster::setMaxPixmaps(int maxBody, int maxEyes)
 {
diff --git a/noncore/games/kpacman/pacman.cpp b/noncore/games/kpacman/pacman.cpp
index 40f60a8..82524b4 100644
--- a/noncore/games/kpacman/pacman.cpp
+++ b/noncore/games/kpacman/pacman.cpp
@@ -1,26 +1,25 @@
 #include "pacman.h"
-#include "board.h"
 Pacman::Pacman(Board *b)
 {
    board = b;
    setDemo(FALSE);
    setAlive(0);
    actualPosition = lastPosition = OUT;
    mouthPosition = 0;
    lastPix = 0;
    maxPixmaps = 0;
 }
 void Pacman::setMaxPixmaps(int max)
 {
    if (actualDirection == X && lastPix >= 0) {
        actualDirection = lastPix / (maxPixmaps/4);
        if (max < maxPixmaps)
            mouthPosition = 0;
        else
            mouthPosition = lastPix % (maxPixmaps/4);
        maxPixmaps = max;       
        lastPix = pix();
diff --git a/noncore/games/kpacman/painter.cpp b/noncore/games/kpacman/painter.cpp
index d8c7460..410d3f5 100644
--- a/noncore/games/kpacman/painter.cpp
+++ b/noncore/games/kpacman/painter.cpp
@@ -1,48 +1,40 @@
 #include "portable.h"
 #if defined( KDE2_PORT )
 #include <kapp.h>
 #include <kconfig.h>
 #include <kstddirs.h>
 #elif defined( QPE_PORT )
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #endif
-#include <qcolor.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qrect.h>
-#include <qstring.h>
-#include <qmessagebox.h>
 #include <qfileinfo.h>
 #include "painter.h"
-#include "board.h"
 Painter::Painter( Board *b, QWidget *parent, int Scheme, int Mode, Bitfont *font)
 {
    w = parent;
    board = b;
    pointPix = NULL;
    wallPix = NULL;
    prisonPix = NULL;
    energizerPix = NULL;
    fruitPix = NULL;
    pacmanPix = NULL;
    dyingPix = NULL;
    eyesPix = NULL;
    monsterPix = NULL;
    fruitScorePix = NULL;
    monsterScorePix = NULL;
    lastPointPixmapName = "";
    lastWallPixmapName = "";
    lastPrisonPixmapName = "";
    lastEnergizerPixmapName = "";
    lastFruitPixmapName = "";
    lastPacmanPixmapName = "";
diff --git a/noncore/games/kpacman/referee.cpp b/noncore/games/kpacman/referee.cpp
index 1b810d8..2d0f3be 100644
--- a/noncore/games/kpacman/referee.cpp
+++ b/noncore/games/kpacman/referee.cpp
@@ -1,54 +1,45 @@
 #include "portable.h"
 #if defined( KDE2_PORT )
 #include <kapp.h>
 #include <kconfig.h>
 #include <kstddirs.h>
 #include <kaccel.h>
 #include <referee.h>
 #include <referee.moc>
 #elif defined( QPE_PORT )
 #include <qaccel.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include "referee.h"
 #endif
-#include <qdatetm.h>
 #include <stdlib.h>
 #include <qtimer.h>
-#include <qevent.h>
-#include <qcolor.h>
-#include <qkeycode.h>
 #include <qfileinfo.h>
-#include "board.h"
-#include "pacman.h"
-#include "monster.h"
-#include "fruit.h"
-#include "painter.h"
 Referee::Referee( QWidget *parent, const char *name, int Scheme, int Mode, Bitfont *font)
    : QWidget( parent, name )
 {
    gameState.resize(12);
    gameTimer = 0;
    energizerTimer = 0;
    focusedPause = FALSE;
    setFocusPolicy(QWidget::StrongFocus);
    initKeys();
    scheme = Scheme;
    mode = Mode;
    confScheme();
    board = new Board(BoardWidth*BoardHeight);
    pix = new Painter(board, this, scheme, mode, font);
    setFixedSize(pix->levelPix().size());
    pacman = new Pacman(board);
diff --git a/noncore/games/kpacman/score.cpp b/noncore/games/kpacman/score.cpp
index e91771b..6878b81 100644
--- a/noncore/games/kpacman/score.cpp
+++ b/noncore/games/kpacman/score.cpp
@@ -1,53 +1,47 @@
 #include "portable.h"
 #if defined( KDE2_PORT )
 #include <score.h>
 #include <score.moc>
 #include <kaccel.h>
 #include <kapp.h>
 #include <kconfig.h>
 #include <kstddirs.h>
 #include <kmessagebox.h>
 #elif defined( QPE_PORT )
 #include <qaccel.h>
 #include <qpe/config.h>
 #include "score.h"
 #endif
 #include <stdlib.h>
 #include <ctype.h>
-#include <qpixmap.h>
-#include <qstring.h>
-#include <qdstream.h>
-#include <qkeycode.h>
 #include <qtimer.h>
-#include <qfileinfo.h>
-#include "bitfont.h"
 Score::Score(QWidget *parent, const char *name, int Scheme, int Mode, Bitfont *font) : QWidget(parent, name)
 {
    setFocusPolicy(QWidget::StrongFocus);
    paused = FALSE;
    lastScore = -1;
    lastPlayer = -1;
    cursorBlinkTimer = 0;
    cursorBlinkMS = -1;
    cursor.x = -1;
    cursor.y = -1;
    cursor.on = FALSE;
    cursor.chr = QChar('?');
    initKeys();
    scheme = Scheme;
    mode = Mode;
    confScheme();
    bitfont = font;
diff --git a/noncore/games/kpacman/status.cpp b/noncore/games/kpacman/status.cpp
index 2a17c21..02ff63d 100644
--- a/noncore/games/kpacman/status.cpp
+++ b/noncore/games/kpacman/status.cpp
@@ -1,42 +1,40 @@
 #include "portable.h"
 #if defined( KDE2_PORT )
 #include <kapp.h>
 #include <klocale.h>
 #include <kstddirs.h>
 #include <status.h>
 #include <status.moc>
 #elif defined( QPE_PORT )
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include "status.h"
 #endif
-#include <qpixmap.h>
 #include <qbitmap.h>
-#include <qstring.h>
 #include <qmsgbox.h>
 #include <qfileinfo.h>
 Status::Status( QWidget *parent, const char *name, int Scheme, int Mode ) :
    QWidget( parent, name )
 {
    qWarning("Status::Status");
    actualLifes = 0;
    actualLevel = 0;
    lifesPix = NULL;
    levelPix = NULL;
    scheme = Scheme;
    mode = Mode;
    level = 0;
    confScheme();
 }
 QList<QPixmap> *Status::loadPixmap(QWidget *parent, QString pixmapName,
                                   QList<QPixmap> *pixmaps)
 {
    if (pixmaps == NULL) {
diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp
index e1f43d0..2b924c6 100644
--- a/noncore/games/mindbreaker/mindbreaker.cpp
+++ b/noncore/games/mindbreaker/mindbreaker.cpp
@@ -4,54 +4,50 @@
 ** 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 "mindbreaker.h"
 #include <qtopia/resource.h>
 #include <qtopia/config.h>
 #include <qtopia/qpeapplication.h>
 #include <qtoolbar.h>
-#include <qpainter.h>
-#include <qpixmap.h>
 #include <qtoolbutton.h>
-#include <qpushbutton.h>
 #include <qmessagebox.h>
-#include <qlabel.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <unistd.h>
 static int pegRTTI = 3393393;
 static int adjusted_panel_height;
 static int adjusted_panel_width;
 static int adjusted_bin_margin;
 static int adjusted_peg_size;
 static int adjusted_answerpeg_size;
 static int adjusted_title_height;
 static int adjusted_title_width;
 static int adjusted_first_peg_x_diff;
 static int adjusted_first_peg_y_diff;
 static int adjusted_peg_spacing;
 static int adjusted_answerpegx;
diff --git a/noncore/games/minesweep/main.cpp b/noncore/games/minesweep/main.cpp
index bd70f7c..e187be5 100644
--- a/noncore/games/minesweep/main.cpp
+++ b/noncore/games/minesweep/main.cpp
@@ -1,27 +1,26 @@
 /**********************************************************************
 ** 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 "minesweep.h"
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<MineSweep> )
diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp
index 1790110..72c05b0 100644
--- a/noncore/games/minesweep/minefield.cpp
+++ b/noncore/games/minesweep/minefield.cpp
@@ -1,52 +1,48 @@
 /**********************************************************************
 ** 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 "minefield.h"
 #include <qtopia/config.h>
 #include <qtopia/qpeapplication.h>
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qpixmap.h>
-#include <qimage.h>
 #include <qtimer.h>
 #include <stdlib.h>
 static const char *pix_flag[]={
 "13 13 3 1",
 "# c #000000",
 "x c #ff0000",
 ". c None",
 ".............",
 ".............",
 ".....#xxxxxx.",
 ".....#xxxxxx.",
 ".....#xxxxxx.",
 ".....#xxxxxx.",
 ".....#.......",
 ".....#.......",
 ".....#.......",
 ".....#.......",
 "...#####.....",
 "..#######....",
 "............."};
 static const char *pix_mine[]={
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index d707dab..4a6a92c 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -6,56 +6,51 @@
 ** 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 "minesweep.h"
 #include "minefield.h"
 #include <qtopia/qpeapplication.h>
 #include <qtopia/resource.h>
 #include <qtopia/config.h>
 #include <qtoolbar.h>
 #include <qmenubar.h>
-#include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qlcdnumber.h>
-#include <qmessagebox.h>
 #include <qtimer.h>
-#include <qpalette.h>
-#include <qapplication.h>
-#include <qlayout.h>
 #include <qlabel.h>
 #include <stdlib.h>
 #include <time.h>
 static const char *pix_new[]={
 "20 20 3 1",
 "  c None",
 "# c #00FF00",
 ". c #000000",
 "                    ",
 "       ......       ",
 "     ..######..     ",
 "    .##########.    ",
 "   .############.   ",
 "  .##############.  ",
 "  .##############.  ",
 " .################. ",
 " .################. ",
 " .################. ",
 " .################. ",
diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp
index 0bd22f6..86318db 100644
--- a/noncore/games/oyatzee/oyatzee.cpp
+++ b/noncore/games/oyatzee/oyatzee.cpp
@@ -1,36 +1,30 @@
 #include "oyatzee.h"
 #include <qmessagebox.h>
-#include <qapplication.h>
-#include <qdir.h>
-#include <qlabel.h>
 #include <qpushbutton.h>
-#include <qtimer.h>
-#include <qvbox.h>
 #include <qpainter.h>
 #include <qlayout.h>
-#include <qpoint.h>
 #include <stdlib.h>
 OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow( parent , name , fl )
 {
        QWidget *thing = new QWidget( this );
        setCentralWidget( thing );
        setCaption( tr( "OYatzee" ) );
        setPlayerNumber( 4 );
        setRoundsNumber( 1 );
        lastPlayerFinished = false;
        currentPlayer = 1;
        
        ps.append( new Player( "Carsten" ) );
        ps.append( new Player( "Julia" ) );
        ps.append( new Player( "Christine" ) );
        ps.append( new Player( "Stephan" ) );
        
        QVBoxLayout *vbox = new QVBoxLayout( thing );
diff --git a/noncore/games/parashoot/base.cpp b/noncore/games/parashoot/base.cpp
index cdf1dfa..5f3c79d 100644
--- a/noncore/games/parashoot/base.cpp
+++ b/noncore/games/parashoot/base.cpp
@@ -1,50 +1,48 @@
 /**********************************************************************
 ** 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 "codes.h"  
 #include "base.h"
-#include "man.h"
 #include <qtopia/resource.h>
-#include <qregexp.h>
 int damage;
 Base::Base(QCanvas* canvas) :
    QCanvasSprite(0, canvas),
    kaboom("landmine"),
    ohdear("crmble01")
 {
   basearray = new QCanvasPixmapArray();
   QString b0 = Resource::findPixmap("parashoot/b0001");
   b0.replace(QRegExp("0001"),"%1");
   basearray->readPixmaps(b0, 4);
   setSequence(basearray);
   setFrame(0);
   move(2, canvas->height()-50);
   setZ(10);
   show();
   damage = 0;
 }
 void Base::damageBase()
 {
   damage++;
diff --git a/noncore/games/parashoot/cannon.cpp b/noncore/games/parashoot/cannon.cpp
index 5671351..330d850 100644
--- a/noncore/games/parashoot/cannon.cpp
+++ b/noncore/games/parashoot/cannon.cpp
@@ -1,47 +1,46 @@
 /**********************************************************************
 ** 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 <qtopia/resource.h>
-#include <qregexp.h>
 #include "codes.h"  
 #include "cannon.h"
 Cannon::Cannon(QCanvas* canvas) :
        QCanvasSprite(0, canvas)
 {
 shotsfired=0;
    index = 8;
    cannonx = 0;
    cannony = 0;
    cannonarray = new QCanvasPixmapArray();
    QString c0 = Resource::findPixmap("parashoot/can0001");
    c0.replace(QRegExp("0001"),"%1");
    cannonarray->readPixmaps(c0,17);
    setSequence(cannonarray);
    setFrame(index);
    reposition();
    movedir = NoDir;
    moveDelay = 0;
    setAnimated(TRUE);
    show();
diff --git a/noncore/games/parashoot/helicopter.cpp b/noncore/games/parashoot/helicopter.cpp
index 036b21e..7d91cd1 100644
--- a/noncore/games/parashoot/helicopter.cpp
+++ b/noncore/games/parashoot/helicopter.cpp
@@ -3,49 +3,48 @@
 **
 ** 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 "helicopter.h"
 #include "man.h"
 #include "codes.h"
 #include <qtopia/resource.h>
-#include <qregexp.h>
 static QList<Helicopter> all;
 Helicopter::Helicopter(QCanvas* canvas) :
    QCanvasSprite(0, canvas),
    chikachika("aland01")
 {
    all.append(this);
    hits = 0;
    QCanvasPixmapArray* helicopterarray = new QCanvasPixmapArray();
    QString h0 = Resource::findPixmap("parashoot/helicopter0001");
    h0.replace(QRegExp("0001"),"%1");
    helicopterarray->readPixmaps(h0,4 );
    setSequence(helicopterarray);
    setAnimated(true);
    move(canvas->width(), 5);
    setVelocity(-2, 0);
    chikachika.playLoop();
    show();
 }
 Helicopter::~Helicopter()
 {
diff --git a/noncore/games/parashoot/interface.cpp b/noncore/games/parashoot/interface.cpp
index 948b92c..5c9b0ef 100644
--- a/noncore/games/parashoot/interface.cpp
+++ b/noncore/games/parashoot/interface.cpp
@@ -3,52 +3,48 @@
 **
 ** 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 "interface.h"
 #include "man.h"
 #include <qtopia/qpeapplication.h>
 #include <qtopia/resource.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qapplication.h>
-#include <qstyle.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 ParaShoot::ParaShoot(QWidget* parent, const char* name, WFlags f) :
    QMainWindow(parent,name,f),
    canvas( 232, 258 ),
    cannon(NULL),
    base(NULL),
    gamestopped( true ),
    waitover( false ),
    fanfare("level_up"),
    score(0)
 {
    QPEApplication::grabKeyboard();
    QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff );
    updatespeed = 80;
    canvas.setAdvancePeriod(80);
    pb = new QCanvasView(&canvas, this);
    pb->setFocus();
    setToolBarsMovable( FALSE );
diff --git a/noncore/games/parashoot/main.cpp b/noncore/games/parashoot/main.cpp
index ee36d26..40f809f 100644
--- a/noncore/games/parashoot/main.cpp
+++ b/noncore/games/parashoot/main.cpp
@@ -1,27 +1,26 @@
 /**********************************************************************
 ** 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 "interface.h"
-#include <qpe/qpeapplication.h> 
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<ParaShoot> )
diff --git a/noncore/games/parashoot/man.cpp b/noncore/games/parashoot/man.cpp
index 94807c2..0a151b0 100644
--- a/noncore/games/parashoot/man.cpp
+++ b/noncore/games/parashoot/man.cpp
@@ -3,49 +3,48 @@
 **
 ** 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 "codes.h"
 #include "man.h"
 #include "base.h"
 #include <qtopia/resource.h>
-#include <qregexp.h>
 int mancount;
 Man::Man(QCanvas* canvas) :
    QCanvasSprite(0, canvas),
    splat("lose") // No tr
 {
    manarray = new QCanvasPixmapArray();
    QString m0 = Resource::findPixmap("parashoot/man0001");
    m0.replace(QRegExp("0001"),"%1");
    manarray->readPixmaps(m0, 7);
    setSequence(manarray);
    setAnimated(true);
    mancount++;
    dead = false;
    start();
 }
 Man::Man(QCanvas* canvas, int x, int y) :
    QCanvasSprite(0, canvas),
    splat("bang") // No tr
 {
    manarray = new QCanvasPixmapArray();
    QString m0 = Resource::findPixmap("parashoot/man0001");
diff --git a/noncore/games/qasteroids/main.cpp b/noncore/games/qasteroids/main.cpp
index c762990..18a13eb 100644
--- a/noncore/games/qasteroids/main.cpp
+++ b/noncore/games/qasteroids/main.cpp
@@ -1,27 +1,26 @@
 /**********************************************************************
 ** 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 "toplevel.h"
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<KAstTopLevel> )
diff --git a/noncore/games/qasteroids/toplevel.cpp b/noncore/games/qasteroids/toplevel.cpp
index c4fea89..9053d3d 100644
--- a/noncore/games/qasteroids/toplevel.cpp
+++ b/noncore/games/qasteroids/toplevel.cpp
@@ -8,53 +8,51 @@
 ** 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.
 **
 **********************************************************************//*
 * KAsteroids - Copyright (c) Martin R. Jones 1997
 *
 * Part of the KDE project
 */
        //--- toplevel.cpp ---
 #include "toplevel.h"
 #include "ledmeter.h"
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
-#include <qaccel.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlcdnumber.h>
-#include <qpushbutton.h>
 #include <sys/utsname.h>
        #define SB_SCORE1
        #define SB_LEVEL2
        #define SB_SHIPS3
 struct SLevel
 {
    int    nrocks;
    double rockSpeed;
 };
        #define MAX_LEVELS16
 SLevel levels[MAX_LEVELS] =
 {
    { 1, 0.4 },
    { 1, 0.6 },
    { 2, 0.5 },
    { 2, 0.7 },
    { 2, 0.8 },
    { 3, 0.6 },
diff --git a/noncore/games/qasteroids/view.cpp b/noncore/games/qasteroids/view.cpp
index 448a54a..352c63b 100644
--- a/noncore/games/qasteroids/view.cpp
+++ b/noncore/games/qasteroids/view.cpp
@@ -5,51 +5,48 @@
 **
 ** 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.
 **
 **********************************************************************//*
 * KAsteroids - Copyright (c) Martin R. Jones 1997
 *
 * Part of the KDE project
 */
 #include "view.h"
 #include <qpe/resource.h>
-#include <qapplication.h>
-#include <qkeycode.h>
-#include <qaccel.h>
 #include <stdlib.h>
 #include <math.h>
 #define IMG_BACKGROUND "qasteroids/bg.png"
 #define REFRESH_DELAY           33
 #define SHIP_SPEED              0.3
 #define MISSILE_SPEED           10.0
 #define SHIP_STEPS              64
 #define ROTATE_RATE             2
 #define SHIELD_ON_COST          1
 #define SHIELD_HIT_COST         30
 #define BRAKE_ON_COST           4
 #define MAX_ROCK_SPEED          2.5
 #define MAX_POWERUP_SPEED       1.5
        #define MAX_SHIP_SPEED  8
 #define MAX_BRAKES              5
 #define MAX_SHIELDS             5
        #define MAX_FIREPOWER   5
 #define TEXT_SPEED              4
diff --git a/noncore/games/sfcave/helpwindow.cpp b/noncore/games/sfcave/helpwindow.cpp
index 544e237..8a5d034 100644
--- a/noncore/games/sfcave/helpwindow.cpp
+++ b/noncore/games/sfcave/helpwindow.cpp
@@ -1,44 +1,42 @@
 /***************************************************************************
                          helpwindow.cpp  -  description
                             -------------------
    begin                : Sun Sep 8 2002
    copyright            : (C) 2002 by Andy Qua
    email                : andy.qua@blueyonder.co.uk
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 <qwidget.h>
 #include <qlayout.h>
-#include <qstring.h>
 #include <qtextview.h>
 #include <qpe/qpeapplication.h>
 #include "helpwindow.h"
 #define HELP_TEXT \
 "<qt><h1>SFCave Help</h1><p> " \
 "SFCave is a flying game for the Zaurus.<br><br> " \
 "The aim is to stay alive for as long as possible and get the highest score " \
 "you can.<br><br>" \
 "There are three game types currently - SFCave, Gates, and Fly.<br>" \
 "<b>SFCave</b> is a remake of the classic SFCave game - fly through the " \
 "cavern avoiding all the blocks that just happen to be hanging in " \
 "midair<br><br>" \
 "<b>Gates</b> is similar to SFCave but instead you must fly through the " \
 "without crashing.<br><br>" \
 "<b>Fly</b> is somewhat different to SFCave and above. Instead, you have " \
 "are flying in the open air above a scrolling landscape, and the aim is to " \
 "hug the ground - the closer to the land you fly the more points " \
 "scored.<br><br><br>" \
 "Basic instruction - Press <b>Up</B> or <b>Down</b> on the circle pad to " \
 "start a new game, press the middle of the pad to apply thrust (makes you " \
diff --git a/noncore/games/snake/interface.cpp b/noncore/games/snake/interface.cpp
index 2c60693..b5fb5bf 100644
--- a/noncore/games/snake/interface.cpp
+++ b/noncore/games/snake/interface.cpp
@@ -1,54 +1,50 @@
 /**********************************************************************
 ** 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 "interface.h"
 #include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
 #include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
-#include <qstyle.h>
-#include <qapplication.h>
-#include <qmessagebox.h>
 SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) :
    QMainWindow(parent,name,f),
    canvas(232, 258)
 {
    setCaption( tr("Snake") );
    QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff );
    QPixmap bg = Resource::loadPixmap("snake/grass");
    canvas.setBackgroundPixmap(bg);
    canvas.setUpdatePeriod(100);
    snake = 0;
    cv = new QCanvasView(&canvas, this);
    pauseTimer = new QTimer(this);
    connect(pauseTimer, SIGNAL(timeout()), this, SLOT(wait()) );
    setToolBarsMovable( FALSE );
    QToolBar* toolbar = new QToolBar( this);
    toolbar->setHorizontalStretchable( TRUE );
    QPixmap newicon = Resource::loadPixmap("ksnake");
    setIcon(newicon);
diff --git a/noncore/games/snake/main.cpp b/noncore/games/snake/main.cpp
index 77a2769..9a9b167 100644
--- a/noncore/games/snake/main.cpp
+++ b/noncore/games/snake/main.cpp
@@ -1,29 +1,28 @@
 /**********************************************************************
 ** 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 "interface.h"
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<SnakeGame> )
diff --git a/noncore/games/snake/snake.cpp b/noncore/games/snake/snake.cpp
index 9f19841..8a683ab 100644
--- a/noncore/games/snake/snake.cpp
+++ b/noncore/games/snake/snake.cpp
@@ -1,51 +1,49 @@
 /**********************************************************************
 ** 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 "snake.h"
 #include "target.h"
-#include "codes.h"
 #include <qpe/resource.h>
-#include <qregexp.h>
 static int Piecekey[4][4] = { {6, 0, 4, 3 }, {0, 6, 2, 1 }, { 1, 3, 5, 0 }, {2, 4, 0, 5 } };
 Snake::Snake(QCanvas* c)
 {
   canvas = c; 
   score = 0;
   snakelist.setAutoDelete(true);
   autoMoveTimer = new QTimer(this);
   connect( autoMoveTimer, SIGNAL(timeout()), this, SLOT(moveSnake()) );
   createSnake();
 }
 void Snake::createSnake()
 {
   snakeparts = new QCanvasPixmapArray();
   QString s0 = Resource::findPixmap("snake/s0001");
   s0.replace(QRegExp("0001"),"%1");
   snakeparts->readPixmaps(s0, 15);
 
   grow = 0;
   last = Key_Right;
 
   QCanvasSprite* head = new QCanvasSprite(snakeparts, canvas );
diff --git a/noncore/games/solitaire/canvascard.cpp b/noncore/games/solitaire/canvascard.cpp
index 7c4a5ba..c36da6c 100644
--- a/noncore/games/solitaire/canvascard.cpp
+++ b/noncore/games/solitaire/canvascard.cpp
@@ -1,53 +1,48 @@
 /**********************************************************************
 ** 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 "cardgame.h"
 #include "canvascard.h"
 #include <qpe/resource.h>
-#include <qpainter.h>
-#include <qimage.h>
-#include <qpaintdevice.h>
-#include <qbitmap.h>
 #include <qgfx_qws.h> // Needed to get the device's width
 #include <math.h>
 #if defined( QT_QWS_CASSIOPEIA )
 #define SLOW_HARDWARE
 #endif
 // Seems to be fast enough to me even without Transformations in the library
 //#if defined( QT_NO_TRANSFORMATIONS ) && defined( QT_QWS_IPAQ )
 //#define SLOW_HARDWARE
 //#endif
 QBitmap *Create180RotatedBitmap(QBitmap *srcBitmap)
 {
 #ifdef QT_NO_TRANSFORMATIONS
    int w = srcBitmap->width();
    int h = srcBitmap->height();
    QBitmap *dstBitmap = new QBitmap( w, h );
    // ### this is very poorly implemented and probably could be much faster
    for (int i = 0; i < w; i++)
        for (int j = 0; j < h; j++)
            bitBlt( dstBitmap, i, j, srcBitmap, w - i - 1, h - j - 1, 1, 1 );
diff --git a/noncore/games/solitaire/canvascardgame.cpp b/noncore/games/solitaire/canvascardgame.cpp
index 9ae2a23..ed5748e 100644
--- a/noncore/games/solitaire/canvascardgame.cpp
+++ b/noncore/games/solitaire/canvascardgame.cpp
@@ -1,55 +1,47 @@
 /**********************************************************************
 ** 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 "cardgame.h"
-#include "canvasshapes.h"
-#include "canvascard.h"
 #include "canvascardgame.h"
-#include <qpe/resource.h>
-#include <qpe/config.h>
-#include <qmainwindow.h>
-#include <qmenubar.h>
-#include <qpainter.h>
 #include <qgfx_qws.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <time.h>
 #include <math.h>
 extern int highestZ;
 class CanvasCardPile : public QCanvasRectangle
 {
 public:
    CanvasCardPile( CanvasCardGame *ccg, QCanvas *canvas ) : QCanvasRectangle( canvas ), parent( ccg ) { 
        pile = new QPixmap( 0, 0 );
        pileHeight = 0;
        firstCard = NULL;
    }
    void addCard( CanvasCard *card );
    void advance(int stage);
    void animatedMove() { animatedMove(savedX, savedY); }
    void savePos(void) { savedX = (int)x(); savedY = (int)y(); }
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp
index c12344a..503bc92 100644
--- a/noncore/games/solitaire/canvascardwindow.cpp
+++ b/noncore/games/solitaire/canvascardwindow.cpp
@@ -1,56 +1,51 @@
 /**********************************************************************
 ** 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 "canvascardwindow.h"
-#include "patiencecardgame.h"
 #include "freecellcardgame.h"
 #include "chicanecardgame.h"
 #include "harpcardgame.h"
 #include "teeclubcardgame.h"
-#include <qpe/resource.h>
-#include <qmainwindow.h>
-#include <qpopupmenu.h>
-#include <qstyle.h>
 CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) :
    QMainWindow(parent, name, f), canvas(230, 260), snapOn(TRUE), cardBack(4), gameType(0),
    cardGame(NULL)
 {
    setIcon( Resource::loadPixmap( "cards" ) );
    setCaption(tr("Patience"));
    // Create Playing Area for Games
    if ( QPixmap::defaultDepth() < 12 ) {
 //      canvas.setBackgroundColor(QColor(0x51, 0x74, 0x6B));
 //  canvas.setBackgroundColor(QColor(0x20, 0xb0, 0x50));
  canvas.setBackgroundColor(QColor(0x08, 0x98, 0x2D));
    } else {
        QPixmap bg;
  bg.convertFromImage( Resource::loadImage( "table_pattern" ), ThresholdDither );
        canvas.setBackgroundPixmap(bg);
    }
 #if defined( QT_QWS_CASSIOPEIA )
    canvas.setAdvancePeriod(70);
 #else
    canvas.setAdvancePeriod(30);
diff --git a/noncore/games/solitaire/canvasshapes.cpp b/noncore/games/solitaire/canvasshapes.cpp
index 6ccd4a4..011958d 100644
--- a/noncore/games/solitaire/canvasshapes.cpp
+++ b/noncore/games/solitaire/canvasshapes.cpp
@@ -1,45 +1,43 @@
 /**********************************************************************
 ** 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 <qpainter.h>
-#include <qcanvas.h>
 #include <qgfx_qws.h>
 #include "canvasshapes.h"
 CanvasRoundRect::CanvasRoundRect(int x, int y, QCanvas *canvas) :
        QCanvasRectangle( x, y, ( qt_screen->deviceWidth() < 200 ) ? 20 : 23, ( qt_screen->deviceWidth() < 200 ) ? 27 : 36, canvas)
 {
    setZ(0);
    show();
 }
 void CanvasRoundRect::redraw()
 {
    hide();
    show();
 }
 void CanvasRoundRect::drawShape(QPainter &p)
 {
    if ( qt_screen->deviceWidth() < 200 )
        p.drawRoundRect( (int)x() + 1, (int)y() + 1, 18, 25);
    else
diff --git a/noncore/games/solitaire/card.cpp b/noncore/games/solitaire/card.cpp
index 609e280..52e38ac 100644
--- a/noncore/games/solitaire/card.cpp
+++ b/noncore/games/solitaire/card.cpp
@@ -1,50 +1,47 @@
 /**********************************************************************
 ** 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 "card.h"
-#include <qpe/config.h>
-#include <qpoint.h>
-#include <qlist.h>
 /*
 Card( eValue v, eSuit s, bool f ) :
    val(v), suit(s), faceUp(f), showing(FALSE), ix(0), iy(0), iz(0), cardPile(NULL) { }
 virtual ~Card() { }
 eValue getValue() { return val; }
 eSuit getSuit() { return suit; }
 CardPile *getCardPile() { return cardPile; }
 bool isFacing() { return faceUp; }
 bool isShowing() { return showing; }
 bool isRed() { return ((suit == diamonds) || (suit == hearts)); }
 int getX(void) { return ix; }
 int getY(void) { return iy; }
 int getZ(void) { return iz; }
 void setCardPile(CardPile *p) { cardPile = p; }
 void setFace(bool f) { faceUp = f; }
 void flip(void) { flipTo(getX(), getY()); }
 virtual void setPos(int x, int y, int z) { ix = x; iy = y; iz = z; }
 virtual void move(int x, int y) { ix = x; iy = y; }
 virtual void move(QPoint p) { ix = p.x(); iy = p.y(); }
 virtual void flipTo(int x, int y, int steps = 8) { ix = x; iy = y; faceUp = !faceUp; redraw(); Q_UNUSED(steps); }
 virtual void showCard(void) { showing = TRUE; }
 virtual void hideCard(void) { showing = FALSE; }
 virtual void redraw(void) { }
diff --git a/noncore/games/solitaire/cardpile.cpp b/noncore/games/solitaire/cardpile.cpp
index aace2e2..1d572be 100644
--- a/noncore/games/solitaire/cardpile.cpp
+++ b/noncore/games/solitaire/cardpile.cpp
@@ -1,51 +1,49 @@
 /**********************************************************************
 ** 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 "cardpile.h"
 #include "card.h"
 #include <qpe/config.h>
-#include <qpoint.h>
-#include <qlist.h>
 CardPile::CardPile(int x, int y) : pileX(x), pileY(y), dealing(FALSE), PileResize(FALSE) {
    pileWidth = 0;
    pileHeight = 0;
    pileNextX = pileX;
    pileNextY = pileY;
    pileCenterX = x + pileWidth / 2;
    pileCenterY = y + pileHeight / 2;
    pileRadius = (pileWidth > pileHeight) ? pileWidth : pileHeight;
    pileOffsetDown = 13;
 }
 int CardPile::distanceFromPile(int x, int y) {
    return (pileCenterX-x)*(pileCenterX-x)+(pileCenterY-y)*(pileCenterY-y);
 }
 int CardPile::distanceFromNextPos(int x, int y) {
    return (pileNextX-x)*(pileNextX-x)+(pileNextY-y)*(pileNextY-y);
 }
diff --git a/noncore/games/solitaire/chicanecardgame.cpp b/noncore/games/solitaire/chicanecardgame.cpp
index 6729a94..6c607b9 100644
--- a/noncore/games/solitaire/chicanecardgame.cpp
+++ b/noncore/games/solitaire/chicanecardgame.cpp
@@ -5,49 +5,48 @@
 **
 ** 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.
 **
 **
 ** created on base of patiencecardgame by cam (C.A.Mader) 2002
 ** Rules for this game:
        **use 2 decks = 104 cards
        **deal 8 rows with 3 hidden cards and one open card
 **      append red to black and vice versa
        **each card can be layed on a free place
        **deal 8 cards at once
 **
 **********************************************************************/
-#include <qgfx_qws.h>
 #include "chicanecardgame.h"
 extern int highestZ;
        ChicaneCardGame::ChicaneCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent, 2)// Use 2 Decks
 {
    highestZ = 0;
    for (int i = 0; i < 8; i++) {
        discardPiles[i] = new ChicaneDiscardPile( 27 + i * 26, 10, canvas() );
        addCardPile(discardPiles[i]);
    }
    for (int i = 0; i < 8; i++) {
        workingPiles[i] = new ChicaneWorkingPile( 27 + i * 26, 50, canvas() );
        addCardPile(workingPiles[i]);
    }
    faceDownDealingPile = new ChicaneFaceDownDeck( 2, 10, canvas() );
 }
 void ChicaneCardGame::deal(void)
 {
diff --git a/noncore/games/solitaire/freecellcardgame.cpp b/noncore/games/solitaire/freecellcardgame.cpp
index aeb32fc..d474f4e 100644
--- a/noncore/games/solitaire/freecellcardgame.cpp
+++ b/noncore/games/solitaire/freecellcardgame.cpp
@@ -1,44 +1,43 @@
 /**********************************************************************
 ** 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 <qgfx_qws.h>
 #include "freecellcardgame.h"
 extern int highestZ;
 int numberOfFreeCells = 4;
 FreecellCardGame::FreecellCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent)
 {
    numberOfFreeCells = 4;
    highestZ = 0;
    int spaceBetweenPiles = ( qt_screen->deviceWidth() < 200 ) ? 21 : 28;
    int xOrigin = ( qt_screen->deviceWidth() < 200 ) ? 0 : 5;
    int spacing = ( qt_screen->deviceWidth() < 200 ) ? 0 : 0;
    for (int i = 0; i < 4; i++) {
        freecellPiles[i] = new FreecellFreecellPile( xOrigin + i * spaceBetweenPiles, 10, canvas() );
        addCardPile(freecellPiles[i]);
    }
    for (int i = 0; i < 4; i++) {
        discardPiles[i] = new FreecellDiscardPile( xOrigin + spacing + 6 + (i + 4) * spaceBetweenPiles, 10, canvas() );
        addCardPile(discardPiles[i]);
    }
diff --git a/noncore/games/solitaire/harpcardgame.cpp b/noncore/games/solitaire/harpcardgame.cpp
index 0711622..d13d73b 100644
--- a/noncore/games/solitaire/harpcardgame.cpp
+++ b/noncore/games/solitaire/harpcardgame.cpp
@@ -7,49 +7,48 @@
 ** 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.
 **
 **
 ** created on base of patiencecardgame by cam (C.A.Mader) 2002
 ** Rules for this game:
 **      use 2 decks = 104 cards
 **      deal 8 rows with one open card in the first place
 **      one hidden and one open in the second place and so on
 **      append red to black and vice versa
 **      each card can be layed on a free place
 **      deal 8 cards at once
 **
 **
 **********************************************************************/
-#include <qgfx_qws.h>
 #include "harpcardgame.h"
 extern int highestZ;
        HarpCardGame::HarpCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent, 2)// Use 2 Decks
 {
    highestZ = 0;
    for (int i = 0; i < 8; i++) {
        discardPiles[i] = new HarpDiscardPile( 27 + i * 26, 10, canvas() );
        addCardPile(discardPiles[i]);
    }
    for (int i = 0; i < 8; i++) {
        workingPiles[i] = new HarpWorkingPile( 27 + i * 26, 50, canvas() );
        addCardPile(workingPiles[i]);
    }
    faceDownDealingPile = new HarpFaceDownDeck( 2, 10, canvas() );
 }
 void HarpCardGame::deal(void)
 {
diff --git a/noncore/games/solitaire/main.cpp b/noncore/games/solitaire/main.cpp
index bd3cf8b..9301171 100644
--- a/noncore/games/solitaire/main.cpp
+++ b/noncore/games/solitaire/main.cpp
@@ -1,26 +1,25 @@
 /**********************************************************************
 ** 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 "canvascardwindow.h"
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<CanvasCardWindow> )
 \ No newline at end of file
diff --git a/noncore/games/solitaire/patiencecardgame.cpp b/noncore/games/solitaire/patiencecardgame.cpp
index 96a599c..756577a 100644
--- a/noncore/games/solitaire/patiencecardgame.cpp
+++ b/noncore/games/solitaire/patiencecardgame.cpp
@@ -1,44 +1,43 @@
 /**********************************************************************
 ** 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 <qgfx_qws.h>
 #include "patiencecardgame.h"
 int highestZ = 0;
 PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent)
 {
    numberOfTimesThroughDeck = 0;
    highestZ = 0;
    if ( qt_screen->deviceWidth() < 200 )
    {
        circleCross = new CanvasCircleOrCross( 7, 16, canvas() );
        rectangle = new CanvasRoundRect(  30, 10, canvas() );
        for (int i = 0; i < 4; i++)
        {
            discardPiles[i] = new PatienceDiscardPile( 78 + i * 23, 10, canvas() );
            addCardPile(discardPiles[i]);
        }
        for (int i = 0; i < 7; i++)
        {
            workingPiles[i] = new PatienceWorkingPile( 5 + i * 23, 50, canvas() );
diff --git a/noncore/games/solitaire/teeclubcardgame.cpp b/noncore/games/solitaire/teeclubcardgame.cpp
index 0941e0d..b1af757 100644
--- a/noncore/games/solitaire/teeclubcardgame.cpp
+++ b/noncore/games/solitaire/teeclubcardgame.cpp
@@ -7,49 +7,48 @@
 ** 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.
 **
 **
 ** created on base of patiencecardgame by cam (C.A.Mader) 2002
 ** Rules for this game:
 **      use 2 decks = 104 cards
 **      deal 9 rows with 5 open cards each
 **      append one card to each other card which is one step higher
 **      move only columns of cards which are equal in suit
 **      each card can be layed on a free place
 **      deal 1 card at once on the first pile
 **
 **
 **********************************************************************/
-#include <qgfx_qws.h>
 #include "teeclubcardgame.h"
  
 
 extern int highestZ;
 
 
        TeeclubCardGame::TeeclubCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent, 2)// Use 2 Decks
 {
    highestZ = 0;
    for (int i = 0; i < 8; i++) {
        discardPiles[i] = new TeeclubDiscardPile( 27 + i * 26, 10, canvas() );
        addCardPile(discardPiles[i]);
    }
    for (int i = 0; i < 9; i++) {
        workingPiles[i] = new TeeclubWorkingPile(  2 + i * 26, 50, canvas() );
        addCardPile(workingPiles[i]);
    }
    faceDownDealingPile = new TeeclubFaceDownDeck( 2, 10, canvas() );
 }
 void TeeclubCardGame::deal(void)
 {
diff --git a/noncore/games/tetrix/main.cpp b/noncore/games/tetrix/main.cpp
index fcf4b33..bf1242f 100644
--- a/noncore/games/tetrix/main.cpp
+++ b/noncore/games/tetrix/main.cpp
@@ -1,28 +1,27 @@
 /**********************************************************************
 ** 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 "qtetrix.h"
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<QTetrix> )
diff --git a/noncore/games/tetrix/ohighscoredlg.cpp b/noncore/games/tetrix/ohighscoredlg.cpp
index 7581f51..8d8079e 100644
--- a/noncore/games/tetrix/ohighscoredlg.cpp
+++ b/noncore/games/tetrix/ohighscoredlg.cpp
@@ -1,44 +1,43 @@
 /***************************************************************************
   begin                    : January 2003
   copyright                : ( C ) 2003 by Carsten Niehaus
   email                    : cniehaus@handhelds.org
 **************************************************************************/
 /***************************************************************************
 *                                                                         *
 * 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 <qdialog.h>
-#include <qpe/config.h>
 #include <qlayout.h>
-#include <qpe/config.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/config.h>
 #include <qstring.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qlineedit.h>
 #include "ohighscoredlg.h"
 OHighscore::OHighscore( int score , int playerLevel )
 {
        pLevel = playerLevel;
        getList();
        checkIfItIsANewhighscore( score );
 }
 OHighscore::~OHighscore()
 {
        std::list<t_playerData*>::iterator deleteIterator = playerData.begin();
        for ( ; deleteIterator != playerData.end() ; deleteIterator++ )
        {
                delete ( *deleteIterator );
        }
diff --git a/noncore/games/tetrix/qtetrix.cpp b/noncore/games/tetrix/qtetrix.cpp
index 6d29c3f..20cf1a7 100644
--- a/noncore/games/tetrix/qtetrix.cpp
+++ b/noncore/games/tetrix/qtetrix.cpp
@@ -1,55 +1,52 @@
 /**********************************************************************
 ** 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 "qtetrix.h"
 #include <qpe/resource.h>
-#include <qpe/config.h>
-#include <qapplication.h>
 #include <qlabel.h>
 #include <qdatetime.h>
 #include <qlayout.h>
-#include <qstring.h>
 #include "ohighscoredlg.h"
 void drawTetrixButton( QPainter *p, int x, int y, int w, int h,
                       const QColor *color )
 {
    QColor fc;
    if ( color ) {
        QPointArray a;
        a.setPoints( 3,  x,y+h-1, x,y, x+w-1,y );
        p->setPen( color->light() );
        p->drawPolyline( a );
        a.setPoints( 3, x+1,y+h-1, x+w-1,y+h-1, x+w-1,y+1 );
        p->setPen( color->dark() );
        p->drawPolyline( a );
        x++;
        y++;
        w -= 2;
        h -= 2;
        fc = *color;
    }
    else
        fc = p->backgroundColor();
diff --git a/noncore/games/tetrix/qtetrixb.cpp b/noncore/games/tetrix/qtetrixb.cpp
index 521f171..3c179df 100644
--- a/noncore/games/tetrix/qtetrixb.cpp
+++ b/noncore/games/tetrix/qtetrixb.cpp
@@ -1,50 +1,48 @@
 /**********************************************************************
 ** 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 "qtetrixb.h"
 #include "qtetrix.h"
 #include <qtimer.h>
-#include <qkeycode.h>
-#include <qpainter.h>
 const int waitAfterLineTime = 500;
 QTetrixBoard::QTetrixBoard( QWidget *p, const char *name )
    : QFrame( p, name )
 {
    setFrameStyle( QFrame::Panel | QFrame::Sunken );
    paint = 0;
    timer = new QTimer(this);
    connect( timer, SIGNAL(timeout()), SLOT(timeout()) );
    colors[0].setRgb(200,100,100);
    colors[1].setRgb(100,200,100);
    colors[2].setRgb(100,100,200);
    colors[3].setRgb(200,200,100);
    colors[4].setRgb(200,100,200);
    colors[5].setRgb(100,200,200);
    colors[6].setRgb(218,170,  0);
    xOffset          = -1;      // -1 until a resizeEvent is received.
    blockWidth       = 20;
    yOffset          = 30;
    blockHeight      = 20;
    noGame           = TRUE;
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp
index cfff683..9aafe4c 100644
--- a/noncore/games/tictac/main.cpp
+++ b/noncore/games/tictac/main.cpp
@@ -1,13 +1,12 @@
 /****************************************************************************
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 #include "tictac.h"
 OPIE_EXPORT_APP( OApplicationFactory<TicTacToe> )
diff --git a/noncore/games/tictac/tictac.cpp b/noncore/games/tictac/tictac.cpp
index 9de3b58..12ce35f 100644
--- a/noncore/games/tictac/tictac.cpp
+++ b/noncore/games/tictac/tictac.cpp
@@ -1,45 +1,41 @@
 /****************************************************************************
 ** tictac.cpp,v 1.3.8.1 2003/08/29 06:50:40 harlekin Exp
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 #include "tictac.h"
 #include <qpe/qpeapplication.h>
-#include <qpainter.h>
 #include <qdrawutil.h>
 #include <qcombobox.h>
-#include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <stdlib.h>       // rand() function
-#include <qdatetime.h>        // seed for rand()
-#include <qstringlist.h> //needed for proper internationalization
 //***************************************************************************
 //* TicTacButton member functions
 //***************************************************************************
 // --------------------------------------------------------------------------
 // Creates a TicTacButton
 //
 TicTacButton::TicTacButton( QWidget *parent ) : QPushButton( parent )
 {
    t = Blank;          // initial type
 }
 // --------------------------------------------------------------------------
 // Paints TicTacButton
 //
 void TicTacButton::drawButtonLabel( QPainter *p )
 {
    QRect r = rect();
    p->setPen( QPen( white,2 ) );   // set fat pen
    if ( t == Circle ) {
diff --git a/noncore/games/wordgame/main.cpp b/noncore/games/wordgame/main.cpp
index f32acff..eb3e2f2 100644
--- a/noncore/games/wordgame/main.cpp
+++ b/noncore/games/wordgame/main.cpp
@@ -1,28 +1,27 @@
 /**********************************************************************
 ** 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 "wordgame.h"
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 OPIE_EXPORT_APP( OApplicationFactory<WordGame> )
diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp
index c01551d..43a54f8 100644
--- a/noncore/games/wordgame/wordgame.cpp
+++ b/noncore/games/wordgame/wordgame.cpp
@@ -1,73 +1,64 @@
 /**********************************************************************
 ** 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 "wordgame.h"
-#include <qpe/applnk.h>
 #include <qpe/global.h>
-#include <qpe/filemanager.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
-#include <qdatetime.h>
-#include <qfileinfo.h>
-#include <qfile.h>
 #include <qdir.h>
-#include <qiconset.h>
-#include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qtextstream.h>
 #include <qtimer.h>
 #include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
 #include <qvbox.h>
 #include <qwidgetstack.h>
-#include <qpainter.h>
 #include <qlayout.h>
-#include <qregexp.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/types.h>
 enum RuleEffects {
    Multiplier=15,
    MultiplyAll=64,
    Start=128
 };
 static int tile_smallw = 16;
 static int tile_smallh = 16;
 static int tile_bigw = 22;
 static int tile_bigh = 22;
 static int tile_stweak = -2;
 static int tile_btweak = -1;
 static const int rack_tiles=7;
 const char* sampleWGR=
        "wordgame_shapes\n"
        "15 15\n"
diff --git a/noncore/games/zlines/ballpainter.cpp b/noncore/games/zlines/ballpainter.cpp
index c2b34e1..622ec29 100644
--- a/noncore/games/zlines/ballpainter.cpp
+++ b/noncore/games/zlines/ballpainter.cpp
@@ -1,52 +1,49 @@
 /***************************************************************************
                          ballpainter.cpp  -  description
                             -------------------
    begin                : Fri May 19 2000
    copyright            : (C) 2000 by Roman Merzlyakov
    email                : roman@sbrf.barrt.ru
    copyright            : (C) 2000 by Roman Razilov
    email                : Roman.Razilov@gmx.de
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 <qpe/resource.h>
-#include <qapplication.h>
 #include "ballpainter.h"
 //#include "shotcounter.h"
 #include <qpainter.h>
-#include "linesboard.h"
 //#include <qcolor.h>
-#include <qjpegio.h>
 #define PIXSIZE 21
 int colorLinesArr[NCOLORS] =
 {0x0000ff, 0x00ff00, 0xff0000, 0x00ffff, 0xff00ff, 0xffff00, 0x005080};
 // 0x00bbggrr
 // red   ,  green  ,  blue   , yellow  , violet  ,   cyan  , brown
 BallPainter::BallPainter()
        : QObject()
 {
        createPixmap();
 }
 BallPainter::~BallPainter()
 {
 }
 QPixmap* BallPainter::pixmap( enum Pixmaps pix )
 {
    QString name;
diff --git a/noncore/games/zlines/field.cpp b/noncore/games/zlines/field.cpp
index 2a87739..0adf4ac 100644
--- a/noncore/games/zlines/field.cpp
+++ b/noncore/games/zlines/field.cpp
@@ -1,44 +1,43 @@
 /***************************************************************************
  field.cpp  -  description
  -------------------
 begin                : Fri May 19 2000
 copyright            : (C) 2000 by Roman Merzlyakov
 email                : roman@sbrf.barrt.ru
 copyright            : (C) 2000 by Roman Razilov
 email                : Roman.Razilov@gmx.de
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 <stdlib.h>
-#include "cfg.h"
 #include "field.h"
 Field::Field(QWidget* parent, const char* name)
        : QWidget( parent, name )
 {
        clearField();
 }
 Field::~Field()
 {
 }
 void Field::clearField()
 {
        for(int y=0; y<NUMCELLSH; y++)
                for(int x=0; x<NUMCELLSW; x++)
                        field[y][x].clear();
 }
 void Field::clearAnim()
 {
        for(int y=0; y<NUMCELLSH; y++)
                for(int x=0; x<NUMCELLSW; x++)
                        field[y][x].setAnim( ANIM_NO );
 }
diff --git a/noncore/games/zlines/klines.cpp b/noncore/games/zlines/klines.cpp
index 02ff0db..76c94e2 100644
--- a/noncore/games/zlines/klines.cpp
+++ b/noncore/games/zlines/klines.cpp
@@ -2,64 +2,55 @@
                          klines.cpp  -  description
                             -------------------
    begin                : Fri May 19 2000
    copyright            : (C) 2000 by Roman Merzlyakov
    email                : roman@sbrf.barrt.ru
    copyright            : (C) 2000 by Roman Razilov
    email                : Roman.Razilov@gmx.de
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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.                                   *
 *                                                                         *
 ***************************************************************************/
 /* changes
 21.05.2000    Roman Razilov     Menu game/Next
 */
 //
 // The implementation of the KLines widget
 //
-#include <qkeycode.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
-#include <qstring.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
 #include <qapplication.h>
-#include <qmenubar.h>
-#include <qpopupmenu.h>
-#include "cfg.h"
-#include <qstatusbar.h>
 #include "klines.h"
 /*
   Creates the KLines widget and sets saved options (if any).
 */
 KLines::KLines(QWidget *par, const char* n, WFlags fl) : QMainWindow(par,n,fl)
 {
        time_t t;
        time(&t);
        srand((unsigned int)t + getpid());
        setCaption(QString("ZLines"));
        mwidget = new MainWidget(this);
        setCentralWidget( mwidget );
        lsb = mwidget->GetLsb();
        lPrompt = mwidget->GetPrompt();
        menu = menuBar();
        game = new QPopupMenu;
        edit = new QPopupMenu;
diff --git a/noncore/games/zlines/linesboard.cpp b/noncore/games/zlines/linesboard.cpp
index 0965b2c..1e59aeb 100644
--- a/noncore/games/zlines/linesboard.cpp
+++ b/noncore/games/zlines/linesboard.cpp
@@ -1,46 +1,43 @@
 /***************************************************************************
                          linesboard.cpp  -  description
                             -------------------
    begin                : Fri May 19 2000
    copyright            : (C) 2000 by Roman Merzlyakov
    email                : roman@sbrf.barrt.ru
    copyright            : (C) 2000 by Roman Razilov
    email                : Roman.Razilov@gmx.de
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 <qpainter.h>
-#include <qpixmap.h>
-#include <qcolor.h>
-#include <qkeycode.h>
 #include <stdlib.h>
 #include "linesboard.h"
 /*
   Constructs a LinesBoard widget.
 */
 LinesBoard::LinesBoard( BallPainter * abPainter, QWidget* parent, const char* name )
    : Field( parent, name )
 {
  anim = ANIM_NO;
 //  waypos = 0;
 //  waylen = 0;
 //  jumpingRow = -1;
 //  jumpingCol = -1;
  painting = 0;
  way = new Waypoints[NUMCELLSW*NUMCELLSH];
  bPainter = abPainter;
  setFocusPolicy( NoFocus );
  setBackgroundColor( gray );
diff --git a/noncore/games/zlines/main.cpp b/noncore/games/zlines/main.cpp
index ff41f95..238e7d3 100644
--- a/noncore/games/zlines/main.cpp
+++ b/noncore/games/zlines/main.cpp
@@ -1,30 +1,29 @@
 /***************************************************************************
                          main.cpp  -  description
                             -------------------
    begin                : Fri May 19 2000
    copyright            : (C) 2000 by Roman Merzlyakov
    email                : roman@sbrf.barrt.ru
    copyright            : (C) 2000 by Roman Razilov
    email                : Roman.Razilov@gmx.de
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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.                                   *
 *                                                                         *
 ***************************************************************************/
 /*
  * Roman Razilov 2000-05-19 debug dummmy
  * Roman Razilov 2000-05-21 qimgio
 */
-#include <qglobal.h>
 #include <opie/oapplicationfactory.h>
 #include "klines.h"
 OPIE_EXPORT_APP( OApplicationFactory<KLines> )
diff --git a/noncore/games/zlines/mwidget.cpp b/noncore/games/zlines/mwidget.cpp
index 6641fa2..211d3d3 100644
--- a/noncore/games/zlines/mwidget.cpp
+++ b/noncore/games/zlines/mwidget.cpp
@@ -1,45 +1,44 @@
 /***************************************************************************
  mwidget.cpp  -  description
  -------------------
 begin                : Fri May 19 2000
 copyright            : (C) 2000 by Roman Merzlyakov
 email                : roman@sbrf.barrt.ru
 copyright            : (C) 2000 by Roman Razilov
 email                : Roman.Razilov@gmx.de
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   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 "mwidget.h"
 #include <qlayout.h>
-#include "ballpainter.h"
 #include <qhbox.h>
 #include <qlabel.h>
 MainWidget::MainWidget( QWidget* parent, const char* name )
        : QFrame( parent, name )
 {
        BallPainter *bPainter = new BallPainter();
        QGridLayout *Form1Layout = new QGridLayout( this );
        Form1Layout->setSpacing( 4 );
        Form1Layout->setMargin( 4 );
        QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
        Form1Layout->addItem( spacer, 0, 0 );
        lsb = new LinesBoard(bPainter, this);
        Form1Layout->addWidget( lsb, 0, 1 );
        QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
        Form1Layout->addItem( spacer_2, 0, 2 );
        QHBox *bottom=new QHBox(this);
        
        mPoints=new QLabel(bottom);
        bottom->setStretchFactor(mPoints, 2);
diff --git a/noncore/games/zsame/StoneWidget.cpp b/noncore/games/zsame/StoneWidget.cpp
index 49fa1a4..646fc9c 100644
--- a/noncore/games/zsame/StoneWidget.cpp
+++ b/noncore/games/zsame/StoneWidget.cpp
@@ -1,52 +1,47 @@
 /*
 *   ksame 0.4 - simple Game
 *   Copyright (C) 1997,1998  Marcus Kreutzberger
 *
 *   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.
 *
 *   This program is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 */
 #include <stdio.h>
 #include <stdlib.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qcursor.h>
 #include <qpe/resource.h>
 #include <time.h>
 #include <assert.h>
 #include "StoneWidget.h"
 struct StoneSlice {
    QPixmap stone;
 };
 StoneWidget::StoneWidget( QWidget *parent, int x, int y )
    : QWidget(parent,"StoneWidget"), stonefield(x,y)
 {
 //    setBackgroundPixmap(QPixmap(locate("wallpaper", "Time-For-Lunch-2.jpg")));
 //    QPixmap stonemap(locate("appdata", "stones.png"));
    QPixmap stonemap = Resource::loadPixmap("zsame/stones" );
    assert(!stonemap.isNull());
diff --git a/noncore/games/zsame/ZSameWidget.cpp b/noncore/games/zsame/ZSameWidget.cpp
index 5001b55..45a877f 100644
--- a/noncore/games/zsame/ZSameWidget.cpp
+++ b/noncore/games/zsame/ZSameWidget.cpp
@@ -1,67 +1,60 @@
 /* Yo Emacs, this is -*- C++ -*- */
 /*
 *   ksame 0.4 - simple Game
 *   Copyright (C) 1997,1998  Marcus Kreutzberger
 *
 *   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.
 *
 *   This program is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 */
 #include <stdio.h>
-#include <qwidget.h>
-#include <qpushbutton.h>
-#include <qpixmap.h>
-#include <qvbox.h>
-#include <qpopupmenu.h>
 #include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qapplication.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpe/resource.h>
 #include <opie/oapplicationfactory.h>
 #include <kapplication.h>
 #include "ZSameWidget.h"
-#include "StoneWidget.h"
-#include "version.h"
 static int default_colors=3;
 #define i18n tr
 OPIE_EXPORT_APP( OApplicationFactory<ZSameWidget> )
 ZSameWidget::ZSameWidget( QWidget* parent, const char* name,  WFlags fl )
    : QMainWindow( parent, name, fl )
 {
    setCaption(tr("ZSame"));
    setToolBarsMovable( false );
    QToolBar* con = new QToolBar( this );
    con->setHorizontalStretchable( true );
    QMenuBar* mb = new QMenuBar( con );
    QToolBar* tb = new QToolBar( this );
    QPopupMenu* fileMenu = new QPopupMenu( this );
    QAction* a = new QAction(tr("New Game"), Resource::loadIconSet("new") ,
author	chicken <chicken>	2004-03-01 20:30:56 (UTC)
committer	chicken <chicken>	2004-03-01 20:30:56 (UTC)
commit	7b0bdb05e4ae29b2643d73e3b8f20a86a86dcccc (patch) (unidiff)
tree	0ec283bce345770910a2630e868afcde3d7c3dc9 /noncore/games
parent	054b3c3e032bdb0a6061a3345487b4ff877eebfd (diff)
download	opie-7b0bdb05e4ae29b2643d73e3b8f20a86a86dcccc.zip opie-7b0bdb05e4ae29b2643d73e3b8f20a86a86dcccc.tar.gz opie-7b0bdb05e4ae29b2643d73e3b8f20a86a86dcccc.tar.bz2