Browse Source

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 8 years ago
parent
commit
2f84d0e2d3
135 changed files with 472 additions and 472 deletions
  1. +3
    -3
      atlantik/client/atlantik.cpp
  2. +1
    -1
      atlantik/client/atlantik.h
  3. +5
    -5
      atlantik/client/monopigator.cpp
  4. +3
    -3
      atlantik/client/monopigator.h
  5. +1
    -1
      atlantik/kio_atlantik/kio_atlantik.h
  6. +2
    -2
      kasteroids/toplevel.cpp
  7. +3
    -3
      katomic/gamewidget.cpp
  8. +2
    -2
      katomic/toplevel.h
  9. +2
    -2
      kbackgammon/engines/fibs/kbgfibs.cpp
  10. +2
    -2
      kbackgammon/engines/fibs/kbgfibschat.cpp
  11. +3
    -3
      kbackgammon/engines/fibs/kplayerlist.cpp
  12. +2
    -2
      kbackgammon/engines/gnubg/kbggnubg.cpp
  13. +2
    -2
      kbackgammon/engines/nextgen/kbgng.cpp
  14. +2
    -2
      kbackgammon/engines/offline/kbgoffline.cpp
  15. +6
    -6
      kbackgammon/kbg.cpp
  16. +2
    -2
      kbackgammon/kbgboard.cpp
  17. +2
    -2
      kbackgammon/kbgtextview.cpp
  18. +1
    -1
      kbattleship/kbattleship/kbattleship.cpp
  19. +2
    -2
      kbattleship/kbattleship/kbattleship.h
  20. +1
    -1
      kbattleship/kbattleship/kclientdialog.h
  21. +6
    -6
      kbattleship/kbattleship/kserverdialog.cpp
  22. +2
    -2
      kbattleship/kbattleship/kserverdialog.h
  23. +2
    -2
      kblackbox/kbbgame.cpp
  24. +4
    -4
      kbounce/kbounce.cpp
  25. +8
    -8
      kenolaba/AbTop.cpp
  26. +4
    -4
      kenolaba/AbTop.h
  27. +1
    -1
      kenolaba/Board.h
  28. +4
    -4
      kenolaba/EvalDlgImpl.cpp
  29. +2
    -2
      kenolaba/EvalScheme.cpp
  30. +3
    -3
      kenolaba/EvalScheme.h
  31. +2
    -2
      kgoldrunner/src/kgoldrunner.cpp
  32. +3
    -3
      kgoldrunner/src/kgoldrunner.h
  33. +2
    -2
      kjumpingcube/kcubeboxwidget.cpp
  34. +5
    -5
      kjumpingcube/kcubeboxwidget.h
  35. +7
    -7
      kjumpingcube/kjumpingcube.cpp
  36. +1
    -1
      kmahjongg/boardwidget.cpp
  37. +4
    -4
      kmahjongg/kmahjongg.cpp
  38. +2
    -2
      kmines/CHANGELOG
  39. +1
    -1
      kmines/highscores.cpp
  40. +2
    -2
      kmines/main.cpp
  41. +4
    -4
      kmines/status.cpp
  42. +1
    -1
      knetwalk/src/highscores.cpp
  43. +1
    -1
      kolf/canvasitem.cpp
  44. +4
    -4
      kolf/canvasitem.h
  45. +2
    -2
      kolf/floater.cpp
  46. +2
    -2
      kolf/floater.h
  47. +19
    -19
      kolf/game.cpp
  48. +21
    -21
      kolf/game.h
  49. +3
    -3
      kolf/kcomboboxdialog.cpp
  50. +2
    -2
      kolf/kcomboboxdialog.h
  51. +9
    -9
      kolf/kolf.cpp
  52. +2
    -2
      kolf/newgame.cpp
  53. +2
    -2
      kolf/objects/poolball/poolball.cpp
  54. +3
    -3
      kolf/objects/poolball/poolball.h
  55. +3
    -3
      kolf/objects/test/test.cpp
  56. +3
    -3
      kolf/objects/test/test.h
  57. +2
    -2
      kolf/slope.cpp
  58. +2
    -2
      kolf/slope.h
  59. +2
    -2
      konquest/gameenddlg.cc
  60. +2
    -2
      konquest/newgamedlg.cc
  61. +1
    -1
      kpat/CHANGES
  62. +4
    -4
      kpat/cardmaps.cpp
  63. +7
    -7
      kpat/dealer.cpp
  64. +2
    -2
      kpat/gamestatsimpl.cpp
  65. +19
    -19
      kpat/pwidget.cpp
  66. +1
    -1
      kpoker/global.h
  67. +5
    -5
      kpoker/kpoker.cpp
  68. +3
    -3
      kpoker/kpoker.h
  69. +2
    -2
      kpoker/newgamedlg.cpp
  70. +2
    -2
      kpoker/top.cpp
  71. +2
    -2
      kpoker/top.h
  72. +1
    -1
      kreversi/board.h
  73. +1
    -1
      kreversi/highscores.cpp
  74. +8
    -8
      kreversi/kreversi.cpp
  75. +4
    -4
      kreversi/kreversi.h
  76. +3
    -3
      kreversi/qreversigame.h
  77. +1
    -1
      kreversi/qreversigameview.h
  78. +4
    -4
      ksame/KSameWidget.cpp
  79. +2
    -2
      ksame/KSameWidget.h
  80. +2
    -2
      ksame/StoneWidget.cpp
  81. +2
    -2
      ksame/StoneWidget.h
  82. +1
    -1
      kshisen/ChangeLog
  83. +3
    -3
      kshisen/app.cpp
  84. +2
    -2
      ksirtet/CHANGELOG
  85. +3
    -3
      ksmiletris/gamewindow.cpp
  86. +1
    -1
      ksnake/ChangeLog
  87. +2
    -2
      ksnake/game.cpp
  88. +3
    -3
      ksokoban/LevelCollection.cpp
  89. +7
    -7
      ksokoban/MainWindow.cpp
  90. +2
    -2
      ksokoban/PlayField.cpp
  91. +1
    -1
      kspaceduel/dialogs.cpp
  92. +1
    -1
      kspaceduel/dialogs.h
  93. +3
    -3
      kspaceduel/mainview.cpp
  94. +2
    -2
      ktron/ktron.cpp
  95. +2
    -2
      ktron/tron.cpp
  96. +4
    -4
      ktuberling/toplevel.cpp
  97. +2
    -2
      libksirtet/base/main.cpp
  98. +2
    -2
      libksirtet/base/main.h
  99. +2
    -2
      libksirtet/common/ai.cpp
  100. +1
    -1
      libksirtet/common/highscores.cpp
  101. +1
    -1
      libksirtet/common/main.cpp
  102. +1
    -1
      libksirtet/common/main.h
  103. +1
    -1
      libksirtet/lib/mp_interface.cpp
  104. +4
    -4
      libksirtet/lib/wizard.cpp
  105. +5
    -5
      libtdegames/highscore/kconfigrawbackend.cpp
  106. +6
    -6
      libtdegames/highscore/kconfigrawbackend.h
  107. +2
    -2
      libtdegames/highscore/kexthighscore_gui.cpp
  108. +4
    -4
      libtdegames/highscore/kexthighscore_internal.cpp
  109. +2
    -2
      libtdegames/highscore/kexthighscore_internal.h
  110. +8
    -8
      libtdegames/highscore/khighscore.cpp
  111. +13
    -13
      libtdegames/highscore/khighscore.h
  112. +2
    -2
      libtdegames/highscore/kscoredialog.cpp
  113. +5
    -5
      libtdegames/kcarddialog.cpp
  114. +6
    -6
      libtdegames/kcarddialog.h
  115. +2
    -2
      libtdegames/kchatbase.cpp
  116. +8
    -8
      libtdegames/kchatbase.h
  117. +2
    -2
      libtdegames/kgame/TODO
  118. +1
    -1
      libtdegames/kgame/kmessageserver.h
  119. +2
    -2
      lskat/lskat/KRSocket.cpp
  120. +4
    -4
      lskat/lskat/KRSocket.h
  121. +19
    -19
      lskat/lskat/KRemoteConnect.cpp
  122. +5
    -5
      lskat/lskat/KRemoteConnect.h
  123. +2
    -2
      lskat/lskat/lskat.cpp
  124. +4
    -4
      lskat/lskat/lskat.h
  125. +4
    -4
      lskat/lskat/lskatdoc.cpp
  126. +3
    -3
      lskat/lskat/lskatdoc.h
  127. +6
    -6
      twin4/twin4/kspritecache.cpp
  128. +10
    -10
      twin4/twin4/kspritecache.h
  129. +4
    -4
      twin4/twin4/twin4.cpp
  130. +2
    -2
      twin4/twin4/twin4.h
  131. +2
    -2
      twin4/twin4/twin4doc.cpp
  132. +2
    -2
      twin4/twin4/twin4doc.h
  133. +2
    -2
      twin4/twin4/twin4player.cpp
  134. +3
    -3
      twin4/twin4/twin4player.h
  135. +4
    -4
      twin4/twin4/twin4view.cpp

