summaryrefslogtreecommitdiffstats
path: root/libtdegames
diff options
context:
space:
mode:
Diffstat (limited to 'libtdegames')
-rw-r--r--libtdegames/configure.in.in2
-rw-r--r--libtdegames/highscore/kexthighscore_gui.cpp2
-rw-r--r--libtdegames/highscore/kexthighscore_internal.h2
-rw-r--r--libtdegames/highscore/khighscore.cpp4
-rw-r--r--libtdegames/highscore/khighscore.h2
-rw-r--r--libtdegames/highscore/kscoredialog.cpp6
-rw-r--r--libtdegames/kcarddialog.h2
-rw-r--r--libtdegames/kchatbase.cpp8
-rw-r--r--libtdegames/kchatbase.h6
-rw-r--r--libtdegames/kgameprogress.cpp4
10 files changed, 19 insertions, 19 deletions
diff --git a/libtdegames/configure.in.in b/libtdegames/configure.in.in
index ffcaf9c9..33b5935b 100644
--- a/libtdegames/configure.in.in
+++ b/libtdegames/configure.in.in
@@ -1,5 +1,5 @@
dnl AB: checking for a system-wide highscore file. If "no" then the default
-dnl (just kapp->config()) is used. See KHighscore for details.
+dnl (just tdeApp->config()) is used. See KHighscore for details.
AC_MSG_CHECKING(whether to use system-wide highscores)
AC_ARG_ENABLE(highscore-dir,
diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp
index 286fb97a..2a598a21 100644
--- a/libtdegames/highscore/kexthighscore_gui.cpp
+++ b/libtdegames/highscore/kexthighscore_gui.cpp
@@ -444,7 +444,7 @@ void ConfigDialog::accept()
{
if ( save() ) {
KDialogBase::accept();
- kapp->config()->sync(); // safer
+ tdeApp->config()->sync(); // safer
}
}
diff --git a/libtdegames/highscore/kexthighscore_internal.h b/libtdegames/highscore/kexthighscore_internal.h
index c1d166bb..76f4eb65 100644
--- a/libtdegames/highscore/kexthighscore_internal.h
+++ b/libtdegames/highscore/kexthighscore_internal.h
@@ -177,7 +177,7 @@ class ConfigGroup : public TDEConfigGroupSaver
{
public:
ConfigGroup(const TQString &group = TQString())
- : TDEConfigGroupSaver(kapp->config(), group) {}
+ : TDEConfigGroupSaver(tdeApp->config(), group) {}
};
//-----------------------------------------------------------------------------
diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp
index bfed1534..35503301 100644
--- a/libtdegames/highscore/khighscore.cpp
+++ b/libtdegames/highscore/khighscore.cpp
@@ -143,7 +143,7 @@ bool KHighscore::lockForWriting(TQWidget *widget)
void KHighscore::writeAndUnlock()
{
if ( !d->global ) {
- kapp->config()->sync();
+ tdeApp->config()->sync();
return;
}
if ( !isLocked() ) return;
@@ -162,7 +162,7 @@ KHighscore::~KHighscore()
TDEConfig* KHighscore::config() const
{
- return (d->global ? _config : kapp->config());
+ return (d->global ? _config : tdeApp->config());
}
void KHighscore::writeEntry(int entry, const TQString& key, const TQVariant& value)
diff --git a/libtdegames/highscore/khighscore.h b/libtdegames/highscore/khighscore.h
index d75a26e9..b313ac9f 100644
--- a/libtdegames/highscore/khighscore.h
+++ b/libtdegames/highscore/khighscore.h
@@ -295,7 +295,7 @@ protected:
/**
* @return A pointer to the TDEConfig object to be used. This is
- * either kapp->config() (default) or a KSimpleConfig object for
+ * either tdeApp->config() (default) or a KSimpleConfig object for
* a system-wide highscore file.
**/
TDEConfig* config() const;
diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp
index 0f35c191..98aab883 100644
--- a/libtdegames/highscore/kscoredialog.cpp
+++ b/libtdegames/highscore/kscoredialog.cpp
@@ -275,7 +275,7 @@ void KScoreDialog::loadScores()
TQString key, value;
d->loaded = true;
d->scores.clear();
- TDEConfigGroup config(kapp->config(), d->configGroup.utf8());
+ TDEConfigGroup config(tdeApp->config(), d->configGroup.utf8());
d->player = config.readEntry("LastPlayer");
@@ -298,7 +298,7 @@ void KScoreDialog::loadScores()
void KScoreDialog::saveScores()
{
TQString key, value;
- TDEConfigGroup config(kapp->config(), d->configGroup.utf8());
+ TDEConfigGroup config(tdeApp->config(), d->configGroup.utf8());
config.writeEntry("LastPlayer", d->player);
@@ -315,7 +315,7 @@ void KScoreDialog::saveScores()
}
}
}
- kapp->config()->sync();
+ tdeApp->config()->sync();
}
int KScoreDialog::addScore(int newScore, const FieldInfo &newInfo, bool askName)
diff --git a/libtdegames/kcarddialog.h b/libtdegames/kcarddialog.h
index 7f432eb3..b4d9d23f 100644
--- a/libtdegames/kcarddialog.h
+++ b/libtdegames/kcarddialog.h
@@ -63,7 +63,7 @@ class KCardDialogPrivate;
* deck/carddir. You have to save the value of those parameters in your config
* file - that's why the parameters are needed.
*
- * You can also provide a TDEConfig pointer (usually kapp->config()). This
+ * You can also provide a TDEConfig pointer (usually tdeApp->config()). This
* pointer is used to store information about the dialog in an own group
* ("KCardDailog").
* So you can just ignore the randomCardDir and randomDeck
diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp
index 4ebd425b..99a831d9 100644
--- a/libtdegames/kchatbase.cpp
+++ b/libtdegames/kchatbase.cpp
@@ -235,8 +235,8 @@ void KChatBase::init(bool noComboBox)
d->mAcceptMessage = true; // by default
setMaxItems(-1); // unlimited
- if (kapp) {
- // kapp might be NULL as well - in case we are in TQt designer.
+ if (tdeApp) {
+ // tdeApp might be NULL as well - in case we are in TQt designer.
readConfig();
}
}
@@ -469,7 +469,7 @@ void KChatBase::saveConfig(TDEConfig* conf)
{
TQString oldGroup;
if (!conf) {
- conf = kapp->config();
+ conf = tdeApp->config();
oldGroup = conf->group();
conf->setGroup("KChatBase");
}
@@ -489,7 +489,7 @@ void KChatBase::readConfig(TDEConfig* conf)
{
TQString oldGroup;
if (!conf) {
- conf = kapp->config();
+ conf = tdeApp->config();
oldGroup = conf->group();
conf->setGroup("KChatBase");
}
diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h
index 0012bb40..d5c63691 100644
--- a/libtdegames/kchatbase.h
+++ b/libtdegames/kchatbase.h
@@ -362,18 +362,18 @@ public:
/**
* Save the configuration of the dialog to a TDEConfig object. If
- * the supplied TDEConfig pointer is NULL then kapp->config() is used
+ * the supplied TDEConfig pointer is NULL then tdeApp->config() is used
* instead (and the group is changed to "KChatBase") butr the current
* group is restored at the end.
* @param conf A pointer to the TDEConfig object to save the config
- * to. If you use 0 then kapp->config() is used and the group is changed
+ * to. If you use 0 then tdeApp->config() is used and the group is changed
* to "KChatBase" (the current group is restored at the end).
**/
virtual void saveConfig(TDEConfig* conf = 0);
/**
* Read the configuration from a TDEConfig object. If the pointer is
- * NULL kapp->config() is used and the group is changed to "KChatBase".
+ * NULL tdeApp->config() is used and the group is changed to "KChatBase".
* The current TDEConfig::group is restored after this call.
**/
virtual void readConfig(TDEConfig* conf = 0);
diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp
index f3b48c5a..7e0067cf 100644
--- a/libtdegames/kgameprogress.cpp
+++ b/libtdegames/kgameprogress.cpp
@@ -72,13 +72,13 @@ void KGameProgress::initialize()
bar_style = Solid;
text_enabled = TRUE;
setBackgroundMode( PaletteBackground );
- connect(kapp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(paletteChange()));
+ connect(tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(paletteChange()));
paletteChange();
}
void KGameProgress::paletteChange()
{
- TQPalette p = kapp->palette();
+ TQPalette p = tdeApp->palette();
const TQColorGroup &colorGroup = p.active();
if (!use_supplied_bar_color)
bar_color = colorGroup.highlight();