summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/kpacman/config.cpp394
-rw-r--r--noncore/games/kpacman/config.h74
-rw-r--r--noncore/games/kpacman/keys.cpp4
-rw-r--r--noncore/games/kpacman/kpacman.cpp18
-rw-r--r--noncore/games/kpacman/kpacman.pro2
-rw-r--r--noncore/games/kpacman/kpacmanwidget.cpp2
-rw-r--r--noncore/games/kpacman/painter.cpp2
-rw-r--r--noncore/games/kpacman/referee.cpp2
-rw-r--r--noncore/games/kpacman/status.cpp4
9 files changed, 19 insertions, 483 deletions
diff --git a/noncore/games/kpacman/config.cpp b/noncore/games/kpacman/config.cpp
deleted file mode 100644
index b9e3607..0000000
--- a/noncore/games/kpacman/config.cpp
+++ b/dev/null
@@ -1,394 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
-**
-** This file is part of Qt Palmtop 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.
-**
-** $Id$
-**
-**********************************************************************/
-
-#include "config.h"
-
-#include <qfile.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qtextstream.h>
-#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
-#include <qtextcodec.h>
-#endif
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-/*!
- \internal
-*/
-QString Config::configFilename(const QString& name, Domain d)
-{
- switch (d) {
- case File:
- return name;
- case User: {
- QDir dir = (QString(getenv("HOME")) + "/Settings");
- if ( !dir.exists() )
- mkdir(dir.path().local8Bit(),0700);
- return dir.path() + "/" + name + ".conf";
- }
- }
- return name;
-}
-
-/*!
- \class Config config.h
- \brief The Config class provides for saving application cofniguration state.
-
- You should keep a Config in existence only while you do not want others
- to be able to change the state. There is no locking currently, but there
- may be in the future.
-*/
-
-/*!
- \enum Config::ConfigGroup
- \internal
-*/
-
-/*!
- \enum Config::Domain
-
- \value File
- \value User
-
- See Config for details.
-*/
-
-/*!
- Constructs a config that will load or create a configuration with the
- given \a name in the given \a domain.
-
- You must call setGroup() before doing much else with the Config.
-
- In the default Domain, \e User,
- the configuration is user-specific. \a name should not contain "/" in
- this case, and in general should be the name of the C++ class that is
- primarily responsible for maintaining the configuration.
-
- In the File Domain, \a name is an absolute filename.
-*/
-Config::Config( const QString &name, Domain domain )
- : filename( configFilename(name,domain) )
-{
- git = groups.end();
- read();
-
- lang = getenv("LANG");
- int i = lang.find(".");
- if ( i > 0 )
- lang = lang.left( i );
- i = lang.find( "_" );
- if ( i > 0 )
- glang = lang.left(i);
-}
-
-/*!
- Writes any changes to disk and destroys the in-memory object.
-*/
-Config::~Config()
-{
- if ( changed )
- write();
-}
-
-/*!
- Returns whether the current group has an entry called \a key.
-*/
-bool Config::hasKey( const QString &key ) const
-{
- if ( groups.end() == git )
- return FALSE;
- ConfigGroup::ConstIterator it = ( *git ).find( key );
- return it != ( *git ).end();
-}
-
-/*!
- Sets the current group for subsequent reading and writing of
- entries to \a gname. Grouping allows the application to partition the namespace.
-
- This function must be called prior to any reading or writing
- of entries.
-
- The \a gname must not be empty.
-*/
-void Config::setGroup( const QString &gname )
-{
- QMap< QString, ConfigGroup>::Iterator it = groups.find( gname );
- if ( it == groups.end() ) {
- ConfigGroup *grp = new ConfigGroup;
- git = groups.insert( gname, *grp );
- changed = TRUE;
- return;
- }
- git = it;
-}
-
-/*!
- Writes a (\a key, \a value) entry to the current group.
-
- \sa readEntry()
-*/
-void Config::writeEntry( const QString &key, const QString &value )
-{
- if ( git == groups.end() ) {
- qWarning( "no group set" );
- return;
- }
- if ( (*git)[key] != value ) {
- ( *git ).insert( key, value );
- changed = TRUE;
- }
-}
-
-/*!
- Writes a (\a key, \a num) entry to the current group.
-
- \sa readNumEntry()
-*/
-void Config::writeEntry( const QString &key, int num )
-{
- QString s;
- s.setNum( num );
- writeEntry( key, s );
-}
-
-#ifdef Q_HAS_BOOL_TYPE
-/*!
- Writes a (\a key, \a b) entry to the current group.
-
- \sa readBoolEntry()
-*/
-void Config::writeEntry( const QString &key, bool b )
-{
- QString s;
- s.setNum( ( int )b );
- writeEntry( key, s );
-}
-#endif
-
-/*!
- Writes a (\a key, \a lst) entry to the current group. The list
- is separated by \a sep, so the strings must not contain that character.
-
- \sa readListEntry()
-*/
-void Config::writeEntry( const QString &key, const QStringList &lst, const QChar &sep )
-{
- QString s;
- QStringList::ConstIterator it = lst.begin();
- for ( ; it != lst.end(); ++it )
- s += *it + sep;
- writeEntry( key, s );
-}
-
-
-
-/*!
- Reads a string entry stored with \a key, defaulting to \a deflt if there is no entry.
-*/
-QString Config::readEntry( const QString &key, const QString &deflt )
-{
- QString res = readEntryDirect( key+"["+lang+"]" );
- if ( !res.isNull() )
- return res;
- if ( !glang.isEmpty() ) {
- res = readEntryDirect( key+"["+glang+"]" );
- if ( !res.isNull() )
- return res;
- }
- return readEntryDirect( key, deflt );
-}
-
-/*!
- \internal
-*/
-QString Config::readEntryDirect( const QString &key, const QString &deflt )
-{
- if ( git == groups.end() ) {
- //qWarning( "no group set" );
- return deflt;
- }
- ConfigGroup::Iterator it = ( *git ).find( key );
- if ( it != ( *git ).end() )
- return *it;
- else
- return deflt;
-}
-
-/*!
- Reads a numeric entry stored with \a key, defaulting to \a deflt if there is no entry.
-*/
-int Config::readNumEntry( const QString &key, int deflt )
-{
- QString s = readEntry( key );
- if ( s.isEmpty() )
- return deflt;
- else
- return s.toInt();
-}
-
-/*!
- Reads a bool entry stored with \a key, defaulting to \a deflt if there is no entry.
-*/
-bool Config::readBoolEntry( const QString &key, bool deflt )
-{
- QString s = readEntry( key );
- if ( s.isEmpty() )
- return deflt;
- else
- return (bool)s.toInt();
-}
-
-/*!
- Reads a string list entry stored with \a key, and with \a sep as the separator.
-*/
-QStringList Config::readListEntry( const QString &key, const QChar &sep )
-{
- QString s = readEntry( key );
- if ( s.isEmpty() )
- return QStringList();
- else
- return QStringList::split( sep, s );
-}
-
-/*!
- Removes all entries from the current group.
-*/
-void Config::clearGroup()
-{
- if ( git == groups.end() ) {
- qWarning( "no group set" );
- return;
- }
- if ( !(*git).isEmpty() ) {
- ( *git ).clear();
- changed = TRUE;
- }
-}
-
-/*!
- \internal
-*/
-void Config::write( const QString &fn )
-{
- if ( !fn.isEmpty() )
- filename = fn;
-
- QFile f( filename );
- if ( !f.open( IO_WriteOnly ) ) {
- qWarning( "could not open for writing `%s'", filename.latin1() );
- git = groups.end();
- return;
- }
-
- QTextStream s( &f );
-#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
- // The below should work, but doesn't in Qt 2.3.0
- s.setCodec( QTextCodec::codecForMib( 106 ) );
-#else
- s.setEncoding( QTextStream::UnicodeUTF8 );
-#endif
- QMap< QString, ConfigGroup >::Iterator g_it = groups.begin();
- for ( ; g_it != groups.end(); ++g_it ) {
- s << "[" << g_it.key() << "]" << "\n";
- ConfigGroup::Iterator e_it = ( *g_it ).begin();
- for ( ; e_it != ( *g_it ).end(); ++e_it )
- s << e_it.key() << " = " << *e_it << "\n";
- }
-
- f.close();
-}
-
-/*!
- Returns whether the Config is in a valid state.
-*/
-bool Config::isValid() const
-{
- return groups.end() != git;
-}
-
-/*!
- \internal
-*/
-void Config::read()
-{
- changed = FALSE;
-
- if ( !QFileInfo( filename ).exists() ) {
- git = groups.end();
- return;
- }
-
- QFile f( filename );
- if ( !f.open( IO_ReadOnly ) ) {
- git = groups.end();
- return;
- }
-
- QTextStream s( &f );
-#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
- // The below should work, but doesn't in Qt 2.3.0
- s.setCodec( QTextCodec::codecForMib( 106 ) );
-#else
- s.setEncoding( QTextStream::UnicodeUTF8 );
-#endif
-
- QString line;
- while ( !s.atEnd() ) {
- line = s.readLine();
- if ( !parse( line ) ) {
- git = groups.end();
- return;
- }
- }
-
- f.close();
-}
-
-/*!
- \internal
-*/
-bool Config::parse( const QString &l )
-{
- QString line = l.stripWhiteSpace();
- if ( line[ 0 ] == QChar( '[' ) ) {
- QString gname = line;
- gname = gname.remove( 0, 1 );
- if ( gname[ (int)gname.length() - 1 ] == QChar( ']' ) )
- gname = gname.remove( gname.length() - 1, 1 );
- ConfigGroup *grp = new ConfigGroup;
- git = groups.insert( gname, *grp );
- } else if ( !line.isEmpty() ) {
- if ( git == groups.end() )
- return FALSE;
- int eq = line.find( '=' );
- if ( eq == -1 )
- return FALSE;
- QString key = line.left(eq).stripWhiteSpace();
- QString value = line.mid(eq+1).stripWhiteSpace();
- ( *git ).insert( key, value );
- }
- return TRUE;
-}
diff --git a/noncore/games/kpacman/config.h b/noncore/games/kpacman/config.h
deleted file mode 100644
index 3c26b5d..0000000
--- a/noncore/games/kpacman/config.h
+++ b/dev/null
@@ -1,74 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
-**
-** This file is part of Qt Designer.
-**
-** 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.
-**
-**********************************************************************/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-// ##### could use QSettings with Qt 3.0
-
-#include <qmap.h>
-#include <qstringlist.h>
-
-class ConfigPrivate;
-class Config
-{
-public:
- typedef QMap< QString, QString > ConfigGroup;
-
- enum Domain { File, User };
- Config( const QString &name, Domain domain=User );
- ~Config();
-
- bool isValid() const;
- bool hasKey( const QString &key ) const;
-
- void setGroup( const QString &gname );
- void writeEntry( const QString &key, const QString &value );
- void writeEntry( const QString &key, int num );
-#ifdef Q_HAS_BOOL_TYPE
- void writeEntry( const QString &key, bool b );
-#endif
- void writeEntry( const QString &key, const QStringList &lst, const QChar &sep );
-
- QString readEntry( const QString &key, const QString &deflt = QString::null );
- QString readEntryDirect( const QString &key, const QString &deflt = QString::null );
- int readNumEntry( const QString &key, int deflt = -1 );
- bool readBoolEntry( const QString &key, bool deflt = FALSE );
- QStringList readListEntry( const QString &key, const QChar &sep );
-
- void clearGroup();
-
- void write( const QString &fn = QString::null );
-
-protected:
- void read();
- bool parse( const QString &line );
-
- QMap< QString, ConfigGroup > groups;
- QMap< QString, ConfigGroup >::Iterator git;
- QString filename;
- QString lang;
- QString glang;
- bool changed;
- ConfigPrivate *d;
- static QString configFilename(const QString& name, Domain);
-};
-
-#endif
diff --git a/noncore/games/kpacman/keys.cpp b/noncore/games/kpacman/keys.cpp
index 8b17785..07ce135 100644
--- a/noncore/games/kpacman/keys.cpp
+++ b/noncore/games/kpacman/keys.cpp
@@ -15,3 +15,3 @@
#include <qpe/qpeapplication.h>
-#include "config.h"
+#include <qpe/config.h>
#include "keys.h"
@@ -195,2 +195,3 @@ void Keys::ok()
{
+ /*
APP_CONFIG_BEGIN( cfg );
@@ -201,2 +202,3 @@ void Keys::ok()
APP_CONFIG_END( cfg );
+ */
accept();
diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp
index aee8eea..812e9ea 100644
--- a/noncore/games/kpacman/kpacman.cpp
+++ b/noncore/games/kpacman/kpacman.cpp
@@ -9,3 +9,3 @@
#include <qmenubar.h>
-#include "config.h"
+#include <qpe/config.h>
#include <qapplication.h>
@@ -72,3 +72,3 @@ Kpacman::~Kpacman()
{
- APP_CONFIG_BEGIN( cfg );
+ /* APP_CONFIG_BEGIN( cfg );
cfg->writeEntry("FocusOutPause", focusOutPause);
@@ -77,2 +77,3 @@ Kpacman::~Kpacman()
APP_CONFIG_END( cfg );
+ */
delete _menuBar;
@@ -145,7 +146,8 @@ int Kpacman::lookupSchemes()
APP_CONFIG_BEGIN( cfg );
- int ModeCount = cfg->readNumEntry("ModeCount", -1);
- int Mode = cfg->readNumEntry("Mode", -1);
- int SchemeCount = cfg->readNumEntry("SchemeCount");
- int Scheme = cfg->readNumEntry("Scheme", -1);
+ int ModeCount = cfg->readNumEntry("ModeCount", 0);
+ int Mode = cfg->readNumEntry("Mode", 0);
+ int SchemeCount = cfg->readNumEntry("SchemeCount", 0);
+ int Scheme = cfg->readNumEntry("Scheme", 0);
+ /*
if (SchemeCount == 0 || Scheme == -1) {
@@ -157,2 +159,3 @@ int Kpacman::lookupSchemes()
}
+ */
@@ -351,3 +354,3 @@ void Kpacman::schemeChecked(int id)
}
-
+ /*
APP_CONFIG_BEGIN( cfg );
@@ -356,2 +359,3 @@ void Kpacman::schemeChecked(int id)
APP_CONFIG_END( cfg );
+ */
diff --git a/noncore/games/kpacman/kpacman.pro b/noncore/games/kpacman/kpacman.pro
index e193ebc..81d369a 100644
--- a/noncore/games/kpacman/kpacman.pro
+++ b/noncore/games/kpacman/kpacman.pro
@@ -19,3 +19,2 @@ HEADERS = kpacmanwidget.h \
colors.h \
- config.h \
portable.h
@@ -34,3 +33,2 @@ SOURCES = kpacmanwidget.cpp \
kpacman.cpp \
- config.cpp \
main.cpp
diff --git a/noncore/games/kpacman/kpacmanwidget.cpp b/noncore/games/kpacman/kpacmanwidget.cpp
index cf2aed9..823d2bf 100644
--- a/noncore/games/kpacman/kpacmanwidget.cpp
+++ b/noncore/games/kpacman/kpacmanwidget.cpp
@@ -11,3 +11,3 @@
#include <qpe/qpeapplication.h>
-#include "config.h"
+#include <qpe/config.h>
#include "kpacmanwidget.h"
diff --git a/noncore/games/kpacman/painter.cpp b/noncore/games/kpacman/painter.cpp
index 80aeab0..d8c7460 100644
--- a/noncore/games/kpacman/painter.cpp
+++ b/noncore/games/kpacman/painter.cpp
@@ -9,3 +9,3 @@
#include <qpe/qpeapplication.h>
-#include "config.h"
+#include <qpe/config.h>
#endif
diff --git a/noncore/games/kpacman/referee.cpp b/noncore/games/kpacman/referee.cpp
index 6d8f3fb..1b810d8 100644
--- a/noncore/games/kpacman/referee.cpp
+++ b/noncore/games/kpacman/referee.cpp
@@ -13,3 +13,3 @@
#include <qpe/qpeapplication.h>
-#include "config.h"
+#include <qpe/config.h>
#include "referee.h"
diff --git a/noncore/games/kpacman/status.cpp b/noncore/games/kpacman/status.cpp
index 1ef910d..2a17c21 100644
--- a/noncore/games/kpacman/status.cpp
+++ b/noncore/games/kpacman/status.cpp
@@ -11,3 +11,3 @@
#include <qpe/qpeapplication.h>
-#include "config.h"
+#include <qpe/config.h>
#include "status.h"
@@ -249,3 +249,3 @@ void Status::confMisc(bool defGroup)
fillStrList(levelPixmapName,
- cfg->readEntry("LevelPixmapName", "level.xpm"), maxLevel+1);
+ cfg->readEntry("LevelPixmapName", "fruit.xpm"), maxLevel+1);
APP_CONFIG_END( cfg );