1 files changed, 19 insertions, 19 deletions

diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp
index 3ca77b51..23bd4c1b 100644
--- a/atlantik/client/configdlg.cpp
+++ b/atlantik/client/configdlg.cpp
@@ -14,7 +14,7 @@
 // the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 // Boston, MA 02110-1301, USA.
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
@@ -53,7 +53,7 @@ ConfigDialog::ConfigDialog(Atlantik* parent, const char *name) : KDialogBase(Ico
 	configBoard = new ConfigBoard(this, p_board, "configBoard");
 	configMonopigator = new ConfigMonopigator(this, p_monopigator, "configMonopigator");
 
-	setMinimumSize(sizeHint());
+	setMinimumSize(tqsizeHint());
 }
 
 bool ConfigDialog::chatTimestamps()
@@ -114,23 +114,23 @@ AtlantikConfig ConfigDialog::config()
 ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
 {
 	m_configDialog = configDialog;
-	TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
 
 	TQLabel *label = new TQLabel(i18n("Player name:"), parent);
-	layout->addWidget(label);
+	tqlayout->addWidget(label);
 
 	m_playerName = new TQLineEdit(parent);
-	layout->addWidget(m_playerName);
+	tqlayout->addWidget(m_playerName);
 
 	TQLabel *label2 = new TQLabel(i18n("Player image:"), parent);
-	layout->addWidget(label2);
+	tqlayout->addWidget(label2);
                 
 	m_playerIcon = new KPushButton(parent, "playerIcon");
-	layout->addWidget(m_playerIcon);
+	tqlayout->addWidget(m_playerIcon);
 
 	connect( m_playerIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseImage()) );
                                         
-	layout->addStretch(1);
+	tqlayout->addStretch(1);
 
 	reset();
 }
@@ -185,10 +185,10 @@ void ConfigPlayer::reset()
 ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
 {
 	m_configDialog = configDialog;
-	TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
 
 	m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), parent);
-	layout->addWidget(m_connectOnStart);
+	tqlayout->addWidget(m_connectOnStart);
 
 	TQString message=i18n(
 		"If checked, Atlantik connects to a meta server on start-up to\n"
@@ -196,7 +196,7 @@ ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *paren
 	TQWhatsThis::add(m_connectOnStart, message);
 
 	m_hideDevelopmentServers = new TQCheckBox(i18n("Hide development servers"), parent);
-	layout->addWidget(m_hideDevelopmentServers);
+	tqlayout->addWidget(m_hideDevelopmentServers);
 
 	message=i18n(
 		"Some of the Internet servers might be running development\n"
@@ -204,7 +204,7 @@ ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *paren
 		"display these servers.\n");
 	TQWhatsThis::add(m_hideDevelopmentServers, message);
 
-	layout->addStretch(1);
+	tqlayout->addStretch(1);
 
 	reset();
 }
@@ -228,17 +228,17 @@ void ConfigMonopigator::reset()
 ConfigGeneral::ConfigGeneral(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
 {
 	m_configDialog = configDialog;
-	TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
 
 	m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), parent);
-	layout->addWidget(m_chatTimestamps);
+	tqlayout->addWidget(m_chatTimestamps);
 
 	TQString message=i18n(
 		"If checked, Atlantik will add timestamps in front of chat\n"
 		"messages.\n");
 	TQWhatsThis::add(m_chatTimestamps, message);
 
-	layout->addStretch(1);
+	tqlayout->addStretch(1);
 
 	reset();
 }
@@ -256,10 +256,10 @@ void ConfigGeneral::reset()
 ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
 {
 	m_configDialog = configDialog;
-	TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
 
 	TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game Status Feedback"), parent);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 
 	m_indicateUnowned = new TQCheckBox(i18n("Display title deed card on unowned properties"), box);
 	TQString message=i18n(
@@ -292,9 +292,9 @@ ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const cha
 	TQWhatsThis::add(m_quartzEffects, message);
 
 //	box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), parent);
-//	layout->addWidget(box);
+//	tqlayout->addWidget(box);
 
-	layout->addStretch(1);
+	tqlayout->addStretch(1);
 
 	reset();
 }