+ 3
- 3
atlantik/client/atlantik.cpp View File

@ -212,7 +212,7 @@ Atlantik::Atlantik ()
void Atlantik::readConfig()
{
// Read configuration settings
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
// General configuration
config->setGroup("General");
@ -508,7 +508,7 @@ void Atlantik::configureNotifications()
void Atlantik::slotUpdateConfig()
{
KConfig *config=kapp->config();
TDEConfig *config=kapp->config();
bool optBool, configChanged = false;
TQString optStr;
@ -761,7 +761,7 @@ void Atlantik::initNetworkObject()
void Atlantik::clientCookie(TQString cookie)
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
if (cookie.isNull())
{


+ 1
- 1
atlantik/client/atlantik.h View File

@ -102,7 +102,7 @@ public:
Atlantik();
/**
* Read the configuration settings using KConfig.
* Read the configuration settings using TDEConfig.
*
*/
void readConfig();


+ 5
- 5
atlantik/client/monopigator.cpp View File

@ -45,7 +45,7 @@ void Monopigator::loadData(const KURL &url)
m_downloadData->open(IO_WriteOnly);
m_downloadData->reset();
m_job = KIO::get(url, true, false);
m_job = TDEIO::get(url, true, false);
m_job->addMetaData(TQString::fromLatin1("UserAgent"), TQString::fromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
if (!m_timer)
@ -54,18 +54,18 @@ void Monopigator::loadData(const KURL &url)
m_timer->start(10000, true);
}
connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(m_job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
}
void Monopigator::slotData(KIO::Job *, const TQByteArray &data)
void Monopigator::slotData(TDEIO::Job *, const TQByteArray &data)
{
m_timer->stop();
m_downloadData->writeBlock(data.data(), data.size());
}
void Monopigator::slotResult(KIO::Job *job)
void Monopigator::slotResult(TDEIO::Job *job)
{
processData(m_downloadData->buffer(), !job->error());
m_job = 0;


+ 3
- 3
atlantik/client/monopigator.h View File

@ -44,8 +44,8 @@ signals:
void timeout();
private slots:
void slotData(KIO::Job *, const TQByteArray &);
void slotResult(KIO::Job *);
void slotData(TDEIO::Job *, const TQByteArray &);
void slotResult(TDEIO::Job *);
void slotTimeout();
private:
@ -53,7 +53,7 @@ private:
TQBuffer *m_downloadData;
TQTimer *m_timer;
KIO::Job *m_job;
TDEIO::Job *m_job;
};
class MonopigatorEntry : public TQObject, public TQListViewItem


+ 1
- 1
atlantik/kio_atlantik/kio_atlantik.h View File

@ -14,7 +14,7 @@
// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
// Boston, MA 02110-1301, USA.
class AtlantikProtocol : public KIO::SlaveBase
class AtlantikProtocol : public TDEIO::SlaveBase
{
public:
AtlantikProtocol( const TQCString &pool, const TQCString &app) : SlaveBase( "atlantik", pool, app ) {}


+ 2
- 2
kasteroids/toplevel.cpp View File

@ -583,10 +583,10 @@ void KAstTopLevel::slotKeyConfig()
void KAstTopLevel::slotPref()
{
if(KConfigDialog::showDialog("settings"))
if(TDEConfigDialog::showDialog("settings"))
return;
KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
/* Make widget */
TQWidget *w = new TQWidget(0, "Settings");


+ 3
- 3
katomic/gamewidget.cpp View File

@ -118,8 +118,8 @@ void GameWidget::getMoves(int moves)
void GameWidget::mergeHighScores(int l)
{
KConfigGroup oldConfig(kapp->config(), TQString("High Scores Level %1").arg(l).utf8());
KConfigGroup newConfig(kapp->config(), TQString("Highscores Level %1").arg(l).utf8());
TDEConfigGroup oldConfig(kapp->config(), TQString("High Scores Level %1").arg(l).utf8());
TDEConfigGroup newConfig(kapp->config(), TQString("Highscores Level %1").arg(l).utf8());
newConfig.writeEntry("LastPlayer", oldConfig.readEntry("LastPlayer"));
@ -229,7 +229,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name )
updateLevel(1);
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Options");
settings.anim_speed = config->readNumEntry("Animation Speed", 1);
if (settings.anim_speed < 1 || settings.anim_speed > MAX_SPEED)


+ 2
- 2
katomic/toplevel.h View File

@ -9,7 +9,7 @@
class GameWidget;
class KAction;
class KConfig;
class TDEConfig;
#include <kmainwindow.h>
@ -47,7 +47,7 @@ class AtomTopLevel : public KMainWindow
// called before exiting -> save configuration
virtual bool queryExit();
KConfig *config;
TDEConfig *config;
GameWidget *main;


+ 2
- 2
kbackgammon/engines/fibs/kbgfibs.cpp View File

@ -85,7 +85,7 @@ void KBgEngineFIBS::start()
*/
void KBgEngineFIBS::readConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("fibs engine");
// history variables
@ -120,7 +120,7 @@ void KBgEngineFIBS::readConfig()
*/
void KBgEngineFIBS::saveConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("fibs engine");
// history variables


+ 2
- 2
kbackgammon/engines/fibs/kbgfibschat.cpp View File

@ -306,7 +306,7 @@ KBgChat::~KBgChat()
*/
void KBgChat::readConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("chat window");
TQPoint pos(10, 10);
@ -326,7 +326,7 @@ void KBgChat::readConfig()
*/
void KBgChat::saveConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("chat window");
config->writeEntry("ori", pos());


+ 3
- 3
kbackgammon/engines/fibs/kplayerlist.cpp View File

@ -508,7 +508,7 @@ void KFibsPlayerList::setupDefault()
*/
void KFibsPlayerList::readColumns()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup(name());
for (int i = 0; i < LVEnd; i++) {
@ -522,7 +522,7 @@ void KFibsPlayerList::readColumns()
*/
void KFibsPlayerList::readConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup(name());
TQPoint pos, defpos(10, 10);
@ -540,7 +540,7 @@ void KFibsPlayerList::readConfig()
*/
void KFibsPlayerList::saveConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup(name());
config->writeEntry("ori", pos());


+ 2
- 2
kbackgammon/engines/gnubg/kbggnubg.cpp View File

@ -388,7 +388,7 @@ void KBgEngineGNU::getSetupPages(KDialogBase *nb)
*/
void KBgEngineGNU::readConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("gnu engine");
// nothing yet
@ -399,7 +399,7 @@ void KBgEngineGNU::readConfig()
*/
void KBgEngineGNU::saveConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("gnu engine");
// nothing yet


+ 2
- 2
kbackgammon/engines/nextgen/kbgng.cpp View File

@ -447,7 +447,7 @@ KBgEngineNg::~KBgEngineNg()
*/
void KBgEngineNg::readConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("next generation engine");
_port = config->readNumEntry("port", PROG_COOKIE);
@ -462,7 +462,7 @@ void KBgEngineNg::readConfig()
*/
void KBgEngineNg::saveConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("next generation engine");
config->writeEntry("port", _port);


+ 2
- 2
kbackgammon/engines/offline/kbgoffline.cpp View File

@ -247,7 +247,7 @@ void KBgEngineOffline::setupCancel()
*/
void KBgEngineOffline::readConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("offline engine");
d->mName[0] = config->readEntry("player-one", i18n("South")); // same as above
@ -260,7 +260,7 @@ void KBgEngineOffline::readConfig()
*/
void KBgEngineOffline::saveConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("offline engine");
config->writeEntry("player-one", d->mName[0] );


+ 6
- 6
kbackgammon/kbg.cpp View File

@ -268,7 +268,7 @@ void KBg::setupEngine()
}
statusBar()->message(engineString[currEngine]);
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("global settings");
if (config->readBoolEntry("enable timeout", true))
engine[currEngine]->setCommit(config->readDoubleNumEntry("timeout", 2.5));
@ -308,7 +308,7 @@ void KBg::setupEngine()
*/
void KBg::saveConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("global settings");
/*
@ -352,7 +352,7 @@ void KBg::saveConfig()
*/
void KBg::readConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("global settings");
/*
@ -407,7 +407,7 @@ void KBg::readConfig()
void KBg::setupOk()
{
// global settings
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("global settings");
config->writeEntry("enable timeout", cbt->isChecked());
@ -500,7 +500,7 @@ void KBg::setupDlg()
KDialogBase::Apply|KDialogBase::Help,
KDialogBase::Ok, this, "setup", true, true);
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("global settings");
/*
@ -637,7 +637,7 @@ void KBg::print()
{
KPrinter *prt = new KPrinter();
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("printing");
prt->setNumCopies(config->readNumEntry("numcopies", 1));


+ 2
- 2
kbackgammon/kbgboard.cpp View File

@ -307,7 +307,7 @@ void KBgBoardSetup::selectBackgroundColor()
*/
void KBgBoard::saveConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup(name());
config->writeEntry("bgcolor", backgroundColor());
@ -326,7 +326,7 @@ void KBgBoard::readConfig()
TQColor col(200, 200, 166);
TQFont fon("Serif", 18, TQFont::Normal);
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup(name());
setBackgroundColor(config->readColorEntry("bgcolor", &col));


+ 2
- 2
kbackgammon/kbgtextview.cpp View File

@ -84,7 +84,7 @@ void KBgTextView::selectFont()
*/
void KBgTextView::readConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup(name());
// nothing to restore
@ -95,7 +95,7 @@ void KBgTextView::readConfig()
*/
void KBgTextView::saveConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup(name());
// nothing to save


+ 1
- 1
kbattleship/kbattleship/kbattleship.cpp View File

@ -805,7 +805,7 @@ void KBattleshipWindow::slotNewServer()
slotStatusMsg(i18n("Loading Start-Server dialog..."));
m_server = new KServerDialog(this);
m_server = new TDEServerDialog(this);
connect(m_server, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotStartBattleshipServer()));
connect(m_server, TQT_SIGNAL(cancelClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteServerDialog()));
m_server->show();


+ 2
- 2
kbattleship/kbattleship/kbattleship.h View File

@ -137,7 +137,7 @@ private:
TQString m_enemyClientDescription;
TQString m_enemyProtocolVersion;
KConfig *m_config;
TDEConfig *m_config;
KBAIPlayer *m_aiPlayer;
KonnectionHandling *m_connection;
KBattleshipServer *m_kbserver;
@ -153,7 +153,7 @@ private:
KToggleAction *m_configSound;
KToggleAction *m_configGrid;
KClientDialog *m_client;
KServerDialog *m_server;
TDEServerDialog *m_server;
KShipList *m_ownshiplist;
KShipList *m_enemyshiplist;
TQString m_ownNickname;


+ 1
- 1
kbattleship/kbattleship/kclientdialog.h View File

@ -54,7 +54,7 @@ signals:
void sigCancelConnect();
private:
KConfig *m_config;
TDEConfig *m_config;
DNSSD::ServiceBrowser *m_browser;
clientConnectDlg *m_mainWidget;
};


+ 6
- 6
kbattleship/kbattleship/kserverdialog.cpp View File

@ -21,7 +21,7 @@
#include "kserverdialog.h"
KServerDialog::KServerDialog(TQWidget *parent, const char *name) :
TDEServerDialog::TDEServerDialog(TQWidget *parent, const char *name) :
KDialogBase(Plain, i18n("Start Server"), Ok|Cancel, Ok, parent, name, true, false, KGuiItem(i18n("&Start")))
{
TQFrame* page = plainPage();
@ -37,29 +37,29 @@ KServerDialog::KServerDialog(TQWidget *parent, const char *name) :
m_mainWidget->gamenameEdit->setText(gamename);
}
void KServerDialog::slotOk()
void TDEServerDialog::slotOk()
{
hide();
emit okClicked();
}
void KServerDialog::slotCancel()
void TDEServerDialog::slotCancel()
{
hide();
emit cancelClicked();
}
TQString KServerDialog::port() const
TQString TDEServerDialog::port() const
{
return TQString::number(m_mainWidget->portEdit->value());
}
TQString KServerDialog::nickname() const
TQString TDEServerDialog::nickname() const
{
return m_mainWidget->nicknameEdit->text();
}
TQString KServerDialog::gamename() const
TQString TDEServerDialog::gamename() const
{
return m_mainWidget->gamenameEdit->text();
}


+ 2
- 2
kbattleship/kbattleship/kserverdialog.h View File

@ -28,12 +28,12 @@
#include "dialogs/serverDlg.h"
class KServerDialog : public KDialogBase
class TDEServerDialog : public KDialogBase
{
Q_OBJECT
public:
KServerDialog(TQWidget *parent = 0, const char *name = 0);
TDEServerDialog(TQWidget *parent = 0, const char *name = 0);
TQString port() const;
TQString nickname() const;


+ 2
- 2
kblackbox/kbbgame.cpp View File

@ -107,7 +107,7 @@ KBBGame::KBBGame()
running = FALSE;
gameBoard = NULL;
KConfig *kConf;
TDEConfig *kConf;
int j;
kConf = kapp->config();
kConf->setGroup( "KBlackBox Setup" );
@ -163,7 +163,7 @@ KBBGame::KBBGame()
KBBGame::~KBBGame()
{
KConfig *kConf;
TDEConfig *kConf;
TQString s;
kConf = kapp->config();


+ 4
- 4
kbounce/kbounce.cpp View File

@ -41,7 +41,7 @@ KJezzball::KJezzball()
m_game.score = 0;
m_state = Idle;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
m_backgroundDir = config->readPathEntry( "BackgroundDir" );
m_showBackground = config->readBoolEntry( "ShowBackground", false );
@ -110,7 +110,7 @@ KJezzball::KJezzball()
KJezzball::~KJezzball()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->writeEntry( "PlaySounds", m_soundAction->isChecked() );
}
@ -264,7 +264,7 @@ void KJezzball::selectBackground()
m_backgroundShowAction->setEnabled(true);
// save settings
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->writePathEntry( "BackgroundDir", m_backgroundDir );
config->sync();
@ -289,7 +289,7 @@ void KJezzball::showBackground()
m_showBackground = show;
// save setting
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->writeEntry( "ShowBackground", m_showBackground );
config->sync();


+ 8
- 8
kenolaba/AbTop.cpp View File

@ -244,7 +244,7 @@ void AbTop::readConfig()
{
kdDebug(12011) << "Reading config..." << endl;
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("Options");
readOptions(config);
@ -258,7 +258,7 @@ void AbTop::readConfig()
board->setEvalScheme( currentEvalScheme );
}
void AbTop::readOptions(KConfig* config)
void AbTop::readOptions(TDEConfig* config)
{
TQString entry = config->readEntry("Level");
for (uint i=0; i<Nb_Levels; i++)
@ -280,7 +280,7 @@ void AbTop::readOptions(KConfig* config)
showSpyAction->setChecked( showSpy );
}
void AbTop::readProperties(KConfig *config)
void AbTop::readProperties(TDEConfig *config)
{
TQString entry;
@ -312,7 +312,7 @@ void AbTop::writeConfig()
{
kdDebug(12011) << "Writing config..." << endl;
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("Options");
writeOptions(config);
@ -325,7 +325,7 @@ void AbTop::writeConfig()
}
void AbTop::writeOptions(KConfig *config)
void AbTop::writeOptions(TDEConfig *config)
{
config->writeEntry("Level", LEVEL[levelAction->currentItem()].key);
config->writeEntry("Computer", IPLAY[iplayAction->currentItem()].key);
@ -335,7 +335,7 @@ void AbTop::writeOptions(KConfig *config)
config->writeEntry("ShowSpy", showSpy);
}
void AbTop::saveProperties(KConfig *config)
void AbTop::saveProperties(TDEConfig *config)
{
writeOptions(config);
if (currentEvalScheme)
@ -352,14 +352,14 @@ void AbTop::saveProperties(KConfig *config)
void AbTop::savePosition()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("SavedPosition");
config->writeEntry("Position", board->getState(moveNo));
}
void AbTop::restorePosition()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("SavedPosition");
TQString entry = config->readEntry("Position");


+ 4
- 4
kenolaba/AbTop.h View File

@ -49,8 +49,8 @@ public:
void netHost(char* h) { hosts.append(h); }
protected:
virtual void saveProperties( KConfig * );
virtual void readProperties( KConfig * );
virtual void saveProperties( TDEConfig * );
virtual void readProperties( TDEConfig * );
public slots:
@ -99,8 +99,8 @@ private:
void setMoveNo(int, bool updateGUI = false);
bool iPlayNow();
Move haveHint();
void readOptions(KConfig *);
void writeOptions(KConfig *);
void readOptions(TDEConfig *);
void writeOptions(TDEConfig *);
Move actMove;
Board* board;


+ 1
- 1
kenolaba/Board.h View File

@ -10,7 +10,7 @@
#include <krandomsequence.h>
#include "Move.h"
class KConfig;
class TDEConfig;
class EvalScheme;
/* Class for best moves so far */


+ 4
- 4
kenolaba/EvalDlgImpl.cpp View File

@ -30,7 +30,7 @@ EvalDlgImpl::EvalDlgImpl(TQWidget* parent, Board* board)
connect( evalSaveAs, TQT_SIGNAL( clicked() ), this, TQT_SLOT( saveas() ) );
connect( evalList, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( select(int) ) );
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("General");
TQStringList list = config->readListEntry("EvalSchemes");
evalList->insertItem( i18n("Current") );
@ -235,7 +235,7 @@ void EvalDlgImpl::deleteEntry()
TQString name = evalList->text(i);
evalList->removeItem(i);
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("General");
TQStringList list = config->readListEntry("EvalSchemes");
list.remove(name);
@ -251,7 +251,7 @@ void EvalDlgImpl::saveas()
if (dlg.exec()) {
TQString name=dlg.text();
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("General");
TQStringList list = config->readListEntry("EvalSchemes");
TQListBoxItem *it = evalList->findItem(name);
@ -286,7 +286,7 @@ void EvalDlgImpl::select(int i)
else {
// read in the Scheme from the config file
_scheme = new EvalScheme(name);
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
_scheme->read(config);
}


+ 2
- 2
kenolaba/EvalScheme.cpp View File

@ -74,7 +74,7 @@ void EvalScheme::setDefaults()
}
void EvalScheme::read(KConfig *config)
void EvalScheme::read(TDEConfig *config)
{
TQString confSection = TQString("%1 Evaluation Scheme").arg(_name);
config->setGroup(confSection);
@ -115,7 +115,7 @@ void EvalScheme::read(KConfig *config)
}
void EvalScheme::save(KConfig* config)
void EvalScheme::save(TDEConfig* config)
{
TQString confSection = TQString("%1 Evaluation Scheme").arg(_name);
config->setGroup(confSection);


+ 3
- 3
kenolaba/EvalScheme.h View File

@ -14,7 +14,7 @@
#include "Move.h"
class KConfig;
class TDEConfig;
/*
* The constructor gets a name, and tries to read the scheme
@ -30,8 +30,8 @@ class EvalScheme
~EvalScheme() {}
void setDefaults();
void read(KConfig*);
void save(KConfig*);
void read(TDEConfig*);
void save(TDEConfig*);
static EvalScheme* create(TQString);
TQString ascii();


+ 2
- 2
kgoldrunner/src/kgoldrunner.cpp View File

@ -711,7 +711,7 @@ void KGoldrunner::showEnemy4() {game->showEnemyState (4);}
void KGoldrunner::showEnemy5() {game->showEnemyState (5);}
void KGoldrunner::showEnemy6() {game->showEnemyState (6);}
void KGoldrunner::saveProperties(KConfig *config)
void KGoldrunner::saveProperties(TDEConfig *config)
{
// The 'config' object points to the session managed
// config file. Anything you write here will be available
@ -722,7 +722,7 @@ void KGoldrunner::saveProperties(KConfig *config)
// config->writeEntry("qqq", qqq);
}
void KGoldrunner::readProperties(KConfig *config)
void KGoldrunner::readProperties(TDEConfig *config)
{
// The 'config' object points to the session managed
// config file. This function is automatically called whenever


+ 3
- 3
kgoldrunner/src/kgoldrunner.h View File

@ -59,14 +59,14 @@ protected:
* This function is called when it is time for the app to save its
* properties for session management purposes.
*/
void saveProperties(KConfig *);
void saveProperties(TDEConfig *);
/**
* This function is called when this app is restored. The KConfig
* This function is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties.
*/
void readProperties(KConfig *);
void readProperties(TDEConfig *);
bool queryClose (); // To save edits before closing.


+ 2
- 2
kjumpingcube/kcubeboxwidget.cpp View File

@ -242,7 +242,7 @@ void KCubeBoxWidget::stopActivities()
}
void KCubeBoxWidget::saveProperties(KConfigBase* config)
void KCubeBoxWidget::saveProperties(TDEConfigBase* config)
{
if(isMoving())
{
@ -275,7 +275,7 @@ void KCubeBoxWidget::saveProperties(KConfigBase* config)
config->writeEntry("CubeDim",dim());
}
void KCubeBoxWidget::readProperties(KConfigBase* config)
void KCubeBoxWidget::readProperties(TDEConfigBase* config)
{
TQStrList list;
list.setAutoDelete(true);


+ 5
- 5
kjumpingcube/kcubeboxwidget.h View File

@ -31,7 +31,7 @@ class TQGridLayout;
class CubeBox;
class TQPalette;
class TQTimer;
class KConfigBase;
class TDEConfigBase;
#ifdef HAVE_CONFIG_H
#include <config.h>
@ -108,8 +108,8 @@ public:
*/
void checkComputerplayer(Player player);
inline void saveGame(KConfigBase *c) { saveProperties(c); }
inline void restoreGame(KConfigBase *c) { readProperties(c); }
inline void saveGame(TDEConfigBase *c) { saveProperties(c); }
inline void restoreGame(TDEConfigBase *c) { readProperties(c); }
public slots:
/** stops all activities like getting a hint or doing a move */
@ -135,8 +135,8 @@ protected:
virtual void deleteCubes();
virtual void initCubes();
void saveProperties(KConfigBase *);
void readProperties(KConfigBase *);
void saveProperties(TDEConfigBase *);
void readProperties(TDEConfigBase *);
protected slots:
/** sets the cursor to an waitcursor */


+ 7
- 7
kjumpingcube/kjumpingcube.cpp View File

@ -120,7 +120,7 @@ void KJumpingCube::saveGame(bool saveAs)
url.setFileName( url.filename()+".kjc" );
}
if(KIO::NetAccess::exists(url,false,this))
if(TDEIO::NetAccess::exists(url,false,this))
{
TQString mes=i18n("The file %1 exists.\n"
"Do you want to overwrite it?").arg(url.url());
@ -144,7 +144,7 @@ void KJumpingCube::saveGame(bool saveAs)
view->saveGame(&config);
config.sync();
if(KIO::NetAccess::upload( tempFile.name(),gameURL,this ))
if(TDEIO::NetAccess::upload( tempFile.name(),gameURL,this ))
{
TQString s=i18n("game saved as %1");
s=s.arg(gameURL.url());
@ -166,7 +166,7 @@ void KJumpingCube::openGame()
url = KFileDialog::getOpenURL( gameURL.url(), "*.kjc", this, 0 );
if( url.isEmpty() )
return;
if(!KIO::NetAccess::exists(url,true,this))
if(!TDEIO::NetAccess::exists(url,true,this))
{
TQString mes=i18n("The file %1 does not exist!").arg(url.url());
KMessageBox::sorry(this,mes);
@ -176,7 +176,7 @@ void KJumpingCube::openGame()
while(!fileOk);
TQString tempFile;
if( KIO::NetAccess::download( url, tempFile, this ) )
if( TDEIO::NetAccess::download( url, tempFile, this ) )
{
KSimpleConfig config(tempFile,true);
config.setGroup("KJumpingCube");
@ -194,7 +194,7 @@ void KJumpingCube::openGame()
undoAction->setEnabled(false);
KIO::NetAccess::removeTempFile( tempFile );
TDEIO::NetAccess::removeTempFile( tempFile );
}
else
KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() ));
@ -265,10 +265,10 @@ void KJumpingCube::enableStop_Thinking(){
* Show Configure dialog.
*/
void KJumpingCube::showOptions(){
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);
dialog->addPage(new Settings(0, "General"), i18n("General"), "package_settings");
connect(dialog, TQT_SIGNAL(settingsChanged()), view, TQT_SLOT(loadSettings()));
dialog->show();


+ 1
- 1
kmahjongg/boardwidget.cpp View File

@ -87,7 +87,7 @@ void BoardWidget::loadSettings(){
void BoardWidget::saveSettings(){
// Preview can't handle this. TODO
//KConfig *config=kapp->config();
//TDEConfig *config=kapp->config();
//config->setGroup("General");
//config->writePathEntry("Tileset_file", tileFile);


+ 4
- 4
kmahjongg/kmahjongg.cpp View File

@ -233,10 +233,10 @@ void KMahjongg::redo()
* Show Configure dialog.
*/
void KMahjongg::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);
dialog->addPage(new Settings(0, "General"), i18n("General"), "package_settings");
connect(dialog, TQT_SIGNAL(settingsChanged()), bw, TQT_SLOT(loadSettings()));
connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(setDisplayedWidth()));
@ -466,7 +466,7 @@ void KMahjongg::loadGame() {
if ( url.isEmpty() )
return;
KIO::NetAccess::download( url, fname, this );
TDEIO::NetAccess::download( url, fname, this );
// open the file for reading
FILE *outFile = fopen( TQFile::encodeName(fname), "r");
@ -496,7 +496,7 @@ void KMahjongg::loadGame() {
// close the file before exit
fclose(outFile);
KIO::NetAccess::removeTempFile( fname );
TDEIO::NetAccess::removeTempFile( fname );
// refresh the board
bw->gameLoaded();


+ 2
- 2
kmines/CHANGELOG View File

@ -79,7 +79,7 @@
* fixed repaint of LCDs in inactive mode
2.1.3 (29 November 2001)
* use KConfigGroupSaver everywhere
* use TDEConfigGroupSaver everywhere
* config entry for wwhs server url (just in case ...)
2.1.2 (19 November 2001)
@ -293,7 +293,7 @@ Mario Weilguni <mweilguni@kde.org>
system defines something called "Status"...
0.5
* use KApp for configuration and highscoring save (via KConfig)
* use KApp for configuration and highscoring save (via TDEConfig)
* better look of option & highscores windows
0.4


+ 1
- 1
kmines/highscores.cpp View File

@ -68,7 +68,7 @@ void ExtManager::convertLegacy(uint gameType)
case Level::NB_TYPES: Q_ASSERT(false);
}
KConfigGroupSaver cg(kapp->config(), group);
TDEConfigGroupSaver cg(kapp->config(), group);
TQString name = cg.config()->readEntry("Name", TQString());
if ( name.isNull() ) return;
if ( name.isEmpty() ) name = i18n("anonymous");


+ 2
- 2
kmines/main.cpp View File

@ -155,9 +155,9 @@ void MainWidget::focusOutEvent(TQFocusEvent *e)
void MainWidget::configureSettings()
{
if ( KConfigDialog::showDialog("settings") ) return;
if ( TDEConfigDialog::showDialog("settings") ) return;
KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self());
TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self());
GameConfig *gc = new GameConfig;
dialog->addPage(gc, i18n("Game"), "package_system");
dialog->addPage(new AppearanceConfig, i18n("Appearance"), "style");


+ 4
- 4
kmines/status.cpp View File

@ -339,7 +339,7 @@ void Status::saveLog()
{
KURL url = KFileDialog::getSaveURL(TQString(), TQString(), this);
if ( url.isEmpty() ) return;
if ( KIO::NetAccess::exists(url, false, this) ) {
if ( TDEIO::NetAccess::exists(url, false, this) ) {
KGuiItem gi = KStdGuiItem::save();
gi.setText(i18n("Overwrite"));
int res = KMessageBox::warningYesNo(this,
@ -350,7 +350,7 @@ void Status::saveLog()
KTempFile tmp;
(*tmp.textStream()) << _log.toString();
tmp.close();
KIO::NetAccess::upload(tmp.name(), url, this);
TDEIO::NetAccess::upload(tmp.name(), url, this);
tmp.unlink();
}
@ -361,7 +361,7 @@ void Status::loadLog()
TQString tmpFile;
bool success = false;
TQDomDocument doc;
if( KIO::NetAccess::download(url, tmpFile, this) ) {
if( TDEIO::NetAccess::download(url, tmpFile, this) ) {
TQFile file(tmpFile);
if ( file.open(IO_ReadOnly) ) {
int errorLine;
@ -373,7 +373,7 @@ void Status::loadLog()
}
success = true;
}
KIO::NetAccess::removeTempFile(tmpFile);
TDEIO::NetAccess::removeTempFile(tmpFile);
}
if ( !success ) {


+ 1
- 1
knetwalk/src/highscores.cpp View File

@ -63,7 +63,7 @@ namespace KExtHighscore
default: Q_ASSERT(false);
}
KConfigGroupSaver cg(kapp->config(), group);
TDEConfigGroupSaver cg(kapp->config(), group);
TQString name = cg.config()->readEntry("Name", TQString());
if ( name.isNull() ) return;
if ( name.isEmpty() ) name = i18n("anonymous");


+ 1
- 1
kolf/canvasitem.cpp View File

@ -35,7 +35,7 @@ TQCanvasRectangle *CanvasItem::onVStrut()
return aboveVStrut && ritem? ritem : 0;
}
void CanvasItem::save(KConfig *cfg)
void CanvasItem::save(TDEConfig *cfg)
{
cfg->writeEntry("dummykey", true);
}


+ 4
- 4
kolf/canvasitem.h View File

@ -6,7 +6,7 @@
#include "config.h"
class Ball;
class KConfig;
class TDEConfig;
class StateDB;
class KolfGame;
@ -16,9 +16,9 @@ public:
CanvasItem() { game = 0; }
virtual ~CanvasItem() {}
/**
* load your settings from the KConfig, which represents a course.
* load your settings from the TDEConfig, which represents a course.
*/
virtual void load(KConfig *) {}
virtual void load(TDEConfig *) {}
/**
* load a point if you wish. Rarely necessary.
*/
@ -38,7 +38,7 @@ public:
/**
* save your settings.
*/
virtual void save(KConfig *cfg);
virtual void save(TDEConfig *cfg);
/**
* save a point if you wish. Rarely necessary.
*/


+ 2
- 2
kolf/floater.cpp View File

@ -220,7 +220,7 @@ void Floater::loadState(StateDB *db)
move(moveTo.x(), moveTo.y());
}
void Floater::save(KConfig *cfg)
void Floater::save(TDEConfig *cfg)
{
cfg->writeEntry("speed", speed);
cfg->writeEntry("startPoint", TQPoint(wall->startPoint().x() + wall->x(), wall->startPoint().y() + wall->y()));
@ -229,7 +229,7 @@ void Floater::save(KConfig *cfg)
doSave(cfg);
}
void Floater::load(KConfig *cfg)
void Floater::load(TDEConfig *cfg)
{
move(firstPoint.x(), firstPoint.y());


+ 2
- 2
kolf/floater.h View File

@ -41,8 +41,8 @@ public:
virtual bool collision(Ball *ball, long int id) { Bridge::collision(ball, id); return false; }
virtual void saveState(StateDB *db);
virtual void loadState(StateDB *db);
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
virtual void save(TDEConfig *cfg);
virtual void load(TDEConfig *cfg);
virtual bool loadLast() const { return true; }
virtual void firstMove(int x, int y);
virtual void aboutToSave();


+ 19
- 19
kolf/game.cpp View File

@ -346,12 +346,12 @@ void Bridge::moveBy(double dx, double dy)
}
}
void Bridge::load(KConfig *cfg)
void Bridge::load(TDEConfig *cfg)
{
doLoad(cfg);
}
void Bridge::doLoad(KConfig *cfg)
void Bridge::doLoad(TDEConfig *cfg)
{
newSize(cfg->readNumEntry("width", width()), cfg->readNumEntry("height", height()));
setTopWallVisible(cfg->readBoolEntry("topWallVisible", topWallVisible()));
@ -360,12 +360,12 @@ void Bridge::doLoad(KConfig *cfg)
setRightWallVisible(cfg->readBoolEntry("rightWallVisible", rightWallVisible()));
}
void Bridge::save(KConfig *cfg)
void Bridge::save(TDEConfig *cfg)
{
doSave(cfg);
}
void Bridge::doSave(KConfig *cfg)
void Bridge::doSave(TDEConfig *cfg)
{
cfg->writeEntry("width", width());
cfg->writeEntry("height", height());
@ -506,7 +506,7 @@ void Windmill::setGame(KolfGame *game)
right->setGame(game);
}
void Windmill::save(KConfig *cfg)
void Windmill::save(TDEConfig *cfg)
{
cfg->writeEntry("speed", speed);
cfg->writeEntry("bottom", m_bottom);
@ -514,7 +514,7 @@ void Windmill::save(KConfig *cfg)
doSave(cfg);
}
void Windmill::load(KConfig *cfg)
void Windmill::load(TDEConfig *cfg)
{
setSpeed(cfg->readNumEntry("speed", -1));
@ -598,7 +598,7 @@ Sign::Sign(TQCanvas *canvas)
setRightWallVisible(true);