5 files changed, 14 insertions, 101 deletions

diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp
index 7df6ef0..d9d2d69 100644
--- a/noncore/games/kpacman/kpacman.cpp
+++ b/noncore/games/kpacman/kpacman.cpp
@@ -27,11 +27,13 @@ Kpacman::Kpacman(QWidget *parent, const char *name)
     menu();
 
-    view = new KpacmanWidget( this, QString(name)+"widget");
+	m_view = new QWidget( this, "m_view" );
+    m_view->setBackgroundColor( black );
+	m_layout = new QGridLayout( m_view );
+	m_layout->setMargin( 7 );
 
-#ifndef QWS
-    setFixedSize(view->width(), view->height());
-#else
-    setCaption( "Kpacman" );
-#endif
+	view = new KpacmanWidget( this, QString(name)+"widget");
+	m_layout->addWidget( view, 0, 0 );
+
+    setCaption( "KPacman" );
 
     view->referee->setFocus();
@@ -64,12 +66,5 @@ Kpacman::Kpacman(QWidget *parent, const char *name)
     toggleHideMouseCursor();
 
-#ifndef QWS
-    menuBar->show();
-    view->show();
-    setMenu(menuBar);
-    setView(view);
-#else
-    setCentralWidget( view );
-#endif
+    setCentralWidget( m_view );
 }
 
diff --git a/noncore/games/kpacman/kpacman.h b/noncore/games/kpacman/kpacman.h
index d7de9de..2c1de70 100644
--- a/noncore/games/kpacman/kpacman.h
+++ b/noncore/games/kpacman/kpacman.h
@@ -8,14 +8,6 @@
 #include "portable.h"
 
-#if defined( KDE2_PORT )
-#include <kapp.h>
-#include <klocale.h>
-#include <ktmainwindow.h>
-#include <kmenubar.h>
-#elif defined( QPE_PORT )
 #include <qmainwindow.h>
 class QMenuBar;
-#endif
-
 #include <qregexp.h>
 
@@ -26,16 +18,10 @@ class QMenuBar;
 #include <qlist.h>
 #include <qfileinf.h>
+#include <qlayout.h>
 
-#if defined( KDE2_PORT )
-#include <referee.h>
-#include <status.h>
-#include <score.h>
-#include <keys.h>
-#elif defined( QPE_PORT )
 #include "referee.h"
 #include "status.h"
 #include "score.h"
 #include "keys.h"
-#endif
 
 class Kpacman : public KTMainWindow
@@ -72,4 +58,6 @@ private:
     int lookupSchemes();
 
+	QGridLayout *m_layout;
+	QWidget *m_view;
     KMenuBar *_menuBar;
     QPopupMenu *gamePopup;
diff --git a/noncore/games/kpacman/kpacmanwidget.cpp b/noncore/games/kpacman/kpacmanwidget.cpp
index 215dcda..feb782c 100644
--- a/noncore/games/kpacman/kpacmanwidget.cpp
+++ b/noncore/games/kpacman/kpacmanwidget.cpp
@@ -34,9 +34,5 @@ KpacmanWidget::KpacmanWidget( QWidget *parent, const char *name)
     status = new Status(this, name, scheme, mode);
 
-#ifndef QWS
-    setFixedSize(referee->width(), bitfont->height()*3 + referee->height() + status->height());
-#else
     setBackgroundColor( black );
-#endif
 }
 
@@ -139,9 +135,4 @@ void KpacmanWidget::setScheme(int Scheme, int Mode)
     status->setScheme(Scheme, Mode);
 
-#ifndef QWS
-    setFixedSize(referee->width(),
-                 bitfont->height()*3 + referee->height() + status->height());
-#endif
-
     score->repaint(FALSE);
     referee->repaint(FALSE);
diff --git a/noncore/games/kpacman/referee.cpp b/noncore/games/kpacman/referee.cpp
index 70916f0..81f331b 100644
--- a/noncore/games/kpacman/referee.cpp
+++ b/noncore/games/kpacman/referee.cpp
@@ -732,8 +732,8 @@ void Referee::keyPressEvent( QKeyEvent *k )
         play();
     else if ( !gameState.testBit(Playing) &&
-						key == Key_Up ||
+						( key == Key_Up ||
             			key == Key_Down ||
             			key == Key_Right ||
-            			key == Key_Left ) 
+            			key == Key_Left )) 
         play();
     // "Space" => pause
