-rw-r--r-- | noncore/games/kpacman/kpacman.cpp | 4 | ||||
-rw-r--r-- | noncore/games/kpacman/kpacmanwidget.cpp | 5 | ||||
-rw-r--r-- | noncore/games/kpacman/portable.h | 5 | ||||
-rw-r--r-- | noncore/games/kpacman/status.cpp | 1 |
4 files changed, 8 insertions, 7 deletions
diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp index d9d2d69..aee8eea 100644 --- a/noncore/games/kpacman/kpacman.cpp +++ b/noncore/games/kpacman/kpacman.cpp @@ -112,13 +112,13 @@ void Kpacman::menu() focusInContinueID = optionsPopup->insertItem(tr("&Continue in Foreground"), this, SLOT(toggleFocusInContinue())); optionsPopup->insertSeparator(); optionsPopup->insertItem(tr("Change &keys..."), this, SLOT(confKeys())); -#ifndef QWS +#ifndef QPE_PORT QString aboutText = tr("@PACKAGE@ - @VERSION@\n\n" "Joerg Thoennissen (joe@dsite.de)\n\n" "A pacman game for the KDE Desktop\n\n" "The program based on the source of ksnake\n" "by Michel Filippi (mfilippi@sade.rhein-main.de).\n" "The design was strongly influenced by the pacman\n" @@ -132,13 +132,13 @@ void Kpacman::menu() //_menuBar = new KMenuBar(this); //CHECK_PTR( _menuBar ); //_menuBar->insertItem(tr("&Game"), gamePopup); //_menuBar->insertItem(tr("&Options"), optionsPopup); //_menuBar->insertSeparator(); -#ifndef QWS +#ifndef QPE_PORT _menuBar->insertItem(tr("&Help"), helpPopup); #endif } int Kpacman::lookupSchemes() { diff --git a/noncore/games/kpacman/kpacmanwidget.cpp b/noncore/games/kpacman/kpacmanwidget.cpp index feb782c..cf2aed9 100644 --- a/noncore/games/kpacman/kpacmanwidget.cpp +++ b/noncore/games/kpacman/kpacmanwidget.cpp @@ -20,12 +20,15 @@ #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(); @@ -138,15 +141,17 @@ void KpacmanWidget::setScheme(int Scheme, int Mode) referee->repaint(FALSE); status->repaint(FALSE); } void KpacmanWidget::resizeEvent( QResizeEvent * ) { + qWarning("Resize"); referee->setGeometry(0, bitfont->height()*3, referee->width(), referee->height()); referee->setBackgroundColor(BLACK); + if(!status ) return; status->setGeometry(0, bitfont->height()*3+referee->height(), referee->width(), status->height()); status->setBackgroundColor(BLACK); score->setGeometry(0, 0, referee->width(), bitfont->height()*3+referee->height()+status->height()); score->setBackgroundColor(BLACK); diff --git a/noncore/games/kpacman/portable.h b/noncore/games/kpacman/portable.h index ff0912b..b087be5 100644 --- a/noncore/games/kpacman/portable.h +++ b/noncore/games/kpacman/portable.h @@ -16,18 +16,13 @@ * * ***************************************************************************/ #ifndef PORTABLE_H #define PORTABLE_H -#ifdef QWS #define QPE_PORT -#else -#define KDE2_PORT -#define KDE_PORT -#endif #if defined( KDE2_PORT ) #define APP kapp #define APP_CONFIG_BEGIN( cfgname ) KConfig cfgname = kapp->config() diff --git a/noncore/games/kpacman/status.cpp b/noncore/games/kpacman/status.cpp index 3453d37..1ef910d 100644 --- a/noncore/games/kpacman/status.cpp +++ b/noncore/games/kpacman/status.cpp @@ -19,12 +19,13 @@ #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; |