summaryrefslogtreecommitdiffstats
path: root/kshisen
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:32:59 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:32:59 -0600
commit2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d (patch)
treeea24a96bad3bb7356ec1a2dca2a1338692d79745 /kshisen
parentd6f3812c8d969a673b420beca2482804177704fb (diff)
downloadtdegames-2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d.tar.gz
tdegames-2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kshisen')
-rw-r--r--kshisen/ChangeLog2
-rw-r--r--kshisen/app.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/kshisen/ChangeLog b/kshisen/ChangeLog
index fdc2a653..938d0ac9 100644
--- a/kshisen/ChangeLog
+++ b/kshisen/ChangeLog
@@ -1,5 +1,5 @@
2004-05-14 Benjamin Meyer (v.1.5.1)
- * Moved settings into a KConfigXT dialog.
+ * Moved settings into a TDEConfigXT dialog.
2003-05-23 Dave Corrie <[email protected]> (v.1.4.90)
diff --git a/kshisen/app.cpp b/kshisen/app.cpp
index e6ed257c..bcd57195 100644
--- a/kshisen/app.cpp
+++ b/kshisen/app.cpp
@@ -502,7 +502,7 @@ void App::readOldHighscore()
// this is for before-KHighscore-highscores
int i;
TQString s, e, grp;
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
highscore.resize(0);
i = 0;
@@ -746,10 +746,10 @@ void App::keyBindings()
* Show Settings dialog.
*/
void App::showSettings(){
- if(KConfigDialog::showDialog("settings"))
+ if(TDEConfigDialog::showDialog("settings"))
return;
- KConfigDialog *dialog = new KConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow);
+ TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow);
Settings *general = new Settings(0, "General");
dialog->addPage(general, i18n("General"), "package_settings");
connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadSettings()));