diff --git a/noncore/games/kpacman/score.cpp b/noncore/games/kpacman/score.cpp
index 17dbf0a..b3ff3d9 100644
--- a/noncore/games/kpacman/score.cpp
+++ b/noncore/games/kpacman/score.cpp
@@ -479,32 +479,4 @@ void Score::read()
 void Score::write()
 {
-#ifndef QWS
-    if (!highscoreFile.exists() && highscoreFile.name() == systemHighscoreFileInfo.filePath())
-        KMessageBox::information(0,
-                                 tr("You're going to create the highscore-file\n"
-                                 "'%1'\n"
-																 "for your maschine, that should be used systemwide.\n"
-																 "\n"
-                                 "To grant access to the other users, set the appropriate rights (a+w)\n"
-                                 "on that file or ask your systemadministator for that favor.\n"
-                                 "\n"
-                                 "To use a different directory or filename for the highscores,"
-                                 "specify them in the configfile (kpacmanrc:highscoreFilePath)."
-                                 ).arg(systemHighscoreFileInfo.filePath()));
-
-    if (highscoreFile.name() == privateHighscoreFileInfo.filePath())
-        KMessageBox::information(0,
-                                 tr("You're using a private highscore-file, that's mostly because of\n"
-                                 "missing write-access to the systemwide file\n"
-                                 "'%1' .\n"
-                                 "\n"
-                                 "Ask your systemadministrator for granting you access to that file,\n"
-                                 "by setting the appropriate rights (a+w) on it.\n"
-                                 "\n"
-                                 "To use a different directory or filename for the highscores,"
-                                 "specify them in the configfile (kpacmanrc:highscoreFilePath)."
-                                 ).arg(systemHighscoreFileInfo.filePath()),
-                                 QString::null, "PrivateHighscore");
-#endif
     if (highscoreFile.open(IO_WriteOnly)) {
         QDataStream s(&highscoreFile);
@@ -606,37 +578,4 @@ int Score::y(float row)
 QFileInfo Score::locateHighscoreFilePath()
 {
-#ifndef QWS
-    QFileInfo systemHighscoreDirPath;
-    QStringList systemHighscoreDirs;
-
-    // Schreibfähige "private" highscore-Datei ermitteln für den fallback.
-    privateHighscoreFileInfo.setFile(KGlobal::dirs()->saveLocation("appdata")+highscoreName);
-
-    // FilePath aus der Konfigurationsdatei benutzen
-    systemHighscoreFileInfo.setFile(cfg->readEntry("HighscoreFilePath"));
-
-    // Kein Wert aus der Konfiguration erhalten, dann die "system"-Datei suchen.
-    if (systemHighscoreFileInfo.filePath().isEmpty())
-        systemHighscoreDirs = KGlobal::dirs()->resourceDirs("appdata");
-    else
-        systemHighscoreDirs = QStringList(systemHighscoreFileInfo.filePath());
-
-    for (QStringList::Iterator i = systemHighscoreDirs.begin(); i != systemHighscoreDirs.end(); ++i) {
-
-         systemHighscoreFileInfo.setFile(*i);
-         if (systemHighscoreFileInfo.fileName().isEmpty())
-             systemHighscoreFileInfo.setFile(systemHighscoreFileInfo.dirPath()+"/"+highscoreName);
-
-         // privateHighscoreFileInfo für die "system" Suche ignorieren
-         if (systemHighscoreFileInfo.filePath() != privateHighscoreFileInfo.filePath())
-         		 if (!systemHighscoreFileInfo.exists()) {
-					       systemHighscoreDirPath.setFile(systemHighscoreFileInfo.dirPath());
-						     if (systemHighscoreDirPath.exists() && systemHighscoreDirPath.isWritable())
-         		         return systemHighscoreFileInfo;
-         		 } else
-         		     if (systemHighscoreFileInfo.isWritable())
-         		         return systemHighscoreFileInfo;
-    }
-#endif
     return privateHighscoreFileInfo;
 }