summaryrefslogtreecommitdiffstats
path: root/libksirtet
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:32:59 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:32:59 -0600
commit2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d (patch)
treeea24a96bad3bb7356ec1a2dca2a1338692d79745 /libksirtet
parentd6f3812c8d969a673b420beca2482804177704fb (diff)
downloadtdegames-2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d.tar.gz
tdegames-2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libksirtet')
-rw-r--r--libksirtet/base/main.cpp4
-rw-r--r--libksirtet/base/main.h4
-rw-r--r--libksirtet/common/ai.cpp4
-rw-r--r--libksirtet/common/highscores.cpp2
-rw-r--r--libksirtet/common/main.cpp2
-rw-r--r--libksirtet/common/main.h2
-rw-r--r--libksirtet/lib/mp_interface.cpp2
-rw-r--r--libksirtet/lib/wizard.cpp8
8 files changed, 14 insertions, 14 deletions
diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp
index cbfc433a..535af790 100644
--- a/libksirtet/base/main.cpp
+++ b/libksirtet/base/main.cpp
@@ -78,9 +78,9 @@ void BaseMainWindow::configureHighscores()
void BaseMainWindow::configureSettings()
{
if ( !_inter->_isPaused() ) _inter->_pause();
- if ( KConfigDialog::showDialog("settings") ) return;
+ if ( TDEConfigDialog::showDialog("settings") ) return;
- KConfigDialog *dialog = new KConfigDialog(this, "settings", BasePrefs::self() );
+ TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", BasePrefs::self() );
TQWidget *w = bfactory->createGameConfig();
if (w) dialog->addPage(w, i18n("Game"), "package_system");
w = bfactory->createAppearanceConfig();
diff --git a/libksirtet/base/main.h b/libksirtet/base/main.h
index d92d49e0..33b5f9d9 100644
--- a/libksirtet/base/main.h
+++ b/libksirtet/base/main.h
@@ -8,7 +8,7 @@
class BaseInterface;
class KToggleAction;
class KKeyDialog;
-class KConfigDialog;
+class TDEConfigDialog;
class KDE_EXPORT BaseMainWindow : public KZoomMainWindow
{
@@ -34,7 +34,7 @@ protected:
BaseInterface *_inter;
void buildGUI(TQWidget *widget);
- virtual void addConfig(KConfigDialog *) {}
+ virtual void addConfig(TDEConfigDialog *) {}
virtual void addKeys(KKeyDialog &) {}
virtual void saveKeys() {}
diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp
index 3f48035f..578c71d5 100644
--- a/libksirtet/common/ai.cpp
+++ b/libksirtet/common/ai.cpp
@@ -343,14 +343,14 @@ TQCString AIConfig::coefficientKey(const char *name)
double AIConfig::coefficient(const AI::Data &data)
{
- KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").arg(data.name) );
+ TDEConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").arg(data.name) );
assert(item);
return item->property().toDouble();
}
int AIConfig::trigger(const AI::Data &data)
{
- KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").arg(data.name) );
+ TDEConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").arg(data.name) );
assert(item);
return item->property().toInt();
}
diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp
index bd9be550..29774d71 100644
--- a/libksirtet/common/highscores.cpp
+++ b/libksirtet/common/highscores.cpp
@@ -20,7 +20,7 @@ CommonHighscores::CommonHighscores()
void CommonHighscores::convertLegacy(uint)
{
- KConfigGroupSaver cg(kapp->config(), "High Scores");
+ TDEConfigGroupSaver cg(kapp->config(), "High Scores");
for (uint i=0; i<10; i++) {
TQString name
= cg.config()->readEntry(TQString("name%1").arg(i), TQString());
diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp
index 8856a726..4383243f 100644
--- a/libksirtet/common/main.cpp
+++ b/libksirtet/common/main.cpp
@@ -10,7 +10,7 @@
#include "inter.h"
#include "factory.h"
-void MainWindow::addConfig(KConfigDialog *dialog)
+void MainWindow::addConfig(TDEConfigDialog *dialog)
{
TQWidget *w = cfactory->createAIConfig();
if (w) dialog->addPage(w, i18n("A.I."), "personal");
diff --git a/libksirtet/common/main.h b/libksirtet/common/main.h
index ccf15403..daafca74 100644
--- a/libksirtet/common/main.h
+++ b/libksirtet/common/main.h
@@ -14,7 +14,7 @@ public:
protected:
void init();
- void addConfig(KConfigDialog *);
+ void addConfig(TDEConfigDialog *);
void addKeys(KKeyDialog &);
void saveKeys();
virtual void focusInEvent(TQFocusEvent *e);
diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp
index 1799c270..74c6beee 100644
--- a/libksirtet/lib/mp_interface.cpp
+++ b/libksirtet/lib/mp_interface.cpp
@@ -95,7 +95,7 @@ void MPInterface::specialLocalGame(uint nbHumans, uint nbAIs)
ConnectionData cd;
BoardData bd;
PlayerComboBox::Type t;
- KConfigGroupSaver cg(kapp->config(), MP_GROUP);
+ TDEConfigGroupSaver cg(kapp->config(), MP_GROUP);
for (uint i=0; i<(nbHumans+nbAIs); i++) {
bd.type = (i<nbHumans ? PlayerComboBox::Human : PlayerComboBox::AI);
bd.name = TQString();
diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp
index a3fd4f2b..2070ae4f 100644
--- a/libksirtet/lib/wizard.cpp
+++ b/libksirtet/lib/wizard.cpp
@@ -43,7 +43,7 @@ MPWizard::MPWizard(const MPGameInfo &gi, ConnectionData &_cd,
//-----------------------------------------------------------------------------
void MPWizard::setupTypePage()
{
- KConfigGroupSaver cg(kapp->config(), MP_GROUP);
+ TDEConfigGroupSaver cg(kapp->config(), MP_GROUP);
typePage = new TQVBox(this);
typePage->setMargin(KDialogBase::marginHint());
@@ -87,7 +87,7 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi)
TQSignalMapper *aism = new TQSignalMapper(TQT_TQOBJECT(this));
if (gi.AISettingSlot) connect(aism, TQT_SIGNAL(mapped(int)), gi.AISettingSlot);
- KConfigGroupSaver cg(kapp->config(), MP_GROUP);
+ TDEConfigGroupSaver cg(kapp->config(), MP_GROUP);
TQString n;
PlayerComboBox::Type type;
PlayerLine *pl;
@@ -135,7 +135,7 @@ void MPWizard::typeChanged(int t)
str = "localhost";
lserver->setText(i18n("Hostname:"));
} else {
- KConfigGroupSaver cg(kapp->config(), MP_GROUP);
+ TDEConfigGroupSaver cg(kapp->config(), MP_GROUP);
str = cg.config()->readEntry(MP_SERVER_ADDRESS,
i18n("the.server.address"));
lserver->setText(i18n("Server address:"));
@@ -159,7 +159,7 @@ void MPWizard::lineTypeChanged(int)
void MPWizard::accept()
{
- KConfigGroupSaver cg(kapp->config(), MP_GROUP);
+ TDEConfigGroupSaver cg(kapp->config(), MP_GROUP);
cd.network = ( type!=Local );
cd.server = ( type!=Client );