Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.

10 files changed, 50 insertions, 50 deletions

diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index 5c923a07..e2b2b942 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -315,7 +315,7 @@ void Atlantik::showSelectServer()
 	initNetworkObject();
 
 	connect(m_selectServer, TQT_SIGNAL(serverConnect(const TQString, int)), m_atlantikNetwork, TQT_SLOT(serverConnect(const TQString, int)));
-	connect(m_selectServer, TQT_SIGNAL(msgStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &)));
+	connect(m_selectServer, TQT_SIGNAL(msgtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
 
 	m_selectServer->slotRefresh( m_config.connectOnStart );
 }
@@ -357,7 +357,7 @@ void Atlantik::showSelectGame()
 	connect(m_selectGame, TQT_SIGNAL(joinGame(int)), m_atlantikNetwork, TQT_SLOT(joinGame(int)));
 	connect(m_selectGame, TQT_SIGNAL(newGame(const TQString &)), m_atlantikNetwork, TQT_SLOT(newGame(const TQString &)));
 	connect(m_selectGame, TQT_SIGNAL(leaveServer()), TQT_TQOBJECT(this), TQT_SLOT(showSelectServer()));
-	connect(m_selectGame, TQT_SIGNAL(msgStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &)));
+	connect(m_selectGame, TQT_SIGNAL(msgtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
 }
 
 void Atlantik::showSelectConfiguration()
@@ -383,7 +383,7 @@ void Atlantik::showSelectConfiguration()
 	connect(m_selectConfiguration, TQT_SIGNAL(changeOption(int, const TQString &)), m_atlantikNetwork, TQT_SLOT(changeOption(int, const TQString &)));
 	connect(m_selectConfiguration, TQT_SIGNAL(buttonCommand(TQString)), m_atlantikNetwork, TQT_SLOT(writeData(TQString)));
 	connect(m_selectConfiguration, TQT_SIGNAL(iconSelected(const TQString &)), m_atlantikNetwork, TQT_SLOT(setImage(const TQString &)));
-	connect(m_selectConfiguration, TQT_SIGNAL(statusMessage(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &)));
+	connect(m_selectConfiguration, TQT_SIGNAL(statusMessage(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
 }
 
 void Atlantik::initBoard()
@@ -475,12 +475,12 @@ void Atlantik::networkClosed(int status)
 	switch( status )
 	{
 	case KBufferedIO::involuntary:
-		slotMsgStatus( i18n("Connection with server %1:%2 lost.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
+		slotMsgtqStatus( i18n("Connection with server %1:%2 lost.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
 		showSelectServer();
 		break;
 	default:
 		if ( !m_atlantikNetwork->host().isEmpty() )
-			slotMsgStatus( i18n("Disconnected from %1:%2.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
+			slotMsgtqStatus( i18n("Disconnected from %1:%2.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
 		break;
 	}
 }
@@ -625,7 +625,7 @@ void Atlantik::slotMsgError(TQString msg)
 	serverMsgsAppend("Error: " + msg);
 }
 
-void Atlantik::slotMsgStatus(const TQString &message, const TQString &icon)
+void Atlantik::slotMsgtqStatus(const TQString &message, const TQString &icon)
 {
 	KMainWindow::statusBar()->changeItem(message, 1);
 	m_eventLog->addEvent(message, icon);
@@ -636,7 +636,7 @@ void Atlantik::slotMsgChat(TQString player, TQString msg)
 	if (m_config.chatTimestamps)
 	{
 		TQTime time = TQTime::currentTime();
-		serverMsgsAppend(TQString("[%1] %2: %3").arg(time.toString("hh:mm")).arg(player).arg(msg));
+		serverMsgsAppend(TQString("[%1] %2: %3").tqarg(time.toString("hh:mm")).tqarg(player).tqarg(msg));
 	}
 	else
 		serverMsgsAppend(player + ": " + msg);
@@ -730,7 +730,7 @@ void Atlantik::initNetworkObject()
 	m_atlantikNetwork = new AtlantikNetwork(m_atlanticCore);
 	connect(m_atlantikNetwork, TQT_SIGNAL(msgInfo(TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgInfo(TQString)));
 	connect(m_atlantikNetwork, TQT_SIGNAL(msgError(TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgError(TQString)));
-	connect(m_atlantikNetwork, TQT_SIGNAL(msgStatus(const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &, const TQString &)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(msgtqStatus(const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &, const TQString &)));
 	connect(m_atlantikNetwork, TQT_SIGNAL(msgChat(TQString, TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgChat(TQString, TQString)));
 
 	connect(m_atlantikNetwork, TQT_SIGNAL(connectionSuccess()), TQT_TQOBJECT(this), TQT_SLOT(slotNetworkConnected()));
diff --git a/atlantik/client/atlantik.h b/atlantik/client/atlantik.h
index 377ef98b..7e8ff1b0 100644
--- a/atlantik/client/atlantik.h
+++ b/atlantik/client/atlantik.h
@@ -18,8 +18,8 @@
 #define ATLANTIK_ATLANTIK_H
 
 #include <tqwidget.h>
-#include <layout.h>
-#include <textedit.h>
+#include <tqlayout.h>
+#include <tqtextedit.h>
 #include <tqlabel.h>
 #include <tqptrlist.h>
 
@@ -188,7 +188,7 @@ public slots:
 	 */
 	void slotMsgInfo(TQString msg);
 
-	void slotMsgStatus(const TQString &message, const TQString &icon = TQString());
+	void slotMsgtqStatus(const TQString &message, const TQString &icon = TQString());
 
 	/**
 	 * Informs serverMsgs() to append an incoming message from the
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();
 }
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index 32388205..9636e6e2 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdatetime.h>
 
 #include <klocale.h>
@@ -37,7 +37,7 @@ EventLog::EventLog()
 
 void EventLog::addEvent(const TQString &description, const TQString &icon)
 {
-	Event *event = new Event(TQDateTime::currentDateTime(), description, icon);
+	Event *event = new Event(TQDateTime::tqcurrentDateTime(), description, icon);
 	m_events.append(event);
 	emit newEvent(event);
 }
@@ -113,7 +113,7 @@ void EventLogWidget::save()
 	{
 		TQTextStream stream(&file);
 
-		stream << i18n( "Atlantik log file, saved at %1." ).arg( TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
+		stream << i18n( "Atlantik log file, saved at %1." ).tqarg( TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
 
 		TQPtrList<Event> events = m_eventLog->events();
 		for (TQPtrListIterator<Event> it( events ); (*it) ; ++it)
diff --git a/atlantik/client/monopigator.cpp b/atlantik/client/monopigator.cpp
index 7e0a834d..e07a184a 100644
--- a/atlantik/client/monopigator.cpp
+++ b/atlantik/client/monopigator.cpp
@@ -46,7 +46,7 @@ void Monopigator::loadData(const KURL &url)
 	m_downloadData->reset();
 
 	m_job = KIO::get(url, true, false);
-	m_job->addMetaData(TQString::fromLatin1("UserAgent"), TQString::fromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
+	m_job->addMetaData(TQString::tqfromLatin1("UserAgent"), TQString::tqfromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
 
 	if (!m_timer)
 	{
diff --git a/atlantik/client/selectconfiguration_widget.h b/atlantik/client/selectconfiguration_widget.h
index 7aed5fc6..88108f8f 100644
--- a/atlantik/client/selectconfiguration_widget.h
+++ b/atlantik/client/selectconfiguration_widget.h
@@ -18,7 +18,7 @@
 #define ATLANTIK_SELECTCONFIGURATION_WIDGET_H
 
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvgroupbox.h>
 
 #include <klistview.h>
diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp
index 0769dfc2..a4072044 100644
--- a/atlantik/client/selectgame_widget.cpp
+++ b/atlantik/client/selectgame_widget.cpp
@@ -80,13 +80,13 @@ void SelectGame::addGame(Game *game)
 
 	if (game->id() == -1)
 	{
-		TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").arg(game->name()), game->description(), TQString(), TQString(), game->type() );
+		TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").tqarg(game->name()), game->description(), TQString(), TQString(), game->type() );
 		item->setPixmap(0, TQPixmap(SmallIcon("filenew")));
 	}
 	else
 	{
 		Player *master = game->master();
-		TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Join %1's %2 Game").arg( (master ? master->name() : TQString()), game->name() ), game->description(), TQString::number(game->id()), TQString::number(game->players()), game->type() );
+		TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Join %1's %2 Game").tqarg( (master ? master->name() : TQString()), game->name() ), game->description(), TQString::number(game->id()), TQString::number(game->players()), game->type() );
 		item->setPixmap( 0, TQPixmap(SmallIcon("atlantik")) );
 		item->setEnabled(game->canBeJoined());
 
@@ -118,11 +118,11 @@ void SelectGame::updateGame(Game *game)
 	item->setText( 1, game->description() );
 
 	if (game->id() == -1)
-		item->setText(0, i18n("Create a new %1 Game").arg(game->name()));
+		item->setText(0, i18n("Create a new %1 Game").tqarg(game->name()));
 	else
 	{
 		Player *master = game->master();
-		item->setText( 0, i18n("Join %1's %2 Game").arg( (master ? master->name() : TQString()), game->name() ) );
+		item->setText( 0, i18n("Join %1's %2 Game").tqarg( (master ? master->name() : TQString()), game->name() ) );
 		item->setText( 3, TQString::number( game->players() ) );
 		item->setEnabled( game->canBeJoined() );
 
@@ -143,7 +143,7 @@ void SelectGame::playerChanged(Player *player)
 		game = m_atlanticCore->findGame( item->text(2).toInt() );
 		if ( game && game->master() == player )
 		{
-			item->setText( 0, i18n("Join %1's %2 Game").arg( player->name(), game->name() ) );
+			item->setText( 0, i18n("Join %1's %2 Game").tqarg( player->name(), game->name() ) );
 			return;
 		}
 		item = item->nextSibling();
diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h
index 273acfa3..5b9a523d 100644
--- a/atlantik/client/selectgame_widget.h
+++ b/atlantik/client/selectgame_widget.h
@@ -18,7 +18,7 @@
 #define ATLANTIK_SELECTGAME_WIDGET_H
 
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klistview.h>
 #include <kpushbutton.h>
@@ -52,7 +52,7 @@ signals:
 	void joinGame(int gameId);
 	void newGame(const TQString &gameType);
 	void leaveServer();
-	void msgStatus(const TQString &status);
+	void msgtqStatus(const TQString &status);
 
 private:
 	TQListViewItem *findItem(Game *game);
diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp
index ecff22e5..3b5bcf1a 100644
--- a/atlantik/client/selectserver_widget.cpp
+++ b/atlantik/client/selectserver_widget.cpp
@@ -15,7 +15,7 @@
 // Boston, MA 02110-1301, USA.
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqsizepolicy.h>
 #include <tqvbuttongroup.h>
@@ -42,12 +42,12 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe
 	TQLabel *hostLabel = new TQLabel(i18n("Hostname:"), customGroup);
 
 	m_hostEdit = new KLineEdit(customGroup);
-	m_hostEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
+	m_hostEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
 
 	TQLabel *portLabel = new TQLabel(i18n("Port:"), customGroup);
 
 	m_portEdit = new KLineEdit(TQString::number(1234), customGroup);
-	m_portEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
+	m_portEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
 
 	KPushButton *connectButton = new KPushButton( KGuiItem(i18n("Connect"), "network"), customGroup);
 	connect(connectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(customConnect()));
@@ -113,7 +113,7 @@ void SelectServer::setHideDevelopmentServers(bool hideDevelopmentServers)
 void SelectServer::initMonopigator()
 {
 	// Hardcoded, but there aren't any other Monopigator root servers at the moment
-	emit msgStatus(i18n("Retrieving server list..."));
+	emit msgtqStatus(i18n("Retrieving server list..."));
 
 	m_refreshButton->setGuiItem(KGuiItem(i18n("Reload Server List"), "reload"));
 	m_monopigator->loadData(KURL( "http://monopd-gator.kde.org/"));
@@ -135,13 +135,13 @@ void SelectServer::slotMonopigatorAdd(TQString ip, TQString host, TQString port,
 
 void SelectServer::monopigatorFinished()
 {
-	emit msgStatus(i18n("Retrieved server list."));
+	emit msgtqStatus(i18n("Retrieved server list."));
 	m_refreshButton->setEnabled(true);
 }
 
 void SelectServer::monopigatorTimeout()
 {
-	emit msgStatus(i18n("Error while retrieving the server list."));
+	emit msgtqStatus(i18n("Error while retrieving the server list."));
 	m_refreshButton->setEnabled(true);
 }
 
diff --git a/atlantik/client/selectserver_widget.h b/atlantik/client/selectserver_widget.h
index 164e6291..f663422d 100644
--- a/atlantik/client/selectserver_widget.h
+++ b/atlantik/client/selectserver_widget.h
@@ -18,7 +18,7 @@
 #define ATLANTIK_SELECTSERVER_WIDGET_H
 
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 
 #include <klineedit.h>
@@ -57,7 +57,7 @@ private slots:
 
 signals:
 	void serverConnect(const TQString host, int port);
-	void msgStatus(const TQString &message);
+	void msgtqStatus(const TQString &message);
 	void showDevelopmentServers(bool show);
 
 private: