8 files changed, 87 insertions, 78 deletions

diff --git a/noncore/games/backgammon/aidialog.cpp b/noncore/games/backgammon/aidialog.cpp
index 7dfe403..32e9b52 100644
--- a/noncore/games/backgammon/aidialog.cpp
+++ b/noncore/games/backgammon/aidialog.cpp
@@ -1,95 +1,96 @@
 #include "aidialog.h"
 
 #include <qgroupbox.h>
 
+#include <qpe/qpeapplication.h>
 
 AI_Dialog::AI_Dialog(QWidget* parent,const char* name,bool modal,WFlags f)
   : QDialog(parent,name,modal,f)
 {
     setCaption("AI Configuration");
 
     QGroupBox* settings=new QGroupBox(tr( "Settings" ),this);
     settings->setGeometry(10,5,220,170);
     
     QLabel* rescue_label=new QLabel(tr( "<b>Rescue</b>" ),settings);
     rescue_label->setGeometry(50,20,50,20);
     rescue=new QSpinBox(0,6,1,settings);
     rescue->setGeometry(100,20,40,20);
     QPushButton* rescuehelp=new QPushButton(tr( "?" ),settings);
     rescuehelp->setGeometry(140,20,20,20);
     connect(rescuehelp,SIGNAL(pressed()),this,SLOT(rescuehelp_pressed()));
     connect(rescuehelp,SIGNAL(released()),this,SLOT(rescuehelp_released()));
     
     QLabel* eliminate_label=new QLabel(tr( "<b>Eliminate</b>" ),settings);
     eliminate_label->setGeometry(50,40,50,20);
     eliminate=new QSpinBox(0,6,1,settings);
     eliminate->setGeometry(100,40,40,20);
     QPushButton* eliminatehelp=new QPushButton(tr( "?" ),settings);
     eliminatehelp->setGeometry(140,40,20,20);
     connect(eliminatehelp,SIGNAL(pressed()),this,SLOT(eliminatehelp_pressed()));
     connect(eliminatehelp,SIGNAL(released()),this,SLOT(eliminatehelp_released()));
-    
+
     QLabel* expose_label=new QLabel(tr( "<b>Expose</b>" ),settings);
     expose_label->setGeometry(50,60,50,20);
     expose=new QSpinBox(0,6,1,settings);
     expose->setGeometry(100,60,40,20);
     QPushButton* exposeehelp=new QPushButton(tr( "?" ),settings);
     exposeehelp->setGeometry(140,60,20,20);
     connect(exposeehelp,SIGNAL(pressed()),this,SLOT(exposehelp_pressed()));
     connect(exposeehelp,SIGNAL(released()),this,SLOT(exposehelp_released()));
-    
+
     QLabel* protect_label=new QLabel(tr( "<b>Protect</b>" ),settings);
     protect_label->setGeometry(50,80,50,20);
     protect=new QSpinBox(0,6,1,settings);
     protect->setGeometry(100,80,40,20);
     QPushButton* protecthelp=new QPushButton(tr( "?" ),settings);
     protecthelp->setGeometry(140,80,20,20);
     connect(protecthelp,SIGNAL(pressed()),this,SLOT(protecthelp_pressed()));
     connect(protecthelp,SIGNAL(released()),this,SLOT(protecthelp_released()));
-    
+
     QLabel* safe_label=new QLabel(tr( "<b>Safe</b>" ),settings);
     safe_label->setGeometry(50,100,50,20);
     safe=new QSpinBox(0,6,1,settings);
     safe->setGeometry(100,100,40,20);
     QPushButton* safeehelp=new QPushButton(tr( "?" ),settings);
     safeehelp->setGeometry(140,100,20,20);
     connect(safeehelp,SIGNAL(pressed()),this,SLOT(safehelp_pressed()));
     connect(safeehelp,SIGNAL(released()),this,SLOT(safehelp_released()));
-    
+
     QLabel* empty_label=new QLabel(tr( "<b>Empty</b>" ),settings);
     empty_label->setGeometry(50,120,50,20);
     empty=new QSpinBox(0,6,1,settings);
     empty->setGeometry(100,120,40,20);
     QPushButton* emptyhelp=new QPushButton(tr( "?" ),settings);
     emptyhelp->setGeometry(140,120,20,20);
     connect(emptyhelp,SIGNAL(pressed()),this,SLOT(emptyhelp_pressed()));
     connect(emptyhelp,SIGNAL(released()),this,SLOT(emptyhelp_released()));
-    
+
     defaultvalues=new QPushButton(tr( "Default Values" ),settings);
     defaultvalues->setGeometry(60,140,90,20);
     connect(defaultvalues,SIGNAL(clicked()),this,SLOT(setDefaultValues()));
 
     QGroupBox* helpbox=new QGroupBox(tr( "Help" ),this);
     helpbox->setGeometry(10,185,220,90);
 
     help=new QLabel(helpbox);
     help->setGeometry(10,15,200,65);
-    
+
     setHelpText();
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 
 
 AI_Dialog::~AI_Dialog()
 {
 }
 
 void AI_Dialog::rescuehelp_pressed()
 {
   setHelpText("rescue");
 }
 
 void AI_Dialog::rescuehelp_released()
 {
   setHelpText();
 }
diff --git a/noncore/games/backgammon/filedialog.cpp b/noncore/games/backgammon/filedialog.cpp
index 6c858a2..a5e71c9 100644
--- a/noncore/games/backgammon/filedialog.cpp
+++ b/noncore/games/backgammon/filedialog.cpp
@@ -1,64 +1,65 @@
-#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);
-    showMaximized();
-}
-
-FileDialog::~FileDialog()
-{}
-
-
-void FileDialog::selectorclicked(QListViewItem* entry)
-{
-    if(entry==NULL)
-        return;
-    file_name=entry->text(0);
-    fileinput->setText(file_name);
-}
-
-void FileDialog::getCurrentDir()
-{
-    dirselector->clear();
-    QDir dir(QPEApplication::qpeDir()+"/backgammon");
-    dir.setFilter(QDir::Files);
-    QFileInfoListIterator it(*(dir.entryInfoList()));
-    QFileInfo* fi;
-
-    int ext_length=ext.length();
-    while((fi=it.current())) // go through all file and subdirs
-    {
-        QString file=fi->fileName();
-        if(file.right(ext_length)==ext && file)
-        {
-            file=file.left(file.length()-ext_length);
-            new QListViewItem(dirselector,file);
-        }
-        ++it;
-    }
-}
-
-QString FileDialog::filename()
-{
-    return file_name;
-}
+#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()

