Rename old tq methods that no longer need a unique name

14 files changed, 33 insertions, 33 deletions

diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index e2b2b942..dd61f3f3 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(msgtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
+	connect(m_selectServer, TQT_SIGNAL(msgStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(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(msgtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
+	connect(m_selectGame, TQT_SIGNAL(msgStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(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(slotMsgtqStatus(const TQString &)));
+	connect(m_selectConfiguration, TQT_SIGNAL(statusMessage(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &)));
 }
 
 void Atlantik::initBoard()
@@ -475,12 +475,12 @@ void Atlantik::networkClosed(int status)
 	switch( status )
 	{
 	case KBufferedIO::involuntary:
-		slotMsgtqStatus( i18n("Connection with server %1:%2 lost.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
+		slotMsgStatus( 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() )
-			slotMsgtqStatus( i18n("Disconnected from %1:%2.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
+			slotMsgStatus( 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::slotMsgtqStatus(const TQString &message, const TQString &icon)
+void Atlantik::slotMsgStatus(const TQString &message, const TQString &icon)
 {
 	KMainWindow::statusBar()->changeItem(message, 1);
 	m_eventLog->addEvent(message, icon);
@@ -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(msgtqStatus(const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &, const 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(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 7e8ff1b0..2134edf1 100644
--- a/atlantik/client/atlantik.h
+++ b/atlantik/client/atlantik.h
@@ -188,7 +188,7 @@ public slots:
 	 */
 	void slotMsgInfo(TQString msg);
 
-	void slotMsgtqStatus(const TQString &message, const TQString &icon = TQString());
+	void slotMsgStatus(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 23bd4c1b..793ff254 100644
--- a/atlantik/client/configdlg.cpp
+++ b/atlantik/client/configdlg.cpp
@@ -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(tqsizeHint());
+	setMinimumSize(sizeHint());
 }
 
 bool ConfigDialog::chatTimestamps()
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index 9636e6e2..800478b3 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -37,7 +37,7 @@ EventLog::EventLog()
 
 void EventLog::addEvent(const TQString &description, const TQString &icon)
 {
-	Event *event = new Event(TQDateTime::tqcurrentDateTime(), description, icon);
+	Event *event = new Event(TQDateTime::currentDateTime(), 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." ).tqarg( TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
+		stream << i18n( "Atlantik log file, saved at %1." ).tqarg( TQDateTime::currentDateTime().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 e07a184a..7e0a834d 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::tqfromLatin1("UserAgent"), TQString::tqfromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
+	m_job->addMetaData(TQString::fromLatin1("UserAgent"), TQString::fromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
 
 	if (!m_timer)
 	{
diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h
index 5b9a523d..885ccd2b 100644
--- a/atlantik/client/selectgame_widget.h
+++ b/atlantik/client/selectgame_widget.h
@@ -52,7 +52,7 @@ signals:
 	void joinGame(int gameId);
 	void newGame(const TQString &gameType);
 	void leaveServer();
-	void msgtqStatus(const TQString &status);
+	void msgStatus(const TQString &status);
 
 private:
 	TQListViewItem *findItem(Game *game);
diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp
index 3b5bcf1a..97a594c4 100644
--- a/atlantik/client/selectserver_widget.cpp
+++ b/atlantik/client/selectserver_widget.cpp
@@ -42,12 +42,12 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe
 	TQLabel *hostLabel = new TQLabel(i18n("Hostname:"), customGroup);
 
 	m_hostEdit = new KLineEdit(customGroup);
-	m_hostEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
+	m_hostEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
 
 	TQLabel *portLabel = new TQLabel(i18n("Port:"), customGroup);
 
 	m_portEdit = new KLineEdit(TQString::number(1234), customGroup);
-	m_portEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
+	m_portEdit->setSizePolicy(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 msgtqStatus(i18n("Retrieving server list..."));
+	emit msgStatus(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 msgtqStatus(i18n("Retrieved server list."));
+	emit msgStatus(i18n("Retrieved server list."));
 	m_refreshButton->setEnabled(true);
 }
 
 void SelectServer::monopigatorTimeout()
 {
-	emit msgtqStatus(i18n("Error while retrieving the server list."));
+	emit msgStatus(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 f663422d..61cc2726 100644
--- a/atlantik/client/selectserver_widget.h
+++ b/atlantik/client/selectserver_widget.h
@@ -57,7 +57,7 @@ private slots:
 
 signals:
 	void serverConnect(const TQString host, int port);
-	void msgtqStatus(const TQString &message);
+	void msgStatus(const TQString &message);
 	void showDevelopmentServers(bool show);
 
 private:
diff --git a/atlantik/libatlantic/auction.cpp b/atlantik/libatlantic/auction.cpp
index ebc6c40e..2e09a685 100644
--- a/atlantik/libatlantic/auction.cpp
+++ b/atlantik/libatlantic/auction.cpp
@@ -32,7 +32,7 @@ Auction::~Auction()
 	emit completed();
 }
 
-void Auction::settqStatus(int status)
+void Auction::setStatus(int status)
 {
 	if (m_status != status)
 	{
diff --git a/atlantik/libatlantic/auction.h b/atlantik/libatlantic/auction.h
index c482416e..387c3f61 100644
--- a/atlantik/libatlantic/auction.h
+++ b/atlantik/libatlantic/auction.h
@@ -36,7 +36,7 @@ public:
 	int auctionId() { return m_auctionId; }
 	Estate *estate() { return m_estate; }
 
-	void settqStatus(int status);
+	void setStatus(int status);
 	int status() { return m_status; }
 
 	void newBid(Player *player, int bid);
diff --git a/atlantik/libatlantikclient/atlantik_network.cpp b/atlantik/libatlantikclient/atlantik_network.cpp
index 7b980ef8..4a5e42c2 100644
--- a/atlantik/libatlantikclient/atlantik_network.cpp
+++ b/atlantik/libatlantikclient/atlantik_network.cpp
@@ -872,7 +872,7 @@ void AtlantikNetwork::processNode(TQDomNode n)
 					if (auction && !a.isNull())
 					{
 						int status = a.value().toInt();
-						auction->settqStatus(status);
+						auction->setStatus(status);
 
 						// TODO: find a good way to visualise "sold!"
 						if (status == 3)
@@ -906,23 +906,23 @@ void AtlantikNetwork::serverConnect(const TQString host, int port)
 {
 	setAddress(host, port);
 	enableRead(true);
-	emit msgtqStatus(i18n("Connecting to %1:%2...").tqarg(host).tqarg(TQString::number(port)), "connect_creating");
+	emit msgStatus(i18n("Connecting to %1:%2...").tqarg(host).tqarg(TQString::number(port)), "connect_creating");
 	startAsyncConnect();
 }
 
 void AtlantikNetwork::slotLookupFinished(int count)
 {
-	emit msgtqStatus(i18n("Server host name lookup finished..."));
+	emit msgStatus(i18n("Server host name lookup finished..."));
 }
 
 void AtlantikNetwork::slotConnectionSuccess()
 {
-	emit msgtqStatus(i18n("Connected to %1:%2.").tqarg(host()).tqarg(port()), "connect_established");
+	emit msgStatus(i18n("Connected to %1:%2.").tqarg(host()).tqarg(port()), "connect_established");
 }
 
 void AtlantikNetwork::slotConnectionFailed(int error)
 {
-	emit msgtqStatus(i18n("Connection failed! Error code: %1").tqarg(error), "connect_no");
+	emit msgStatus(i18n("Connection failed! Error code: %1").tqarg(error), "connect_no");
 }
 
 #include "atlantik_network.moc"
diff --git a/atlantik/libatlantikclient/atlantik_network.h b/atlantik/libatlantikclient/atlantik_network.h
index 3164bf18..ee366f69 100644
--- a/atlantik/libatlantikclient/atlantik_network.h
+++ b/atlantik/libatlantikclient/atlantik_network.h
@@ -102,7 +102,7 @@ signals:
 	void msgInfo(TQString);
 	void msgError(TQString);
 	void msgChat(TQString, TQString);
-	void msgtqStatus(const TQString &data, const TQString &icon = TQString());
+	void msgStatus(const TQString &data, const TQString &icon = TQString());
 	void networkEvent(const TQString &data, const TQString &icon);
 
 	void displayDetails(TQString text, bool clearText, bool clearButtons, Estate *estate = 0);
diff --git a/atlantik/libatlantikclient/monopdprotocol.cpp b/atlantik/libatlantikclient/monopdprotocol.cpp
index 39f8fb81..f024f163 100644
--- a/atlantik/libatlantikclient/monopdprotocol.cpp
+++ b/atlantik/libatlantikclient/monopdprotocol.cpp
@@ -36,12 +36,12 @@ MonopdProtocol::MonopdProtocol() : TQObject()
 
 void MonopdProtocol::auctionEstate()
 {
-	sendData(TQString::tqfromLatin1(".ea"));
+	sendData(TQString::fromLatin1(".ea"));
 }
 
 void MonopdProtocol::buyEstate()
 {
-	sendData(TQString::tqfromLatin1(".eb"));
+	sendData(TQString::fromLatin1(".eb"));
 }
 
 void MonopdProtocol::confirmTokenLocation(Estate *estate)
@@ -53,12 +53,12 @@ void MonopdProtocol::confirmTokenLocation(Estate *estate)
 
 void MonopdProtocol::endTurn()
 {
-	sendData(TQString::tqfromLatin1(".E"));
+	sendData(TQString::fromLatin1(".E"));
 }
 
 void MonopdProtocol::rollDice()
 {
-	sendData(TQString::tqfromLatin1(".r"));
+	sendData(TQString::fromLatin1(".r"));
 }
 
 void MonopdProtocol::setName(TQString name)
@@ -70,7 +70,7 @@ void MonopdProtocol::setName(TQString name)
 
 void MonopdProtocol::startGame()
 {
-	sendData(TQString::tqfromLatin1(".gs"));
+	sendData(TQString::fromLatin1(".gs"));
 }
 
 void MonopdProtocol::sendData(TQString)
diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp
index d4d7bdfa..a287badc 100644
--- a/atlantik/libatlantikui/auction_widget.cpp
+++ b/atlantik/libatlantikui/auction_widget.cpp
@@ -80,7 +80,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid
 	KPushButton *bidButton = new KPushButton(i18n("Make Bid"), bidBox, "bidButton");
 	connect(bidButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBidButtonClicked()));
 
-	// tqStatus label
+	// Status label
 	m_statusLabel = new TQLabel(this, "statusLabel");
 	m_mainLayout->addWidget(m_statusLabel);
 }