From 2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:32:59 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- ksame/KSameWidget.cpp | 8 ++++---- ksame/KSameWidget.h | 4 ++-- ksame/StoneWidget.cpp | 4 ++-- ksame/StoneWidget.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ksame') diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp index a49db4f7..7d28b276 100644 --- a/ksame/KSameWidget.cpp +++ b/ksame/KSameWidget.cpp @@ -93,7 +93,7 @@ KSameWidget::KSameWidget(TQWidget *parent, const char* name, WFlags fl) : if (!kapp->isRestored()) newGame(kapp->random(),default_colors); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); if (cfg->readBoolEntry("showRemaining")) { showNumberRemaining->setChecked(true); @@ -101,12 +101,12 @@ KSameWidget::KSameWidget(TQWidget *parent, const char* name, WFlags fl) : } } -void KSameWidget::readProperties(KConfig *conf) { +void KSameWidget::readProperties(TDEConfig *conf) { Q_ASSERT(conf); stone->readProperties(conf); } -void KSameWidget::saveProperties(KConfig *conf) { +void KSameWidget::saveProperties(TDEConfig *conf) { Q_ASSERT(conf); stone->saveProperties(conf); conf->sync(); @@ -127,7 +127,7 @@ void KSameWidget::showNumberRemainingToggled() } else status->changeItem(i18n("%1 Colors").arg(stone->colors()),1); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->writeEntry("showRemaining", showNumberRemaining->isChecked()); cfg->sync(); } diff --git a/ksame/KSameWidget.h b/ksame/KSameWidget.h index 059c16b9..94982cab 100644 --- a/ksame/KSameWidget.h +++ b/ksame/KSameWidget.h @@ -56,8 +56,8 @@ private slots: protected: void newGame(unsigned int board, int colors); - virtual void saveProperties(KConfig *conf); - virtual void readProperties(KConfig *conf); + virtual void saveProperties(TDEConfig *conf); + virtual void readProperties(TDEConfig *conf); bool confirmAbort(); diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp index dc02a1bc..e4a4bb46 100644 --- a/ksame/StoneWidget.cpp +++ b/ksame/StoneWidget.cpp @@ -202,7 +202,7 @@ bool StoneWidget::isOriginalBoard() { return !modified; } -void StoneWidget::readProperties(KConfig *conf) { +void StoneWidget::readProperties(TDEConfig *conf) { Q_ASSERT(conf); history.clear(); @@ -227,7 +227,7 @@ void StoneWidget::readProperties(KConfig *conf) { void -StoneWidget::saveProperties(KConfig *conf) { +StoneWidget::saveProperties(TDEConfig *conf) { Q_ASSERT(conf); TQStrList list(true); diff --git a/ksame/StoneWidget.h b/ksame/StoneWidget.h index 7efc606d..059c268e 100644 --- a/ksame/StoneWidget.h +++ b/ksame/StoneWidget.h @@ -71,8 +71,8 @@ public: // test for unchanged start position bool isOriginalBoard(); - virtual void readProperties(KConfig *conf); - virtual void saveProperties(KConfig *conf); + virtual void readProperties(TDEConfig *conf); + virtual void saveProperties(TDEConfig *conf); int count(int color); protected: -- cgit v1.2.1