+{}

+

+

+void FileDialog::selectorclicked(QListViewItem* entry)

+{

+    if(entry==NULL)

+        return;

+    file_name=entry->text(0);

+    fileinput->setText(file_name);

+}

+

+void FileDialog::getCurrentDir()

+{

+    dirselector->clear();

+    QDir dir(QPEApplication::qpeDir()+"/backgammon");

+    dir.setFilter(QDir::Files);

+    QFileInfoListIterator it(*(dir.entryInfoList()));

+    QFileInfo* fi;

+

+    int ext_length=ext.length();

+    while((fi=it.current())) // go through all file and subdirs

+    {

+        QString file=fi->fileName();

+        if(file.right(ext_length)==ext && file)

+        {

+            file=file.left(file.length()-ext_length);

+            new QListViewItem(dirselector,file);

+        }

+        ++it;

+    }

+}

+

+QString FileDialog::filename()

+{

+    return file_name;

+}

diff --git a/noncore/games/backgammon/playerdialog.cpp b/noncore/games/backgammon/playerdialog.cpp
index c16f202..0faf7e2 100644
--- a/noncore/games/backgammon/playerdialog.cpp
+++ b/noncore/games/backgammon/playerdialog.cpp
@@ -1,50 +1,52 @@
 #include "playerdialog.h"
 
 #include <qgroupbox.h>
 
+#include <qpe/qpeapplication.h>
+
 PlayerDialog::PlayerDialog(QWidget* parent,const char* name,bool modal,WFlags f)
         :QDialog(parent,name,modal,f)
 {
     auto2=false;
     auto2=true;
     setCaption("Player Settings");
 
     QGroupBox* player1_box=new QGroupBox("Player 1",this);
     player1_box->setGeometry(10,30,220,60);
     
     manual_button1=new QRadioButton("Human",player1_box);
     connect(manual_button1,SIGNAL(clicked()),this,SLOT(button_manual1()));
     manual_button1->setGeometry(10,20,100,20);
     auto_button1=new QRadioButton("Computer",player1_box);
     connect(auto_button1,SIGNAL(clicked()),this,SLOT(button_auto1()));
     auto_button1->setGeometry(110,20,100,20);
     button1_state(auto1);
 
     QGroupBox* player2_box=new QGroupBox("Player 2",this);
     player2_box->setGeometry(10,150,220,60);
     
     manual_button2=new QRadioButton("Human",player2_box);
     connect(manual_button2,SIGNAL(clicked()),this,SLOT(button_manual2()));
     manual_button2->setGeometry(10,20,100,20);
     auto_button2=new QRadioButton("Computer",player2_box);
     connect(auto_button2,SIGNAL(clicked()),this,SLOT(button_auto2()));
     auto_button2->setGeometry(110,20,100,20);
     button2_state(auto2);
 
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 
 PlayerDialog::~PlayerDialog()
 {}
 
 
 void PlayerDialog::button_manual1()
 {
     auto1=false;
     button1_state(auto1);
 }
 
 void PlayerDialog::button_auto1()
 {
     auto1=true;
     button1_state(auto1);
diff --git a/noncore/games/backgammon/rulesdialog.cpp b/noncore/games/backgammon/rulesdialog.cpp
index 85c3db3..5e17eeb 100644
--- a/noncore/games/backgammon/rulesdialog.cpp
+++ b/noncore/games/backgammon/rulesdialog.cpp
@@ -1,51 +1,53 @@
 #include "rulesdialog.h"
 
 #include <qgroupbox.h>
 #include <qlabel.h>
 
+#include <qpe/qpeapplication.h>
+
 RulesDialog::RulesDialog(QWidget* parent,const char* name,bool modal,WFlags f)
   : QDialog(parent,name,modal,f)
 {
     setCaption("Rules Configuration");
     QLabel* header=new QLabel("<b>Change the game rules here</b>",this);
     header->setGeometry(10,10,200,20);
 
     //
     QGroupBox* pieces_out_box=new QGroupBox("Movement",this);
     pieces_out_box->setGeometry(10,10,220,120);
     
     pieces_out=new QCheckBox("Don't care about others",pieces_out_box);
     pieces_out->setGeometry(10,20,200,20);
     connect(pieces_out,SIGNAL(clicked()),this,SLOT(pieces_out_clicked()));
    
     QLabel* pieces_out_help=new QLabel("allow movement of the pieses\neven if there are pieces knocked\nout by the opponent",pieces_out_box);
     pieces_out_help->setGeometry(10,40,200,60);
 
     //
     QGroupBox* nice_dice_box=new QGroupBox("Dice",this);
     nice_dice_box->setGeometry(10,140,220,120);
 
     nice_dice=new QCheckBox("Big dice for small numbers",nice_dice_box);
     nice_dice->setGeometry(10,20,200,20);
     connect(nice_dice,SIGNAL(clicked()),this,SLOT(nice_dice_clicked()));
 
     QLabel* nice_dice_help=new QLabel("allow to rescue pieces with dice\nvalues graeter than the distance\nto the players endzone.",nice_dice_box);
     nice_dice_help->setGeometry(10,40,200,60);
     
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 
 
 RulesDialog::~RulesDialog()
 {
 }
 
 void RulesDialog::pieces_out_clicked()
 {
   if(pieces_out->isChecked())
     rules.move_with_pieces_out=true;
   else
     rules.move_with_pieces_out=false;
 }
 
 void RulesDialog::nice_dice_clicked()
diff --git a/noncore/games/backgammon/themedialog.cpp b/noncore/games/backgammon/themedialog.cpp
index dcb957c..f342381 100644
--- a/noncore/games/backgammon/themedialog.cpp
+++ b/noncore/games/backgammon/themedialog.cpp
@@ -46,33 +46,33 @@ ThemeDialog::ThemeDialog(QWidget* parent,const char* name,bool modal,WFlags f)
     boxdiceB->setGeometry(40,160,195,20);
     fillBox("dice",boxdiceB);
 
     QLabel* labelodds=new QLabel("odds",this);
     labelodds->setGeometry(0,200,40,20);
     boxodds=new QComboBox(this);
     boxodds->setGeometry(40,200,195,20);
     fillBox("odds",boxodds);
     boxodds->setEnabled(false);
 
     QLabel* labeltable=new QLabel("table",this);
     labeltable->setGeometry(0,225,40,20);
     boxtable=new QComboBox(this);
     boxtable->setGeometry(40,225,195,20);
     fillBox("table",boxtable);
 
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 
 ThemeDialog::~ThemeDialog()
 {}
 
 
 ImageNames ThemeDialog::getNames()
 {
     ImageNames names;
     names.theme=lineName->text();
     names.board=boxboard->currentText();
     names.pieces1=boxpiecesA->currentText();
     names.pieces2=boxpiecesB->currentText();
     names.dice1=boxdiceA->currentText();
     names.dice2=boxdiceB->currentText();
     names.odds=boxodds->currentText();
diff --git a/noncore/games/sfcave/helpwindow.cpp b/noncore/games/sfcave/helpwindow.cpp
index c920312..544e237 100644
--- a/noncore/games/sfcave/helpwindow.cpp
+++ b/noncore/games/sfcave/helpwindow.cpp
@@ -7,32 +7,34 @@
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   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 " \
@@ -58,22 +60,22 @@
 
 
 HelpWindow::HelpWindow( QWidget *parent, const char *name, bool modal, WFlags flags )
     : QDialog( parent, name, modal, flags )
 {
 //    resize( 230, 280 );
 
     setCaption( "Help for SFCave" );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     QString text = HELP_TEXT;;
     QTextView *view = new QTextView( text, 0, this, "view" );
     layout->insertSpacing( -1, 5 );
     layout->insertWidget( -1, view );
     layout->insertSpacing( -1, 5 );
 
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 
 HelpWindow::~HelpWindow()
 {
 }
diff --git a/noncore/games/tetrix/ohighscoredlg.cpp b/noncore/games/tetrix/ohighscoredlg.cpp
index cf0dcf7..7581f51 100644
--- a/noncore/games/tetrix/ohighscoredlg.cpp
+++ b/noncore/games/tetrix/ohighscoredlg.cpp
@@ -4,32 +4,33 @@
    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 <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 );
 }
@@ -156,33 +157,33 @@ QString OHighscore::getName()
 
 OHighscoreDialog::OHighscoreDialog(OHighscore *highscore, QWidget *parent, const char *name, bool modal) : QDialog(parent, name, modal)
 {
         hs_ = highscore;
         setCaption( tr( "Highscores" ) );
         vbox_layout = new QVBoxLayout( this, 4 , 4 );
         list = new QListView( this );
         list->setSorting( -1 );
         list->addColumn( tr( "#" ));
         list->addColumn( tr( "Name" ));
         list->addColumn( tr( "Points" ));
         list->addColumn( tr( "Level" ));
 
         createHighscoreListView();
         
         vbox_layout->addWidget( list );
-        showMaximized();
+        QPEApplication::showDialog( this );
 }
 
 void OHighscoreDialog::createHighscoreListView()
 {
         int pos = 10;
         int points_ = 0;
         int level_ = 0;
 
         std::list<t_playerData*>::reverse_iterator iListe = hs_->playerData.rbegin();
         
         for ( ; iListe != hs_->playerData.rend() ; ++iListe )
         {
                 QListViewItem *item = new QListViewItem( list );
                 item->setText(  0 , QString::number( pos ) );                   //number
                 item->setText(  1 , ( *iListe )->sName );                       //name
                 if ( (  *iListe )->points  == -1 )
diff --git a/noncore/games/tictac/tictac.cpp b/noncore/games/tictac/tictac.cpp
index 4954ba4..9de3b58 100644
--- a/noncore/games/tictac/tictac.cpp
+++ b/noncore/games/tictac/tictac.cpp
@@ -50,33 +50,33 @@ void TicTacButton::drawButtonLabel( QPainter *p )
     }
 }
 
 
 //***************************************************************************
 //* TicTacGameBoard member functions
 //***************************************************************************
 
 // --------------------------------------------------------------------------
 // Creates a game board with N x N buttons and connects the "clicked()"
 // signal of all buttons to the "buttonClicked()" slot.
 //
 
 TicTacGameBoard::TicTacGameBoard( int n, QWidget *parent, const char *name )
         : QWidget( parent, name )
 {
-    showMaximized();
+    QPEApplication::showWidget( this );
     st = Init;          // initial state
     nBoard = n;
     n *= n;         // make square
     comp_starts = FALSE;      // human starts
     buttons = new TicTacButtons(n);   // create real buttons
     btArray = new TicTacArray(n);   // create button model
     QGridLayout * grid = new QGridLayout( this, 3, 3, 4 );
     QPalette p( blue );
     for ( int i=0; i<n; i++ ) {     // create and connect buttons
         TicTacButton *ttb = new TicTacButton( this );
         ttb->setPalette( p );
         ttb->setEnabled( FALSE );
         connect( ttb, SIGNAL(clicked()), SLOT(buttonClicked()) );
         grid->addWidget( ttb, i%3, i/3 );
         buttons->insert( i, ttb );
         btArray->at(i) = TicTacButton::Blank; // initial button type
@@ -320,33 +320,33 @@ TicTacToe::TicTacToe( QWidget *parent, const char *name, WFlags fl )
     whoStarts = new QComboBox( this );
     whoStarts->insertItem( tr( "Computer starts" ) );
     whoStarts->insertItem( tr( "Human starts" ) );
     l->addWidget( whoStarts );
 
       // Create the push buttons and connect their clicked() signals
       // to this right slots.
 
     newGame = new QPushButton( tr( "Play!" ), this );
     connect( newGame, SIGNAL(clicked()), SLOT(newGameClicked()) );
     quit = new QPushButton( tr( "Quit" ), this );
     connect( quit, SIGNAL(clicked()), qApp, SLOT(quit()) );
     QHBoxLayout * b = new QHBoxLayout;
     l->addLayout( b );
     b->addWidget( newGame );
     b->addWidget( quit );
-    showMaximized();
+    QPEApplication::showWidget( this );
     newState();
 }
 
 
 // --------------------------------------------------------------------------
 // TicTacToe::newGameClicked()      - SLOT
 //
 // This slot is activated when the new game button is clicked.
 //
 
 void TicTacToe::newGameClicked()
 {
     board->computerStarts( whoStarts->currentItem() == 0 );
     board->newGame();
     newState();
 }