diff options
337 files changed, 2053 insertions, 2053 deletions
diff --git a/atlantik/atlanticd/atlanticclient.cpp b/atlantik/atlanticd/atlanticclient.cpp index 0e4e3e12..40e7c930 100644 --- a/atlantik/atlanticd/atlanticclient.cpp +++ b/atlantik/atlanticd/atlanticclient.cpp @@ -14,7 +14,7 @@ // the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, // Boston, MA 02110-1301, USA. -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include "atlanticclient.h" diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index e2b2b942..5c923a07 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.").arg(m_atlantikNetwork->host()).arg(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.").arg(m_atlantikNetwork->host()).arg(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); @@ -636,7 +636,7 @@ void Atlantik::slotMsgChat(TQString player, TQString msg) if (m_config.chatTimestamps) { TQTime time = TQTime::currentTime(); - serverMsgsAppend(TQString("[%1] %2: %3").tqarg(time.toString("hh:mm")).tqarg(player).tqarg(msg)); + serverMsgsAppend(TQString("[%1] %2: %3").arg(time.toString("hh:mm")).arg(player).arg(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(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..377ef98b 100644 --- a/atlantik/client/atlantik.h +++ b/atlantik/client/atlantik.h @@ -18,8 +18,8 @@ #define ATLANTIK_ATLANTIK_H #include <tqwidget.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <tqlabel.h> #include <tqptrlist.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..3ca77b51 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 <tqlayout.h> +#include <layout.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(tqsizeHint()); + setMinimumSize(sizeHint()); } 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 *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); TQLabel *label = new TQLabel(i18n("Player name:"), parent); - tqlayout->addWidget(label); + layout->addWidget(label); m_playerName = new TQLineEdit(parent); - tqlayout->addWidget(m_playerName); + layout->addWidget(m_playerName); TQLabel *label2 = new TQLabel(i18n("Player image:"), parent); - tqlayout->addWidget(label2); + layout->addWidget(label2); m_playerIcon = new KPushButton(parent, "playerIcon"); - tqlayout->addWidget(m_playerIcon); + layout->addWidget(m_playerIcon); connect( m_playerIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseImage()) ); - tqlayout->addStretch(1); + layout->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 *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), parent); - tqlayout->addWidget(m_connectOnStart); + layout->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); - tqlayout->addWidget(m_hideDevelopmentServers); + layout->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); - tqlayout->addStretch(1); + layout->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 *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), parent); - tqlayout->addWidget(m_chatTimestamps); + layout->addWidget(m_chatTimestamps); TQString message=i18n( "If checked, Atlantik will add timestamps in front of chat\n" "messages.\n"); TQWhatsThis::add(m_chatTimestamps, message); - tqlayout->addStretch(1); + layout->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 *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game Status Feedback"), parent); - tqlayout->addWidget(box); + layout->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); -// tqlayout->addWidget(box); +// layout->addWidget(box); - tqlayout->addStretch(1); + layout->addStretch(1); reset(); } diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp index 9636e6e2..32388205 100644 --- a/atlantik/client/eventlogwidget.cpp +++ b/atlantik/client/eventlogwidget.cpp @@ -17,7 +17,7 @@ #include <iostream> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.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::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." ).arg( 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/selectconfiguration_widget.h b/atlantik/client/selectconfiguration_widget.h index 88108f8f..7aed5fc6 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 <tqlayout.h> +#include <layout.h> #include <tqvgroupbox.h> #include <klistview.h> diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp index a4072044..0769dfc2 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").tqarg(game->name()), game->description(), TQString(), TQString(), game->type() ); + TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").arg(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").tqarg( (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").arg( (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").tqarg(game->name())); + item->setText(0, i18n("Create a new %1 Game").arg(game->name())); else { Player *master = game->master(); - item->setText( 0, i18n("Join %1's %2 Game").tqarg( (master ? master->name() : TQString()), game->name() ) ); + item->setText( 0, i18n("Join %1's %2 Game").arg( (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").tqarg( player->name(), game->name() ) ); + item->setText( 0, i18n("Join %1's %2 Game").arg( player->name(), game->name() ) ); return; } item = item->nextSibling(); diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h index 5b9a523d..273acfa3 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 <tqlayout.h> +#include <layout.h> #include <klistview.h> #include <kpushbutton.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..ecff22e5 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 <tqlayout.h> +#include <layout.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->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..164e6291 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 <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <klineedit.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/kio_atlantik/kio_atlantik.cpp b/atlantik/kio_atlantik/kio_atlantik.cpp index 4465f007..0f371b1f 100644 --- a/atlantik/kio_atlantik/kio_atlantik.cpp +++ b/atlantik/kio_atlantik/kio_atlantik.cpp @@ -16,7 +16,7 @@ #include <stdlib.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tdeversion.h> #undef KDE_3_1_FEATURES 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/libatlantic/trade.cpp b/atlantik/libatlantic/trade.cpp index 7bd3aee1..7bd638c9 100644 --- a/atlantik/libatlantic/trade.cpp +++ b/atlantik/libatlantic/trade.cpp @@ -196,5 +196,5 @@ void TradeMoney::setMoney(unsigned int money) TQString TradeMoney::text() const { - return TQString("$%1").tqarg(m_money); + return TQString("$%1").arg(m_money); } diff --git a/atlantik/libatlantikclient/atlantik_network.cpp b/atlantik/libatlantikclient/atlantik_network.cpp index 7b980ef8..cb53577f 100644 --- a/atlantik/libatlantikclient/atlantik_network.cpp +++ b/atlantik/libatlantikclient/atlantik_network.cpp @@ -17,8 +17,8 @@ #include <iostream> #include <tqdom.h> -#include <tqtextcodec.h> -#include <tqtextstream.h> +#include <textcodec.h> +#include <textstream.h> #include <tqtimer.h> #include <kdebug.h> @@ -95,37 +95,37 @@ void AtlantikNetwork::endTurn() void AtlantikNetwork::setName(TQString name) { // Almost deprecated, will be replaced by libmonopdprotocol - writeData(TQString(".n%1").tqarg(name)); + writeData(TQString(".n%1").arg(name)); } void AtlantikNetwork::tokenConfirmation(Estate *estate) { - writeData(TQString(".t%1").tqarg(estate ? estate->id() : -1)); + writeData(TQString(".t%1").arg(estate ? estate->id() : -1)); } void AtlantikNetwork::estateToggleMortgage(Estate *estate) { - writeData(TQString(".em%1").tqarg(estate ? estate->id() : -1)); + writeData(TQString(".em%1").arg(estate ? estate->id() : -1)); } void AtlantikNetwork::estateHouseBuy(Estate *estate) { - writeData(TQString(".hb%1").tqarg(estate ? estate->id() : -1)); + writeData(TQString(".hb%1").arg(estate ? estate->id() : -1)); } void AtlantikNetwork::estateHouseSell(Estate *estate) { - writeData(TQString(".hs%1").tqarg(estate ? estate->id() : -1)); + writeData(TQString(".hs%1").arg(estate ? estate->id() : -1)); } void AtlantikNetwork::newGame(const TQString &gameType) { - writeData(TQString(".gn%1").tqarg(gameType)); + writeData(TQString(".gn%1").arg(gameType)); } void AtlantikNetwork::joinGame(int gameId) { - writeData(TQString(".gj%1").tqarg(gameId)); + writeData(TQString(".gj%1").arg(gameId)); } void AtlantikNetwork::cmdChat(TQString msg) @@ -135,42 +135,42 @@ void AtlantikNetwork::cmdChat(TQString msg) void AtlantikNetwork::newTrade(Player *player) { - writeData(TQString(".Tn%1").tqarg(player ? player->id() : -1)); + writeData(TQString(".Tn%1").arg(player ? player->id() : -1)); } void AtlantikNetwork::kickPlayer(Player *player) { - writeData(TQString(".gk%1").tqarg(player ? player->id() : -1)); + writeData(TQString(".gk%1").arg(player ? player->id() : -1)); } void AtlantikNetwork::tradeUpdateEstate(Trade *trade, Estate *estate, Player *player) { - writeData(TQString(".Te%1:%2:%3").tqarg(trade ? trade->tradeId() : -1).tqarg(estate ? estate->id() : -1).tqarg(player ? player->id() : -1)); + writeData(TQString(".Te%1:%2:%3").arg(trade ? trade->tradeId() : -1).arg(estate ? estate->id() : -1).arg(player ? player->id() : -1)); } void AtlantikNetwork::tradeUpdateMoney(Trade *trade, unsigned int money, Player *pFrom, Player *pTo) { - writeData(TQString(".Tm%1:%2:%3:%4").tqarg(trade ? trade->tradeId() : -1).tqarg(pFrom ? pFrom->id() : -1).tqarg(pTo ? pTo->id() : -1).tqarg(money)); + writeData(TQString(".Tm%1:%2:%3:%4").arg(trade ? trade->tradeId() : -1).arg(pFrom ? pFrom->id() : -1).arg(pTo ? pTo->id() : -1).arg(money)); } void AtlantikNetwork::tradeReject(Trade *trade) { - writeData(TQString(".Tr%1").tqarg(trade ? trade->tradeId() : -1)); + writeData(TQString(".Tr%1").arg(trade ? trade->tradeId() : -1)); } void AtlantikNetwork::tradeAccept(Trade *trade) { - writeData(TQString(".Ta%1:%2").tqarg(trade ? trade->tradeId() : -1).tqarg(trade ? trade->revision() : -1)); + writeData(TQString(".Ta%1:%2").arg(trade ? trade->tradeId() : -1).arg(trade ? trade->revision() : -1)); } void AtlantikNetwork::auctionBid(Auction *auction, int amount) { - writeData(TQString(".ab%1:%2").tqarg(auction ? auction->auctionId() : -1).tqarg(amount)); + writeData(TQString(".ab%1:%2").arg(auction ? auction->auctionId() : -1).arg(amount)); } void AtlantikNetwork::setImage(const TQString &name) { - writeData(TQString(".pi%1").tqarg(name)); + writeData(TQString(".pi%1").arg(name)); } void AtlantikNetwork::jailPay() @@ -190,7 +190,7 @@ void AtlantikNetwork::jailCard() void AtlantikNetwork::changeOption(int configId, const TQString &value) { - writeData( TQString(".gc%1:%2").tqarg(configId).tqarg(value) ); + writeData( TQString(".gc%1:%2").arg(configId).arg(value) ); } void AtlantikNetwork::writeData(TQString msg) @@ -607,7 +607,7 @@ void AtlantikNetwork::processNode(TQDomNode n) Estate *estate = 0; bool b_newEstate = false; - // FIXME: allow any estateId, GUI should not use it to determin its tqgeometry + // FIXME: allow any estateId, GUI should not use it to determin its geometry if (estateId >= 0 && estateId < 100 && !(estate = m_atlanticCore->findEstate(a.value().toInt()))) { // Create estate object @@ -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...").arg(host).arg(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.").arg(host()).arg(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").arg(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..68ded495 100644 --- a/atlantik/libatlantikui/auction_widget.cpp +++ b/atlantik/libatlantikui/auction_widget.cpp @@ -47,7 +47,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid // Player list Estate *estate = auction->estate(); - m_playerGroupBox = new TQVGroupBox(estate ? i18n("Auction: %1").tqarg(estate->name()) : i18n("Auction"), this, "groupBox"); + m_playerGroupBox = new TQVGroupBox(estate ? i18n("Auction: %1").arg(estate->name()) : i18n("Auction"), this, "groupBox"); m_mainLayout->addWidget(m_playerGroupBox); m_playerList = new KListView(m_playerGroupBox); @@ -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); } diff --git a/atlantik/libatlantikui/auction_widget.h b/atlantik/libatlantikui/auction_widget.h index 8c77d025..7250a6e5 100644 --- a/atlantik/libatlantikui/auction_widget.h +++ b/atlantik/libatlantikui/auction_widget.h @@ -18,7 +18,7 @@ #define ATLANTIK_AUCTION_WIDGET_H #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <klistview.h> diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp index c2c8fded..89581a35 100644 --- a/atlantik/libatlantikui/board.cpp +++ b/atlantik/libatlantikui/board.cpp @@ -351,13 +351,13 @@ TQPoint AtlantikBoard::calculateTokenDestination(Token *token, Estate *eDest) int x = 0, y = 0; if (token->player()->inJail()) { - x = evDest->tqgeometry().right() - token->width() - 2; - y = evDest->tqgeometry().top(); + x = evDest->geometry().right() - token->width() - 2; + y = evDest->geometry().top(); } else { - x = evDest->tqgeometry().center().x() - (token->width()/2); - y = evDest->tqgeometry().center().y() - (token->height()/2); + x = evDest->geometry().center().x() - (token->width()/2); + y = evDest->geometry().center().y() - (token->height()/2); /* // Re-center because of EstateView headers @@ -394,8 +394,8 @@ void AtlantikBoard::slotMoveToken() } // Where are we? - int xCurrent = m_movingToken->tqgeometry().x(); - int yCurrent = m_movingToken->tqgeometry().y(); + int xCurrent = m_movingToken->geometry().x(); + int yCurrent = m_movingToken->geometry().y(); // Where do we want to go today? Estate *eDest = m_atlanticCore->estateAfter(m_movingToken->location()); diff --git a/atlantik/libatlantikui/board.h b/atlantik/libatlantikui/board.h index c9e160ac..c14f384a 100644 --- a/atlantik/libatlantikui/board.h +++ b/atlantik/libatlantikui/board.h @@ -19,7 +19,7 @@ #include <tqwidget.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrlist.h> #include "libatlantikui_export.h" class TQPoint; diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp index c92b5cc2..9b94ae9d 100644 --- a/atlantik/libatlantikui/estatedetails.cpp +++ b/atlantik/libatlantikui/estatedetails.cpp @@ -16,7 +16,7 @@ #include <tqpainter.h> #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrlist.h> #include <tqregexp.h> #include <tqvgroupbox.h> @@ -114,7 +114,7 @@ void EstateDetails::paintEvent(TQPaintEvent *) TQColor greenHouse(0, 255, 0); TQColor redHotel(255, 51, 51); TQPainter painter; - painter.tqbegin(TQT_TQPAINTDEVICE(m_pixmap), this); + painter.begin(TQT_TQPAINTDEVICE(m_pixmap), this); painter.setPen(TQt::black); @@ -136,7 +136,7 @@ void EstateDetails::paintEvent(TQPaintEvent *) quartzBuffer->resize(25, (height()/4)-2); TQPainter quartzPainter; - quartzPainter.tqbegin(TQT_TQPAINTDEVICE(quartzBuffer), this); + quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this); painter.setBrush(titleColor); painter.drawRect(0, 0, width(), titleHeight); @@ -217,22 +217,22 @@ void EstateDetails::addDetails() // Price if (m_estate->price()) { - infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").tqarg(m_estate->price())); + infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").arg(m_estate->price())); infoText->setPixmap(0, TQPixmap(SmallIcon("info"))); } // Owner, houses, isMortgaged if (m_estate && m_estate->canBeOwned()) { - infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Owner: %1").tqarg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned"))); + infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Owner: %1").arg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned"))); infoText->setPixmap(0, TQPixmap(SmallIcon("info"))); if (m_estate->isOwned()) { - infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Houses: %1").tqarg(m_estate->houses())); + infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Houses: %1").arg(m_estate->houses())); infoText->setPixmap(0, TQPixmap(SmallIcon("info"))); - infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").tqarg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No"))); + infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No"))); infoText->setPixmap(0, TQPixmap(SmallIcon("info"))); } } diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp index 2307ef6b..82586002 100644 --- a/atlantik/libatlantikui/estateview.cpp +++ b/atlantik/libatlantikui/estateview.cpp @@ -72,20 +72,20 @@ void EstateView::updateToolTip() TQString toolTip = m_estate->name(); if ( m_estate->isOwned() ) { - toolTip.append( "\n" + i18n("Owner: %1").tqarg( m_estate->owner()->name() ) ); + toolTip.append( "\n" + i18n("Owner: %1").arg( m_estate->owner()->name() ) ); if ( m_estate->isMortgaged() ) - toolTip.append( "\n" + i18n("Unmortgage Price: %1").tqarg( m_estate->unmortgagePrice() ) ); + toolTip.append( "\n" + i18n("Unmortgage Price: %1").arg( m_estate->unmortgagePrice() ) ); else - toolTip.append( "\n" + i18n("Mortgage Value: %1").tqarg( m_estate->mortgagePrice() ) ); + toolTip.append( "\n" + i18n("Mortgage Value: %1").arg( m_estate->mortgagePrice() ) ); if ( m_estate->canSellHouses() ) - toolTip.append( "\n" + i18n("House Value: %1").tqarg( m_estate->houseSellPrice() ) ); + toolTip.append( "\n" + i18n("House Value: %1").arg( m_estate->houseSellPrice() ) ); if ( m_estate->canBuyHouses() ) - toolTip.append( "\n" + i18n("House Price: %1").tqarg( m_estate->housePrice() ) ); + toolTip.append( "\n" + i18n("House Price: %1").arg( m_estate->housePrice() ) ); } else if ( m_estate->canBeOwned() ) - toolTip.append( "\n" + i18n("Price: %1").tqarg( m_estate->price() ) ); + toolTip.append( "\n" + i18n("Price: %1").arg( m_estate->price() ) ); else if ( m_estate->money() ) - toolTip.append( "\n" + i18n("Money: %1").tqarg( m_estate->money() ) ); + toolTip.append( "\n" + i18n("Money: %1").arg( m_estate->money() ) ); TQToolTip::add( this, toolTip ); } @@ -255,7 +255,7 @@ void EstateView::paintEvent(TQPaintEvent *) TQColor greenHouse(0, 255, 0); TQColor redHotel(255, 51, 51); TQPainter painter; - painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this); + painter.begin(TQT_TQPAINTDEVICE(qpixmap), this); painter.setPen(TQt::black); @@ -281,7 +281,7 @@ void EstateView::paintEvent(TQPaintEvent *) quartzBuffer->resize(m_titleWidth-2, 25); TQPainter quartzPainter; - quartzPainter.tqbegin(TQT_TQPAINTDEVICE(quartzBuffer), this); + quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this); painter.setBrush(m_estate->color()); switch(m_orientation) @@ -477,7 +477,7 @@ void EstateView::mousePressEvent(TQMouseEvent *e) { // Request trade if (Player *player = m_estate->owner()) - rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(player->name()), 3); + rmbMenu->insertItem(i18n("Request Trade with %1").arg(player->name()), 3); } KPopupMenu *pm = dynamic_cast<KPopupMenu *>(rmbMenu); diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp index f73d2999..1cd6d2e8 100644 --- a/atlantik/libatlantikui/portfolioview.cpp +++ b/atlantik/libatlantikui/portfolioview.cpp @@ -196,7 +196,7 @@ void PortfolioView::paintEvent(TQPaintEvent *) qpixmap = new TQPixmap(width(), height()); TQPainter painter; - painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this); + painter.begin(TQT_TQPAINTDEVICE(qpixmap), this); painter.setPen(TQt::white); painter.setBrush(TQt::white); @@ -260,12 +260,12 @@ void PortfolioView::mousePressEvent(TQMouseEvent *e) if ( m_portfolioEstates.count() ) { // Start trade - rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(m_player->name()), 0); + rmbMenu->insertItem(i18n("Request Trade with %1").arg(m_player->name()), 0); } else { // Kick player - rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").tqarg(m_player->name()), 0); + rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").arg(m_player->name()), 0); rmbMenu->setItemEnabled( 0, m_atlanticCore->selfIsMaster() ); } diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp index d6df61dc..bb60e5ed 100644 --- a/atlantik/libatlantikui/token.cpp +++ b/atlantik/libatlantikui/token.cpp @@ -127,7 +127,7 @@ void Token::paintEvent(TQPaintEvent *) qpixmap = new TQPixmap(width(), height()); TQPainter painter; - painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this); + painter.begin(TQT_TQPAINTDEVICE(qpixmap), this); if (m_image) { diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp index d6cfe4d4..fc99da50 100644 --- a/atlantik/libatlantikui/trade_widget.cpp +++ b/atlantik/libatlantikui/trade_widget.cpp @@ -16,7 +16,7 @@ #include <iostream> -#include <tqlayout.h> +#include <layout.h> #include <tqhgroupbox.h> #include <tqheader.h> #include <tqpopupmenu.h> @@ -52,7 +52,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_trade = trade; m_atlanticCore = atlanticCore; - setCaption(i18n("Trade %1").tqarg(trade->tradeId())); + setCaption(i18n("Trade %1").arg(trade->tradeId())); TQVBoxLayout *listCompBox = new TQVBoxLayout(this, KDialog::marginHint()); @@ -143,7 +143,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_status = new TQLabel(this); listCompBox->addWidget(m_status); - m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).tqarg( m_trade->count( true ) ).tqarg( m_trade->count( false ) ) ); + m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).arg( m_trade->count( true ) ).arg( m_trade->count( false ) ) ); // mPlayerList->header()->hide(); // mPlayerList->setRootIsDecorated(true); @@ -216,7 +216,7 @@ void TradeDisplay::tradeChanged() { // TODO: add notification whether playerSelf has accepted or not and // enable/disable accept button based on that - m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).tqarg( m_trade->count( true ) ).tqarg( m_trade->count( false ) ) ); + m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).arg( m_trade->count( true ) ).arg( m_trade->count( false ) ) ); } void TradeDisplay::playerChanged(Player *player) @@ -232,7 +232,7 @@ void TradeDisplay::playerChanged(Player *player) void TradeDisplay::tradeRejected(Player *player) { if (player) - m_status->setText(i18n("Trade proposal was rejected by %1.").tqarg(player->name())); + m_status->setText(i18n("Trade proposal was rejected by %1.").arg(player->name())); else m_status->setText(i18n("Trade proposal was rejected.")); diff --git a/kasteroids/ledmeter.cpp b/kasteroids/ledmeter.cpp index e323d6fd..1d807d18 100644 --- a/kasteroids/ledmeter.cpp +++ b/kasteroids/ledmeter.cpp @@ -76,7 +76,7 @@ void KALedMeter::drawContents( TQPainter *p ) unsigned cidx = 0; int ncol = mCount; - TQColor col = tqcolorGroup().foreground(); + TQColor col = colorGroup().foreground(); if ( !mCRanges.isEmpty() ) { diff --git a/kasteroids/sprites/rock1/rock1.pov b/kasteroids/sprites/rock1/rock1.pov index bcf4c8a7..58298c05 100644 --- a/kasteroids/sprites/rock1/rock1.pov +++ b/kasteroids/sprites/rock1/rock1.pov @@ -1,5 +1,5 @@ #include "colors.inc" -#include "tqshapes.inc" +#include "shapes.inc" #include "textures.inc" // #include "stones.inc" diff --git a/kasteroids/sprites/rock2/rock2.pov b/kasteroids/sprites/rock2/rock2.pov index 625c7854..2f37a206 100644 --- a/kasteroids/sprites/rock2/rock2.pov +++ b/kasteroids/sprites/rock2/rock2.pov @@ -1,5 +1,5 @@ #include "colors.inc" -#include "tqshapes.inc" +#include "shapes.inc" #include "textures.inc" // #include "stones.inc" diff --git a/kasteroids/sprites/rock3/rock3.pov b/kasteroids/sprites/rock3/rock3.pov index 625c7854..2f37a206 100644 --- a/kasteroids/sprites/rock3/rock3.pov +++ b/kasteroids/sprites/rock3/rock3.pov @@ -1,5 +1,5 @@ #include "colors.inc" -#include "tqshapes.inc" +#include "shapes.inc" #include "textures.inc" // #include "stones.inc" diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp index ffc6b8e2..c90ae813 100644 --- a/kasteroids/toplevel.cpp +++ b/kasteroids/toplevel.cpp @@ -5,7 +5,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlcdnumber.h> #include <tqspinbox.h> #include <tqcheckbox.h> @@ -102,7 +102,7 @@ KAstTopLevel::KAstTopLevel() label = new TQLabel( i18n("Score"), mainWin ); label->setFont( labelFont ); label->setPalette( pal ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); hb->addWidget( label ); scoreLCD = new TQLCDNumber( 6, mainWin ); @@ -116,7 +116,7 @@ KAstTopLevel::KAstTopLevel() label = new TQLabel( i18n("Level"), mainWin ); label->setFont( labelFont ); label->setPalette( pal ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); hb->addWidget( label ); levelLCD = new TQLCDNumber( 2, mainWin ); @@ -129,7 +129,7 @@ KAstTopLevel::KAstTopLevel() label = new TQLabel( i18n("Ships"), mainWin ); label->setFont( labelFont ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hb->addWidget( label ); @@ -151,7 +151,7 @@ KAstTopLevel::KAstTopLevel() vb->addWidget( view, 10 ); -// -- bottom tqlayout: +// -- bottom layout: TQFrame *sep2 = new TQFrame( mainWin ); sep2->setMaximumHeight( 1 ); sep2->setFrameStyle( TQFrame::HLine | TQFrame::Raised ); @@ -168,7 +168,7 @@ KAstTopLevel::KAstTopLevel() /* label = new TQLabel( i18n( "T" ), mainWin ); label->setFont( smallFont ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hbd->addWidget( label ); @@ -184,7 +184,7 @@ KAstTopLevel::KAstTopLevel() TQPixmap pm( sprites_prefix + "powerups/brake.png" ); label = new TQLabel( mainWin ); label->setPixmap( pm ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hbd->addWidget( label ); @@ -200,7 +200,7 @@ KAstTopLevel::KAstTopLevel() pm.load( sprites_prefix + "powerups/shield.png" ); label = new TQLabel( mainWin ); label->setPixmap( pm ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hbd->addWidget( label ); @@ -216,7 +216,7 @@ KAstTopLevel::KAstTopLevel() pm.load( sprites_prefix + "powerups/shoot.png" ); label = new TQLabel( mainWin ); label->setPixmap( pm ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hbd->addWidget( label ); @@ -231,7 +231,7 @@ KAstTopLevel::KAstTopLevel() label = new TQLabel( i18n( "Fuel" ), mainWin ); label->setFont( smallFont ); - label->setFixedWidth( label->tqsizeHint().width() + 10 ); + label->setFixedWidth( label->sizeHint().width() + 10 ); label->setPalette( pal ); hbd->addWidget( label ); @@ -484,7 +484,7 @@ void KAstTopLevel::slotNewGame() view->setRockSpeed( levels[0].rockSpeed ); view->addRocks( levels[0].nrocks ); view->showText( i18n( "Press %1 to launch." ) - .tqarg(launchAction->shortcut().seq(0).toString()), + .arg(launchAction->shortcut().seq(0).toString()), yellow ); waitShip = true; gameOver = false; @@ -509,7 +509,7 @@ void KAstTopLevel::slotShipKilled() { waitShip = true; view->showText( i18n( "Ship Destroyed. Press %1 to launch.") - .tqarg(launchAction->shortcut().seq(0).toString()), + .arg(launchAction->shortcut().seq(0).toString()), yellow ); } else @@ -577,7 +577,7 @@ void KAstTopLevel::slotKeyConfig() { KKeyDialog::configure( actionCollection(), this ); if ( waitShip ) view->showText( i18n( "Press %1 to launch." ) - .tqarg(launchAction->shortcut().seq(0).toString()), + .arg(launchAction->shortcut().seq(0).toString()), yellow, false ); } @@ -637,9 +637,9 @@ void KAstTopLevel::doStats() " Hit:\t%2\n" " Missed:\t%3\n" "Hit ratio:\t%4 %\t\t") - .tqarg(view->shots()).tqarg(view->hits()) - .tqarg(view->shots() - view->hits()) - .tqarg(r); + .arg(view->shots()).arg(view->hits()) + .arg(view->shots() - view->hits()) + .arg(r); view->showText( s, green, FALSE ); } diff --git a/kasteroids/view.cpp b/kasteroids/view.cpp index 8b90aa9c..e203ffb5 100644 --- a/kasteroids/view.cpp +++ b/kasteroids/view.cpp @@ -78,7 +78,7 @@ KAsteroidsView::KAsteroidsView( TQWidget *parent, const char *name ) field.setBackgroundColor(black); TQPixmap pm( locate("sprite", IMG_BACKGROUND) ); - field.tqsetBackgroundPixmap( pm ); + field.setBackgroundPixmap( pm ); textSprite = new TQCanvasText( &field ); TQFont font( KGlobalSettings::generalFont().family(), 18 ); diff --git a/katomic/configbox.cpp b/katomic/configbox.cpp index ad524023..dedcaf59 100644 --- a/katomic/configbox.cpp +++ b/katomic/configbox.cpp @@ -8,7 +8,7 @@ #include <klocale.h> #include <kglobal.h> #include <kconfig.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqslider.h> diff --git a/katomic/feld.cpp b/katomic/feld.cpp index dcddf606..b18f78ae 100644 --- a/katomic/feld.cpp +++ b/katomic/feld.cpp @@ -124,7 +124,7 @@ void Feld::mousePressEvent (TQMouseEvent *e) resetValidDirs(); chosen = false; } - emittqStatus(); + emitStatus(); } const atom& Feld::getAtom(uint index) const @@ -154,7 +154,7 @@ void Feld::nextAtom() xpos = x; ypos = y; chosen = true; resetValidDirs(); - emittqStatus(); + emitStatus(); return; } } @@ -187,7 +187,7 @@ void Feld::previousAtom() xpos = x; ypos = y; chosen = true; resetValidDirs(); - emittqStatus(); + emitStatus(); return; } } @@ -198,7 +198,7 @@ void Feld::previousAtom() } -void Feld::emittqStatus() +void Feld::emitStatus() { if (!chosen || moving) {} else { @@ -231,7 +231,7 @@ void Feld::done () if (moving) return; - emittqStatus(); + emitStatus(); if (checkDone()) emit gameOver(moves); diff --git a/katomic/feld.h b/katomic/feld.h index 66b1499d..668dbdf2 100644 --- a/katomic/feld.h +++ b/katomic/feld.h @@ -65,7 +65,7 @@ protected: void paintMovingAtom(); void mousePressEvent (TQMouseEvent *); void mouseMoveEvent (TQMouseEvent *); - void emittqStatus(); + void emitStatus(); protected: struct UndoInfo { diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index 064037ef..e99f28f8 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -25,7 +25,7 @@ #include <tqscrollbar.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqlabel.h> @@ -95,11 +95,11 @@ void GameWidget::doRedo () } void GameWidget::gameOver(int moves) { - KMessageBox::information(this, i18n("You solved level %1 with %2 moves!").tqarg(level).tqarg(moves), i18n("Congratulations")); + KMessageBox::information(this, i18n("You solved level %1 with %2 moves!").arg(level).arg(moves), i18n("Congratulations")); KScoreDialog high(KScoreDialog::Name | KScoreDialog::Score, this); - high.setCaption(i18n("Level %1 Highscores").tqarg(level)); - high.setConfigGroup(TQString("Highscores Level %1").tqarg(level)); + high.setCaption(i18n("Level %1 Highscores").arg(level)); + high.setConfigGroup(TQString("Highscores Level %1").arg(level)); KScoreDialog::FieldInfo scoreInfo; @@ -118,8 +118,8 @@ void GameWidget::getMoves(int moves) void GameWidget::mergeHighScores(int l) { - KConfigGroup oldConfig(kapp->config(), TQString("High Scores Level %1").tqarg(l).utf8()); - KConfigGroup newConfig(kapp->config(), TQString("Highscores Level %1").tqarg(l).utf8()); + KConfigGroup oldConfig(kapp->config(), TQString("High Scores Level %1").arg(l).utf8()); + KConfigGroup newConfig(kapp->config(), TQString("Highscores Level %1").arg(l).utf8()); newConfig.writeEntry("LastPlayer", oldConfig.readEntry("LastPlayer")); @@ -138,7 +138,7 @@ void GameWidget::mergeHighScores(int l) void GameWidget::updateLevel (int l) { level=l; - TQString levelFile = locate("appdata", TQString("levels/level_%1").tqarg(l)); + TQString levelFile = locate("appdata", TQString("levels/level_%1").arg(l)); if (levelFile.isNull()) { return updateLevel(1); } @@ -147,11 +147,11 @@ void GameWidget::updateLevel (int l) cfg.setGroup("Level"); feld->load(cfg); - if (!kapp->config()->hasGroup(TQString("Highscores Level %1").tqarg(level)) && - kapp->config()->hasGroup(TQString("High Scores Level %1").tqarg(level))) + if (!kapp->config()->hasGroup(TQString("Highscores Level %1").arg(level)) && + kapp->config()->hasGroup(TQString("High Scores Level %1").arg(level))) mergeHighScores(level); - highScore->setConfigGroup(TQString("Highscores Level %1").tqarg(level)); + highScore->setConfigGroup(TQString("Highscores Level %1").arg(level)); highest.setNum(highScore->highScore()); if (highest != "0" ) hs->setText(highest); @@ -159,7 +159,7 @@ void GameWidget::updateLevel (int l) ys->setText("0"); scrl->setValue(level); - feld->tqrepaint(); + feld->repaint(); } void GameWidget::restartLevel() @@ -214,7 +214,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) headerFont.setBold(true); hs = new TQLabel (highest, bg); - hs->tqsetAlignment(TQt::AlignRight); + hs->setAlignment(TQt::AlignRight); hs->setFont(headerFont); slay->addWidget(hs); @@ -223,7 +223,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) slay->addWidget(new TQLabel(i18n("Your score so far:"), bg)); ys = new TQLabel (current, bg); - ys->tqsetAlignment(TQt::AlignRight); + ys->setAlignment(TQt::AlignRight); ys->setFont(headerFont); slay->addWidget(ys); @@ -245,8 +245,8 @@ GameWidget::~GameWidget() void GameWidget::showHighscores () { KScoreDialog high(KScoreDialog::Name | KScoreDialog::Score, this); - high.setCaption(i18n("Level %1 Highscores").tqarg(level)); - high.setConfigGroup(TQString("Highscores Level %1").tqarg(level)); + high.setCaption(i18n("Level %1 Highscores").arg(level)); + high.setConfigGroup(TQString("Highscores Level %1").arg(level)); high.exec(); } diff --git a/katomic/molek.cpp b/katomic/molek.cpp index 6731962f..4a0562c2 100644 --- a/katomic/molek.cpp +++ b/katomic/molek.cpp @@ -62,7 +62,7 @@ void Molek::load (const KSimpleConfig& config) if (value.isEmpty()) break; - current.obj = value.tqat(0).latin1(); + current.obj = value.at(0).latin1(); value = value.mid(2); if (value.isNull()) value = ""; @@ -82,7 +82,7 @@ void Molek::load (const KSimpleConfig& config) line = config.readEntry(key); for (int i = 0; i < MOLEK_SIZE; i++) - molek[i][j] = atom2int(line.tqat(i).latin1()); + molek[i][j] = atom2int(line.at(i).latin1()); } mname = i18n(config.readEntry("Name", I18N_NOOP("Noname")).latin1()); @@ -103,12 +103,12 @@ void Molek::load (const KSimpleConfig& config) height++; width++; - tqrepaint (); + repaint (); } void Molek::paintEvent( TQPaintEvent * ) { - TQString st = i18n("Level: %1").tqarg(level); + TQString st = i18n("Level: %1").arg(level); TQPainter paint (this); paint.setPen (TQColor (190, 190, 190)); diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp index e2d9e745..273410f0 100644 --- a/katomic/toplevel.cpp +++ b/katomic/toplevel.cpp @@ -19,7 +19,7 @@ */ #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <kglobal.h> #include <klocale.h> diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp index 57eb6666..d56e633c 100644 --- a/kbackgammon/engines/fibs/kbgfibs.cpp +++ b/kbackgammon/engines/fibs/kbgfibs.cpp @@ -39,7 +39,7 @@ #include <kconfig.h> #include <tqtimer.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <tqsocket.h> #include <tqpopupmenu.h> @@ -81,7 +81,7 @@ void KBgEngineFIBS::start() // == configuration handling =================================================== /* - * Restore settings and ask tqchildren to do the same + * Restore settings and ask children to do the same */ void KBgEngineFIBS::readConfig() { @@ -110,7 +110,7 @@ void KBgEngineFIBS::readConfig() autoMsg[MsgLos] = config->readEntry("msg-los", ""); autoMsg[MsgWin] = config->readEntry("msg-win", ""); - // ask the tqchildren to read their config options + // ask the children to read their config options playerlist->readConfig(); chatWindow->readConfig(); } @@ -145,7 +145,7 @@ void KBgEngineFIBS::saveConfig() config->writeEntry("msg-los", autoMsg[MsgLos]); config->writeEntry("msg-win", autoMsg[MsgWin]); - // ask the tqchildren to read their config options + // ask the children to read their config options playerlist->saveConfig(); chatWindow->saveConfig(); } @@ -343,7 +343,7 @@ void KBgEngineFIBS::getSetupPages(KDialogBase *nb) TQWhatsThis::add(cbk, i18n("Usually, FIBS drops the connection after one hour of inactivity. When " "you check this box, %1 will try to keep the connection alive, even " "if you are not actually playing or chatting. Use this with caution " - "if you do not have flat-rate Internet access.").tqarg(PROG_NAME)); + "if you do not have flat-rate Internet access.").arg(PROG_NAME)); cbk->setChecked(keepalive); @@ -357,7 +357,7 @@ void KBgEngineFIBS::getSetupPages(KDialogBase *nb) tc->addTab(w, i18n("&Connection")); /* - * Ask tqchildren for settings + * Ask children for settings */ chatWindow->getSetupPages(tc, nb->spacingHint()); playerlist->getSetupPages(tc, nb->spacingHint()); @@ -431,28 +431,28 @@ void KBgEngineFIBS::changeJoin(const TQString &info) TQString text, menu; if ((*it).contains(TQRegExp(" r$"))) { - menu = i18n("R means resume", "%1 (R)").tqarg(name); + menu = i18n("R means resume", "%1 (R)").arg(name); text = i18n("%1 (experience %2, rating %3) wants to resume a saved match with you. " "If you want to play, use the corresponding menu entry to join (or type " - "'join %4').").tqarg(name).tqarg(expi_s).tqarg(rate_s).tqarg(name); + "'join %4').").arg(name).arg(expi_s).arg(rate_s).arg(name); KNotifyClient::event("invitation", i18n("%1 wants to resume a saved match with you"). arg(name)); } else if ((*it).contains(TQRegExp(" u$"))) { - menu = i18n("U means unlimited", "%1 (U)").tqarg(name); + menu = i18n("U means unlimited", "%1 (U)").arg(name); text = i18n("%1 (experience %2, rating %3) wants to play an unlimited match with you. " "If you want to play, use the corresponding menu entry to join (or type " - "'join %4').").tqarg(name).tqarg(expi_s).tqarg(rate_s).tqarg(name); + "'join %4').").arg(name).arg(expi_s).arg(rate_s).arg(name); KNotifyClient::event("invitation", i18n("%1 has invited you to an unlimited match"). arg(name)); } else { TQString len = (*it).right((*it).length() - name.length() - 1); menu = i18n("If the format of the (U) and (R) strings is changed, it should also be changed here", - "%1 (%2)").tqarg(name).tqarg(len); + "%1 (%2)").arg(name).arg(len); text = i18n("%1 (experience %2, rating %3) wants to play a %4 point match with you. " "If you want to play, use the corresponding menu entry to join (or type " - "'join %5').").tqarg(name).tqarg(expi_s).tqarg(rate_s).tqarg(len).tqarg(name); + "'join %5').").arg(name).arg(expi_s).arg(rate_s).arg(len).arg(name); KNotifyClient::event("invitation", i18n("%1 has invited you for a %2 point match"). - tqarg(name).tqarg(len)); + arg(name).arg(len)); } emit serverString("rawwho " + name); // this avoids a race if (whoisInvite) { @@ -877,7 +877,7 @@ void KBgEngineFIBS::connectFIBS() /* * Connect */ - emit infoText(i18n("Looking up %1").tqarg(infoFIBS[FIBSHost])); + emit infoText(i18n("Looking up %1").arg(infoFIBS[FIBSHost])); connection->connectToHost(infoFIBS[FIBSHost], infoFIBS[FIBSPort].toUShort()); return; @@ -888,7 +888,7 @@ void KBgEngineFIBS::connectFIBS() */ void KBgEngineFIBS::hostFound() { - emit infoText(i18n("Connecting to %1").tqarg(infoFIBS[FIBSHost])); + emit infoText(i18n("Connecting to %1").arg(infoFIBS[FIBSHost])); } /* @@ -947,7 +947,7 @@ void KBgEngineFIBS::connected() /* * Initialize the rx state machine */ - rxtqStatus = RxConnect; + rxStatus = RxConnect; rxCollect = ""; /* @@ -992,7 +992,7 @@ void KBgEngineFIBS::newAccount() if (!queryConnection(true)) return; - rxtqStatus = RxNewLogin; + rxStatus = RxNewLogin; rxCollect = ""; login = false; connectFIBS(); @@ -1077,12 +1077,12 @@ bool KBgEngineFIBS::queryConnection(const bool newlogin) text = i18n("Enter the login you would like to use on the server %1. The login may not\n" "contain spaces or colons. If the login you choose is not available, you'll later be\n" - "given the opportunity to pick another one.\n\n").tqarg(infoFIBS[FIBSHost]); + "given the opportunity to pick another one.\n\n").arg(infoFIBS[FIBSHost]); else text = i18n("Enter your login on the server %1. If you don't have a login, you\n" - "should create one using the corresponding menu option.\n\n").tqarg(infoFIBS[FIBSHost]); + "should create one using the corresponding menu option.\n\n").arg(infoFIBS[FIBSHost]); first = true; @@ -1107,12 +1107,12 @@ bool KBgEngineFIBS::queryConnection(const bool newlogin) text = i18n("Enter the password you would like to use with the login %1\n" "on the server %2. It may not contain colons.\n\n"). - tqarg(infoFIBS[FIBSUser]).tqarg(infoFIBS[FIBSHost]); + arg(infoFIBS[FIBSUser]).arg(infoFIBS[FIBSHost]); else text = i18n("Enter the password for the login %1 on the server %2.\n\n"). - tqarg(infoFIBS[FIBSUser]).tqarg(infoFIBS[FIBSHost]); + arg(infoFIBS[FIBSUser]).arg(infoFIBS[FIBSHost]); first = true; do { @@ -1289,7 +1289,7 @@ void KBgEngineFIBS::handleServerData(TQString &line) */ line.replace(pat[TabChar], " "); - switch (rxtqStatus) { + switch (rxStatus) { case RxConnect: handleMessageConnect(line, rawline); @@ -1345,7 +1345,7 @@ void KBgEngineFIBS::handleMessageWhois(const TQString &line) { rxCollect += "<br> " + line; if (line.contains(pat[WhoisE1]) || line.contains(pat[WhoisE2])) { - rxtqStatus = RxNormal; + rxStatus = RxNormal; emit infoText("<font color=\"darkgreen\">" + rxCollect + "<br></font>"); } } @@ -1358,7 +1358,7 @@ void KBgEngineFIBS::handleMessageRating(const TQString &line) rxCollect += "<br>" + line; if (line.contains(pat[EndRate]) && ++rxCount == 2) { emit infoText("<font color=\"blue\">" + rxCollect + "<br></font>"); - rxtqStatus = RxNormal; + rxStatus = RxNormal; } } @@ -1368,7 +1368,7 @@ void KBgEngineFIBS::handleMessageRating(const TQString &line) void KBgEngineFIBS::handleMessageMotd(const TQString &line) { if (line.contains(pat[MotdEnd])) { - rxtqStatus = RxNormal; + rxStatus = RxNormal; emit infoText("<font color=\"blue\"><pre>" + rxCollect + "</pre></font>"); /* * just to be on the safe side, we set the value of boardstyle. @@ -1398,7 +1398,7 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r * This can only happen if the password/login is wrong. */ if (rxCollect.isEmpty()) { - rxtqStatus = RxIgnore; + rxStatus = RxIgnore; int ret = KMessageBox::warningContinueCancel ((TQWidget *)parent(), i18n("There was a problem with " "your login and password. " @@ -1411,9 +1411,9 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r infoFIBS[FIBSUser] = ""; infoFIBS[FIBSPswd] = ""; login = true; - connectFIBS(); // will reset the rxtqStatus + connectFIBS(); // will reset the rxStatus } else { - rxtqStatus = RxConnect; + rxStatus = RxConnect; emit serverString(""); emit serverString(""); } @@ -1435,7 +1435,7 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r int words = sscanf (line.latin1(), "%255s%255s%li%255s", p[0], p[1], &tmp, p[2]); if (words >= 4) { TQDateTime d; d.setTime_t(tmp); - TQString text = i18n("%1, last logged in from %2 at %3.").tqarg(p[1]).tqarg(p[2]).tqarg(d.toString()); + TQString text = i18n("%1, last logged in from %2 at %3.").arg(p[1]).arg(p[2]).arg(d.toString()); emit infoText("<hr><br>" + text); playerlist->setName(p[1]); } @@ -1473,7 +1473,7 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r */ if (line.contains(pat[OwnInfo])) { - rxtqStatus = RxNormal; + rxStatus = RxNormal; int fibsOptions[NumFIBSOpt]; @@ -1538,7 +1538,7 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r * The beginning of a new login procedure starts starts here */ if (line.contains(pat[OneName])) { - rxtqStatus = RxNewLogin; + rxStatus = RxNewLogin; emit infoText(TQString("<font color=\"red\">") + rxCollect + "</font>"); rxCollect = ""; TQString tmp = rawline; @@ -1610,10 +1610,10 @@ void KBgEngineFIBS::handleMessageNewLogin(const TQString &line) TQString text = i18n("Your account has been created. Your new login is <u>%1</u>. To fully activate " "this account, I will now close the connection. Once you reconnect, you can start " - "playing backgammon on FIBS.").tqarg(infoFIBS[FIBSUser]); + "playing backgammon on FIBS.").arg(infoFIBS[FIBSUser]); emit infoText("<br><hr><font color=\"blue\">" + text + "</font><br><hr>"); emit serverString("bye"); - rxtqStatus = RxNormal; + rxStatus = RxNormal; rxCollect = ""; return; } @@ -1717,7 +1717,7 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline) /* * Save the board string and create a new game state */ - KBgtqStatus *st = new KBgtqStatus(currBoard = rawline); + KBgStatus *st = new KBgStatus(currBoard = rawline); /* * Save important state data and stop the timeout @@ -1736,15 +1736,15 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline) * Update the caption string */ if (st->turn() < 0) - caption = i18n("%1 (%2) vs. %3 (%4) - game over").tqarg(pname[US]). - tqarg(st->points(US)).tqarg(pname[THEM]).tqarg(st->points(THEM)); + caption = i18n("%1 (%2) vs. %3 (%4) - game over").arg(pname[US]). + arg(st->points(US)).arg(pname[THEM]).arg(st->points(THEM)); else if (st->length() < 0) - caption = i18n("%1 (%2) vs. %3 (%4) - unlimited match").tqarg(pname[US]). - tqarg(st->points(US)).tqarg(pname[THEM]).tqarg(st->points(THEM)); + caption = i18n("%1 (%2) vs. %3 (%4) - unlimited match").arg(pname[US]). + arg(st->points(US)).arg(pname[THEM]).arg(st->points(THEM)); else - caption = i18n("%1 (%2) vs. %3 (%4) - %5 point match").tqarg(pname[US]). - tqarg(st->points(US)).tqarg(pname[THEM]).tqarg(st->points(THEM)). - tqarg(st->length()); + caption = i18n("%1 (%2) vs. %3 (%4) - %5 point match").arg(pname[US]). + arg(st->points(US)).arg(pname[THEM]).arg(st->points(THEM)). + arg(st->length()); emit statText(caption); @@ -1779,13 +1779,13 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline) */ else if (line.contains(pat[YouAway])) { - emit changePlayertqStatus(infoFIBS[FIBSUser], KFibsPlayerList::Away, true); + emit changePlayerStatus(infoFIBS[FIBSUser], KFibsPlayerList::Away, true); actBack->setEnabled(true); line += "<br><pre> </pre>" + i18n("(or use the corresponding menu entry to join the match)"); } else if (line.contains(pat[YouBack])) { - emit changePlayertqStatus(infoFIBS[FIBSUser], KFibsPlayerList::Away, false); + emit changePlayerStatus(infoFIBS[FIBSUser], KFibsPlayerList::Away, false); actBack->setEnabled(false); actAway->setEnabled(true); } @@ -1863,23 +1863,23 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline) // - rx status changes ------------------------------------------------------------ else if (line.contains(pat[WhoisBG])) { - rxtqStatus = RxWhois; + rxStatus = RxWhois; rxCollect = TQString("<br><u>") + line + "</u>"; return; } else if (line.contains(pat[MotdBeg])) { - rxtqStatus = RxMotd; + rxStatus = RxMotd; rxCollect = ""; return; } else if (line.contains(pat[BegRate])) { - rxtqStatus = RxRating; + rxStatus = RxRating; rxCount = 0; rxCollect = "<br>" + line; return; } else if (line.contains(pat[Goodbye])) { - rxtqStatus = RxGoodbye; + rxStatus = RxGoodbye; rxCollect = "<br><hr><br>"; handleServerData(rawline); // danger: recursion! return; @@ -1944,13 +1944,13 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline) else if (line.contains(pat[BegBlnd])) { rawline.replace(pat[BegBlnd], ""); rawline.truncate(rawline.length()-1); - emit changePlayertqStatus(rawline, KFibsPlayerList::Blind, true); + emit changePlayerStatus(rawline, KFibsPlayerList::Blind, true); line = "<font color=\"red\">" + line + "</font>"; } else if (line.contains(pat[EndBlnd])) { rawline.replace(pat[EndBlnd], ""); rawline.truncate(rawline.length()-1); - emit changePlayertqStatus(rawline, KFibsPlayerList::Blind, false); + emit changePlayerStatus(rawline, KFibsPlayerList::Blind, false); line = "<font color=\"red\">" + line + "</font>"; } /* @@ -2128,8 +2128,8 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen connect(this, TQT_SIGNAL(fibsLogout (const TQString &)), playerlist, TQT_SLOT(deletePlayer(const TQString &))); connect(this, TQT_SIGNAL(fibsWhoEnd()), playerlist, TQT_SLOT(stopUpdate())); connect(this, TQT_SIGNAL(fibsConnectionClosed()), playerlist, TQT_SLOT(stopUpdate())); - connect(this, TQT_SIGNAL(changePlayertqStatus(const TQString &, int, bool)), - playerlist, TQT_SLOT(changePlayertqStatus(const TQString &, int, bool))); + connect(this, TQT_SIGNAL(changePlayerStatus(const TQString &, int, bool)), + playerlist, TQT_SLOT(changePlayerStatus(const TQString &, int, bool))); connect(playerlist, TQT_SIGNAL(fibsCommand(const TQString &)), this, TQT_SLOT(handleCommand(const TQString &))); connect(playerlist, TQT_SIGNAL(fibsInvite(const TQString &)), this, TQT_SLOT(fibsRequestInvitation(const TQString &))); diff --git a/kbackgammon/engines/fibs/kbgfibs.h b/kbackgammon/engines/fibs/kbgfibs.h index 24555ef2..db79ce51 100644 --- a/kbackgammon/engines/fibs/kbgfibs.h +++ b/kbackgammon/engines/fibs/kbgfibs.h @@ -175,7 +175,7 @@ signals: void fibsConnectionClosed(); - void changePlayertqStatus(const TQString &, int, bool); + void changePlayerStatus(const TQString &, int, bool); void chatMessage(const TQString &msg); @@ -199,7 +199,7 @@ private: TQString currBoard, caption; - //KBgtqStatus *currBoard + //KBgStatus *currBoard //KBgFIBSBoard *boardHandler; TQStringList invitations; @@ -400,10 +400,10 @@ protected slots: protected: - enum RxtqStatus {RxIgnore, RxConnect, RxWhois, RxMotd, RxRating, + enum RxStatus {RxIgnore, RxConnect, RxWhois, RxMotd, RxRating, RxNewLogin, RxGoodbye, RxNormal}; - int rxtqStatus, rxCount; + int rxStatus, rxCount; TQString rxCollect; diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp index c3490cec..bae73d46 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.cpp +++ b/kbackgammon/engines/fibs/kbgfibschat.cpp @@ -28,17 +28,17 @@ #include <tqstring.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpopupmenu.h> #include <tqregexp.h> #include <tqfont.h> #include <tqwhatsthis.h> #include <tqdatetime.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqsimplerichtext.h> #include <tqregion.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpainter.h> #include <tqpoint.h> #include <tqlistbox.h> @@ -123,7 +123,7 @@ protected: */ virtual void paint(TQPainter *p) { - t->draw(p, 1, 1, TQRegion(p->viewport()), w->tqcolorGroup()); + t->draw(p, 1, 1, TQRegion(p->viewport()), w->colorGroup()); } private: @@ -200,7 +200,7 @@ KBgChat::KBgChat(TQWidget *parent, const char *name) d->mInvt = new TQPopupMenu(); setAutoAddMessages(false); // we get an echo from FIBS - setFromNickname(i18n("%1 user").tqarg(PROG_NAME)); + setFromNickname(i18n("%1 user").arg(PROG_NAME)); if (!addSendingEntry(i18n("Kibitz to watchers and players"), CLIP_YOU_KIBITZ)) kdDebug(10500) << "adding kibitz" << endl; @@ -450,7 +450,7 @@ void KBgChat::startGame(const TQString &name) if (!id) { id = new int(nextId()); d->mName2ID->insert(name, id); - addSendingEntry(i18n("Talk to %1").tqarg(name), *id); + addSendingEntry(i18n("Talk to %1").arg(name), *id); } setSendingEntry(CLIP_YOU_KIBITZ); } @@ -476,7 +476,7 @@ void KBgChat::fibsTalk(const TQString &name) if (!id) { id = new int(nextId()); d->mName2ID->insert(name, id); - addSendingEntry(i18n("Talk to %1").tqarg(name), *id); + addSendingEntry(i18n("Talk to %1").arg(name), *id); } setSendingEntry(*id); } @@ -549,7 +549,7 @@ void KBgChat::handleData(const TQString &msg) switch (cmd) { case CLIP_SAYS: if (!d->mGag.contains(user)) { - cMsg = i18n("<u>%1 tells you:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>%1 tells you:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"red\">" + cMsg + "</font>"; emit personalMessage(cMsg); } else @@ -558,7 +558,7 @@ void KBgChat::handleData(const TQString &msg) case CLIP_SHOUTS: if ((!((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()) && (!d->mGag.contains(user))) { - cMsg = i18n("<u>%1 shouts:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>%1 shouts:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"black\">" + cMsg + "</font>"; } else cMsg = ""; @@ -566,7 +566,7 @@ void KBgChat::handleData(const TQString &msg) case CLIP_WHISPERS: if (!d->mGag.contains(user)) { - cMsg = i18n("<u>%1 whispers:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>%1 whispers:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"red\">" + cMsg + "</font>"; emit personalMessage(cMsg); } else @@ -575,7 +575,7 @@ void KBgChat::handleData(const TQString &msg) case CLIP_KIBITZES: if (!d->mGag.contains(user)) { - cMsg = i18n("<u>%1 kibitzes:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>%1 kibitzes:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"red\">" + cMsg + "</font>"; emit personalMessage(cMsg); } else @@ -583,28 +583,28 @@ void KBgChat::handleData(const TQString &msg) break; case CLIP_YOU_SAY: - cMsg = i18n("<u>You tell %1:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>You tell %1:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_YOU_SHOUT: - cMsg = i18n("<u>You shout:</u> %1").tqarg(cMsg); + cMsg = i18n("<u>You shout:</u> %1").arg(cMsg); cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_YOU_WHISPER: - cMsg = i18n("<u>You whisper:</u> %1").tqarg(cMsg); + cMsg = i18n("<u>You whisper:</u> %1").arg(cMsg); cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_YOU_KIBITZ: - cMsg = i18n("<u>You kibitz:</u> %1").tqarg(cMsg); + cMsg = i18n("<u>You kibitz:</u> %1").arg(cMsg); cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); @@ -615,21 +615,21 @@ void KBgChat::handleData(const TQString &msg) cMsg.remove(0, cMsg.find(' ')+1); date.setTime_t(cMsg.left(cMsg.find(' ')+1).toUInt()); cMsg.remove(0, cMsg.find(' ')); - cMsg = i18n("<u>User %1 left a message at %2</u>: %3").tqarg(user).tqarg(date.toString()).tqarg(cMsg); + cMsg = i18n("<u>User %1 left a message at %2</u>: %3").arg(user).arg(date.toString()).arg(cMsg); cMsg = "<font color=\"red\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_MESSAGE_DELIVERED: - cMsg = i18n("Your message for %1 has been delivered.").tqarg(user); + cMsg = i18n("Your message for %1 has been delivered.").arg(user); cMsg = TQString("<font color=\"darkgreen\">") + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_MESSAGE_SAVED: - cMsg = i18n("Your message for %1 has been saved.").tqarg(user); + cMsg = i18n("Your message for %1 has been saved.").arg(user); cMsg = TQString("<font color=\"darkgreen\">") + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); @@ -683,22 +683,22 @@ void KBgChat::contextMenu(TQListBoxItem *i, const TQPoint &p) */ if (!d->mName[0].isNull()) { - d->mAct[KBgChatPrivate::Talk]->setText(i18n("Talk to %1").tqarg(d->mName[0])); + d->mAct[KBgChatPrivate::Talk]->setText(i18n("Talk to %1").arg(d->mName[0])); d->mAct[KBgChatPrivate::Talk]->plug(d->mChat); - d->mAct[KBgChatPrivate::Inquire]->setText(i18n("Info on %1").tqarg(d->mName[0])); + d->mAct[KBgChatPrivate::Inquire]->setText(i18n("Info on %1").arg(d->mName[0])); d->mAct[KBgChatPrivate::Inquire]->plug(d->mChat); // invite menu is always the same - d->mChat->insertItem(i18n("Invite %1").tqarg(d->mName[0]), d->mInvt); + d->mChat->insertItem(i18n("Invite %1").arg(d->mName[0]), d->mInvt); d->mChat->insertSeparator(); if (d->mGag.contains(d->mName[0]) <= 0) { - d->mAct[KBgChatPrivate::Gag]->setText(i18n("Gag %1").tqarg(d->mName[0])); + d->mAct[KBgChatPrivate::Gag]->setText(i18n("Gag %1").arg(d->mName[0])); d->mAct[KBgChatPrivate::Gag]->plug(d->mChat); } else { - d->mAct[KBgChatPrivate::Ungag]->setText(i18n("Ungag %1").tqarg(d->mName[0])); + d->mAct[KBgChatPrivate::Ungag]->setText(i18n("Ungag %1").arg(d->mName[0])); d->mAct[KBgChatPrivate::Ungag]->plug(d->mChat); } } @@ -741,7 +741,7 @@ void KBgChat::slotGag() d->mGag.append(d->mName[0]); TQString msg("<font color=\"blue\">"); - msg += i18n("You won't hear what %1 says and shouts.").tqarg(d->mName[0]); + msg += i18n("You won't hear what %1 says and shouts.").arg(d->mName[0]); msg += "</font>"; addMessage(TQString(), msg); @@ -763,7 +763,7 @@ void KBgChat::slotUngag() d->mGag.remove(d->mName[0]); TQString msg("<font color=\"blue\">"); - msg += i18n("You will again hear what %1 says and shouts.").tqarg(d->mName[0]); + msg += i18n("You will again hear what %1 says and shouts.").arg(d->mName[0]); msg += "</font>"; addMessage(TQString(), msg); diff --git a/kbackgammon/engines/fibs/kbginvite.cpp b/kbackgammon/engines/fibs/kbginvite.cpp index 3870a6d2..532cb18a 100644 --- a/kbackgammon/engines/fibs/kbginvite.cpp +++ b/kbackgammon/engines/fibs/kbginvite.cpp @@ -25,7 +25,7 @@ #include "kbginvite.moc" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqspinbox.h> #include <tqstring.h> @@ -103,9 +103,9 @@ KBgInvite::KBgInvite(const char *name) * Adjust widget sizes and resize the dialog */ KDialog::resizeLayout(this, marginHint(), spacingHint()); - setMinimumSize(tqchildrenRect().size()); + setMinimumSize(childrenRect().size()); vbox->activate(); - resize(tqminimumSize()); + resize(minimumSize()); /* * Set focus and default buttons diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp index 62fb9a95..25a169b5 100644 --- a/kbackgammon/engines/fibs/kplayerlist.cpp +++ b/kbackgammon/engines/fibs/kplayerlist.cpp @@ -24,7 +24,7 @@ #include "kplayerlist.moc" #include "kplayerlist.h" -#include <tqlayout.h> +#include <layout.h> #include <tqiconset.h> #include <tqgroupbox.h> #include <tqpopupmenu.h> @@ -101,7 +101,7 @@ public: case KFibsPlayerList::Watches: case KFibsPlayerList::Client: case KFibsPlayerList::Email: - case KFibsPlayerList::tqStatus: + case KFibsPlayerList::Status: case KFibsPlayerList::Host: s = s.lower(); break; @@ -175,7 +175,7 @@ public: /* * Short abbreviations for Blind, Ready, and Away. */ - TQString mAbrv[KFibsPlayerList::MaxtqStatus]; + TQString mAbrv[KFibsPlayerList::MaxStatus]; /* * Name of the last selected player - for internal purposes @@ -218,7 +218,7 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name) d->mCol[Player]->name = i18n("Player"); d->mCol[Opponent]->name = i18n("Opponent"); d->mCol[Watches]->name = i18n("Watches"); - d->mCol[tqStatus]->name = i18n("Status"); + d->mCol[Status]->name = i18n("Status"); d->mCol[Rating]->name = i18n("Rating"); d->mCol[Experience]->name = i18n("Exp."); d->mCol[Idle]->name = i18n("Idle"); @@ -231,7 +231,7 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name) d->mCol[Player]->key = "player"; d->mCol[Opponent]->key = "opponent"; d->mCol[Watches]->key = "watches"; - d->mCol[tqStatus]->key = "status"; + d->mCol[Status]->key = "status"; d->mCol[Rating]->key = "rating"; d->mCol[Experience]->key = "experience"; d->mCol[Idle]->key = "idle"; @@ -469,7 +469,7 @@ void KFibsPlayerList::getSetupPages(KTabCtl *nb, int space) gl = new TQGridLayout(gbl, LVEnd, 2, 20); gl->addWidget(lb, 0, 0); - // two column tqlayout.... + // two column layout.... for (i = 1; i < LVEnd/2; i++) { gl->addWidget(d->mCol[2*i-1]->cb, i, 0); gl->addWidget(d->mCol[2*i ]->cb, i, 1); @@ -569,12 +569,12 @@ void KFibsPlayerList::showContextMenu(KListView *, TQListViewItem *i, const TQPo */ d->mUser = (i ? i->text(Player) : TQString()); - d->mAct[KFibsPlayerListPrivate::Info ]->setText(i18n("Info on %1" ).tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Talk ]->setText(i18n("Talk to %1" ).tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Mail ]->setText(i18n("Email to %1").tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Look ]->setText(i18n("Look at %1" ).tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Watch ]->setText(i18n("Watch %1" ).tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Update]->setText(i18n("Update %1" ).tqarg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Info ]->setText(i18n("Info on %1" ).arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Talk ]->setText(i18n("Talk to %1" ).arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Mail ]->setText(i18n("Email to %1").arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Look ]->setText(i18n("Look at %1" ).arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Watch ]->setText(i18n("Watch %1" ).arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Update]->setText(i18n("Update %1" ).arg(d->mUser)); d->mAct[KFibsPlayerListPrivate::Info ]->setEnabled(i); d->mAct[KFibsPlayerListPrivate::Talk ]->setEnabled(i); @@ -587,15 +587,15 @@ void KFibsPlayerList::showContextMenu(KListView *, TQListViewItem *i, const TQPo d->mAct[KFibsPlayerListPrivate::Unwatch]->setEnabled(d->mWatch); d->mPm[0]->setItemEnabled(d->mInID, i && d->mName != d->mUser); - d->mPm[0]->changeItem(d->mInID, i18n("Invite %1").tqarg(d->mUser)); + d->mPm[0]->changeItem(d->mInID, i18n("Invite %1").arg(d->mUser)); d->mMail = (i && d->mCol[Email]->show ? i->text(d->mCol[Email]->index) : TQString()); d->mAct[KFibsPlayerListPrivate::Mail]->setEnabled(!d->mMail.isEmpty()); - if (i && d->mCol[tqStatus]->show) + if (i && d->mCol[Status]->show) d->mAct[KFibsPlayerListPrivate::BlindAct]->setText - ((i->text(d->mCol[tqStatus]->index).contains(d->mAbrv[Blind])) ? - i18n("Unblind %1").tqarg(d->mUser) : i18n("Blind %1").tqarg(d->mUser)); + ((i->text(d->mCol[Status]->index).contains(d->mAbrv[Blind])) ? + i18n("Unblind %1").arg(d->mUser) : i18n("Blind %1").arg(d->mUser)); else d->mAct[KFibsPlayerListPrivate::BlindAct]->setText(i18n("Blind")); @@ -721,7 +721,7 @@ void KFibsPlayerList::changePlayer(const TQString &line) TQDateTime fromEpoch; TQString str_entry[LVEnd], tmp; - entry[tqStatus][0] = '\0'; + entry[Status][0] = '\0'; // the line comes from FIBS and is 7 bit ASCII sscanf(line.latin1(), "%99s %99s %99s %1s %1s %99s %99s %99s %99s %99s %99s %99s", entry[Player], entry[Opponent], @@ -738,9 +738,9 @@ void KFibsPlayerList::changePlayer(const TQString &line) if ((str_entry[j] = entry[j]) == "-") str_entry[j] = ""; } - str_entry[tqStatus].replace(Ready, 1, ready[0] == '0' ? "-" : d->mAbrv[Ready]); - str_entry[tqStatus].replace(Away, 1, away [0] == '0' ? "-" : d->mAbrv[Away ]); - str_entry[tqStatus].replace(Blind, 1, "-"); + str_entry[Status].replace(Ready, 1, ready[0] == '0' ? "-" : d->mAbrv[Ready]); + str_entry[Status].replace(Away, 1, away [0] == '0' ? "-" : d->mAbrv[Away ]); + str_entry[Status].replace(Blind, 1, "-"); // disable drawing until the end of update setUpdatesEnabled(false); @@ -771,7 +771,7 @@ void KFibsPlayerList::changePlayer(const TQString &line) found: // getting here means the player is in the list - update private status - str_entry[tqStatus].replace(Blind,1,i->text(tqStatus).contains + str_entry[Status].replace(Blind,1,i->text(Status).contains (d->mAbrv[Blind]) ? d->mAbrv[Blind] : "-"); update: @@ -808,7 +808,7 @@ void KFibsPlayerList::deletePlayer(const TQString &player) /* * Set/Unset the status stat in the corresponding column of the list */ -void KFibsPlayerList::changePlayertqStatus(const TQString &player, int stat, bool flag) +void KFibsPlayerList::changePlayerStatus(const TQString &player, int stat, bool flag) { TQListViewItem *i = 0; @@ -827,7 +827,7 @@ void KFibsPlayerList::changePlayertqStatus(const TQString &player, int stat, boo /* * Update the status flag */ - i->setText(tqStatus, i->text(tqStatus).replace(stat, 1, (flag) ? d->mAbrv[stat] : "-")); + i->setText(Status, i->text(Status).replace(stat, 1, (flag) ? d->mAbrv[stat] : "-")); } @@ -886,7 +886,7 @@ void KFibsPlayerList::setName(const TQString &name) */ void KFibsPlayerList::updateCaption() { - setCaption(i18n("Player List - %1 - %2/%3").tqarg(childCount()).tqarg(d->mCount[0]).tqarg(d->mCount[1])); + setCaption(i18n("Player List - %1 - %2/%3").arg(childCount()).arg(d->mCount[0]).arg(d->mCount[1])); } /* diff --git a/kbackgammon/engines/fibs/kplayerlist.h b/kbackgammon/engines/fibs/kplayerlist.h index 793e1b39..63724e06 100644 --- a/kbackgammon/engines/fibs/kplayerlist.h +++ b/kbackgammon/engines/fibs/kplayerlist.h @@ -53,12 +53,12 @@ public: /** * Enumerate player status */ - enum PtqStatus {Ready, Away, Blind, MaxtqStatus}; + enum PStatus {Ready, Away, Blind, MaxStatus}; /** * Enumerate the different columns of the list */ - enum {Player, Opponent, Watches, tqStatus, Rating, Experience, + enum {Player, Opponent, Watches, Status, Rating, Experience, Idle, Time, Host, Client, Email, LVEnd}; /** @@ -111,7 +111,7 @@ public slots: /** * Change the status of a player */ - void changePlayertqStatus(const TQString &player, int stat, bool flag); + void changePlayerStatus(const TQString &player, int stat, bool flag); /** * Fills the playerlist page into the notebook diff --git a/kbackgammon/engines/generic/kbgengine.h b/kbackgammon/engines/generic/kbgengine.h index 48855265..af74dc4b 100644 --- a/kbackgammon/engines/generic/kbgengine.h +++ b/kbackgammon/engines/generic/kbgengine.h @@ -35,7 +35,7 @@ class TQPopupMenu; class KDialogBase; -class KBgtqStatus; +class KBgStatus; /** * @@ -249,12 +249,12 @@ signals: /** * Emit the most recent game state */ - void newState (const KBgtqStatus &); + void newState (const KBgStatus &); /** * Tell the board that we need the current state of the board. */ - void getState (KBgtqStatus *); + void getState (KBgStatus *); /** * Starts/ends the edit mode of the board diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp index 3ad42dd7..90dd5e05 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.cpp +++ b/kbackgammon/engines/gnubg/kbggnubg.cpp @@ -29,7 +29,7 @@ #include <stdlib.h> #include <time.h> #include <unistd.h> -#include <tqlayout.h> +#include <layout.h> #include <kiconloader.h> #include <kstdaction.h> #include <tqbuttongroup.h> @@ -117,7 +117,7 @@ void KBgEngineGNU::handleLine(const TQString &l) // redoubles mess up the game counter "turn" - //KBgtqStatus st(board); + //KBgStatus st(board); //st.setCube(32, BOTH); //emit newState(st); @@ -128,10 +128,10 @@ void KBgEngineGNU::handleLine(const TQString &l) // can be shared between all engines #if 0 - KBgtqStatus st(board); + KBgStatus st(board); int ret = KMessageBox::warningYesNoCancel - (0, i18n("gnubg doubles the cube to %1.").tqarg(2*st.cube(THEM)), + (0, i18n("gnubg doubles the cube to %1.").arg(2*st.cube(THEM)), i18n("gnubg doubles"), i18n("&Accept"), i18n("Re&double"), i18n("&Reject"), true); @@ -164,7 +164,7 @@ void KBgEngineGNU::handleLine(const TQString &l) */ if (line.contains(TQRegExp("^board:"))) { - KBgtqStatus st(line); + KBgStatus st(line); /* * Do preliminary analysis of board @@ -199,7 +199,7 @@ void KBgEngineGNU::handleLine(const TQString &l) case uMove: st.setDice(THEM, 0, 0); st.setDice(THEM, 1, 0); - emit infoText(i18n("You roll %1 and %2.").tqarg(st.dice(US, 0)).tqarg(st.dice(US, 1))); + emit infoText(i18n("You roll %1 and %2.").arg(st.dice(US, 0)).arg(st.dice(US, 1))); switch (st.moves()) { case 0: // get a message @@ -208,7 +208,7 @@ void KBgEngineGNU::handleLine(const TQString &l) emit infoText(i18n("Please move 1 piece.")); break; default: - emit infoText(i18n("Please move %1 pieces.").tqarg(st.moves())); + emit infoText(i18n("Please move %1 pieces.").arg(st.moves())); break; } emit allowCommand(Roll, false); @@ -220,7 +220,7 @@ void KBgEngineGNU::handleLine(const TQString &l) case tMove: st.setDice(US, 0, 0); st.setDice(US, 1, 0); - emit infoText(i18n("gnubg rolls %1 and %2.").tqarg(st.dice(THEM, 0)).tqarg(st.dice(THEM, 1))); + emit infoText(i18n("gnubg rolls %1 and %2.").arg(st.dice(THEM, 0)).arg(st.dice(THEM, 1))); if (st.moves() == 0) emit infoText(i18n("gnubg cannot move.")); @@ -236,7 +236,7 @@ void KBgEngineGNU::handleLine(const TQString &l) emit allowMoving(st.turn() == US); emit newState(st); - emit statText(i18n("%1 vs. %2").tqarg(st.player(US)).tqarg(st.player(THEM))); + emit statText(i18n("%1 vs. %2").arg(st.player(US)).arg(st.player(THEM))); emit allowCommand(Load, true ); emit allowCommand(Undo, false); @@ -533,7 +533,7 @@ void KBgEngineGNU::gnubgExit(KProcess *proc) emit allowMoving(false); emit infoText(TQString("<br/><font color=\"red\">") + i18n("The GNU Backgammon process (%1) has exited. ") - .tqarg(proc->pid()) + "</font><br/>"); + .arg(proc->pid()) + "</font><br/>"); resAction->setEnabled(true); } diff --git a/kbackgammon/engines/nextgen/kbgng.cpp b/kbackgammon/engines/nextgen/kbgng.cpp index e0c1aed5..24808e9c 100644 --- a/kbackgammon/engines/nextgen/kbgng.cpp +++ b/kbackgammon/engines/nextgen/kbgng.cpp @@ -29,7 +29,7 @@ #include <stdlib.h> #include <time.h> #include <unistd.h> -#include <tqlayout.h> +#include <layout.h> #include <kiconloader.h> #include <kstdaction.h> #include <tqbuttongroup.h> @@ -41,7 +41,7 @@ #include <krandomsequence.h> #include <tqstringlist.h> #include <tqcstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <version.h> @@ -150,7 +150,7 @@ void KBgEngineNg::setGame() emit infoText(i18n("Now waiting for incoming connections on port %1."). arg(_port = port)); else - emit infoText(i18n("Failed to offer connections on port %1.").tqarg(port)); + emit infoText(i18n("Failed to offer connections on port %1.").arg(port)); _game->addPlayer(createPlayer(0, _name[0])); break; @@ -165,7 +165,7 @@ void KBgEngineNg::setGame() } while (host_s.isEmpty()); label = i18n("Type the port number on %1 you want to connect to.\nThe " - "number should be between 1024 and 65535.").tqarg(host_s); + "number should be between 1024 and 65535.").arg(host_s); port_s.setNum(_port); do { port_s = KLineEditDlg::getText(label, port_s, &ret, (TQWidget *)parent()); @@ -183,10 +183,10 @@ void KBgEngineNg::setGame() _game->addPlayer(createPlayer(0, _name[0])); if (_game->connectToServer(host_s, port)) - emit infoText(i18n("Now connected to %1:%2.").tqarg(_host = host_s). + emit infoText(i18n("Now connected to %1:%2.").arg(_host = host_s). arg(_port = port)); else - emit infoText(i18n("Failed to connect to %1:%2.").tqarg(_host = host_s). + emit infoText(i18n("Failed to connect to %1:%2.").arg(_host = host_s). arg(_port = port)); // <HERE> @@ -202,13 +202,13 @@ void KBgEngineNg::setGame() // we are still having problems with player creation... - // FIXME - which status _game->setGametqStatus(KGame::End); + // FIXME - which status _game->setGameStatus(KGame::End); } void KBgEngineNg::slotPlayerJoinedGame(KPlayer *p) { - emit infoText(i18n("Player %1 (%2) has joined the game.").tqarg(p->name()).tqarg(p->id())); - cerr << i18n("Player %1 (%2) has joined the game.").tqarg(p->name()).tqarg(p->id()).latin1() << endl; + emit infoText(i18n("Player %1 (%2) has joined the game.").arg(p->name()).arg(p->id())); + cerr << i18n("Player %1 (%2) has joined the game.").arg(p->name()).arg(p->id()).latin1() << endl; } void KBgEngineNg::slotCreatePlayer(KPlayer *&p, int rtti, int io, bool v, KGame *g) @@ -216,7 +216,7 @@ void KBgEngineNg::slotCreatePlayer(KPlayer *&p, int rtti, int io, bool v, KGame Q_UNUSED(rtti) Q_UNUSED(g) Q_UNUSED(io) - emit infoText(i18n("creating player. virtual=%1").tqarg(v)); + emit infoText(i18n("creating player. virtual=%1").arg(v)); p = createPlayer(1); } @@ -507,7 +507,7 @@ void KBgEngineNg::slotPropertyChanged(KGamePropertyBase *p, KPlayer *me) case KGamePropertyBase::IdName: emit infoText(i18n("Player %1 has changed the name to %2.") - .tqarg(_name[player]).tqarg(me->name())); + .arg(_name[player]).arg(me->name())); _name[player] = me->name(); break; @@ -567,8 +567,8 @@ void KBgEngineNg::slotNetworkData(int msgid, const TQByteArray &msg, TQ_UINT32 r case KBgGame::Cmd: emit infoText(msg); - emit infoText(i18n("Players are %1 and %2").tqarg(_player[0]->name()) - .tqarg(_player[1]->name())); + emit infoText(i18n("Players are %1 and %2").arg(_player[0]->name()) + .arg(_player[1]->name())); break; default: diff --git a/kbackgammon/engines/offline/kbgoffline.cpp b/kbackgammon/engines/offline/kbgoffline.cpp index 604d196e..19f08bf7 100644 --- a/kbackgammon/engines/offline/kbgoffline.cpp +++ b/kbackgammon/engines/offline/kbgoffline.cpp @@ -24,7 +24,7 @@ #include "kbgoffline.moc" #include "kbgoffline.h" -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqtimer.h> @@ -60,7 +60,7 @@ public: /* * Store two copies of the game: one backup and a working copy */ - KBgtqStatus mGame[2]; + KBgStatus mGame[2]; /* * Use the standard method of obtaining random numbers @@ -318,14 +318,14 @@ void KBgEngineOffline::newGame() u = getRandom(); t = getRandom(); emit infoText(i18n("%1 rolls %2, %3 rolls %4."). - tqarg(d->mName[0]).tqarg(u).tqarg(d->mName[1]).tqarg(t)); + arg(d->mName[0]).arg(u).arg(d->mName[1]).arg(t)); } if (u > t) { - emit infoText(i18n("%1 makes the first move.").tqarg(d->mName[0])); + emit infoText(i18n("%1 makes the first move.").arg(d->mName[0])); d->mRoll = US; } else { - emit infoText(i18n("%1 makes the first move.").tqarg(d->mName[1])); + emit infoText(i18n("%1 makes the first move.").arg(d->mName[1])); d->mRoll = THEM; int n = u; u = t; t = n; } @@ -338,7 +338,7 @@ void KBgEngineOffline::newGame() /* * tell the user */ - emit statText(i18n("%1 vs. %2").tqarg(d->mName[0]).tqarg(d->mName[1])); + emit statText(i18n("%1 vs. %2").arg(d->mName[0]).arg(d->mName[1])); } /* @@ -722,7 +722,7 @@ bool KBgEngineOffline::queryExit() void KBgEngineOffline::handleCommand(const TQString& cmd) { emit infoText(i18n("Text commands are not yet working. " - "The command '%1' has been ignored.").tqarg(cmd)); + "The command '%1' has been ignored.").arg(cmd)); } /* @@ -791,11 +791,11 @@ void KBgEngineOffline::toggleEditMode() emit allowCommand(Roll, false); emit allowCommand(Done, false); emit allowCommand(Cube, false); - emit statText(i18n("%1 vs. %2 - Edit Mode").tqarg(d->mName[0]).tqarg(d->mName[1])); + emit statText(i18n("%1 vs. %2 - Edit Mode").arg(d->mName[0]).arg(d->mName[1])); } else { d->mNew->setEnabled(true); d->mSwap->setEnabled(true); - emit statText(i18n("%1 vs. %2").tqarg(d->mName[0]).tqarg(d->mName[1])); + emit statText(i18n("%1 vs. %2").arg(d->mName[0]).arg(d->mName[1])); emit getState(&d->mGame[1]); d->mGame[0] = d->mGame[1]; emit allowCommand(Done, d->mDoneFlag); diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp index 0c01d8f1..cdd3e823 100644 --- a/kbackgammon/kbg.cpp +++ b/kbackgammon/kbg.cpp @@ -25,7 +25,7 @@ #include "kbg.moc" #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqpixmap.h> #include <tqstring.h> @@ -293,8 +293,8 @@ void KBg::setupEngine() connect(engine[currEngine], TQT_SIGNAL(redoMove()), board, TQT_SLOT(redoMove())); connect(engine[currEngine], TQT_SIGNAL(setEditMode(const bool)), board, TQT_SLOT(setEditMode(const bool))); connect(engine[currEngine], TQT_SIGNAL(allowMoving(const bool)), board, TQT_SLOT(allowMoving(const bool))); - connect(engine[currEngine], TQT_SIGNAL(getState(KBgtqStatus *)), board, TQT_SLOT(getState(KBgtqStatus *))); - connect(engine[currEngine], TQT_SIGNAL(newState(const KBgtqStatus &)), board, TQT_SLOT(setState(const KBgtqStatus &))); + connect(engine[currEngine], TQT_SIGNAL(getState(KBgStatus *)), board, TQT_SLOT(getState(KBgStatus *))); + connect(engine[currEngine], TQT_SIGNAL(newState(const KBgStatus &)), board, TQT_SLOT(setState(const KBgStatus &))); // now that all signals are connected, start the engine engine[currEngine]->start(); @@ -421,7 +421,7 @@ void KBg::setupOk() if (cbm->isChecked()) KMessageBox::enableAllMessages(); - // tell tqchildren to read their changes + // tell children to read their changes board->setupOk(); // engines @@ -575,7 +575,7 @@ void KBg::setupDlg() TQGridLayout *gle = new TQGridLayout(gbe, 1, 1, nb->spacingHint()); KURLLabel *lab = new KURLLabel("kcmshell kcmnotify", i18n("Klick here to configure the event notification"), gbe); - lab->setMaximumSize(lab->tqsizeHint()); + lab->setMaximumSize(lab->sizeHint()); gle->addWidget(lab, 0, 0); connect(lab, TQT_SIGNAL(leftClickedURL(const TQString &)), TQT_SLOT(startKCM(const TQString &))); @@ -622,7 +622,7 @@ void KBg::setupDlg() connect(nb, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(setupDone())); - nb->resize(nb->tqminimumSize()); + nb->resize(nb->minimumSize()); nb->show(); } @@ -646,7 +646,7 @@ void KBg::print() prt->setPageSize((KPrinter::PageSize) config->readNumEntry("pagesize", KPrinter::A4)); prt->setOrientation((KPrinter::Orientation)config->readNumEntry("orientation", KPrinter::Landscape)); - if (prt->setup(this, i18n("Print %1").tqarg(baseCaption))) { + if (prt->setup(this, i18n("Print %1").arg(baseCaption))) { TQPainter p; p.begin(prt); board->print(&p); diff --git a/kbackgammon/kbgboard.cpp b/kbackgammon/kbgboard.cpp index ba2d1829..a95cd671 100644 --- a/kbackgammon/kbgboard.cpp +++ b/kbackgammon/kbgboard.cpp @@ -39,7 +39,7 @@ #include <math.h> #include <kcolordialog.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqbuttongroup.h> #include <kconfig.h> @@ -196,7 +196,7 @@ void KBgBoardSetup::getSetupPages(KDialogBase *nb) "move a checker the shortest possible distance.")); for (int i = 0; i < 3; i++) { - rbMove[i]->setMinimumSize(rbMove[i]->tqsizeHint()); + rbMove[i]->setMinimumSize(rbMove[i]->sizeHint()); blm->addWidget(rbMove[i]); rbMove[i]->setChecked(i == getShortMoveMode()); } @@ -360,7 +360,7 @@ void KBgBoard::setFont(const TQFont& f) */ void KBgBoard::queryCube() { - KBgtqStatus *st = new KBgtqStatus(); + KBgStatus *st = new KBgStatus(); getState(st); KBgBoardQCube *dlg = new KBgBoardQCube(abs(st->cube()), (st->cube(US) > 0), (st->cube(THEM) > 0)); @@ -395,7 +395,7 @@ KBgBoardQCube::KBgBoardQCube(int val, bool us, bool them) "double. Note that a face value of 1 automatically allows both\n" "players to double.")); - info->setMinimumSize(info->tqsizeHint()); + info->setMinimumSize(info->sizeHint()); vbox->addWidget(info, 0); @@ -454,17 +454,17 @@ KBgBoardQCube::KBgBoardQCube(int val, bool us, bool them) else if (them) cb[1]->setCurrentItem(THEM); - cb[0]->setMinimumSize(cb[0]->tqsizeHint()); - cb[1]->setMinimumSize(cb[1]->tqsizeHint()); + cb[0]->setMinimumSize(cb[0]->sizeHint()); + cb[1]->setMinimumSize(cb[1]->sizeHint()); - ok->setMinimumSize(ok->tqsizeHint()); - cancel->setMinimumSize(cancel->tqsizeHint()); + ok->setMinimumSize(ok->sizeHint()); + cancel->setMinimumSize(cancel->sizeHint()); - setMinimumSize(tqchildrenRect().size()); + setMinimumSize(childrenRect().size()); vbox->activate(); - resize(tqminimumSize()); + resize(minimumSize()); ok->setAutoDefault (true); ok->setDefault(true); @@ -544,7 +544,7 @@ KBgBoardQDice::KBgBoardQDice(const char *name) info->setText(i18n("Set the face values of the selected dice. The other player's\n" "dice will be cleared and it will be the dice's owner's turn.")); - info->setMinimumSize(info->tqsizeHint()); + info->setMinimumSize(info->sizeHint()); vbox->addWidget(info, 0); @@ -560,17 +560,17 @@ KBgBoardQDice::KBgBoardQDice(const char *name) hbox_2->addWidget(ok); hbox_2->addWidget(cancel); - sb[0]->setMinimumSize(sb[0]->tqsizeHint()); - sb[1]->setMinimumSize(sb[1]->tqsizeHint()); + sb[0]->setMinimumSize(sb[0]->sizeHint()); + sb[1]->setMinimumSize(sb[1]->sizeHint()); - ok->setMinimumSize(ok->tqsizeHint()); - cancel->setMinimumSize(cancel->tqsizeHint()); + ok->setMinimumSize(ok->sizeHint()); + cancel->setMinimumSize(cancel->sizeHint()); - setMinimumSize(tqchildrenRect().size()); + setMinimumSize(childrenRect().size()); vbox->activate(); - resize(tqminimumSize()); + resize(minimumSize()); ok->setAutoDefault (true); ok->setDefault(true); @@ -628,10 +628,10 @@ bool KBgBoard::getEditMode() const } /* - * This function takes a KBgtqStatus object and fills it with the current + * This function takes a KBgStatus object and fills it with the current * board status. */ -KBgtqStatus* KBgBoard::getState(KBgtqStatus *st) const +KBgStatus* KBgBoard::getState(KBgStatus *st) const { st->setColor(color); st->setDirection(direction); @@ -1337,7 +1337,7 @@ void KBgBoardHome::mouseDoubleClickEvent(TQMouseEvent * e) KBgBoardQDice *dlg = new KBgBoardQDice(); if (dlg->exec()) { - KBgtqStatus *st = new KBgtqStatus(); + KBgStatus *st = new KBgStatus(); board->getState(st); st->setDice(w, 0, dlg->getDice(0)); st->setDice(w, 1, dlg->getDice(1)); @@ -2085,7 +2085,7 @@ bool KBgBoard::diceAllowMove(int src, int dest) * This is the most important of all members of the board class. It takes * a single board status object and initializes the internal status. */ -void KBgBoard::setState(const KBgtqStatus &st) +void KBgBoard::setState(const KBgStatus &st) { color = st.color(); direction = st.direction(); @@ -2820,7 +2820,7 @@ void KBgBoard::getRollDice(const int w) * This is the constructor of the KBgBoard class. It creates * a backgammon board with an initial distribution of checkers, empty * dice and a cube with face value 1. The initial board is not usable! - * You have to change the status by passing a KBgtqStatus + * You have to change the status by passing a KBgStatus * object to setState(...) before you can play! */ KBgBoard::KBgBoard(TQWidget *parent, const char *name, TQPopupMenu *menu) @@ -2868,7 +2868,7 @@ KBgBoard::KBgBoard(TQWidget *parent, const char *name, TQPopupMenu *menu) * Get the default seeting of the board and initialize the * state of it. */ - KBgtqStatus *st = new KBgtqStatus(); + KBgStatus *st = new KBgStatus(); st->setCube(1, true, true); st->setDirection(+1); @@ -2907,12 +2907,12 @@ KBgBoard::KBgBoard(TQWidget *parent, const char *name, TQPopupMenu *menu) setFont(TQApplication::font()); } -TQSize KBgBoard::tqminimumSizeHint() const +TQSize KBgBoard::minimumSizeHint() const { return TQSize(MINIMUM_CHECKER_SIZE * 15, MINIMUM_CHECKER_SIZE * 11); } -TQSize KBgBoard::tqsizeHint() const { +TQSize KBgBoard::sizeHint() const { return TQSize(MINIMUM_CHECKER_SIZE *15*4,MINIMUM_CHECKER_SIZE*11*2); } diff --git a/kbackgammon/kbgboard.h b/kbackgammon/kbgboard.h index f91ab93b..ed5feeea 100644 --- a/kbackgammon/kbgboard.h +++ b/kbackgammon/kbgboard.h @@ -64,9 +64,9 @@ /* * Just some internal constants and classes */ -const int US = KBgtqStatus::US; -const int THEM = KBgtqStatus::THEM; -const int BOTH = KBgtqStatus::BOTH; +const int US = KBgStatus::US; +const int THEM = KBgStatus::THEM; +const int BOTH = KBgStatus::BOTH; const int HOME_US_LEFT = 101; const int HOME_US_RIGHT = 102; @@ -181,7 +181,7 @@ class KBgBoard : public TQWidget * This function has to be reimplemented to provide a minimum size for * the playing area. */ - TQSize tqminimumSizeHint() const; + TQSize minimumSizeHint() const; public slots: /** @@ -211,10 +211,10 @@ public slots: /** * This is the most important public member. It takes - * a board status - s. the KBgBoardtqStatus class - + * a board status - s. the KBgBoardStatus class - * and sets the board accordingly. */ - void setState(const KBgtqStatus &); + void setState(const KBgStatus &); /** * Set the context menu @@ -224,7 +224,7 @@ public slots: /** * Get the current state of the board. */ - KBgtqStatus *getState(KBgtqStatus *st) const; + KBgStatus *getState(KBgStatus *st) const; /** * Sets the edit mode of the board. In that mode the board can be @@ -292,7 +292,7 @@ public slots: /* ************************************************** */ protected: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; TQColor baseColors[2]; TQFont boardFont; @@ -535,7 +535,7 @@ protected: virtual void drawContents(TQPainter *); /** - * tqStatus numbers that store the current board status. + * Status numbers that store the current board status. */ int mouseButton; int direction; @@ -552,7 +552,7 @@ protected: int cellID; /** - * Indicates whether this cell needs to tqrepaint itself after + * Indicates whether this cell needs to repaint itself after * the board has been processed. */ bool stateChanged; @@ -837,7 +837,7 @@ public: protected: /** - * Spin boxes and buttons are tqchildren + * Spin boxes and buttons are children */ TQSpinBox *sb[2]; TQPushButton *ok; @@ -871,7 +871,7 @@ public: protected: /** - * Spin boxes and buttons are tqchildren + * Spin boxes and buttons are children */ TQComboBox *cb[2]; TQPushButton *ok; diff --git a/kbackgammon/kbgstatus.cpp b/kbackgammon/kbgstatus.cpp index e9e8d4e5..824ff721 100644 --- a/kbackgammon/kbgstatus.cpp +++ b/kbackgammon/kbgstatus.cpp @@ -29,7 +29,7 @@ /* * Parse a rawboard description from FIBS and initialize members. */ -KBgtqStatus::KBgtqStatus(const TQString &rawboard) +KBgStatus::KBgStatus(const TQString &rawboard) { /* * This is the format string from hell... @@ -116,7 +116,7 @@ KBgtqStatus::KBgtqStatus(const TQString &rawboard) * Constructor initializes the status to an empty board with cube one * and empty dice. */ -KBgtqStatus::KBgtqStatus() +KBgStatus::KBgStatus() : TQObject() { /* @@ -146,7 +146,7 @@ KBgtqStatus::KBgtqStatus() /* * Copy constructor calls private utility function. */ -KBgtqStatus::KBgtqStatus(const KBgtqStatus &rhs) +KBgStatus::KBgStatus(const KBgStatus &rhs) : TQObject() { copy(rhs); @@ -155,7 +155,7 @@ KBgtqStatus::KBgtqStatus(const KBgtqStatus &rhs) /* * Destructor */ -KBgtqStatus::~KBgtqStatus() +KBgStatus::~KBgStatus() { // nothing to do } @@ -164,14 +164,14 @@ KBgtqStatus::~KBgtqStatus() * Assignment operator shares a lot of code with the copy * constructor. */ -KBgtqStatus& KBgtqStatus::operator=(const KBgtqStatus &rhs) +KBgStatus& KBgStatus::operator=(const KBgStatus &rhs) { if (this == &rhs) return *this; copy(rhs); return *this; } -void KBgtqStatus::copy(const KBgtqStatus &rhs) +void KBgStatus::copy(const KBgStatus &rhs) { for (int i = 0; i < 26; i++) board_[i] = rhs.board_[i]; @@ -199,32 +199,32 @@ void KBgtqStatus::copy(const KBgtqStatus &rhs) /* * Access functions */ -int KBgtqStatus::board(const int &i) const +int KBgStatus::board(const int &i) const { return ((0 < i && i < 25) ? color_*board_[i] : 0); } -int KBgtqStatus::home(const int &w) const +int KBgStatus::home(const int &w) const { return ((w == US || w == THEM) ? color_*home_[w] : 0); } -int KBgtqStatus::bar(const int &w) const +int KBgStatus::bar(const int &w) const { return ((w == US || w == THEM) ? color_*bar_[w] : 0); } -int KBgtqStatus::color(const int &w) const +int KBgStatus::color(const int &w) const { return ((w == THEM) ? -color_ : color_); } -int KBgtqStatus::direction() const +int KBgStatus::direction() const { return direction_; } -int KBgtqStatus::dice(const int &w, const int &n) const +int KBgStatus::dice(const int &w, const int &n) const { if ((w == US || w == THEM) && (n == 0 || n == 1)) return dice_[w][n]; @@ -232,34 +232,34 @@ int KBgtqStatus::dice(const int &w, const int &n) const return 0; } -int KBgtqStatus::cube(const int &w) const +int KBgStatus::cube(const int &w) const { if (w == US || w == THEM) return ((maydouble_[w]) ? cube_ : -cube_); return 0; } -int KBgtqStatus::points(const int& w) const +int KBgStatus::points(const int& w) const { return ((w == US || w == THEM) ? points_[w] : -1); } -TQString KBgtqStatus::player(const int &w) const +TQString KBgStatus::player(const int &w) const { return ((w == US || w == THEM) ? player_[w] : TQString()); } -int KBgtqStatus::length() const +int KBgStatus::length() const { return length_; } -int KBgtqStatus::turn() const +int KBgStatus::turn() const { return turn_; } -bool KBgtqStatus::doubled() const +bool KBgStatus::doubled() const { return doubled_; } @@ -268,7 +268,7 @@ bool KBgtqStatus::doubled() const /* * Assignment functions */ -void KBgtqStatus::setBoard(const int &i, const int &w, const int &v) +void KBgStatus::setBoard(const int &i, const int &w, const int &v) { if (0 < i && i < 25) { if (w == US) @@ -278,7 +278,7 @@ void KBgtqStatus::setBoard(const int &i, const int &w, const int &v) } } -void KBgtqStatus::setHome(const int &w, const int &v) +void KBgStatus::setHome(const int &w, const int &v) { if (w == US) home_[w] = abs(v); @@ -286,7 +286,7 @@ void KBgtqStatus::setHome(const int &w, const int &v) home_[w] = -abs(v); } -void KBgtqStatus::setBar(const int& w, const int& v) +void KBgStatus::setBar(const int& w, const int& v) { if (w == US) bar_[w] = abs(v); @@ -294,7 +294,7 @@ void KBgtqStatus::setBar(const int& w, const int& v) bar_[w] = -abs(v); } -void KBgtqStatus::setColor(const int &c, const int &w) +void KBgStatus::setColor(const int &c, const int &w) { if (w == US) color_ = ((c < 0) ? Black : White); @@ -302,12 +302,12 @@ void KBgtqStatus::setColor(const int &c, const int &w) color_ = ((c < 0) ? White : Black); } -void KBgtqStatus::setDirection(const int &dir) +void KBgStatus::setDirection(const int &dir) { direction_ = ((dir < 0) ? -1 : +1); } -void KBgtqStatus::setDice(const int &w, const int &n, const int &v) +void KBgStatus::setDice(const int &w, const int &n, const int &v) { if ((w == US || w == THEM) && (n == 0 || n == 1)) { if (0 <= v && v <= 6) @@ -317,7 +317,7 @@ void KBgtqStatus::setDice(const int &w, const int &n, const int &v) } } -void KBgtqStatus::setCube(const int &c, const bool &us, const bool &them) +void KBgStatus::setCube(const int &c, const bool &us, const bool &them) { int w = NONE; if (us) w = US; @@ -326,7 +326,7 @@ void KBgtqStatus::setCube(const int &c, const bool &us, const bool &them) setCube(c, w); } -void KBgtqStatus::setCube(const int &c, const int &w) +void KBgStatus::setCube(const int &c, const int &w) { // assume that int has at least 32 bits... for (int i = 0; i < 31; i++) { @@ -337,24 +337,24 @@ void KBgtqStatus::setCube(const int &c, const int &w) maydouble_[THEM] = (w == THEM || w == BOTH); } -void KBgtqStatus::setPoints(const int &w, const int &p) +void KBgStatus::setPoints(const int &w, const int &p) { if (w == US || w == THEM) points_[w] = p; } -void KBgtqStatus::setPlayer(const int &w, const TQString &name) +void KBgStatus::setPlayer(const int &w, const TQString &name) { if (w == US || w == THEM) player_[w] = name; } -void KBgtqStatus::setLength(const int &l) +void KBgStatus::setLength(const int &l) { length_ = l; } -void KBgtqStatus::setTurn(const int &w) +void KBgStatus::setTurn(const int &w) { if (w == US || w == THEM || w == BOTH) turn_ = w; @@ -364,7 +364,7 @@ void KBgtqStatus::setTurn(const int &w) /* * Utility functions */ -int KBgtqStatus::moves() const +int KBgStatus::moves() const { int start, dir; @@ -407,7 +407,7 @@ int KBgtqStatus::moves() const * Get a copy of ourselves. That way we can mess around with * the internals of the game. */ - KBgtqStatus sc(*this); + KBgStatus sc(*this); /* * Start with getting all checkers off the bar @@ -490,7 +490,7 @@ int KBgtqStatus::moves() const } } -bool KBgtqStatus::movePossible(KBgtqStatus &sc, int a, int start, int dir) const +bool KBgStatus::movePossible(KBgStatus &sc, int a, int start, int dir) const { /* * Determine where the first checker in moving direction is diff --git a/kbackgammon/kbgstatus.h b/kbackgammon/kbgstatus.h index 255dc049..69d1a0b6 100644 --- a/kbackgammon/kbgstatus.h +++ b/kbackgammon/kbgstatus.h @@ -43,7 +43,7 @@ * @author Jens Hoefkens <[email protected]> * @version $Id$ */ -class KBgtqStatus : public TQObject +class KBgStatus : public TQObject { Q_OBJECT @@ -66,27 +66,27 @@ class KBgtqStatus : public TQObject * The default constructor initializes the status to an "empty" * state. The board and dice are empty and the cube shows 1. */ - KBgtqStatus(); + KBgStatus(); /** * Constructor from a FIBS rawboard string */ - KBgtqStatus(const TQString &rawboard); + KBgStatus(const TQString &rawboard); /** * Copy constructor */ - KBgtqStatus(const KBgtqStatus &rhs); + KBgStatus(const KBgStatus &rhs); /** * Assignment operator */ - KBgtqStatus& operator=(const KBgtqStatus &rhs); + KBgStatus& operator=(const KBgStatus &rhs); /** * Destructor */ - virtual ~KBgtqStatus(); + virtual ~KBgStatus(); /* @@ -289,12 +289,12 @@ class KBgtqStatus : public TQObject * anywhere starting from start or later into direction * dir in the game given by sc. */ - bool movePossible(KBgtqStatus &sc, int a, int start, int dir) const; + bool movePossible(KBgStatus &sc, int a, int start, int dir) const; /* * Copy constr. and assignment share a lot of code. */ - void copy(const KBgtqStatus &rhs); + void copy(const KBgStatus &rhs); /* * Private variables with self-expalanatory names. diff --git a/kbattleship/CLIENTS b/kbattleship/CLIENTS index 54c82ec3..393dda40 100644 --- a/kbattleship/CLIENTS +++ b/kbattleship/CLIENTS @@ -1,6 +1,6 @@ Information about other KBattleship-compatible clients: -Client OS tqStatus Homepage/Screenshots +Client OS Status Homepage/Screenshots KBattleship Linux/KDE 100% http://games.kde.org/kbattleship Mac KBattleship Mac OS + Mac OS X 100% http://www.sebek.de/ diff --git a/kbattleship/kbattleship/dialogs/connectDlg.ui b/kbattleship/kbattleship/dialogs/connectDlg.ui index 2bf0e8d5..40ec9609 100644 --- a/kbattleship/kbattleship/dialogs/connectDlg.ui +++ b/kbattleship/kbattleship/dialogs/connectDlg.ui @@ -38,7 +38,7 @@ <property name="text"> <string>&Nick name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -73,7 +73,7 @@ <property name="text"> <string>&Server:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -135,7 +135,7 @@ <property name="text"> <string>&Port:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> diff --git a/kbattleship/kbattleship/dialogs/serverDlg.ui b/kbattleship/kbattleship/dialogs/serverDlg.ui index e1888e8d..daf40894 100644 --- a/kbattleship/kbattleship/dialogs/serverDlg.ui +++ b/kbattleship/kbattleship/dialogs/serverDlg.ui @@ -63,7 +63,7 @@ <property name="text"> <string>&Port:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -95,7 +95,7 @@ <property name="text"> <string>&Nick name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> diff --git a/kbattleship/kbattleship/dialogs/statDlg.ui b/kbattleship/kbattleship/dialogs/statDlg.ui index feea1778..dc863d24 100644 --- a/kbattleship/kbattleship/dialogs/statDlg.ui +++ b/kbattleship/kbattleship/dialogs/statDlg.ui @@ -32,7 +32,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -97,7 +97,7 @@ <property name="text"> <string>:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -116,7 +116,7 @@ <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -315,7 +315,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -441,7 +441,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp index 62952b19..eb624bf5 100644 --- a/kbattleship/kbattleship/kbattleship.cpp +++ b/kbattleship/kbattleship/kbattleship.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <kgamemisc.h> @@ -84,8 +84,8 @@ void KBattleshipWindow::initStatusBar() { m_ownNickname = "-"; m_enemyNickname = "-"; - statusBar()->insertItem(i18n(" Player 1: %1 ").tqarg(m_ownNickname), ID_PLAYER_OWN, 0, true); - statusBar()->insertItem(i18n(" Player 2: %1 ").tqarg(m_enemyNickname), ID_PLAYER_ENEMY, 0, true); + statusBar()->insertItem(i18n(" Player 1: %1 ").arg(m_ownNickname), ID_PLAYER_OWN, 0, true); + statusBar()->insertItem(i18n(" Player 2: %1 ").arg(m_enemyNickname), ID_PLAYER_ENEMY, 0, true); statusBar()->insertItem(i18n("Ready"), ID_STATUS_MSG, 1); statusBar()->setItemAlignment(ID_STATUS_MSG, AlignLeft); } @@ -1075,14 +1075,14 @@ void KBattleshipWindow::parseCommandLine() { if( !u.isValid()) { KMessageBox::sorry(this, i18n("The URL passed to KDE Battleship '%1' is not a valid url") - .tqarg(args->arg(0))); + .arg(args->arg(0))); return; } if( u.protocol() != "kbattleship" ) { KMessageBox::sorry(this, i18n("The URL passed to KDE Battleship '%1' is not recognised " "as a Battleship game.") - .tqarg(args->arg(0))); + .arg(args->arg(0))); return; } @@ -1198,13 +1198,13 @@ void KBattleshipWindow::slotStatusMsg(const TQString &text) void KBattleshipWindow::slotChangeOwnPlayer(const TQString &text) { statusBar()->clear(); - statusBar()->changeItem(i18n(" Player 1: %1 ").tqarg(text), ID_PLAYER_OWN); + statusBar()->changeItem(i18n(" Player 1: %1 ").arg(text), ID_PLAYER_OWN); } void KBattleshipWindow::slotChangeEnemyPlayer(const TQString &text) { statusBar()->clear(); - statusBar()->changeItem(i18n(" Player 2: %1 ").tqarg(text), ID_PLAYER_ENEMY); + statusBar()->changeItem(i18n(" Player 2: %1 ").arg(text), ID_PLAYER_ENEMY); } void KBattleshipWindow::slotSinglePlayer() diff --git a/kbattleship/kbattleship/kbattleshipserver.cpp b/kbattleship/kbattleship/kbattleshipserver.cpp index 7b10d4fd..85e90ffa 100644 --- a/kbattleship/kbattleship/kbattleshipserver.cpp +++ b/kbattleship/kbattleship/kbattleshipserver.cpp @@ -41,7 +41,7 @@ void KBattleshipServer::init() { if(listen()) { - KMessageBox::error(0L, i18n("Failed to bind to local port \"%1\"\n\nPlease check if another KBattleship server instance\nis running or another application uses this port.").tqarg(m_port)); + KMessageBox::error(0L, i18n("Failed to bind to local port \"%1\"\n\nPlease check if another KBattleship server instance\nis running or another application uses this port.").arg(m_port)); emit sigServerFailure(); return; } diff --git a/kbattleship/kbattleship/kbattleshipview.cpp b/kbattleship/kbattleship/kbattleshipview.cpp index 3e70a2a4..e938b77c 100644 --- a/kbattleship/kbattleship/kbattleshipview.cpp +++ b/kbattleship/kbattleship/kbattleshipview.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kdebug.h> @@ -106,11 +106,11 @@ void KBattleshipView::drawEnemyShipsHuman(KMessage *msg, KShipList *list) int posx, posy, placedLeft; bool left; int i = 3; - while (!msg->field(TQString("ship%1").tqarg(i)).isNull()) + while (!msg->field(TQString("ship%1").arg(i)).isNull()) { - posx = msg->field(TQString("ship%1").tqarg(i)).section(" ", 0, 0).toInt(); - posy = msg->field(TQString("ship%1").tqarg(i)).section(" ", 1, 1).toInt(); - placedLeft = msg->field(TQString("ship%1").tqarg(i)).section(" ", 2, 2).toInt(); + posx = msg->field(TQString("ship%1").arg(i)).section(" ", 0, 0).toInt(); + posy = msg->field(TQString("ship%1").arg(i)).section(" ", 1, 1).toInt(); + placedLeft = msg->field(TQString("ship%1").arg(i)).section(" ", 2, 2).toInt(); if (placedLeft == 0) left = false; else left = true; list->addNewShip(!left, posx, posy); diff --git a/kbattleship/kbattleship/kclientdialog.cpp b/kbattleship/kbattleship/kclientdialog.cpp index f52e9472..be8c8f4f 100644 --- a/kbattleship/kbattleship/kclientdialog.cpp +++ b/kbattleship/kbattleship/kclientdialog.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <kcombobox.h> #include <kuser.h> -#include <tqlayout.h> +#include <layout.h> #include "kbattleshipserver.h" // for BATTLESHIP_SERVICE #include "kclientdialog.moc" @@ -42,7 +42,7 @@ KClientDialog::KClientDialog(TQWidget *parent, const char *name) connect(m_mainWidget->serverEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckEnableOk())); m_config->setGroup("History"); - m_browser = new DNSSD::ServiceBrowser(TQString::tqfromLatin1(BATTLESHIP_SERVICE)); + m_browser = new DNSSD::ServiceBrowser(TQString::fromLatin1(BATTLESHIP_SERVICE)); connect(m_browser,TQT_SIGNAL(finished()),TQT_SLOT(nextBatch())); m_browser->startBrowse(); connect(m_mainWidget->lanBox,TQT_SIGNAL(activated(int)),TQT_SLOT(gameSelected(int))); diff --git a/kbattleship/kbattleship/konnectionhandling.cpp b/kbattleship/kbattleship/konnectionhandling.cpp index 45a2a452..5d5c1026 100644 --- a/kbattleship/kbattleship/konnectionhandling.cpp +++ b/kbattleship/kbattleship/konnectionhandling.cpp @@ -94,7 +94,7 @@ void KonnectionHandling::slotNewMessage(KMessage *msg) case KMessage::DISCARD: if(msg->field("kmversion") == TQString("true")) { - KMessageBox::error(0L, i18n("Connection dropped by enemy. The client's protocol implementation (%1) is not compatible with our (%2) version.").tqarg(msg->field("reason")).tqarg(protocolVersion)); + KMessageBox::error(0L, i18n("Connection dropped by enemy. The client's protocol implementation (%1) is not compatible with our (%2) version.").arg(msg->field("reason")).arg(protocolVersion)); emit sigAbortNetworkGame(); } else @@ -156,10 +156,10 @@ void KonnectionHandling::slotNewMessage(KMessage *msg) { // First message....got client information case KMessage::GETVERSION: - if(msg->field("protocolVersion") != TQString::tqfromLatin1(protocolVersion)) + if(msg->field("protocolVersion") != TQString::fromLatin1(protocolVersion)) { m_kbserver->slotDiscardClient(protocolVersion, true, false); - KMessageBox::error(0L, i18n("Connection to client dropped. The client's protocol implementation (%1) is not compatible with our (%2) version.").tqarg(msg->field("protocolVersion")).tqarg(protocolVersion)); + KMessageBox::error(0L, i18n("Connection to client dropped. The client's protocol implementation (%1) is not compatible with our (%2) version.").arg(msg->field("protocolVersion")).arg(protocolVersion)); } else emit sigClientInformation(msg->field("clientName"), msg->field("clientVersion"), msg->field("clientDescription"), msg->field("protocolVersion")); @@ -232,7 +232,7 @@ void KonnectionHandling::slotSocketError(int error) break; default: - KMessageBox::error(0L, i18n("Unknown error; No: %1").tqarg(error)); + KMessageBox::error(0L, i18n("Unknown error; No: %1").arg(error)); break; } diff --git a/kbattleship/kbattleship/kserverdialog.cpp b/kbattleship/kbattleship/kserverdialog.cpp index d8fa1b1d..72b53695 100644 --- a/kbattleship/kbattleship/kserverdialog.cpp +++ b/kbattleship/kbattleship/kserverdialog.cpp @@ -17,7 +17,7 @@ #include <klocale.h> #include <kuser.h> -#include <tqlayout.h> +#include <layout.h> #include "kserverdialog.h" diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp index 988a74fd..dbaf2bc7 100644 --- a/kblackbox/kbbgame.cpp +++ b/kblackbox/kbbgame.cpp @@ -298,7 +298,7 @@ void KBBGame::newGame() randomBalls( balls ); remap( gameBoard, gr->getGraphicBoard() ); - gr->tqrepaint( TRUE ); + gr->repaint( TRUE ); setScore( 0 ); detourCounter = -1; ballsPlaced = 0; @@ -326,12 +326,12 @@ void KBBGame::gameFinished() "I guess you need more practice."); KMessageBox::information(this, - s.tqarg(KGlobal::locale()->formatNumber(score, 0))); + s.arg(KGlobal::locale()->formatNumber(score, 0))); } else { s = i18n( "You should place %1 balls!\n" "You have placed %2.") - .tqarg(KGlobal::locale()->formatNumber(balls, 0)) - .tqarg(KGlobal::locale()->formatNumber(ballsPlaced, 0)); + .arg(KGlobal::locale()->formatNumber(balls, 0)) + .arg(KGlobal::locale()->formatNumber(ballsPlaced, 0)); KMessageBox::sorry(this, s); } @@ -428,7 +428,7 @@ void KBBGame::updateStats() void KBBGame::setScore( int n ) { score = n; - statusBar()->changeItem( i18n("Score: %1").tqarg(n), SSCORE ); + statusBar()->changeItem( i18n("Score: %1").arg(n), SSCORE ); } /* @@ -454,7 +454,7 @@ bool KBBGame::setSize( int w, int h ) gameBoard = new RectOnArray( gr->numC(), gr->numR() ); if (running) abortGame(); newGame(); - // gr->tqrepaint( TRUE ); + // gr->repaint( TRUE ); } } return ok; diff --git a/kblackbox/kbbgfx.cpp b/kblackbox/kbbgfx.cpp index bedde374..0becd126 100644 --- a/kblackbox/kbbgfx.cpp +++ b/kblackbox/kbbgfx.cpp @@ -137,7 +137,7 @@ int KBBGraphic::width() { return cellW * numRows; } int KBBGraphic::height() { return cellH * numCols; } int KBBGraphic::wHint() const { return minW; } int KBBGraphic::hHint() const { return minH; } -TQSize KBBGraphic::tqsizeHint() const { return TQSize(wHint(), hHint()); } +TQSize KBBGraphic::sizeHint() const { return TQSize(wHint(), hHint()); } /* Returns a pointer to graphicBoard @@ -434,7 +434,7 @@ void KBBGraphic::moveSelection(int drow, int dcol) void KBBGraphic::focusInEvent( TQFocusEvent* ) { - tqrepaint( FALSE ); + repaint( FALSE ); } @@ -444,7 +444,7 @@ void KBBGraphic::focusInEvent( TQFocusEvent* ) void KBBGraphic::focusOutEvent( TQFocusEvent* ) { - tqrepaint( FALSE ); + repaint( FALSE ); } /* diff --git a/kblackbox/kbbgfx.h b/kblackbox/kbbgfx.h index 77bca3d3..3c18733e 100644 --- a/kblackbox/kbbgfx.h +++ b/kblackbox/kbbgfx.h @@ -88,7 +88,7 @@ signals: void endMouseClicked(); protected: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void paintEvent( TQPaintEvent* ); void mousePressEvent( TQMouseEvent* ); void mouseMoveEvent( TQMouseEvent* ); diff --git a/kbounce/game.cpp b/kbounce/game.cpp index 065b2657..a223fea8 100644 --- a/kbounce/game.cpp +++ b/kbounce/game.cpp @@ -406,7 +406,7 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c connect( m_clock, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick()) ); m_clock->start( GAME_DELAY ); - // setup tqgeometry + // setup geometry setFixedSize( m_view->size() ); } @@ -500,7 +500,7 @@ void JezzGame::makeBlack() } m_field->update(); - m_view->tqrepaint(); + m_view->repaint(); // count percent value of occupied area int p = percent(); @@ -586,7 +586,7 @@ void JezzGame::ballCollision( Ball */*ball*/, int /*x*/, int /*y*/, int tile ) // update view m_field->update(); - m_view->tqrepaint(); + m_view->repaint(); // send death msg emit died(); @@ -671,7 +671,7 @@ void JezzGame::wallFinished( Wall *wall, int tile ) } m_field->update(); - m_view->tqrepaint(); + m_view->repaint(); makeBlack(); } diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp index 2d4fe887..158786a4 100644 --- a/kbounce/kbounce.cpp +++ b/kbounce/kbounce.cpp @@ -16,7 +16,7 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kapplication.h> #include <kaction.h> @@ -100,7 +100,7 @@ KJezzball::KJezzball() // create demo game createLevel( 1 ); statusBar()->message( i18n("Press %1 to start a game!") - .tqarg(m_newAction->shortcut().toString()) ); + .arg(m_newAction->shortcut().toString()) ); //m_gameWidget->display( i18n("Press <Space> to start a game!") ); setFocusPolicy(TQ_StrongFocus); @@ -228,7 +228,7 @@ void KJezzball::gameOverNow() TQString score; score.setNum( m_game.score ); - KMessageBox::information( this, i18n("Game Over! Score: %1").tqarg(score) ); + KMessageBox::information( this, i18n("Game Over! Score: %1").arg(score) ); statusBar()->message( i18n("Game over. Press <Space> for a new game") ); //m_gameWidget->display( i18n("Game over. Press <Space> for a new game!") ); highscore(); @@ -461,16 +461,16 @@ void KJezzball::switchLevel() TQString foo = TQString( i18n("You have successfully cleared more than 75% of the board.\n") + -i18n("%1 points: 15 points per remaining life\n").tqarg(m_level.lifes*15) + -i18n("%1 points: Bonus\n").tqarg((m_gameWidget->percent()-75)*2*(m_game.level+5)) + -i18n("%1 points: Total score for this level\n").tqarg(score) + -i18n("On to level %1. Remember you get %2 lives this time!")).tqarg(m_game.level+1).tqarg(m_game.level+2); +i18n("%1 points: 15 points per remaining life\n").arg(m_level.lifes*15) + +i18n("%1 points: Bonus\n").arg((m_gameWidget->percent()-75)*2*(m_game.level+5)) + +i18n("%1 points: Total score for this level\n").arg(score) + +i18n("On to level %1. Remember you get %2 lives this time!")).arg(m_game.level+1).arg(m_game.level+2); KMessageBox::information( this,foo ); // KMessageBox::information( this, i18n("You've completed level %1 with " - // "a score of %2.\nGet ready for the next one!").tqarg(level).tqarg(score)); + // "a score of %2.\nGet ready for the next one!").arg(level).arg(score)); m_game.level++; m_levelLCD->display( m_game.level ); diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp index f107408d..a7dc9a7e 100644 --- a/kenolaba/AbTop.cpp +++ b/kenolaba/AbTop.cpp @@ -2,7 +2,7 @@ #include <tqpopupmenu.h> #include <tqtimer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kaction.h> #include <kapplication.h> @@ -107,7 +107,7 @@ AbTop::AbTop() showSpy = false; renderBalls = true; - updatetqStatus(); + updateStatus(); updateActions(); setupGUI(); } @@ -381,7 +381,7 @@ void AbTop::setupStatusBar() { TQString tmp; - TQString t = i18n("Press %1 for a new game").tqarg( newAction->shortcut().toString()); + TQString t = i18n("Press %1 for a new game").arg( newAction->shortcut().toString()); statusLabel = new TQLabel( t, statusBar(), "statusLabel" ); statusBar()->addWidget(statusLabel,1,false); @@ -391,8 +391,8 @@ void AbTop::setupStatusBar() warningPix = BarIcon( "warning" ); okPix = BarIcon( "ok" ); validLabel = new TQLabel( "", statusBar(), "validLabel" ); - validLabel->setFixedSize( 18, statusLabel->tqsizeHint().height() ); - validLabel->tqsetAlignment( AlignCenter ); + validLabel->setFixedSize( 18, statusLabel->sizeHint().height() ); + validLabel->setAlignment( AlignCenter ); validLabel->hide(); validShown = false; @@ -401,11 +401,11 @@ void AbTop::setupStatusBar() noBall = BarIcon( "noball" ); ballLabel = new TQLabel( "", statusBar(), "ballLabel" ); ballLabel->setPixmap(noBall); - ballLabel->setFixedSize( 18, statusLabel->tqsizeHint().height() ); - ballLabel->tqsetAlignment( AlignCenter ); + ballLabel->setFixedSize( 18, statusLabel->sizeHint().height() ); + ballLabel->setAlignment( AlignCenter ); statusBar()->addWidget(ballLabel, 0, true); - moveLabel = new TQLabel( i18n("Move %1").tqarg("--"), statusBar(), "moveLabel" ); + moveLabel = new TQLabel( i18n("Move %1").arg("--"), statusBar(), "moveLabel" ); statusBar()->addWidget(moveLabel, 0, true); #ifdef MYTRACE @@ -436,7 +436,7 @@ void AbTop::updateSpy(TQString s) { if (showSpy) { if (s.isEmpty()) { - updatetqStatus(); + updateStatus(); // statusBar()->clear(); } else @@ -458,17 +458,17 @@ void AbTop::updateBestMove(Move& m, int value) } -void AbTop::updatetqStatus() +void AbTop::updateStatus() { TQString tmp; bool showValid = false; if (!editMode && timerState == noGame) { - tmp = i18n("Move %1").tqarg("--"); + tmp = i18n("Move %1").arg("--"); ballLabel->setPixmap(noBall); } else { - tmp = i18n("Move %1").tqarg(moveNo/2 + 1); + tmp = i18n("Move %1").arg(moveNo/2 + 1); ballLabel->setPixmap( (board->actColor() == Board::color1) ? redBall : yellowBall); } @@ -476,15 +476,15 @@ void AbTop::updatetqStatus() if (editMode) { tmp = TQString("%1: %2 %3 - %4 %5") - .tqarg( i18n("Edit") ) - .tqarg( i18n("Red") ).tqarg(boardWidget->getColor1Count()) - .tqarg( i18n("Yellow") ).tqarg(boardWidget->getColor2Count()); + .arg( i18n("Edit") ) + .arg( i18n("Red") ).arg(boardWidget->getColor1Count()) + .arg( i18n("Yellow") ).arg(boardWidget->getColor2Count()); validLabel->setPixmap( (board->validState() == Board::invalid) ? warningPix:okPix ); showValid = true; } else if (timerState == noGame) { - tmp = i18n("Press %1 for a new game").tqarg( newAction->shortcut().toString()); + tmp = i18n("Press %1 for a new game").arg( newAction->shortcut().toString()); } else { if (timerState == gameOver) { @@ -495,9 +495,9 @@ void AbTop::updatetqStatus() } else { tmp = TQString("%1 - %2") - .tqarg( (board->actColor() == Board::color1) ? + .arg( (board->actColor() == Board::color1) ? i18n("Red"):i18n("Yellow") ) - .tqarg( iPlayNow() ? + .arg( iPlayNow() ? i18n("I am thinking...") : i18n("It is your turn!") ); } } @@ -514,7 +514,7 @@ void AbTop::updatetqStatus() validShown = showValid; } statusBar()->clear(); - statusBar()->tqrepaint(); + statusBar()->repaint(); } void AbTop::edited(int vState) @@ -522,7 +522,7 @@ void AbTop::edited(int vState) if (vState == Board::empty) timerState = noGame; - updatetqStatus(); + updateStatus(); } /* only <stop search>, <hint>, <take back> have to be updated */ @@ -662,7 +662,7 @@ void AbTop::playGame() timerState = gameOver; } - updatetqStatus(); + updateStatus(); updateActions(); boardWidget->setCursor(crossCursor); if (stop) return; @@ -733,7 +733,7 @@ void AbTop::newGame() /* Copy ASCII representation into Clipboard */ void AbTop::copy() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( board->getASCIIState( moveNo ).ascii() ); } @@ -741,7 +741,7 @@ void AbTop::paste() { if (!pastePossible) return; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); pastePosition( cb->text().ascii() ); /* don't do this in pastePosition: RECURSION !! */ @@ -814,7 +814,7 @@ void AbTop::editModify(bool on) timerState = noGame; updateActions(); - updatetqStatus(); + updateStatus(); if (!editMode && vState == Board::valid) { actMove.type = Move::none; timerState = moveShown; @@ -864,7 +864,7 @@ void AbTop::setMoveNo(int m, bool updateGUI) board->setActColor( ((moveNo%2)==0) ? Board::color1 : Board::color2 ); if (updateGUI) { - updatetqStatus(); + updateStatus(); updateActions(); } } diff --git a/kenolaba/AbTop.h b/kenolaba/AbTop.h index 049a64a2..ffa9da3b 100644 --- a/kenolaba/AbTop.h +++ b/kenolaba/AbTop.h @@ -90,7 +90,7 @@ public slots: private: void setupActions(); - void updatetqStatus(); + void updateStatus(); void userMove(); void playGame(); void loadPixmaps(); diff --git a/kenolaba/Ball.cpp b/kenolaba/Ball.cpp index 39448305..392a61c5 100644 --- a/kenolaba/Ball.cpp +++ b/kenolaba/Ball.cpp @@ -21,14 +21,14 @@ void Ball::setSize(int x, int y) sizeX = x; sizeY = y; - tqinvalidate(); + invalidate(); } -void Ball::tqinvalidate() +void Ball::invalidate() { Ball *b; - /* tqinvalidate all Balls... */ + /* invalidate all Balls... */ for(b=first;b!=0;b=b->next) b->pm.resize(0,0); } @@ -43,7 +43,7 @@ void Ball::setLight(int x, int y, int z, const TQColor& c) lightColor = c; - tqinvalidate(); + invalidate(); } @@ -52,7 +52,7 @@ void Ball::setTexture(double c, double d) rippleCount = c; rippleDepth = d; - tqinvalidate(); + invalidate(); } @@ -309,7 +309,7 @@ void BallWidget::resizeEvent(TQResizeEvent *) realSize = (w>h) ? h:w; Ball::setSize( realSize/ballFraction, realSize/ballFraction ); - tqrepaint(); + repaint(); } void BallWidget::paintEvent(TQPaintEvent *) @@ -414,7 +414,7 @@ void BallWidget::animate() timer->start(1000/freq,true); } - // tqrepaint( false ); + // repaint( false ); } diff --git a/kenolaba/Ball.h b/kenolaba/Ball.h index 9cdfe344..6558a600 100644 --- a/kenolaba/Ball.h +++ b/kenolaba/Ball.h @@ -49,7 +49,7 @@ class Ball { private: void render(); - static void tqinvalidate(); + static void invalidate(); //static TQImage back; static int sizeX, sizeY; diff --git a/kenolaba/BoardWidget.cpp b/kenolaba/BoardWidget.cpp index 9462b8d5..744ccb16 100644 --- a/kenolaba/BoardWidget.cpp +++ b/kenolaba/BoardWidget.cpp @@ -237,7 +237,7 @@ void BoardWidget::drawBoard() #ifndef HAVE_KIR TQColorGroup g = TQPalette( *boardColor ).active(); - TQColorGroup g2 = TQWidget::tqcolorGroup(); + TQColorGroup g2 = TQWidget::colorGroup(); int boardSize = width() *10/12; if (boardSize > height()) boardSize = height(); @@ -345,7 +345,7 @@ void BoardWidget::draw() if (renderMode) { updateBalls(); - tqrepaint(false); + repaint(false); return; } @@ -889,7 +889,7 @@ void BoardWidget::mousePressEvent( TQMouseEvent* pEvent ) TQString tmp; actValue = - board.calcEvaluation(); - tmp = i18n("Board value: %1").tqarg(actValue); + tmp = i18n("Board value: %1").arg(actValue); emit updateSpy(tmp); } @@ -930,7 +930,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent ) TQString tmp; actValue = - board.calcEvaluation(); - tmp = i18n("Board value: %1").tqarg(actValue); + tmp = i18n("Board value: %1").arg(actValue); emit updateSpy(tmp); return; } @@ -948,7 +948,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent ) TQString tmp; tmp.sprintf("%+d", v-actValue); - TQString str = TQString("%1 : %2").tqarg(actMove.name()).tqarg(tmp); + TQString str = TQString("%1 : %2").arg(actMove.name()).arg(tmp); emit updateSpy(str); showMove(actMove,3); @@ -961,7 +961,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent ) if (pos == startPos) { showStart(actMove,1); startShown = true; - tmp = i18n("Board value: %1").tqarg(actValue); + tmp = i18n("Board value: %1").arg(actValue); } else draw(); @@ -1019,7 +1019,7 @@ void BoardWidget::mouseReleaseEvent( TQMouseEvent* pEvent ) emit updateSpy(tmp); } -TQSize BoardWidget::tqsizeHint() const +TQSize BoardWidget::sizeHint() const { return TQSize(400, 350); } diff --git a/kenolaba/BoardWidget.h b/kenolaba/BoardWidget.h index bc323aa8..7052f7c4 100644 --- a/kenolaba/BoardWidget.h +++ b/kenolaba/BoardWidget.h @@ -78,7 +78,7 @@ class BoardWidget : public BallWidget void updateSpy(TQString); void edited(int); protected: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: int positionOf(int x, int y); diff --git a/kenolaba/EvalDlg.ui b/kenolaba/EvalDlg.ui index c1fb6411..a98354d4 100644 --- a/kenolaba/EvalDlg.ui +++ b/kenolaba/EvalDlg.ui @@ -90,13 +90,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -125,13 +125,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -160,13 +160,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -269,7 +269,7 @@ <property name="text"> <string>Push Out</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -293,7 +293,7 @@ <property name="text"> <string>Push</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -360,13 +360,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -384,13 +384,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -474,13 +474,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -642,13 +642,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -688,13 +688,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -734,13 +734,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -810,7 +810,7 @@ <property name="text"> <string>Normal</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -822,7 +822,7 @@ <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -831,7 +831,7 @@ <property name="text"> <string>For every move possible the given points are added to the Evaluation.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -920,13 +920,13 @@ <property name="name"> <cstring>posEval3</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -936,13 +936,13 @@ <property name="name"> <cstring>posEval5</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -952,13 +952,13 @@ <property name="name"> <cstring>posEval2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -976,13 +976,13 @@ <property name="name"> <cstring>diffEval2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -992,13 +992,13 @@ <property name="name"> <cstring>diffEval3</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1008,13 +1008,13 @@ <property name="name"> <cstring>posEval4</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1032,13 +1032,13 @@ <property name="name"> <cstring>diffEval5</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1048,13 +1048,13 @@ <property name="name"> <cstring>posEval1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1088,13 +1088,13 @@ <property name="name"> <cstring>diffEval4</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1146,7 +1146,7 @@ <property name="text"> <string>For every ball, the given points are added to the evaluation depending on the balls position. The bonus for a given position is changed randomly in the +/- range.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -1227,13 +1227,13 @@ <property name="name"> <cstring>rowEval3</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1243,13 +1243,13 @@ <property name="name"> <cstring>rowEval2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1259,13 +1259,13 @@ <property name="name"> <cstring>rowEval5</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1275,13 +1275,13 @@ <property name="name"> <cstring>rowEval4</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1341,7 +1341,7 @@ <property name="text"> <string>For a number of balls In-a-Row, the given points are added to the evaluation</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -1422,13 +1422,13 @@ <property name="name"> <cstring>countEval2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1446,13 +1446,13 @@ <property name="name"> <cstring>countEval5</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1462,13 +1462,13 @@ <property name="name"> <cstring>countEval4</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1494,13 +1494,13 @@ <property name="name"> <cstring>countEval1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1518,13 +1518,13 @@ <property name="name"> <cstring>countEval3</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> </size> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -1560,7 +1560,7 @@ <property name="text"> <string>For a difference in the number of balls, the given points are added to the evaluation. A difference of 6 only can be a lost/won game.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -1642,7 +1642,7 @@ <property name="text"> <string>Your evaluation scheme, defined in all other tabs of this dialog, can be stored here.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/kenolaba/EvalScheme.cpp b/kenolaba/EvalScheme.cpp index 0d179a85..d884f398 100644 --- a/kenolaba/EvalScheme.cpp +++ b/kenolaba/EvalScheme.cpp @@ -76,7 +76,7 @@ void EvalScheme::setDefaults() void EvalScheme::read(KConfig *config) { - TQString confSection = TQString("%1 Evaluation Scheme").tqarg(_name); + TQString confSection = TQString("%1 Evaluation Scheme").arg(_name); config->setGroup(confSection); TQStringList list; @@ -117,7 +117,7 @@ void EvalScheme::read(KConfig *config) void EvalScheme::save(KConfig* config) { - TQString confSection = TQString("%1 Evaluation Scheme").tqarg(_name); + TQString confSection = TQString("%1 Evaluation Scheme").arg(_name); config->setGroup(confSection); TQString entry; @@ -128,12 +128,12 @@ void EvalScheme::save(KConfig* config) entry.sprintf("%d", _moveValue[0]); for(int i=1;i<Move::typeCount;i++) - entry += TQString(", %1").tqarg( _moveValue[i] ); + entry += TQString(", %1").arg( _moveValue[i] ); config->writeEntry("MoveValues", entry); entry.sprintf("%d", _inARowValue[0]); for(int i=1;i<InARowCounter::inARowCount;i++) - entry += TQString(", %1").tqarg( _inARowValue[i] ); + entry += TQString(", %1").arg( _inARowValue[i] ); config->writeEntry("InARowValues", entry); entry.sprintf("%d,%d,%d,%d,%d", _ringValue[0], _ringValue[1], @@ -217,15 +217,15 @@ TQString EvalScheme::ascii() res.sprintf("%s=%d", _name.ascii(), _stoneValue[1]); for(i=1;i<6;i++) - res += TQString(",%1").tqarg( _stoneValue[i] ); + res += TQString(",%1").arg( _stoneValue[i] ); for(i=0;i<Move::typeCount;i++) - res += TQString(",%1").tqarg( _moveValue[i] ); + res += TQString(",%1").arg( _moveValue[i] ); for(i=0;i<InARowCounter::inARowCount;i++) - res += TQString(",%1").tqarg( _inARowValue[i] ); + res += TQString(",%1").arg( _inARowValue[i] ); for(i=0;i<5;i++) - res += TQString(",%1").tqarg( _ringValue[i] ); + res += TQString(",%1").arg( _ringValue[i] ); for(i=0;i<5;i++) - res += TQString(",%1").tqarg( _ringDiff[i] ); + res += TQString(",%1").arg( _ringDiff[i] ); return res; } diff --git a/kenolaba/Spy.cpp b/kenolaba/Spy.cpp index e9abc41e..079575b4 100644 --- a/kenolaba/Spy.cpp +++ b/kenolaba/Spy.cpp @@ -5,7 +5,7 @@ #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> @@ -23,8 +23,8 @@ Spy::Spy(Board& b) TQLabel *l = new TQLabel(this); l->setText( i18n("Actual examined position:") ); - l->setFixedHeight( l->tqsizeHint().height() ); - l->tqsetAlignment( AlignVCenter | AlignLeft ); + l->setFixedHeight( l->sizeHint().height() ); + l->setAlignment( AlignVCenter | AlignLeft ); top->addWidget( l ); TQHBoxLayout* b1 = new TQHBoxLayout(); @@ -38,8 +38,8 @@ Spy::Spy(Board& b) actLabel[i] = new TQLabel(this); actLabel[i]->setText("---"); // actLabel[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - actLabel[i]->tqsetAlignment( AlignHCenter | AlignVCenter); - actLabel[i]->setFixedHeight( actLabel[i]->tqsizeHint().height() ); + actLabel[i]->setAlignment( AlignHCenter | AlignVCenter); + actLabel[i]->setFixedHeight( actLabel[i]->sizeHint().height() ); b2->addWidget( actBoard[i] ); b2->addWidget( actLabel[i] ); @@ -48,8 +48,8 @@ Spy::Spy(Board& b) l = new TQLabel(this); l->setText( i18n("Best move so far:") ); - l->setFixedHeight( l->tqsizeHint().height() ); - l->tqsetAlignment( AlignVCenter | AlignLeft ); + l->setFixedHeight( l->sizeHint().height() ); + l->setAlignment( AlignVCenter | AlignLeft ); top->addWidget( l ); b1 = new TQHBoxLayout(); @@ -63,8 +63,8 @@ Spy::Spy(Board& b) bestLabel[i] = new TQLabel(this); bestLabel[i]->setText("---"); // bestLabel[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - bestLabel[i]->tqsetAlignment( AlignHCenter | AlignVCenter); - bestLabel[i]->setFixedHeight( bestLabel[i]->tqsizeHint().height() ); + bestLabel[i]->setAlignment( AlignHCenter | AlignVCenter); + bestLabel[i]->setFixedHeight( bestLabel[i]->sizeHint().height() ); b2->addWidget( bestBoard[i] ); b2->addWidget( bestLabel[i] ); diff --git a/kenolaba/Spy.h b/kenolaba/Spy.h index 719b8d4f..e66fd5eb 100644 --- a/kenolaba/Spy.h +++ b/kenolaba/Spy.h @@ -7,7 +7,7 @@ #define _SPY_H_ -#include <tqlayout.h> +#include <layout.h> #include "Board.h" diff --git a/kfouleggs/piece.cpp b/kfouleggs/piece.cpp index c2e8a186..075bac7a 100644 --- a/kfouleggs/piece.cpp +++ b/kfouleggs/piece.cpp @@ -28,7 +28,7 @@ TQColor FEPieceInfo::defaultColor(uint i) const TQString FEPieceInfo::colorLabel(uint i) const { return (i==NB_NORM_BLOCK_TYPES ? i18n("Garbage color:") - : i18n("Color #%1:").tqarg(i+1)); + : i18n("Color #%1:").arg(i+1)); } void FEPieceInfo::draw(TQPixmap *pixmap, uint blockType, uint, diff --git a/kgoldrunner/gamedata/levels.tar b/kgoldrunner/gamedata/levels.tar Binary files differindex 1e30bd67..851ff50e 100644 --- a/kgoldrunner/gamedata/levels.tar +++ b/kgoldrunner/gamedata/levels.tar diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index da4c73b3..949f30d6 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -572,10 +572,10 @@ void KGoldrunner::gameFreeze (bool on_off) { if (on_off) statusBar()->changeItem - (i18n("Press \"%1\" to RESUME").tqarg(pauseKeys), ID_MSG); + (i18n("Press \"%1\" to RESUME").arg(pauseKeys), ID_MSG); else statusBar()->changeItem - (i18n("Press \"%1\" to PAUSE").tqarg(pauseKeys), ID_MSG); + (i18n("Press \"%1\" to PAUSE").arg(pauseKeys), ID_MSG); } void KGoldrunner::adjustHintAction (bool hintAvailable) @@ -849,7 +849,7 @@ bool KGoldrunner::getDirectories() KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find documentation sub-folder 'en/%1/' " "in area '%2' of the KDE folder ($TDEDIRS).") - .tqarg(myDir).tqarg(dirs->kde_default ("html"))); + .arg(myDir).arg(dirs->kde_default ("html"))); // result = FALSE; // Don't abort if the doc is missing. } else @@ -861,7 +861,7 @@ bool KGoldrunner::getDirectories() KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find system games sub-folder '%1/system/' " "in area '%2' of the KDE folder ($TDEDIRS).") - .tqarg(myDir).tqarg(dirs->kde_default ("data"))); + .arg(myDir).arg(dirs->kde_default ("data"))); result = FALSE; // ABORT if the games data is missing. } else @@ -874,7 +874,7 @@ bool KGoldrunner::getDirectories() KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find or create user games sub-folder '%1/user/' " "in area '%2' of the KDE user area ($TDEHOME).") - .tqarg(myDir).tqarg(dirs->kde_default ("data"))); + .arg(myDir).arg(dirs->kde_default ("data"))); // result = FALSE; // Don't abort if user area is missing. } else { @@ -882,7 +882,7 @@ bool KGoldrunner::getDirectories() if (! create) { KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find or create 'levels/' folder in " - "sub-folder '%1/user/' in the KDE user area ($TDEHOME).").tqarg(myDir)); + "sub-folder '%1/user/' in the KDE user area ($TDEHOME).").arg(myDir)); // result = FALSE; // Don't abort if user area is missing. } } diff --git a/kgoldrunner/src/kgoldrunner.h b/kgoldrunner/src/kgoldrunner.h index 2959b3d0..e346cce1 100644 --- a/kgoldrunner/src/kgoldrunner.h +++ b/kgoldrunner/src/kgoldrunner.h @@ -9,7 +9,7 @@ #include <config.h> #endif -// tqStatus bar +// Status bar const int ID_LIVES = 0; // Field IDs in KDE status bar. const int ID_SCORE = 1; const int ID_LEVEL = 2; @@ -137,7 +137,7 @@ private slots: void showLevel (int); // Show the current level number. void showLives (long); // Show how many lives are remaining. void showScore (long); // Show the player's score. - void gameFreeze (bool); // tqStatus feedback on freeze/unfreeze. + void gameFreeze (bool); // Status feedback on freeze/unfreeze. void adjustHintAction (bool); // Enable/disable "Hint" action. void markRuleType (char ruleType); // Check game's rule type in the menu. diff --git a/kgoldrunner/src/kgrcanvas.cpp b/kgoldrunner/src/kgrcanvas.cpp index b56c2453..cd364d15 100644 --- a/kgoldrunner/src/kgrcanvas.cpp +++ b/kgoldrunner/src/kgrcanvas.cpp @@ -117,7 +117,7 @@ bool KGrCanvas::changeSize (int d) return FALSE; } - TQWMatrix wm = tqworldMatrix(); + TQWMatrix wm = worldMatrix(); double wmScale = 1.0; // Set the scale back to 1:1 and calculate the new scale factor. @@ -210,7 +210,7 @@ void KGrCanvas::makeTitle () title->setPaletteForegroundColor (textColor); title->setFont (TQFont (fontInfo().family(), (baseFontSize * scaleStep) / baseScale, TQFont::Bold)); - title->tqsetAlignment (TQt::AlignCenter); + title->setAlignment (TQt::AlignCenter); title->raise(); title->show(); } @@ -257,12 +257,12 @@ void KGrCanvas::makeHeroSprite (int i, int j, int startFrame) i++; j++; heroSprite->move (i * 4 * STEP, j * 4 * STEP, startFrame); heroSprite->setZ (1); - heroSprite->tqsetVisible (TRUE); + heroSprite->setVisible (TRUE); } void KGrCanvas::setHeroVisible (bool newState) { - heroSprite->tqsetVisible (newState); // Show or hide the hero. + heroSprite->setVisible (newState); // Show or hide the hero. } void KGrCanvas::makeEnemySprite (int i, int j, int startFrame) diff --git a/kgoldrunner/src/kgrconsts.h b/kgoldrunner/src/kgrconsts.h index ce5ada47..2006648a 100644 --- a/kgoldrunner/src/kgrconsts.h +++ b/kgoldrunner/src/kgrconsts.h @@ -70,7 +70,7 @@ enum Position {RIGHTWALK1,RIGHTWALK2,RIGHTWALK3,RIGHTWALK4, LEFTCLIMB1,LEFTCLIMB2,LEFTCLIMB3,LEFTCLIMB4, CLIMB1,CLIMB2, FALL1,FALL2}; -enum tqStatus {STANDING,FALLING,WALKING,CLIMBING,CAPTIVE}; +enum Status {STANDING,FALLING,WALKING,CLIMBING,CAPTIVE}; enum Direction {RIGHT,LEFT,UP,DOWN,STAND}; enum SearchStrategy {LOW,MEDIUM,HIGH}; diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index 9a5ecb44..4a58b235 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -132,7 +132,7 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, TQPoint p = parent->mapToGlobal (TQPoint (0,0)); - // Base the tqgeometry of the dialog box on the playing area. + // Base the geometry of the dialog box on the playing area. int cell = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*cell, p.y()+2*cell); dad-> setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell); @@ -357,7 +357,7 @@ void KGrSLDialog::slAboutColln () { // User clicked the "About" button ... int n = slCollnIndex; - TQString title = i18n("About \"%1\"").tqarg(collections.at(n)->name); + TQString title = i18n("About \"%1\"").arg(collections.at(n)->name); if (collections.at(n)->about.length() > 0) { // Convert game description to ASCII and UTF-8 codes, then translate it. @@ -404,7 +404,7 @@ void KGrSLDialog::slPaintLevel () TQString filePath = game->getFilePath (collections.at(n)->owner, collections.at(n), number->value()); thumbNail->setFilePath (filePath, slName); - thumbNail->tqrepaint(); // Will call "drawContents (p)". + thumbNail->repaint(); // Will call "drawContents (p)". } void KGrSLDialog::slotHelp () @@ -537,14 +537,14 @@ KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint, dad-> setCaption (i18n("Edit Name & Hint")); #endif - // Base the tqgeometry of the text box on the playing area. + // Base the geometry of the text box on the playing area. TQPoint p = parent->mapToGlobal (TQPoint (0,0)); int c = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+4*c, p.y()+4*c); mle-> setMinimumSize ((FIELDWIDTH*c/2), (FIELDHEIGHT/2)*c); // Configure the text box. - mle-> tqsetAlignment (AlignLeft); + mle-> setAlignment (AlignLeft); #ifndef QT3 mle-> setWordWrap (TQMultiLineEdit::WidgetWidth); mle-> setFixedVisibleLines (9); @@ -642,7 +642,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, TQPoint p = parent->mapToGlobal (TQPoint (0,0)); - // Base the tqgeometry of the dialog box on the playing area. + // Base the geometry of the dialog box on the playing area. int cell = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*cell, p.y()+2*cell); dad-> setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell); @@ -669,7 +669,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, collections.at(defaultGame)->nLevels)); #else nLevL-> setText (i18n("%1 levels") - .tqarg(collections.at(defaultGame)->nLevels)); + .arg(collections.at(defaultGame)->nLevels)); #endif OKText = i18n("Save Changes"); } @@ -694,7 +694,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, } // Configure the edit box. - mle-> tqsetAlignment (AlignLeft); + mle-> setAlignment (AlignLeft); #ifndef QT3 mle-> setWordWrap (TQMultiLineEdit::WidgetWidth); mle-> setFixedVisibleLines (8); @@ -802,7 +802,7 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames, dad-> setCaption (i18n("Select Saved Game")); - // Base the tqgeometry of the list box on the playing area. + // Base the geometry of the list box on the playing area. TQPoint p = parent->mapToGlobal (TQPoint (0,0)); int c = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*c, p.y()+2*c); @@ -942,7 +942,7 @@ void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents) mm-> setCaption (title); - // Base the tqgeometry of the text box on the playing area. + // Base the geometry of the text box on the playing area. TQPoint p = parent->mapToGlobal (TQPoint (0,0)); int c = parent->width() / (FIELDWIDTH + 4); mm-> move (p.x()+4*c, p.y()+4*c); @@ -950,7 +950,7 @@ void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents) OK-> setMaximumWidth (3*c); mle-> setFrameStyle (TQFrame::NoFrame); - mle-> tqsetAlignment (AlignLeft); + mle-> setAlignment (AlignLeft); mle-> setReadOnly (TRUE); mle-> setText (contents); diff --git a/kgoldrunner/src/kgrdialog.h b/kgoldrunner/src/kgrdialog.h index cfa65de6..7d24e865 100644 --- a/kgoldrunner/src/kgrdialog.h +++ b/kgoldrunner/src/kgrdialog.h @@ -25,7 +25,7 @@ #include <kmessagebox.h> #endif -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqscrollbar.h> @@ -35,7 +35,7 @@ #include <tqbuttongroup.h> #include <tqradiobutton.h> #ifdef QT3 -#include <tqtextedit.h> +#include <textedit.h> #else #include <tqmultilineedit.h> #endif @@ -187,7 +187,7 @@ private: *******************************************************************************/ #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> class KGrLGDialog : public KGR_DIALOG // KGR_PORTABLE sets TQDialog/KDialogBase { diff --git a/kgoldrunner/src/kgrfigure.cpp b/kgoldrunner/src/kgrfigure.cpp index 7c640e88..272c571e 100644 --- a/kgoldrunner/src/kgrfigure.cpp +++ b/kgoldrunner/src/kgrfigure.cpp @@ -76,7 +76,7 @@ int KGrFigure::gety() return absy; } -tqStatus KGrFigure::gettqStatus() +Status KGrFigure::getStatus() { return status; } @@ -733,7 +733,7 @@ bool KGrHero::standOnEnemy() (((absx - 16) < enemy->getx()) && ((absx + 16) > enemy->getx()))) { if (((absy + 12) == enemy->gety()) && - (enemy->gettqStatus() != FALLING)) { + (enemy->getStatus() != FALLING)) { absy = absy - rely; // Bounce back from overlap, to avoid rely = 0; // hero-enemy mid-cycle deadlock. walkCounter = 1; @@ -807,7 +807,7 @@ KGrEnemy :: KGrEnemy (KGrCanvas * view, int x, int y) walkCounter = 1; captiveCounter = 0; - searchtqStatus = HORIZONTAL; + searchStatus = HORIZONTAL; birthX=x; birthY=y; @@ -849,7 +849,7 @@ void KGrEnemy::showState(char option) case 's': printf (" nuggets %02d status %d walk-ctr %d ", nuggets, status, walkCounter); printf ("dirn %d search %d capt-ctr %d\n", - direction, searchtqStatus, captiveCounter); + direction, searchStatus, captiveCounter); printf (" rel (%02d,%02d) abs (%03d,%03d)", relx, rely, absx, absy); printf (" pix %02d", actualPixmap); @@ -907,7 +907,7 @@ void KGrEnemy::walkTimeDone () case RIGHT: walkRight (WALKDELAY, FALLDELAY); break; case LEFT: walkLeft (WALKDELAY, FALLDELAY); break; default: // Switch search direction in KGoldrunner search (only). - searchtqStatus = (searchtqStatus==VERTIKAL) ? + searchStatus = (searchStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL; // In KGoldrunner rules, if a hole opens under an enemy @@ -942,7 +942,7 @@ void KGrEnemy::walkTimeDone () // In KGoldrunner rules, change the search strategy, // to avoid enemy-enemy deadlock. - searchtqStatus = (searchtqStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL; + searchStatus = (searchStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL; dirn = searchbestway (x, y, herox, heroy); if ((dirn != direction) && ((*playfield)[x][y]->whatIam() != USEDHOLE)) { @@ -1221,7 +1221,7 @@ Direction KGrEnemy::searchbestway(int ew,int eh,int hw,int hh) // KGoldrunner search strategy. case MEDIUM: case HIGH: - if(searchtqStatus==VERTIKAL){ + if(searchStatus==VERTIKAL){ if (eh > hh) return searchupway(ew,eh); if (eh < hh) diff --git a/kgoldrunner/src/kgrfigure.h b/kgoldrunner/src/kgrfigure.h index fd7de606..ab49ceb9 100644 --- a/kgoldrunner/src/kgrfigure.h +++ b/kgoldrunner/src/kgrfigure.h @@ -54,7 +54,7 @@ public: // dependent on number of enemies. int getx(); int gety(); - tqStatus gettqStatus(); + Status getStatus(); int getnuggets(); void setNuggets(int n); @@ -81,7 +81,7 @@ protected: TQTimer *fallTimer; KGrObject *(*playfield)[30][22]; - tqStatus status; + Status status; Direction direction; bool canWalkRight(); bool canWalkLeft(); @@ -185,7 +185,7 @@ public: private: KGrCanvas * enemyView; int birthX, birthY; - int searchtqStatus; + int searchStatus; int captiveCounter; TQTimer *captiveTimer; bool canWalkUp(); diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index a52abe01..6962d7a1 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -190,7 +190,7 @@ void KGrGame::goUpOneLevel() KGrMessage::information (view, collection->name, i18n("<b>CONGRATULATIONS !!!!</b>" "<p>You have conquered the last level in the %1 game !!</p>") - .tqarg("<b>\"" + collection->name + "\"</b>")); + .arg("<b>\"" + collection->name + "\"</b>")); checkHighScore(); // Check if there is a high score for this game. unfreeze(); @@ -384,7 +384,7 @@ void KGrGame::startTutorial() KGrMessage::information (view, i18n("Start Tutorial"), i18n("Cannot find the tutorial game (file-prefix %1) in " "the %2 files.") - .tqarg("'tute'").tqarg("'games.dat'")); + .arg("'tute'").arg("'games.dat'")); } } @@ -514,14 +514,14 @@ bool KGrGame::openLevelFile (int levelNo, TQFile & openlevel) KGrMessage::information (view, i18n("Load Level"), i18n("Cannot find file '%1'. Please make sure '%2' has been " "run in the '%3' folder.") - .tqarg(filePath).tqarg("tar xf levels.tar").tqarg(systemDataDir.myStr())); + .arg(filePath).arg("tar xf levels.tar").arg(systemDataDir.myStr())); return (FALSE); } // �ffne Level zum lesen if (! openlevel.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Load Level"), - i18n("Cannot open file '%1' for read-only.").tqarg(filePath)); + i18n("Cannot open file '%1' for read-only.").arg(filePath)); return (FALSE); } @@ -769,7 +769,7 @@ void KGrGame::saveGame() // Save game ID, score and level. { if (editMode) {myMessage (view, i18n("Save Game"), i18n("Sorry, you cannot save your game play while you are editing. " - "Please try menu item %1.").tqarg("\"" + i18n("&Save Edits...") + "\"")); + "Please try menu item %1.").arg("\"" + i18n("&Save Edits...") + "\"")); return; } if (hero->started) {myMessage (view, i18n("Save Game"), @@ -778,7 +778,7 @@ void KGrGame::saveGame() // Save game ID, score and level. "level, not as they are now.")); } - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); TQTime now = TQTime::currentTime(); TQString saved; TQString day; @@ -800,7 +800,7 @@ void KGrGame::saveGame() // Save game ID, score and level. if (! file2.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Save Game"), i18n("Cannot open file '%1' for output.") - .tqarg(userDataDir + "savegame.tmp")); + .arg(userDataDir + "savegame.tmp")); return; } TQTextStream text2 (&file2); @@ -810,7 +810,7 @@ void KGrGame::saveGame() // Save game ID, score and level. if (! file1.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Save Game"), i18n("Cannot open file '%1' for read-only.") - .tqarg(userDataDir + "savegame.dat")); + .arg(userDataDir + "savegame.dat")); return; } @@ -848,7 +848,7 @@ void KGrGame::loadGame() // Re-load game, score and level. if (! savedGames.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Load Game"), i18n("Cannot open file '%1' for read-only.") - .tqarg(userDataDir + "savegame.dat")); + .arg(userDataDir + "savegame.dat")); return; } @@ -899,7 +899,7 @@ void KGrGame::loadGame() // Re-load game, score and level. } else { KGrMessage::information (view, i18n("Load Game"), - i18n("Cannot find the game with prefix '%1'.").tqarg(pr)); + i18n("Cannot find the game with prefix '%1'.").arg(pr)); } } @@ -947,7 +947,7 @@ void KGrGame::checkHighScore() if (! high1.open (IO_ReadOnly)) { TQString high1_name = high1.name(); KGrMessage::information (view, i18n("Check for High Score"), - i18n("Cannot open file '%1' for read-only.").tqarg(high1_name)); + i18n("Cannot open file '%1' for read-only.").arg(high1_name)); return; } @@ -987,7 +987,7 @@ void KGrGame::checkHighScore() if (! high2.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Check for High Score"), i18n("Cannot open file '%1' for output.") - .tqarg(userDataDir + "hi_" + collection->prefix + ".tmp")); + .arg(userDataDir + "hi_" + collection->prefix + ".tmp")); return; } @@ -1034,7 +1034,7 @@ void KGrGame::checkHighScore() delete hsn; - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); TQString hsDate; #ifdef QT3 TQString day = today.shortDayName(today.dayOfWeek()); @@ -1132,7 +1132,7 @@ void KGrGame::showHighScores() if (! high1.exists()) { KGrMessage::information (view, i18n("Show High Scores"), i18n("Sorry, there are no high scores for the %1 game yet.") - .tqarg("\"" + collection->name + "\"")); + .arg("\"" + collection->name + "\"")); return; } } @@ -1140,7 +1140,7 @@ void KGrGame::showHighScores() if (! high1.open (IO_ReadOnly)) { TQString high1_name = high1.name(); KGrMessage::information (view, i18n("Show High Scores"), - i18n("Cannot open file '%1' for read-only.").tqarg(high1_name)); + i18n("Cannot open file '%1' for read-only.").arg(high1_name)); return; } @@ -1154,7 +1154,7 @@ void KGrGame::showHighScores() TQLabel * hsHeader = new TQLabel (i18n ( "<center><h2>KGoldrunner Hall of Fame</h2></center><br>" "<center><h3>\"%1\" Game</h3></center>") - .tqarg(collection->name), + .arg(collection->name), hs); TQLabel * hsColHeader = new TQLabel ( i18n(" Name " @@ -1584,7 +1584,7 @@ bool KGrGame::saveLevelFile() // Open the output file. if (! levelFile.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Save Level"), - i18n("Cannot open file '%1' for output.").tqarg(filePath)); + i18n("Cannot open file '%1' for output.").arg(filePath)); return (FALSE); } @@ -1642,8 +1642,8 @@ void KGrGame::moveLevelFile () KGrMessage::information (view, i18n("Move Level"), i18n("You must first load a level to be moved. Use " "the %1 or %2 menu.") - .tqarg("\"" + i18n("Game") + "\"") - .tqarg("\"" + i18n("Editor") + "\"")); + .arg("\"" + i18n("Game") + "\"") + .arg("\"" + i18n("Editor") + "\"")); return; } @@ -1780,7 +1780,7 @@ void KGrGame::deleteLevelFile () } else { KGrMessage::information (view, i18n("Delete Level"), - i18n("Cannot find file '%1' to be deleted.").tqarg(filePath)); + i18n("Cannot find file '%1' to be deleted.").arg(filePath)); return; } @@ -1883,7 +1883,7 @@ void KGrGame::editCollection (int action) if (duplicatePrefix) { KGrMessage::information (view, i18n("Save Game Info"), i18n("The filename prefix '%1' is already in use.") - .tqarg(ecPrefix)); + .arg(ecPrefix)); continue; } } @@ -2061,7 +2061,7 @@ bool KGrGame::reNumberLevels (int cIndex, int first, int last, int inc) if (! dir.rename (file1, file2, TRUE)) { // Allow absolute paths. KGrMessage::information (view, i18n("Save Level"), i18n("Cannot rename file '%1' to '%2'.") - .tqarg(file1).tqarg(file2)); + .arg(file1).arg(file2)); return (FALSE); } i = i + step; @@ -2181,8 +2181,8 @@ int KGrGame::selectLevel (int action, int requestedLevel) KGrMessage::information (view, i18n("Select Level"), i18n("There is no level %1 in %2, " "so you cannot play or edit it.") - .tqarg(selectedLevel) - .tqarg("\"" + collections.at(selectedGame)->name + "\"")); + .arg(selectedLevel) + .arg("\"" + collections.at(selectedGame)->name + "\"")); selectedLevel = 0; // Set an invalid selection. continue; // Re-run the dialog box. } @@ -2372,10 +2372,10 @@ void KGrGame::mapCollections() i18n("There is no folder '%1' to hold levels for" " the '%2' game. Please make sure '%3' " "has been run in the '%4' folder.") - .tqarg(d_path) - .tqarg(colln->name) - .tqarg("tar xf levels.tar") - .tqarg(systemDataDir)); + .arg(d_path) + .arg(colln->name) + .arg("tar xf levels.tar") + .arg(systemDataDir)); } continue; } @@ -2388,9 +2388,9 @@ void KGrGame::mapCollections() if ((files->count() <= 0) && (colln->nLevels > 0)) { KGrMessage::information (view, i18n("Check Games & Levels"), i18n("There are no files '%1/%2???.grl' for the %3 game.") - .tqarg(d_path) - .tqarg(colln->prefix) - .tqarg("\"" + colln->name + "\"")); + .arg(d_path) + .arg(colln->prefix) + .arg("\"" + colln->name + "\"")); continue; } @@ -2413,8 +2413,8 @@ void KGrGame::mapCollections() i18n("Check Games & Levels"), i18n("File '%1' is beyond the highest level for " "the %2 game and cannot be played.") - .tqarg(fileName1) - .tqarg("\"" + colln->name + "\"")); + .arg(fileName1) + .arg("\"" + colln->name + "\"")); break; } else if (fileName1 == fileName2) { @@ -2426,16 +2426,16 @@ void KGrGame::mapCollections() i18n("Check Games & Levels"), i18n("File '%1' is before the lowest level for " "the %2 game and cannot be played.") - .tqarg(fileName1) - .tqarg("\"" + colln->name + "\"")); + .arg(fileName1) + .arg("\"" + colln->name + "\"")); break; } else { KGrMessage::information (view, i18n("Check Games & Levels"), i18n("Cannot find file '%1' for the %2 game.") - .tqarg(fileName2) - .tqarg("\"" + colln->name + "\"")); + .arg(fileName2) + .arg("\"" + colln->name + "\"")); lev++; } } @@ -2457,14 +2457,14 @@ bool KGrGame::loadCollections (Owner o) if (o == SYSTEM) { KGrMessage::information (view, i18n("Load Game Info"), i18n("Cannot find game info file '%1'.") - .tqarg(filePath)); + .arg(filePath)); } return (FALSE); } if (! c.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Load Game Info"), - i18n("Cannot open file '%1' for read-only.").tqarg(filePath)); + i18n("Cannot open file '%1' for read-only.").arg(filePath)); return (FALSE); } @@ -2513,7 +2513,7 @@ bool KGrGame::loadCollections (Owner o) // Not EOF: it's an empty line or out-of-context "about" line. KGrMessage::information (view, i18n("Load Game Info"), i18n("Format error in game info file '%1'.") - .tqarg(filePath)); + .arg(filePath)); c.close(); return (FALSE); } @@ -2542,7 +2542,7 @@ bool KGrGame::saveCollections (Owner o) // Open the output file. if (! c.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Save Game Info"), - i18n("Cannot open file '%1' for output.").tqarg(filePath)); + i18n("Cannot open file '%1' for output.").arg(filePath)); return (FALSE); } diff --git a/kgoldrunner/src/kgrgame.h b/kgoldrunner/src/kgrgame.h index 2b0f26c8..5940d20c 100644 --- a/kgoldrunner/src/kgrgame.h +++ b/kgoldrunner/src/kgrgame.h @@ -17,7 +17,7 @@ // "endData" checks for an end-of-file condition. // #define myStr latin1 -#define myChar(i) tqat((i)).latin1() +#define myChar(i) at((i)).latin1() #define endData atEnd #include <tqobject.h> @@ -31,7 +31,7 @@ #include <tqdir.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdatastream.h> #include <tqcolor.h> diff --git a/kjumpingcube/kcubeboxwidget.cpp b/kjumpingcube/kcubeboxwidget.cpp index 815acb6d..e68b2277 100644 --- a/kjumpingcube/kcubeboxwidget.cpp +++ b/kjumpingcube/kcubeboxwidget.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kconfig.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <assert.h> #include <kcursor.h> @@ -453,13 +453,13 @@ void KCubeBoxWidget::initCubes() int i,j; // create Layout - tqlayout=new TQGridLayout(this,s,s); + layout=new TQGridLayout(this,s,s); for(i=0;i<s;i++) { - tqlayout->setRowStretch(i,1); - tqlayout->setColStretch(i,1); + layout->setRowStretch(i,1); + layout->setColStretch(i,1); } @@ -474,7 +474,7 @@ void KCubeBoxWidget::initCubes() { cubes[i][j]=new KCubeWidget(this); cubes[i][j]->setCoordinates(i,j); - tqlayout->addWidget(cubes[i][j],i,j); + layout->addWidget(cubes[i][j],i,j); cubes[i][j]->show(); connect(cubes[i][j],TQT_SIGNAL(clicked(int,int,bool)),TQT_SLOT(stopHint())); connect(cubes[i][j],TQT_SIGNAL(clicked(int,int,bool)),TQT_SLOT(checkClick(int,int,bool))); @@ -504,15 +504,15 @@ void KCubeBoxWidget::initCubes() } -TQSize KCubeBoxWidget::tqsizeHint() const +TQSize KCubeBoxWidget::sizeHint() const { return TQSize(400,400); } void KCubeBoxWidget::deleteCubes() { - if(tqlayout) - delete tqlayout; + if(layout) + delete layout; CubeBoxBase<KCubeWidget>::deleteCubes(); } diff --git a/kjumpingcube/kcubeboxwidget.h b/kjumpingcube/kcubeboxwidget.h index d1cc160c..5e21fa57 100644 --- a/kjumpingcube/kcubeboxwidget.h +++ b/kjumpingcube/kcubeboxwidget.h @@ -131,7 +131,7 @@ signals: void stoppedThinking(); protected: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void deleteCubes(); virtual void initCubes(); @@ -147,7 +147,7 @@ protected slots: private: void init(); - TQGridLayout *tqlayout; + TQGridLayout *layout; CubeBox *undoBox; Brain brain; diff --git a/kjumpingcube/kcubewidget.cpp b/kjumpingcube/kcubewidget.cpp index 9757da99..f3db2828 100644 --- a/kjumpingcube/kcubewidget.cpp +++ b/kjumpingcube/kcubewidget.cpp @@ -93,7 +93,7 @@ KCubeWidget::KCubeWidget(TQWidget* parent,const char* name setPalette(kapp->palette()); // show values - tqrepaint(false); + repaint(false); } KCubeWidget::~KCubeWidget() diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp index a35dcf19..32b19673 100644 --- a/kjumpingcube/kjumpingcube.cpp +++ b/kjumpingcube/kjumpingcube.cpp @@ -64,7 +64,7 @@ KJumpingCube::KJumpingCube() statusBar()->insertItem(s,ID_STATUS_TURN_TEXT, false); statusBar()->changeItem(s,ID_STATUS_TURN_TEXT); statusBar()->setItemAlignment (ID_STATUS_TURN_TEXT, AlignLeft | AlignVCenter); - statusBar()->setFixedHeight( statusBar()->tqsizeHint().height() ); + statusBar()->setFixedHeight( statusBar()->sizeHint().height() ); currentPlayer = new TQWidget(this, "currentPlayer"); currentPlayer->setFixedWidth(40); @@ -123,7 +123,7 @@ void KJumpingCube::saveGame(bool saveAs) if(KIO::NetAccess::exists(url,false,this)) { TQString mes=i18n("The file %1 exists.\n" - "Do you want to overwrite it?").tqarg(url.url()); + "Do you want to overwrite it?").arg(url.url()); result = KMessageBox::warningContinueCancel(this, mes, TQString(), i18n("Overwrite")); if(result==KMessageBox::Cancel) return; @@ -147,12 +147,12 @@ void KJumpingCube::saveGame(bool saveAs) if(KIO::NetAccess::upload( tempFile.name(),gameURL,this )) { TQString s=i18n("game saved as %1"); - s=s.tqarg(gameURL.url()); + s=s.arg(gameURL.url()); statusBar()->message(s,MESSAGE_TIME); } else { - KMessageBox::sorry(this,i18n("There was an error in saving file\n%1").tqarg(gameURL.url())); + KMessageBox::sorry(this,i18n("There was an error in saving file\n%1").arg(gameURL.url())); } } @@ -168,7 +168,7 @@ void KJumpingCube::openGame() return; if(!KIO::NetAccess::exists(url,true,this)) { - TQString mes=i18n("The file %1 does not exist!").tqarg(url.url()); + TQString mes=i18n("The file %1 does not exist!").arg(url.url()); KMessageBox::sorry(this,mes); fileOk=false; } @@ -183,7 +183,7 @@ void KJumpingCube::openGame() if(!config.hasKey("Version")) { TQString mes=i18n("The file %1 isn't a KJumpingCube gamefile!") - .tqarg(url.url()); + .arg(url.url()); KMessageBox::sorry(this,mes); return; } @@ -197,7 +197,7 @@ void KJumpingCube::openGame() KIO::NetAccess::removeTempFile( tempFile ); } else - KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() )); } void KJumpingCube::stop() @@ -223,11 +223,11 @@ void KJumpingCube::changePlayer(int newPlayer) { undoAction->setEnabled(true); currentPlayer->setBackgroundColor(newPlayer == 1 ? Prefs::color1() : Prefs::color2()); - currentPlayer->tqrepaint(); + currentPlayer->repaint(); } void KJumpingCube::showWinner(int player) { - TQString s=i18n("Winner is Player %1!").tqarg(player); + TQString s=i18n("Winner is Player %1!").arg(player); KMessageBox::information(this,s,i18n("Winner")); view->reset(); } diff --git a/kjumpingcube/settings.ui b/kjumpingcube/settings.ui index 30b4010a..b0d16132 100644 --- a/kjumpingcube/settings.ui +++ b/kjumpingcube/settings.ui @@ -94,7 +94,7 @@ <property name="text"> <string>10x10</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -180,7 +180,7 @@ <property name="text"> <string>Average</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -199,7 +199,7 @@ <property name="text"> <string>Expert</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/klickety/field.cpp b/klickety/field.cpp index 19d7d6ff..335b0b0e 100644 --- a/klickety/field.cpp +++ b/klickety/field.cpp @@ -2,7 +2,7 @@ #include "field.moc" #include <tqwhatsthis.h> -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <klocale.h> diff --git a/klickety/piece.cpp b/klickety/piece.cpp index 2d35300b..fcc2fdff 100644 --- a/klickety/piece.cpp +++ b/klickety/piece.cpp @@ -17,7 +17,7 @@ TQColor KLPieceInfo::defaultColor(uint i) const TQString KLPieceInfo::colorLabel(uint i) const { - return i18n("Color #%1:").tqarg(i+1); + return i18n("Color #%1:").arg(i+1); } void KLPieceInfo::draw(TQPixmap *pixmap, uint blockType, uint bMode, diff --git a/klines/field.cpp b/klines/field.cpp index 088febc2..ef509a33 100644 --- a/klines/field.cpp +++ b/klines/field.cpp @@ -73,7 +73,7 @@ void Field::putBall(int x, int y, char color) if( checkBounds(x,y) ){ field[y][x].setColor(color); erase5Balls(); - tqrepaint(FALSE); + repaint(FALSE); } }*/ void Field::moveBall(int xa, int ya, int xb, int yb) diff --git a/klines/klines.cpp b/klines/klines.cpp index bebc14fe..b0bbe51f 100644 --- a/klines/klines.cpp +++ b/klines/klines.cpp @@ -164,7 +164,7 @@ void KLines::startGame() void KLines::setLevel(int level) { levelStr = i18n(LEVEL[level+2]); - statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0); } void KLines::startDemo() @@ -183,7 +183,7 @@ void KLines::startDemo() bFirst = true; levelStr = i18n("Tutorial"); - statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0); lsb->startDemoMode(); lsb->setGameOver(false); @@ -202,7 +202,7 @@ void KLines::stopDemo() bDemo = false; lsb->hideDemoText(); demoTimer.stop(); - statusBar()->changeItem(i18n(" Level: %1").tqarg(i18n("Tutorial - Stopped")), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(i18n("Tutorial - Stopped")), 0); act_demo->setText(i18n("Start &Tutorial")); } @@ -419,7 +419,7 @@ void KLines::focusOutEvent(TQFocusEvent *ev) { lsb->hideDemoText(); demoTimer.stop(); - statusBar()->changeItem(i18n(" Level: %1").tqarg(i18n("Tutorial - Paused")), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(i18n("Tutorial - Paused")), 0); } KMainWindow::focusOutEvent(ev); } @@ -428,7 +428,7 @@ void KLines::focusInEvent(TQFocusEvent *ev) { if (bDemo) { - statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0); slotDemo(); } KMainWindow::focusInEvent(ev); @@ -528,7 +528,7 @@ void KLines::addScore(int ballsErased) void KLines::updateStat() { - statusBar()->changeItem(i18n(" Score: %1").tqarg(score), 1); + statusBar()->changeItem(i18n(" Score: %1").arg(score), 1); } void KLines::viewHighScore() @@ -540,7 +540,7 @@ void KLines::viewHighScore() void KLines::endGame() { lsb->setGameOver(true); - lsb->tqrepaint(false); + lsb->repaint(false); if (bDemo) return; diff --git a/klines/linesboard.cpp b/klines/linesboard.cpp index 4de4f474..bd5610cb 100644 --- a/klines/linesboard.cpp +++ b/klines/linesboard.cpp @@ -163,7 +163,7 @@ void LinesBoard::placeBall( ) /*id LinesBoard::doAfterBalls() { erase5Balls(); - tqrepaint(FALSE); + repaint(FALSE); } */ /* @@ -306,7 +306,7 @@ void LinesBoard::moveFocus(int dx, int dy) focusX = (focusX + dx + NUMCELLSW) % NUMCELLSW; focusY = (focusY + dy + NUMCELLSH) % NUMCELLSH; } - tqrepaint(FALSE); + repaint(FALSE); } void LinesBoard::moveLeft() @@ -401,7 +401,7 @@ int LinesBoard::AnimEnd( ) else if ( oldanim == ANIM_BURN ) { emit eraseLine( deleteAnimatedBalls() ); - tqrepaint(FALSE); + repaint(FALSE); if ( nextBallToPlace < BALLSDROP ) { placeBall(); @@ -455,7 +455,7 @@ void LinesBoard::AnimNext() { if ( (direction > 0 && animstep == animmax) || ( direction < 0 && animstep == 0)) direction = -direction; animstep += direction; - tqrepaint(FALSE); + repaint(FALSE); } else { if ( animstep >= animmax ) AnimEnd(); @@ -466,7 +466,7 @@ void LinesBoard::AnimNext() { moveBall(way[animstep].x,way[animstep].y,way[animstep+1].x,way[animstep+1].y); animstep++; animdelaycount = animdelaystart; - tqrepaint( FALSE ); + repaint( FALSE ); } } } @@ -698,7 +698,7 @@ void LinesBoard::undo() AnimEnd(); restoreUndo(); restoreRandomState(); - tqrepaint( FALSE ); + repaint( FALSE ); } void LinesBoard::showDemoText(const TQString &text) @@ -711,13 +711,13 @@ void LinesBoard::showDemoText(const TQString &text) demoLabel->setAutoMask( FALSE ); demoLabel->setFrameStyle( TQFrame::Plain | TQFrame::Box ); demoLabel->setLineWidth( 1 ); - demoLabel->tqsetAlignment( AlignHCenter | AlignTop ); + demoLabel->setAlignment( AlignHCenter | AlignTop ); demoLabel->setPalette(TQToolTip::palette()); demoLabel->polish(); } demoLabel->setText(text); demoLabel->adjustSize(); - TQSize s = demoLabel->tqsizeHint(); + TQSize s = demoLabel->sizeHint(); TQPoint p = TQPoint(x() + (width()-s.width())/2, y() + (height()-s.height())/2); demoLabel->move(mapToGlobal(p)); demoLabel->show(); diff --git a/klines/mwidget.cpp b/klines/mwidget.cpp index 1492d390..21a55a17 100644 --- a/klines/mwidget.cpp +++ b/klines/mwidget.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include "ballpainter.h" @@ -46,7 +46,7 @@ MainWidget::MainWidget( TQWidget* parent, const char* name ) // warning("width: %i height: %i", width(), height() ); -// warning("wh: %i hh: %i", tqsizeHint().width(), tqsizeHint().height() ); +// warning("wh: %i hh: %i", sizeHint().width(), sizeHint().height() ); } diff --git a/klines/povray/balls.sh b/klines/povray/balls.sh index 66b6ddc2..1897afaa 100755 --- a/klines/povray/balls.sh +++ b/klines/povray/balls.sh @@ -7,7 +7,7 @@ povray -w30 -h30 -V1 -P +A +KI5 +KF6 +KFF6 +SF2 +EF5 -Iball.pov +Ob$1.tga #### burning balls balls povray -w30 -h30 -V1 -P +A +KI0 +KF1 +KFF11 +SF1 +EF5 -Iball.pov +Oe$1.tga -montage -tqgeometry 30x30 -tile 100x1 -page 570x30 a$1??.tga b$1?.tga e$1??.tga bl_$1.tga +montage -geometry 30x30 -tile 100x1 -page 570x30 a$1??.tga b$1?.tga e$1??.tga bl_$1.tga mogrify -crop 570x30+0+0 bl_$1.tga diff --git a/klines/povray/fire.sh b/klines/povray/fire.sh index c3eaa319..2b6b5f9a 100755 --- a/klines/povray/fire.sh +++ b/klines/povray/fire.sh @@ -3,7 +3,7 @@ echo "#declare BallColor = White" >clr.inc if (povray -w30 -h30 -V1 -P +A +KI0 +KF1 +KFF11 +SF6 +EF10 -Iball.pov \ +Ofire.tga) then # mogrify -raise 1x1 e$1??.tga - montage -tqgeometry 30x30 -tile 100x1 -page 150x30 fire*.tga fire.tga + montage -geometry 30x30 -tile 100x1 -page 150x30 fire*.tga fire.tga mogrify -crop 150x30+0+0 fire.tga # animate -delay 7 $1??.tga fi diff --git a/klines/povray/makeballs.sh b/klines/povray/makeballs.sh index 0d937415..62769605 100755 --- a/klines/povray/makeballs.sh +++ b/klines/povray/makeballs.sh @@ -17,7 +17,7 @@ balls.sh Brown "rgb<1/2,1/3,0>" #### montage balls ( 20x7 cells each 30x30) -montage -tqgeometry 570x30 -tile 1x10 bl_*.tga balls.tga +montage -geometry 570x30 -tile 1x10 bl_*.tga balls.tga mogrify -crop 570x210+0+0 balls.tga #### convert to jpeg diff --git a/klines/povray/povray.ini b/klines/povray/povray.ini index 6c01d50a..22ddf8ec 100644 --- a/klines/povray/povray.ini +++ b/klines/povray/povray.ini @@ -10,7 +10,7 @@ ; ; The general form of the options is "Variable=value". Everything ; between the equals sign and the end of the line is considered part -; of the value. The spacing and tqlayout is free-form but only one option +; of the value. The spacing and layout is free-form but only one option ; per line is allowed. Variables and values are not case-sensitive. ; ; Note: characters after a semi-colon are treated as a comment diff --git a/kmahjongg/BoardLayout.cpp b/kmahjongg/BoardLayout.cpp index 8da404ae..6b5671a2 100644 --- a/kmahjongg/BoardLayout.cpp +++ b/kmahjongg/BoardLayout.cpp @@ -1,8 +1,8 @@ #include "BoardLayout.h" #include <tqfile.h> -#include <tqtextstream.h> -#include <tqtextcodec.h> +#include <textstream.h> +#include <textcodec.h> diff --git a/kmahjongg/BoardLayout.h b/kmahjongg/BoardLayout.h index a9a809c7..468bf5bc 100644 --- a/kmahjongg/BoardLayout.h +++ b/kmahjongg/BoardLayout.h @@ -4,7 +4,7 @@ #include <tqstring.h> #include "KmTypes.h" -const TQString layoutMagic1_0 = "kmahjongg-tqlayout-v1.0"; +const TQString layoutMagic1_0 = "kmahjongg-layout-v1.0"; class BoardLayout { diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp index cc80831c..323ccb24 100644 --- a/kmahjongg/Editor.cpp +++ b/kmahjongg/Editor.cpp @@ -1,7 +1,7 @@ #include <stdlib.h> #include <kapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include "Editor.h" @@ -35,7 +35,7 @@ // When we assign a tile to draw in a slot we do it in order from te following -// table, wrapping on the tile number. It makes the tile tqlayout look more +// table, wrapping on the tile number. It makes the tile layout look more // random. @@ -69,10 +69,10 @@ Editor::Editor // setup the tool bar setupToolbar(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 1); - tqlayout->addWidget(topToolbar,0); - tqlayout->addWidget(drawFrame,1); - tqlayout->activate(); + TQVBoxLayout *layout = new TQVBoxLayout(this, 1); + layout->addWidget(topToolbar,0); + layout->addWidget(drawFrame,1); + layout->activate(); resize( sWidth+60, sHeight+60); setMinimumSize( sWidth+60, sHeight+60); @@ -170,7 +170,7 @@ void Editor::setupToolbar() // status in the toolbar for now (ick) theLabel = new TQLabel(statusText(), topToolbar); - int lWidth = theLabel->tqsizeHint().width(); + int lWidth = theLabel->sizeHint().width(); topToolbar->insertWidget(ID_TOOL_STATUS,lWidth, theLabel ); topToolbar->alignItemRight( ID_TOOL_STATUS, true ); @@ -209,19 +209,19 @@ void Editor::topToolbarOption(int option) { break; case ID_TOOL_LEFT: theBoard.shiftLeft(); - tqrepaint(false); + repaint(false); break; case ID_TOOL_RIGHT: theBoard.shiftRight(); - tqrepaint(false); + repaint(false); break; case ID_TOOL_UP: theBoard.shiftUp(); - tqrepaint(false); + repaint(false); break; case ID_TOOL_DOWN: theBoard.shiftDown(); - tqrepaint(false); + repaint(false); break; case ID_TOOL_DEL: mode=remove; @@ -260,7 +260,7 @@ TQString Editor::statusText() { if (x >=BoardLayout::width || x <0 || y >=BoardLayout::height || y <0) x = y = z = 0; - buf = i18n("Tiles: %1 Pos: %2,%3,%4").tqarg(numTiles).tqarg(x).tqarg(y).tqarg(z); + buf = i18n("Tiles: %1 Pos: %2,%3,%4").arg(numTiles).arg(x).arg(y).arg(z); return buf; } @@ -272,7 +272,7 @@ void Editor::loadBoard() { KURL url = KFileDialog::getOpenURL( NULL, - i18n("*.tqlayout|Board Layout (*.tqlayout)\n" + i18n("*.layout|Board Layout (*.layout)\n" "*|All Files"), this, i18n("Open Board Layout" )); @@ -283,7 +283,7 @@ void Editor::loadBoard() { theBoard.loadBoardLayout( url.path() ); - tqrepaint(false); + repaint(false); } @@ -302,14 +302,14 @@ void Editor::newBoard() { clean=true; numTiles=0; statusChanged(); - tqrepaint(false); + repaint(false); } bool Editor::saveBoard() { // get a save file name KURL url = KFileDialog::getSaveURL( NULL, - i18n("*.tqlayout|Board Layout (*.tqlayout)\n" + i18n("*.layout|Board Layout (*.layout)\n" "*|All Files"), this, i18n("Save Board Layout" )); @@ -373,7 +373,7 @@ bool Editor::testSave() // The main paint event, draw in the grid and blit in -// the tiles as specified by the tqlayout. +// the tiles as specified by the layout. void Editor::paintEvent( TQPaintEvent* ) { @@ -386,7 +386,7 @@ void Editor::paintEvent( TQPaintEvent* ) { drawTiles(&buff); bitBlt(dest, 0,0,&buff, 0,0,buff.width(), buff.height(), CopyROP); - drawFrame->tqrepaint(false); + drawFrame->repaint(false); } void Editor::drawBackground(TQPixmap *pixmap) { @@ -564,7 +564,7 @@ void Editor::drawFrameMousePressEvent( TQMouseEvent* e ) numTiles--; statusChanged(); drawFrameMouseMovedEvent(e); - tqrepaint(false); + repaint(false); } break; case insert: { @@ -577,7 +577,7 @@ void Editor::drawFrameMousePressEvent( TQMouseEvent* e ) theBoard.insertTile(n); numTiles++; statusChanged(); - tqrepaint(false); + repaint(false); } } break; @@ -599,7 +599,7 @@ void Editor::drawCursor(POSITION &p, bool visible) if (p.e==100 || !visible) x = -1; drawFrame->setRect(x,y,w,h, tiles.shadowSize(), mode-remove); - drawFrame->tqrepaint(false); + drawFrame->repaint(false); diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp index c38e53b1..637fdf25 100644 --- a/kmahjongg/HighScore.cpp +++ b/kmahjongg/HighScore.cpp @@ -62,7 +62,7 @@ HighScore::HighScore qtarch_Label_3->setGeometry( 10, 45, 30, 30 ); qtarch_Label_3->setFrameStyle( 50 ); qtarch_Label_3->setText( i18n("Pos") ); - qtarch_Label_3->tqsetAlignment( AlignCenter ); + qtarch_Label_3->setAlignment( AlignCenter ); fnt = qtarch_Label_3->font(); fnt.setBold(true); qtarch_Label_3->setFont(fnt); @@ -341,7 +341,7 @@ void HighScore::addRow(int num) { numbersWidgets[num] = new TQLabel( this); numbersWidgets[num]->setGeometry( 10, 75+(num*30), 30, 30 ); numbersWidgets[num]->setFrameStyle( 50 ); - numbersWidgets[num]->tqsetAlignment( AlignRight | AlignVCenter ); + numbersWidgets[num]->setAlignment( AlignRight | AlignVCenter ); numbersWidgets[num]->setNum(num+1); @@ -349,13 +349,13 @@ void HighScore::addRow(int num) { namesWidgets[num] = new TQLabel( this); namesWidgets[num]->setGeometry( 40, 75+(num*30), 150, 30 ); namesWidgets[num]->setFrameStyle( 50 ); - namesWidgets[num]->tqsetAlignment( 289 ); + namesWidgets[num]->setAlignment( 289 ); // board boardWidgets[num] = new TQLabel( this); boardWidgets[num]->setGeometry( 190, 75+(num*30), 80, 30 ); boardWidgets[num]->setFrameStyle( 50 ); - boardWidgets[num]->tqsetAlignment( 289 ); + boardWidgets[num]->setAlignment( 289 ); // score scoresWidgets[num] = new TQLabel( this); @@ -396,11 +396,11 @@ void HighScore::copyTableToScreen(const TQString &name) { elapsedWidgets[p]->setText(buff); } - tqrepaint(false); + repaint(false); } -int HighScore::exec(TQString &tqlayout) { - copyTableToScreen(tqlayout); +int HighScore::exec(TQString &layout) { + copyTableToScreen(layout); return(TQDialog::exec()); } diff --git a/kmahjongg/HighScore.h b/kmahjongg/HighScore.h index a154b3e1..d5513508 100644 --- a/kmahjongg/HighScore.h +++ b/kmahjongg/HighScore.h @@ -41,7 +41,7 @@ public: virtual ~HighScore(); - int exec(TQString &tqlayout); + int exec(TQString &layout); void checkHighScore(int score, int elapsed, long game, TQString &board); diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp index ff635e5c..9c6ac478 100644 --- a/kmahjongg/Preview.cpp +++ b/kmahjongg/Preview.cpp @@ -41,7 +41,7 @@ Preview::Preview(TQWidget* parent) : KDialogBase(parent), m_tiles(true) m_changed = false; setMainWidget(page); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } Preview::~Preview() @@ -52,7 +52,7 @@ void Preview::selectionChanged(int which) { m_selectedFile = m_fileList[which]; drawPreview(); - m_drawFrame->tqrepaint(0,0,-1,-1,false); + m_drawFrame->repaint(0,0,-1,-1,false); markChanged(); } @@ -76,7 +76,7 @@ void Preview::initialise(const PreviewType type) TQString extension; TQString tile = Prefs::tileSet(); TQString back = Prefs::background(); - TQString tqlayout = Prefs::layout(); + TQString layout = Prefs::layout(); // set up the concept of the current file. Initialised to the preferences // value initially. Set the caption to indicate what we are doing @@ -98,10 +98,10 @@ void Preview::initialise(const PreviewType type) break; case board: - m_fileSelector = i18n("*.tqlayout|Board Layout File (*.tqlayout)\n"); + m_fileSelector = i18n("*.layout|Board Layout File (*.layout)\n"); setCaption(i18n("Change Board Layout")); - m_selectedFile = tqlayout; - extension = "*.tqlayout"; + m_selectedFile = layout; + extension = "*.layout"; break; case theme: @@ -162,12 +162,12 @@ void Preview::load() { if ( !url.isEmpty() ) { m_selectedFile = url.path(); drawPreview(); - m_drawFrame->tqrepaint(0,0,-1,-1,false); + m_drawFrame->repaint(0,0,-1,-1,false); markChanged(); } } -// Top level preview drawing method. Background, tileset and tqlayout +// Top level preview drawing method. Background, tileset and layout // are initialised from the preferences. Depending on the type // of preview dialog we pick up the selected file for one of these // chaps. @@ -176,7 +176,7 @@ void Preview::drawPreview() { TQString tile = Prefs::tileSet(); TQString back = Prefs::background(); - TQString tqlayout = Prefs::layout(); + TQString layout = Prefs::layout(); switch (m_previewType) { @@ -189,12 +189,12 @@ void Preview::drawPreview() break; case board: - tqlayout = m_selectedFile; + layout = m_selectedFile; break; case theme: // a theme is quite a bit of work. We load the - // specified bits in (tqlayout, background and tileset + // specified bits in (layout, background and tileset if (!m_selectedFile.isEmpty()) { TQString backRaw, layoutRaw, tilesetRaw, magic; @@ -233,17 +233,17 @@ void Preview::drawPreview() back = locate("appdata", back); } - tqlayout = layoutRaw; - tqlayout.replace(":", "/kmahjongg/pics/"); - if (!TQFile::exists(tqlayout)) + layout = layoutRaw; + layout.replace(":", "/kmahjongg/pics/"); + if (!TQFile::exists(layout)) { - tqlayout = layoutRaw; - tqlayout = "pics/" + tqlayout.right(tqlayout.length() - tqlayout.find(":") - 1); - tqlayout = locate("appdata", tqlayout); + layout = layoutRaw; + layout = "pics/" + layout.right(layout.length() - layout.find(":") - 1); + layout = locate("appdata", layout); } m_themeBack=back; - m_themeLayout=tqlayout; + m_themeLayout=layout; m_themeTileset=tile; } } @@ -251,16 +251,16 @@ void Preview::drawPreview() } renderBackground(back); - renderTiles(tile, tqlayout); + renderTiles(tile, layout); } void Preview::paintEvent( TQPaintEvent* ){ - m_drawFrame->tqrepaint(false); + m_drawFrame->repaint(false); } // the user selected ok, or apply. This method passes the changes // across to the game widget and if necessary forces a board redraw -// (unnecessary on tqlayout changes since it only effects the next game) +// (unnecessary on layout changes since it only effects the next game) void Preview::applyChange() { switch (m_previewType) @@ -287,7 +287,7 @@ void Preview::applyChange() break; } - // don't redraw for a tqlayout change + // don't redraw for a layout change if (m_previewType == board || m_previewType == theme) layoutChange(); else boardRedraw(true); @@ -310,9 +310,9 @@ void Preview::renderBackground(const TQString &bg) { // This method draws a mini-tiled board with no tiles missing. -void Preview::renderTiles(const TQString &file, const TQString &tqlayout) { +void Preview::renderTiles(const TQString &file, const TQString &layout) { m_tiles.loadTileset(file, true); - m_boardLayout.loadBoardLayout(tqlayout); + m_boardLayout.loadBoardLayout(layout); TQPixmap *dest = m_drawFrame->getPreviewPixmap(); int xOffset = m_tiles.width()/2; @@ -366,7 +366,7 @@ void Preview::renderTiles(const TQString &file, const TQString &tqlayout) { void Preview::saveTheme() { TQString tile = Prefs::tileSet(); TQString back = Prefs::background(); - TQString tqlayout = Prefs::layout(); + TQString layout = Prefs::layout(); TQString with = ":"; // we want to replace any path in the default store @@ -375,7 +375,7 @@ void Preview::saveTheme() { back.replace(p,with); tile.replace(p,with); - tqlayout.replace(p,with); + layout.replace(p,with); // Get the name of the file to save @@ -417,7 +417,7 @@ void Preview::saveTheme() { themeMagicV1_0, tile.utf8().data(), back.utf8().data(), - tqlayout.utf8().data()); + layout.utf8().data()); fclose(outFile); } diff --git a/kmahjongg/Preview.h b/kmahjongg/Preview.h index 2b0adb54..f77aaf09 100644 --- a/kmahjongg/Preview.h +++ b/kmahjongg/Preview.h @@ -63,7 +63,7 @@ protected: virtual void drawPreview(); void applyChange() ; void renderBackground(const TQString &bg); - void renderTiles(const TQString &file, const TQString &tqlayout); + void renderTiles(const TQString &file, const TQString &layout); void paintEvent( TQPaintEvent* pa ); signals: diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp index aca8c302..23d183ab 100644 --- a/kmahjongg/boardwidget.cpp +++ b/kmahjongg/boardwidget.cpp @@ -45,7 +45,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name ) if (!loadTileset(tFile)){ KMessageBox::error(this, i18n("An error occurred when loading the tileset file %1\n" - "KMahjongg will now terminate.").tqarg(tFile)); + "KMahjongg will now terminate.").arg(tFile)); kapp->quit(); } @@ -55,17 +55,17 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name ) if( ! loadBackground(tFile, false ) ) { KMessageBox::error(this, - i18n("An error occurred when loading the background image\n%1").tqarg(tFile)+ + i18n("An error occurred when loading the background image\n%1").arg(tFile)+ i18n("KMahjongg will now terminate.")); kapp->quit(); } - getFileOrDefault(Prefs::layout(), "tqlayout", tFile); + getFileOrDefault(Prefs::layout(), "layout", tFile); if( ! loadBoardLayout(tFile) ) { KMessageBox::error(this, - i18n("An error occurred when loading the board tqlayout %1\n" - "KMahjongg will now terminate.").tqarg(tFile)); + i18n("An error occurred when loading the board layout %1\n" + "KMahjongg will now terminate.").arg(tFile)); kapp->quit(); } setDisplayedWidth(); @@ -92,7 +92,7 @@ void BoardWidget::saveSettings(){ //config->writePathEntry("Tileset_file", tileFile); //config->writePathEntry("Background_file", backgroundFile); - //config->writePathEntry("Layout_file", tqlayout); + //config->writePathEntry("Layout_file", layout); } void BoardWidget::getFileOrDefault(TQString filename, TQString type, TQString &res) @@ -111,7 +111,7 @@ void BoardWidget::getFileOrDefault(TQString filename, TQString type, TQString &r if (res.isEmpty()) { KMessageBox::error(this, i18n("KMahjongg could not locate the file: %1\n" "or the default file of type: %2\n" - "KMahjongg will now terminate").tqarg(filename).tqarg(type) ); + "KMahjongg will now terminate").arg(filename).arg(type) ); kapp->quit(); } } @@ -264,7 +264,7 @@ void BoardWidget::paintEvent( TQPaintEvent* pa ) return; } - // if the tqrepaint is because of a window redraw after a move + // if the repaint is because of a window redraw after a move // or a menu roll up, then just blit in the last rendered image if (!updateBackBuffer) { bitBlt(this, xx,pa->rect().top(), @@ -766,7 +766,7 @@ void BoardWidget::calculateNewGame( int gNumber) } // --------------------------------------------------------- -// Generate the position data for the tqlayout from contents of Game.Map. +// Generate the position data for the layout from contents of Game.Map. void BoardWidget::generateTilePositions() { numTiles = 0; @@ -788,7 +788,7 @@ void BoardWidget::generateTilePositions() { } // --------------------------------------------------------- -// Generate the dependency data for the tqlayout from the position data. +// Generate the dependency data for the layout from the position data. // Note that the coordinates of each tile in tilePositions are those of // the upper left quarter of the tile. void BoardWidget::generatePositionDepends() { @@ -1393,7 +1393,7 @@ bool BoardWidget::findMove( POSITION& posA, POSITION& posB ) iPosCount = 0; // Hier Anzahl der gefunden Paare merken - // The new tile tqlayout with non-contiguos horizantle spans + // The new tile layout with non-contiguos horizantle spans // can lead to huge numbers of matching pairs being exposed. // we alter the loop to bail out when BoardLayout::maxTiles/2 pairs are found // (or less); @@ -1804,7 +1804,7 @@ bool BoardWidget::loadBackground( if( ! theBackground.load( pszFileName, requiredWidth(), requiredHeight()) ) { if( bShowError ) - KMessageBox::sorry(this, i18n("Failed to load image:\n%1").tqarg(pszFileName) ); + KMessageBox::sorry(this, i18n("Failed to load image:\n%1").arg(pszFileName) ); return( false ); } Prefs::setBackground(pszFileName); @@ -2010,7 +2010,7 @@ void BoardWidget::shuffle() { // force a redraw updateBackBuffer=true; - tqrepaint(false); + repaint(false); // I consider this s very bad cheat so, I punish the user diff --git a/kmahjongg/boardwidget.h b/kmahjongg/boardwidget.h index bee14b49..62907097 100644 --- a/kmahjongg/boardwidget.h +++ b/kmahjongg/boardwidget.h @@ -205,7 +205,7 @@ class BoardWidget : public TQWidget - bool updateBackBuffer; // does board need redrawing. Not if it is just a tqrepaint + bool updateBackBuffer; // does board need redrawing. Not if it is just a repaint bool gamePaused; diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp index 8bd9b107..e065b848 100644 --- a/kmahjongg/kmahjongg.cpp +++ b/kmahjongg/kmahjongg.cpp @@ -151,7 +151,7 @@ void KMahjongg::setupKAction() pauseAction = KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pause()), actionCollection()); // TODO: store the background ; open on startup - // TODO: same about tqlayout + // TODO: same about layout // TODO: same about theme // move @@ -179,19 +179,19 @@ void KMahjongg::setupStatusBar() tilesLeftLabel= new TQLabel("Removed: 0000/0000", statusBar()); tilesLeftLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statusBar()->addWidget(tilesLeftLabel, tilesLeftLabel->tqsizeHint().width(), ID_STATUS_GAME); + statusBar()->addWidget(tilesLeftLabel, tilesLeftLabel->sizeHint().width(), ID_STATUS_GAME); gameNumLabel = new TQLabel("Game: 000000000000000000000", statusBar()); gameNumLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statusBar()->addWidget(gameNumLabel, gameNumLabel->tqsizeHint().width(), ID_STATUS_TILENUMBER); + statusBar()->addWidget(gameNumLabel, gameNumLabel->sizeHint().width(), ID_STATUS_TILENUMBER); statusLabel= new TQLabel("Kmahjongg", statusBar()); statusLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statusBar()->addWidget(statusLabel, statusLabel->tqsizeHint().width(), ID_STATUS_MESSAGE); + statusBar()->addWidget(statusLabel, statusLabel->sizeHint().width(), ID_STATUS_MESSAGE); - // pStatusBar->tqsetAlignment( ID_STATUS_TILENUMBER, AlignCenter ); + // pStatusBar->setAlignment( ID_STATUS_TILENUMBER, AlignCenter ); } void KMahjongg::setDisplayedWidth() @@ -397,7 +397,7 @@ void KMahjongg::gameOver( void KMahjongg::showStatusText( const TQString &msg, long board ) { statusLabel->setText(msg); - TQString str = i18n("Game number: %1").tqarg(board); + TQString str = i18n("Game number: %1").arg(board); gameNumLabel->setText(str); } @@ -406,8 +406,8 @@ void KMahjongg::showStatusText( const TQString &msg, long board ) void KMahjongg::showTileNumber( int iMaximum, int iCurrent, int iLeft ) { // Hmm... seems iCurrent is the number of remaining tiles, not removed ... - //TQString szBuffer = i18n("Removed: %1/%2").tqarg(iCurrent).tqarg(iMaximum); - TQString szBuffer = i18n("Removed: %1/%2 Combinations left: %3").tqarg(iMaximum-iCurrent).tqarg(iMaximum).tqarg(iLeft); + //TQString szBuffer = i18n("Removed: %1/%2").arg(iCurrent).arg(iMaximum); + TQString szBuffer = i18n("Removed: %1/%2 Combinations left: %3").arg(iMaximum-iCurrent).arg(iMaximum).arg(iLeft); tilesLeftLabel->setText(szBuffer); // Update here since undo allow is effected by demo mode diff --git a/kmahjongg/pics/cross.layout b/kmahjongg/pics/cross.layout index de71a115..39c58f1e 100644 --- a/kmahjongg/pics/cross.layout +++ b/kmahjongg/pics/cross.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 12....12121212121212121212....12 4312..43434343434343434343..1243 124312........1212........124312 diff --git a/kmahjongg/pics/default.layout b/kmahjongg/pics/default.layout index 005254ed..f72ed794 100644 --- a/kmahjongg/pics/default.layout +++ b/kmahjongg/pics/default.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 # Level 0 ------------------------- ...121212121212121212121212..... ...434343434343434343434343..... diff --git a/kmahjongg/pics/default.theme b/kmahjongg/pics/default.theme index 49502e04..9ba994bc 100644 --- a/kmahjongg/pics/default.theme +++ b/kmahjongg/pics/default.theme @@ -1,4 +1,4 @@ kmahjongg-theme-v1.0 :default.tileset :default.bgnd -:default.tqlayout +:default.layout diff --git a/kmahjongg/pics/pirates.layout b/kmahjongg/pics/pirates.layout index 3cce44e3..c5bb895c 100644 --- a/kmahjongg/pics/pirates.layout +++ b/kmahjongg/pics/pirates.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 .............121212.......12..12 .............434343.......43..43 .............12.............12.. diff --git a/kmahjongg/pics/pirates.theme b/kmahjongg/pics/pirates.theme index 51b6ec88..748b3ffa 100644 --- a/kmahjongg/pics/pirates.theme +++ b/kmahjongg/pics/pirates.theme @@ -1,5 +1,5 @@ kmahjongg-theme-v1.0 :pirates.tileset :pirates.bgnd -:pirates.tqlayout +:pirates.layout diff --git a/kmahjongg/pics/pyramid.layout b/kmahjongg/pics/pyramid.layout index 0239212b..edd634dc 100644 --- a/kmahjongg/pics/pyramid.layout +++ b/kmahjongg/pics/pyramid.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 # Level 0 ------------------------- ....121212121212121212121212.... ....434343434343434343434343.... diff --git a/kmahjongg/pics/stax.layout b/kmahjongg/pics/stax.layout index abc7e969..f5595dca 100644 --- a/kmahjongg/pics/stax.layout +++ b/kmahjongg/pics/stax.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 ................................ 12121212..121212121212..12121212 43434343..434343434343..43434343 diff --git a/kmahjongg/pics/test.layout b/kmahjongg/pics/test.layout index 2c76ddec..d46a4e21 100644 --- a/kmahjongg/pics/test.layout +++ b/kmahjongg/pics/test.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 .1212121212121212121212121212... .4343434343434343434343434343... .1212121212121212121212121212... diff --git a/kmahjongg/pics/test2.layout b/kmahjongg/pics/test2.layout index 9ab29fdf..aedc6290 100644 --- a/kmahjongg/pics/test2.layout +++ b/kmahjongg/pics/test2.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 ................................ ................................ .121212121212121212............. diff --git a/kmahjongg/pics/tower.layout b/kmahjongg/pics/tower.layout index 3ca7bfc6..76fe96a0 100644 --- a/kmahjongg/pics/tower.layout +++ b/kmahjongg/pics/tower.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 # Level 0 ------------------------- ....121212121212121212121212.... ....434343434343434343434343.... diff --git a/kmahjongg/pics/triangle.layout b/kmahjongg/pics/triangle.layout index e04c405a..e1dd4891 100644 --- a/kmahjongg/pics/triangle.layout +++ b/kmahjongg/pics/triangle.layout @@ -1,4 +1,4 @@ -kmahjongg-tqlayout-v1.0 +kmahjongg-layout-v1.0 # Level 0 ------------------------- .121212121212121212121212121212. .434343434343434343434343434343. diff --git a/kmahjongg/settings.ui b/kmahjongg/settings.ui index 594cf9b7..0cfb2594 100644 --- a/kmahjongg/settings.ui +++ b/kmahjongg/settings.ui @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kmines/dialogs.cpp b/kmines/dialogs.cpp index 7fb5dec9..ec0d8048 100644 --- a/kmines/dialogs.cpp +++ b/kmines/dialogs.cpp @@ -21,7 +21,7 @@ #include <tqpixmap.h> #include <tqvgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqvbox.h> #include <tqgrid.h> @@ -165,7 +165,7 @@ void CustomConfig::updateNbMines() Level l(_width->value(), _height->value(), _mines->value()); _mines->setRange(1, Level::maxNbMines(l.width(), l.height())); _mines->setLabel(i18n("Mines (%1%):") - .tqarg( (100*l.nbMines()) / (l.width() * l.height()) )); + .arg( (100*l.nbMines()) / (l.width() * l.height()) )); _gameType->setCurrentItem(l.type()); _block = false; } diff --git a/kmines/field.cpp b/kmines/field.cpp index 035b3708..d1831df5 100644 --- a/kmines/field.cpp +++ b/kmines/field.cpp @@ -21,7 +21,7 @@ #include <math.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqpainter.h> @@ -57,7 +57,7 @@ void Field::readSettings() if ( Settings::magicReveal() ) emit setCheating(); } -TQSize Field::tqsizeHint() const +TQSize Field::sizeHint() const { return TQSize(2*frameWidth() + _level.width()*Settings::caseSize(), 2*frameWidth() + _level.height()*Settings::caseSize()); @@ -117,7 +117,7 @@ void Field::changeCase(const Coord &p, CaseState newState) BaseField::changeCase(p, newState); TQPainter painter(this); drawCase(painter, p); - if ( isActive() ) emit updatetqStatus( hasMine(p) ); + if ( isActive() ) emit updateStatus( hasMine(p) ); } TQPoint Field::toPoint(const Coord &p) const diff --git a/kmines/field.h b/kmines/field.h index 2c21348b..3d443843 100644 --- a/kmines/field.h +++ b/kmines/field.h @@ -39,7 +39,7 @@ class Field : public FieldFrame, public BaseField public: Field(TQWidget *parent); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void setLevel(const Level &level); void setReplayField(const TQString &field); @@ -68,7 +68,7 @@ class Field : public FieldFrame, public BaseField SolvingState solvingState() const { return _solvingState; } signals: - void updatetqStatus(bool); + void updateStatus(bool); void gameStateChanged(GameState); void setMood(Mood); void setCheating(); diff --git a/kmines/frame.cpp b/kmines/frame.cpp index 5eee07ba..2b348694 100644 --- a/kmines/frame.cpp +++ b/kmines/frame.cpp @@ -36,7 +36,7 @@ FieldFrame::FieldFrame(TQWidget *parent) void FieldFrame::adjustSize() { - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); _button.resize(Settings::caseSize(), Settings::caseSize()); TQBitmap mask; @@ -124,22 +124,22 @@ void FieldFrame::drawBox(TQPainter &painter, const TQPoint &p, bool hasFocus) const { qDrawShadePanel(&painter, p.x(), p.y(), _button.width(), _button.height(), - tqcolorGroup(), pressed, 2, - &tqcolorGroup().brush(TQColorGroup::Background)); + colorGroup(), pressed, 2, + &colorGroup().brush(TQColorGroup::Background)); if (hasFocus) { painter.translate(p.x(), p.y()); TQRect fbr = tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, &_button); tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, fbr, - tqcolorGroup(), TQStyle::Style_Enabled); + colorGroup(), TQStyle::Style_Enabled); painter.resetXForm(); } TQRect r(p, _button.size()); const TQPixmap *pixmap = (type==NoPixmap ? 0 : &_pixmaps[type]); TQColor color = (nbMines==0 ? black : Settings::mineColor(nbMines-1)); - tqstyle().drawItem(&painter, r, AlignCenter, tqcolorGroup(), true, pixmap, + tqstyle().drawItem(&painter, r, AlignCenter, colorGroup(), true, pixmap, text, -1, &color); if ( advised!=-1 ) - tqstyle().drawItem(&painter, r, AlignCenter, tqcolorGroup(), true, + tqstyle().drawItem(&painter, r, AlignCenter, colorGroup(), true, &_advised[advised], TQString()); } diff --git a/kmines/kzoommainwindow.cpp b/kmines/kzoommainwindow.cpp index 1d0f5319..8d0521bc 100644 --- a/kmines/kzoommainwindow.cpp +++ b/kmines/kzoommainwindow.cpp @@ -58,7 +58,7 @@ void KZoomMainWindow::init(const char *popupName) void KZoomMainWindow::addWidget(TQWidget *widget) { widget->adjustSize(); - TQWidget *tlw = widget->tqtopLevelWidget(); + TQWidget *tlw = widget->topLevelWidget(); KZoomMainWindow *zm = static_cast<KZoomMainWindow *>(tlw->qt_cast("KZoomMainWindow")); Q_ASSERT(zm); @@ -74,7 +74,7 @@ void KZoomMainWindow::widgetDestroyed() bool KZoomMainWindow::eventFilter(TQObject *o, TQEvent *e) { if ( e->type()==TQEvent::LayoutHint ) - setFixedSize(tqminimumSize()); // because K/TQMainWindow + setFixedSize(minimumSize()); // because K/TQMainWindow // does not manage fixed central widget // with hidden menubar... return KMainWindow::eventFilter(o, e); diff --git a/kmines/kzoommainwindow.h b/kmines/kzoommainwindow.h index e4353c2d..00092183 100644 --- a/kmines/kzoommainwindow.h +++ b/kmines/kzoommainwindow.h @@ -50,7 +50,7 @@ public: /** Add a widget to be managed i.e. the adjustSize() method of the * widget is called whenever the zoom is changed. - * This function assumes that the tqtopLevelWidget() is the KZoomMainWindow. + * This function assumes that the topLevelWidget() is the KZoomMainWindow. */ static void addWidget(TQWidget *widget); diff --git a/kmines/main.cpp b/kmines/main.cpp index d1453b3f..9cdcec4d 100644 --- a/kmines/main.cpp +++ b/kmines/main.cpp @@ -62,7 +62,7 @@ MainWidget::MainWidget() { KNotifyClient::startDaemon(); - _status = new tqStatus(this); + _status = new Status(this); connect(_status, TQT_SIGNAL(gameStateChangedSignal(KMines::GameState)), TQT_SLOT(gameStateChanged(KMines::GameState))); connect(_status, TQT_SIGNAL(pause()), TQT_SLOT(pause())); diff --git a/kmines/main.h b/kmines/main.h index 7fb10eda..31221e76 100644 --- a/kmines/main.h +++ b/kmines/main.h @@ -26,7 +26,7 @@ class KAction; class KToggleAction; class KSelectAction; -class tqStatus; +class Status; class MainWidget : public KZoomMainWindow, public KMines { @@ -50,7 +50,7 @@ class MainWidget : public KZoomMainWindow, public KMines virtual bool queryExit(); private: - tqStatus *_status; + Status *_status; KToggleAction *_pause; KSelectAction *_levels; KAction *_advise, *_solve; diff --git a/kmines/solver/solver.cpp b/kmines/solver/solver.cpp index 0c90b747..656df8a2 100644 --- a/kmines/solver/solver.cpp +++ b/kmines/solver/solver.cpp @@ -24,7 +24,7 @@ #include <assert.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kprogress.h> @@ -198,13 +198,13 @@ SolvingRateDialog::SolvingRateDialog(const BaseField &field, TQWidget *parent) setButtonOK(item); TQVBoxLayout *top = new TQVBoxLayout(plainPage(), 0, spacingHint()); - TQLabel *label = new TQLabel(i18n("Width: %1").tqarg(field.width()), + TQLabel *label = new TQLabel(i18n("Width: %1").arg(field.width()), plainPage()); top->addWidget(label); - label = new TQLabel(i18n("Height: %1").tqarg(field.height()), plainPage()); + label = new TQLabel(i18n("Height: %1").arg(field.height()), plainPage()); top->addWidget(label); - label = new TQLabel(i18n("Mines: %1 (%2%)").tqarg(field.nbMines()) - .tqarg( field.nbMines() * 100.0 / field.size()), + label = new TQLabel(i18n("Mines: %1 (%2%)").arg(field.nbMines()) + .arg( field.nbMines() * 100.0 / field.size()), plainPage()); top->addWidget(label); @@ -243,7 +243,7 @@ void SolvingRateDialog::solvingDone(bool success) { if (success) _success++; _label->setText(i18n("Success rate: %1%") - .tqarg(_success * 100.0 / _i, 0, 'f', 3)); + .arg(_success * 100.0 / _i, 0, 'f', 3)); _progress->advance(1); TQTimer::singleShot(0, this, TQT_SLOT(step())); } diff --git a/kmines/status.cpp b/kmines/status.cpp index 31fd7b36..b0c0554f 100644 --- a/kmines/status.cpp +++ b/kmines/status.cpp @@ -22,9 +22,9 @@ #include <tqpainter.h> #include <tqpixmap.h> #include <tqwhatsthis.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtimer.h> #include <kapplication.h> @@ -45,7 +45,7 @@ #include "version.h" -tqStatus::tqStatus(TQWidget *parent) +Status::Status(TQWidget *parent) : TQWidget(parent, "status"), _oldLevel(Level::Easy) { _timer = new TQTimer(this); @@ -54,7 +54,7 @@ tqStatus::tqStatus(TQWidget *parent) _solver = new Solver(TQT_TQOBJECT(this)); connect(_solver, TQT_SIGNAL(solvingDone(bool)), TQT_SLOT(solvingDone(bool))); -// top tqlayout +// top layout TQGridLayout *top = new TQGridLayout(this, 2, 5, 10, 10); top->setColStretch(1, 1); top->setColStretch(3, 1); @@ -93,7 +93,7 @@ tqStatus::tqStatus(TQWidget *parent) _field = new Field(_fieldContainer); _field->readSettings(); g->addWidget(_field, 0, 0, AlignCenter); - connect( _field, TQT_SIGNAL(updatetqStatus(bool)), TQT_SLOT(updatetqStatus(bool)) ); + connect( _field, TQT_SIGNAL(updateStatus(bool)), TQT_SLOT(updateStatus(bool)) ); connect(_field, TQT_SIGNAL(gameStateChanged(GameState)), TQT_SLOT(gameStateChangedSlot(GameState)) ); connect(_field, TQT_SIGNAL(setMood(Mood)), smiley, TQT_SLOT(setMood(Mood))); @@ -120,13 +120,13 @@ tqStatus::tqStatus(TQWidget *parent) top->addMultiCellWidget(_stack, 1, 1, 0, 4); } -void tqStatus::smileyClicked() +void Status::smileyClicked() { if ( _field->gameState()==Paused ) emit pause(); else restartGame(); } -void tqStatus::newGame(int t) +void Status::newGame(int t) { if ( _field->gameState()==Paused ) emit pause(); Level::Type type = (Level::Type)t; @@ -135,7 +135,7 @@ void tqStatus::newGame(int t) else newGame( Settings::customLevel() ); } -void tqStatus::newGame(const Level &level) +void Status::newGame(const Level &level) { _timer->stop(); if ( level.type()!=Level::Custom ) @@ -143,14 +143,14 @@ void tqStatus::newGame(const Level &level) _field->setLevel(level); } -bool tqStatus::checkBlackMark() +bool Status::checkBlackMark() { bool bm = ( _field->gameState()==Playing ); if (bm) KExtHighscore::submitScore(KExtHighscore::Lost, this); return bm; } -void tqStatus::restartGame() +void Status::restartGame() { if ( _field->gameState()==Paused ) emit pause(); else if ( _field->gameState()==Replaying ) { @@ -162,7 +162,7 @@ void tqStatus::restartGame() } } -void tqStatus::settingsChanged() +void Status::settingsChanged() { _field->readSettings(); @@ -173,7 +173,7 @@ void tqStatus::settingsChanged() newGame(l); } -void tqStatus::updatetqStatus(bool mine) +void Status::updateStatus(bool mine) { int r = _field->nbMines() - _field->nbMarked(); TQColor color = (r<0 && !_field->isSolved() ? red : white); @@ -184,7 +184,7 @@ void tqStatus::updatetqStatus(bool mine) gameStateChanged(GameOver, true); // ends only for wins } -void tqStatus::setGameOver(bool won) +void Status::setGameOver(bool won) { if ( !won ) KNotifyClient::event(winId(), "explosion", i18n("Explosion!")); @@ -218,16 +218,16 @@ void tqStatus::setGameOver(bool won) f.appendChild(data); } -void tqStatus::setStopped() +void Status::setStopped() { smiley->setMood(Normal); - updatetqStatus(false); + updateStatus(false); bool custom = ( _field->level().type()==Level::Custom ); dg->reset(custom); _field->setSolvingState(Regular); } -void tqStatus::setPlaying() +void Status::setPlaying() { smiley->setMood(Normal); dg->start(); @@ -238,7 +238,7 @@ void tqStatus::setPlaying() _log = TQDomDocument("kmineslog"); _logRoot = _log.createElement("kmineslog"); _logRoot.setAttribute("version", SHORT_VERSION); - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); _logRoot.setAttribute("date", date.toString(Qt::ISODate)); _logRoot.setAttribute("width", level.width()); _logRoot.setAttribute("height", level.height()); @@ -248,7 +248,7 @@ void tqStatus::setPlaying() _logRoot.appendChild(_logList); } -void tqStatus::gameStateChanged(GameState state, bool won) +void Status::gameStateChanged(GameState state, bool won) { TQWidget *w = _fieldContainer; @@ -280,7 +280,7 @@ void tqStatus::gameStateChanged(GameState state, bool won) emit gameStateChangedSignal(state); } -void tqStatus::addAction(const KGrid2D::Coord &c, Field::ActionType type) +void Status::addAction(const KGrid2D::Coord &c, Field::ActionType type) { TQDomElement action = _log.createElement("Action"); action.setAttribute("time", dg->pretty()); @@ -291,7 +291,7 @@ void tqStatus::addAction(const KGrid2D::Coord &c, Field::ActionType type) dg->addAction(); } -void tqStatus::advise() +void Status::advise() { int res = KMessageBox::warningContinueCancel(this, i18n("When the solver gives " @@ -304,25 +304,25 @@ void tqStatus::advise() _field->setAdvised(c, probability); } -void tqStatus::solve() +void Status::solve() { dg->setCheating(); _solver->solve(*_field, false); _field->setSolvingState(Solved); } -void tqStatus::solvingDone(bool success) +void Status::solvingDone(bool success) { if ( !success ) gameStateChanged(GameOver, false); } -void tqStatus::solveRate() +void Status::solveRate() { SolvingRateDialog sd(*_field, this); sd.exec(); } -void tqStatus::viewLog() +void Status::viewLog() { KDialogBase d(this, "view_log", true, i18n("View Game Log"), KDialogBase::Close, KDialogBase::Close); @@ -335,7 +335,7 @@ void tqStatus::viewLog() d.exec(); } -void tqStatus::saveLog() +void Status::saveLog() { KURL url = KFileDialog::getSaveURL(TQString(), TQString(), this); if ( url.isEmpty() ) return; @@ -354,7 +354,7 @@ void tqStatus::saveLog() tmp.unlink(); } -void tqStatus::loadLog() +void Status::loadLog() { KURL url = KFileDialog::getOpenURL(TQString(), TQString(), this); if ( url.isEmpty() ) return; @@ -368,7 +368,7 @@ void tqStatus::loadLog() bool ok = doc.setContent(&file, 0, &errorLine); if ( !ok ) { KMessageBox::sorry(this, i18n("Cannot read XML file on line %1") - .tqarg(errorLine)); + .arg(errorLine)); return; } success = true; @@ -390,7 +390,7 @@ void tqStatus::loadLog() } } -bool tqStatus::checkLog(const TQDomDocument &doc) +bool Status::checkLog(const TQDomDocument &doc) { // check root element if ( doc.doctype().name()!="kmineslog" ) return false; @@ -435,7 +435,7 @@ bool tqStatus::checkLog(const TQDomDocument &doc) } -void tqStatus::replayLog() +void Status::replayLog() { uint w = _logRoot.attribute("width").toUInt(); uint h = _logRoot.attribute("height").toUInt(); @@ -454,7 +454,7 @@ void tqStatus::replayLog() _timer->start(500); } -void tqStatus::replayStep() +void Status::replayStep() { if ( _index>=_actions.count() ) { _timer->stop(); diff --git a/kmines/status.h b/kmines/status.h index a91fcda9..eec7b608 100644 --- a/kmines/status.h +++ b/kmines/status.h @@ -30,12 +30,12 @@ class Solver; class TQWidgetStack; class TQTimer; -class tqStatus : public TQWidget, public KMines +class Status : public TQWidget, public KMines { Q_OBJECT TQ_OBJECT public : - tqStatus(TQWidget *parent); + Status(TQWidget *parent); const Level ¤tLevel() const { return _field->level(); } bool isPlaying() const { return _field->gameState()==Playing; } @@ -51,7 +51,7 @@ class tqStatus : public TQWidget, public KMines public slots: void newGame(int type); void restartGame(); - void updatetqStatus(bool); + void updateStatus(bool); void pauseGame() { _field->pause(); } void moveUp() { _field->moveCursor(KGrid2D::SquareBase::Up); } diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp index dbce60a4..f9d7f663 100644 --- a/knetwalk/src/mainwindow.cpp +++ b/knetwalk/src/mainwindow.cpp @@ -17,7 +17,7 @@ #include <tqeventloop.h> #include <tqgrid.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqprocess.h> #include <tqpushbutton.h> @@ -78,7 +78,7 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) : lst += i18n("Master"); m_levels->setItems(lst); - setFixedSize(tqminimumSizeHint()); + setFixedSize(minimumSizeHint()); statusBar()->insertItem("abcdefghijklmnopqrst: 0 ",1); setAutoSaveSettings(); @@ -149,7 +149,7 @@ void MainWindow::newGame(int sk) m_clickcount = 0; TQString clicks = i18n("Click: %1"); - statusBar()->changeItem(clicks.tqarg(TQString::number(m_clickcount)),1); + statusBar()->changeItem(clicks.arg(TQString::number(m_clickcount)),1); KNotifyClient::event(winId(), "startsound", i18n("New Game")); for(int i = 0; i < MasterBoardSize * MasterBoardSize; i++) @@ -370,7 +370,7 @@ void MainWindow::rotate(int index, bool toleft) m_clickcount++; TQString clicks = i18n("Click: %1"); - statusBar()->changeItem(clicks.tqarg(TQString::number(m_clickcount)),1); + statusBar()->changeItem(clicks.arg(TQString::number(m_clickcount)),1); if (isGameOver()) { diff --git a/kolf/ball.cpp b/kolf/ball.cpp index 7235edf3..9ac849bc 100644 --- a/kolf/ball.cpp +++ b/kolf/ball.cpp @@ -33,7 +33,7 @@ Ball::Ball(TQCanvas *canvas) //font.setPixelSize(10); label = new TQCanvasText("", font, canvas); label->setColor(white); - label->tqsetVisible(false); + label->setVisible(false); // this sets z setState(Stopped); @@ -438,12 +438,12 @@ BallState Ball::currentState() void Ball::showInfo() { - label->tqsetVisible(isVisible()); + label->setVisible(isVisible()); } void Ball::hideInfo() { - label->tqsetVisible(false); + label->setVisible(false); } void Ball::setName(const TQString &name) @@ -459,8 +459,8 @@ void Ball::setCanvas(TQCanvas *c) void Ball::setVisible(bool yes) { - TQCanvasEllipse::tqsetVisible(yes); + TQCanvasEllipse::setVisible(yes); - label->tqsetVisible(yes && game && game->isInfoShowing()); + label->setVisible(yes && game && game->isInfoShowing()); } diff --git a/kolf/canvasitem.h b/kolf/canvasitem.h index 16f3a930..6b789dfa 100644 --- a/kolf/canvasitem.h +++ b/kolf/canvasitem.h @@ -113,7 +113,7 @@ public: */ virtual void clean() {}; /** - * scale factor changed (game->scaleFactor(), the world matrix is game->tqworldMatrix()) + * scale factor changed (game->scaleFactor(), the world matrix is game->worldMatrix()) * NOTE: not used in Kolf 1.1, which comes with KDE 3.1. */ virtual void scaleChanged() {}; diff --git a/kolf/config.cpp b/kolf/config.cpp index 0d9aafae..b67e12cd 100644 --- a/kolf/config.cpp +++ b/kolf/config.cpp @@ -1,5 +1,5 @@ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdialog.h> #include <klocale.h> @@ -36,8 +36,8 @@ void Config::changed() MessageConfig::MessageConfig(TQString text, TQWidget *parent, const char *name) : Config(parent, name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); - tqlayout->addWidget(new TQLabel(text, this)); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); + layout->addWidget(new TQLabel(text, this)); } DefaultConfig::DefaultConfig(TQWidget *parent, const char *name) diff --git a/kolf/editor.cpp b/kolf/editor.cpp index ab8b1d0c..2746a0e4 100644 --- a/kolf/editor.cpp +++ b/kolf/editor.cpp @@ -2,7 +2,7 @@ #include <klistbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <tqframe.h> @@ -15,13 +15,13 @@ Editor::Editor(ObjectList *list, TQWidget *parent, const char *name) this->list = list; config = 0; - htqlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); - vtqlayout->addWidget(new TQLabel(i18n("Add object:"), this)); + TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); + vlayout->addWidget(new TQLabel(i18n("Add object:"), this)); listbox = new KListBox(this, "Listbox"); - vtqlayout->addWidget(listbox); - htqlayout->setStretchFactor(vtqlayout, 2); + vlayout->addWidget(listbox); + hlayout->setStretchFactor(vlayout, 2); TQStringList items; Object *obj = 0; @@ -49,8 +49,8 @@ void Editor::setItem(CanvasItem *item) if (!config) return; config->ctorDone(); - htqlayout->addWidget(config); - htqlayout->setStretchFactor(config, 2); + hlayout->addWidget(config); + hlayout->setStretchFactor(config, 2); config->setFrameStyle(TQFrame::Box | TQFrame::Raised); config->setLineWidth(1); config->show(); diff --git a/kolf/editor.h b/kolf/editor.h index 8ee1b93a..e61e73cf 100644 --- a/kolf/editor.h +++ b/kolf/editor.h @@ -30,7 +30,7 @@ private slots: private: ObjectList *list; - TQHBoxLayout *htqlayout; + TQHBoxLayout *hlayout; KListBox *listbox; Config *config; }; diff --git a/kolf/floater.cpp b/kolf/floater.cpp index fe6e6344..ff42398a 100644 --- a/kolf/floater.cpp +++ b/kolf/floater.cpp @@ -257,14 +257,14 @@ FloaterConfig::FloaterConfig(Floater *floater, TQWidget *parent) : BridgeConfig(floater, parent) { this->floater = floater; - m_vtqlayout->addStretch(); + m_vlayout->addStretch(); - m_vtqlayout->addWidget(new TQLabel(i18n("Moving speed"), this)); - TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Slow"), this)); + m_vlayout->addWidget(new TQLabel(i18n("Moving speed"), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Slow"), this)); TQSlider *slider = new TQSlider(0, 20, 2, floater->curSpeed(), Qt::Horizontal, this); - htqlayout->addWidget(slider); - htqlayout->addWidget(new TQLabel(i18n("Fast"), this)); + hlayout->addWidget(slider); + hlayout->addWidget(new TQLabel(i18n("Fast"), this)); connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int))); } diff --git a/kolf/game.cpp b/kolf/game.cpp index 9ff1ed73..7554d173 100644 --- a/kolf/game.cpp +++ b/kolf/game.cpp @@ -15,7 +15,7 @@ #include <kprinter.h> #include <kstandarddirs.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcanvas.h> #include <tqcheckbox.h> #include <tqcolor.h> @@ -25,7 +25,7 @@ #include <tqfontmetrics.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqpainter.h> #include <tqpaintdevicemetrics.h> @@ -58,12 +58,12 @@ inline TQString makeGroup(int id, int hole, TQString name, int x, int y) { - return TQString("%1-%2@%3,%4|%5").tqarg(hole).tqarg(name).tqarg(x).tqarg(y).tqarg(id); + return TQString("%1-%2@%3,%4|%5").arg(hole).arg(name).arg(x).arg(y).arg(id); } inline TQString makeStateGroup(int id, const TQString &name) { - return TQString("%1|%2").tqarg(name).tqarg(id); + return TQString("%1|%2").arg(name).arg(id); } ///////////////////////// @@ -144,9 +144,9 @@ void Arrow::setZ(double newz) void Arrow::setVisible(bool yes) { - TQCanvasLine::tqsetVisible(yes); - line1->tqsetVisible(yes); - line2->tqsetVisible(yes); + TQCanvasLine::setVisible(yes); + line1->setVisible(yes); + line2->setVisible(yes); } void Arrow::moveBy(double dx, double dy) @@ -197,23 +197,23 @@ BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *parent) { this->bridge = bridge; - m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); - TQGridLayout *tqlayout = new TQGridLayout(m_vtqlayout, 2, 3, spacingHint()); - tqlayout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0); + m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQGridLayout *layout = new TQGridLayout(m_vlayout, 2, 3, spacingHint()); + layout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0); top = new TQCheckBox(i18n("&Top"), this); - tqlayout->addWidget(top, 0, 1); + layout->addWidget(top, 0, 1); connect(top, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(topWallChanged(bool))); top->setChecked(bridge->topWallVisible()); bot = new TQCheckBox(i18n("&Bottom"), this); - tqlayout->addWidget(bot, 1, 1); + layout->addWidget(bot, 1, 1); connect(bot, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(botWallChanged(bool))); bot->setChecked(bridge->botWallVisible()); left = new TQCheckBox(i18n("&Left"), this); - tqlayout->addWidget(left, 1, 0); + layout->addWidget(left, 1, 0); connect(left, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(leftWallChanged(bool))); left->setChecked(bridge->leftWallVisible()); right = new TQCheckBox(i18n("&Right"), this); - tqlayout->addWidget(right, 1, 2); + layout->addWidget(right, 1, 2); connect(right, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rightWallChanged(bool))); right->setChecked(bridge->rightWallVisible()); } @@ -264,10 +264,10 @@ Bridge::Bridge(TQRect rect, TQCanvas *canvas) setWallZ(z() + 0.01); setWallColor(color); - topWall->tqsetVisible(false); - botWall->tqsetVisible(false); - leftWall->tqsetVisible(false); - rightWall->tqsetVisible(false); + topWall->setVisible(false); + botWall->setVisible(false); + leftWall->setVisible(false); + rightWall->setVisible(false); point = new RectPoint(color, this, canvas); editModeChanged(false); @@ -321,7 +321,7 @@ void Bridge::aboutToDie() void Bridge::editModeChanged(bool changed) { - point->tqsetVisible(changed); + point->setVisible(changed); moveBy(0, 0); } @@ -405,18 +405,18 @@ WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent) : BridgeConfig(windmill, parent) { this->windmill = windmill; - m_vtqlayout->addStretch(); + m_vlayout->addStretch(); TQCheckBox *check = new TQCheckBox(i18n("Windmill on bottom"), this); check->setChecked(windmill->bottom()); connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(endChanged(bool))); - m_vtqlayout->addWidget(check); + m_vlayout->addWidget(check); - TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Slow"), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Slow"), this)); TQSlider *slider = new TQSlider(1, 10, 1, windmill->curSpeed(), Qt::Horizontal, this); - htqlayout->addWidget(slider); - htqlayout->addWidget(new TQLabel(i18n("Fast"), this)); + hlayout->addWidget(slider); + hlayout->addWidget(new TQLabel(i18n("Fast"), this)); connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int))); endChanged(check->isChecked()); @@ -454,7 +454,7 @@ Windmill::Windmill(TQRect rect, TQCanvas *canvas) { guard = new WindmillGuard(canvas); guard->setPen(TQPen(black, 5)); - guard->tqsetVisible(true); + guard->setVisible(true); guard->setAlwaysShow(true); setSpeed(5); guard->setZ(wallZ() + .1); @@ -467,8 +467,8 @@ Windmill::Windmill(TQRect rect, TQCanvas *canvas) right->setAlwaysShow(true); left->setZ(wallZ()); right->setZ(wallZ()); - left->tqsetVisible(true); - right->tqsetVisible(true); + left->setVisible(true); + right->setVisible(true); setTopWallVisible(false); setBotWallVisible(false); @@ -629,12 +629,12 @@ void Sign::draw(TQPainter &painter) TQSimpleRichText txt(m_text, kapp->font()); const int indent = wallPen().width() + 3; txt.setWidth(width() - 2*indent); - TQColorGroup tqcolorGroup; - tqcolorGroup.setColor(TQColorGroup::Foreground, black); - tqcolorGroup.setColor(TQColorGroup::Text, black); - tqcolorGroup.setColor(TQColorGroup::Background, black); - tqcolorGroup.setColor(TQColorGroup::Base, black); - txt.draw(&painter, x() + indent, y(), TQRect(x() + indent, y(), width() - indent, height() - indent), tqcolorGroup); + TQColorGroup colorGroup; + colorGroup.setColor(TQColorGroup::Foreground, black); + colorGroup.setColor(TQColorGroup::Text, black); + colorGroup.setColor(TQColorGroup::Background, black); + colorGroup.setColor(TQColorGroup::Base, black); + txt.draw(&painter, x() + indent, y(), TQRect(x() + indent, y(), width() - indent, height() - indent), colorGroup); } ///////////////////////// @@ -643,10 +643,10 @@ SignConfig::SignConfig(Sign *sign, TQWidget *parent) : BridgeConfig(sign, parent) { this->sign = sign; - m_vtqlayout->addStretch(); - m_vtqlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this)); + m_vlayout->addStretch(); + m_vlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this)); KLineEdit *name = new KLineEdit(sign->text(), this); - m_vtqlayout->addWidget(name); + m_vlayout->addWidget(name); connect(name, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &))); } @@ -663,20 +663,20 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent) { this->ellipse = ellipse; - m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); TQCheckBox *check = new TQCheckBox(i18n("Enable show/hide"), this); - m_vtqlayout->addWidget(check); + m_vlayout->addWidget(check); connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(check1Changed(bool))); check->setChecked(ellipse->changeEnabled()); - TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint()); slow1 = new TQLabel(i18n("Slow"), this); - htqlayout->addWidget(slow1); + hlayout->addWidget(slow1); slider1 = new TQSlider(1, 100, 5, 100 - ellipse->changeEvery(), Qt::Horizontal, this); - htqlayout->addWidget(slider1); + hlayout->addWidget(slider1); fast1 = new TQLabel(i18n("Fast"), this); - htqlayout->addWidget(fast1); + hlayout->addWidget(fast1); connect(slider1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(value1Changed(int))); @@ -684,7 +684,7 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent) // TODO add slider2 and friends and make it possible for ellipses to grow and contract - m_vtqlayout->addStretch(); + m_vlayout->addStretch(); } void EllipseConfig::value1Changed(int news) @@ -733,7 +733,7 @@ Ellipse::Ellipse(TQCanvas *canvas) setChangeEnabled(false); setChangeEvery(50); count = 0; - tqsetVisible(true); + setVisible(true); point = new RectPoint(black, this, canvas); point->setSizeFactor(2.0); @@ -750,7 +750,7 @@ void Ellipse::setChangeEnabled(bool changeEnabled) setAnimated(m_changeEnabled); if (!m_changeEnabled) - tqsetVisible(true); + setVisible(true); } TQPtrList<TQCanvasItem> Ellipse::moveableItems() const @@ -775,7 +775,7 @@ void Ellipse::moveBy(double dx, double dy) void Ellipse::editModeChanged(bool changed) { - point->tqsetVisible(changed); + point->setVisible(changed); moveBy(0, 0); } @@ -788,7 +788,7 @@ void Ellipse::advance(int phase) if (count > (m_changeEvery + 10) * 1.8) count = 0; if (count == 0) - tqsetVisible(!isVisible()); + setVisible(!isVisible()); count++; } @@ -819,7 +819,7 @@ Config *Ellipse::config(TQWidget *parent) void Ellipse::aboutToSave() { - tqsetVisible(true); + setVisible(true); dontHide = true; } @@ -860,7 +860,7 @@ bool Puddle::collision(Ball *ball, long int /*id*/) if (ball->isVisible()) { TQCanvasRectangle i(TQRect(ball->x(), ball->y(), 1, 1), canvas()); - i.tqsetVisible(true); + i.setVisible(true); // is center of ball in? if (i.collidesWith(this)/* && ball->curVector().magnitude() < 4*/) @@ -868,7 +868,7 @@ bool Puddle::collision(Ball *ball, long int /*id*/) playSound("puddle"); ball->setAddStroke(ball->addStroke() + 1); ball->setPlaceOnGround(true); - ball->tqsetVisible(false); + ball->setVisible(false); ball->setState(Stopped); ball->setVelocity(0, 0); if (game && game->curBall() == ball) @@ -911,7 +911,7 @@ Sand::Sand(TQCanvas *canvas) bool Sand::collision(Ball *ball, long int /*id*/) { TQCanvasRectangle i(TQRect(ball->x(), ball->y(), 1, 1), canvas()); - i.tqsetVisible(true); + i.setVisible(true); // is center of ball in? if (i.collidesWith(this)/* && ball->curVector().magnitude() < 4*/) @@ -954,12 +954,12 @@ Putter::Putter(TQCanvas *canvas) void Putter::showInfo() { - guideLine->tqsetVisible(isVisible()); + guideLine->setVisible(isVisible()); } void Putter::hideInfo() { - guideLine->tqsetVisible(m_showGuideLine? isVisible() : false); + guideLine->setVisible(m_showGuideLine? isVisible() : false); } void Putter::moveBy(double dx, double dy) @@ -976,8 +976,8 @@ void Putter::setShowGuideLine(bool yes) void Putter::setVisible(bool yes) { - TQCanvasLine::tqsetVisible(yes); - guideLine->tqsetVisible(m_showGuideLine? yes : false); + TQCanvasLine::setVisible(yes); + guideLine->setVisible(m_showGuideLine? yes : false); } void Putter::setOrigin(int _x, int _y) @@ -1002,11 +1002,11 @@ void Putter::go(Direction d, Amount amount) { case Forwards: len -= 1; - guideLine->tqsetVisible(false); + guideLine->setVisible(false); break; case Backwards: len += 1; - guideLine->tqsetVisible(false); + guideLine->setVisible(false); break; case D_Left: angle += addition; @@ -1085,7 +1085,7 @@ void Bumper::moveBy(double dx, double dy) void Bumper::editModeChanged(bool changed) { - inside->tqsetVisible(!changed); + inside->setVisible(!changed); } void Bumper::advance(int phase) @@ -1166,7 +1166,7 @@ HoleResult Hole::result(TQPoint p, double s, bool * /*wasCenter*/) return Result_Miss; TQCanvasRectangle i(TQRect(p, TQSize(1, 1)), canvas()); - i.tqsetVisible(true); + i.setVisible(true); // is center of ball in cup? if (i.collidesWith(this)) @@ -1238,7 +1238,7 @@ BlackHole::BlackHole(TQCanvas *canvas) setSize(width(), width() / .8); const float factor = 1.3; outside->setSize(width() * factor, height() * factor); - outside->tqsetVisible(true); + outside->setVisible(true); moveBy(0, 0); @@ -1249,7 +1249,7 @@ void BlackHole::showInfo() { delete infoLine; infoLine = new TQCanvasLine(canvas()); - infoLine->tqsetVisible(true); + infoLine->setVisible(true); infoLine->setPen(TQPen(exitItem->pen().color(), 2)); infoLine->setZ(10000); infoLine->setPoints(x(), y(), exitItem->x(), exitItem->y()); @@ -1277,7 +1277,7 @@ void BlackHole::updateInfo() { if (infoLine) { - infoLine->tqsetVisible(true); + infoLine->setVisible(true); infoLine->setPoints(x(), y(), exitItem->x(), exitItem->y()); exitItem->showInfo(); } @@ -1338,7 +1338,7 @@ bool BlackHole::place(Ball *ball, bool /*wasCenter*/) ball->setVelocity(0, 0); ball->setState(Stopped); - ball->tqsetVisible(false); + ball->setVisible(false); ball->setForceStillGoing(true); double magnitude = Vector(TQPoint(x(), y()), TQPoint(exitItem->x(), exitItem->y())).magnitude(); @@ -1367,7 +1367,7 @@ void BlackHole::eject(Ball *ball, double speed) ball->setVector(v); ball->setForceStillGoing(false); - ball->tqsetVisible(true); + ball->setVisible(true); ball->setState(Rolling); runs++; @@ -1418,7 +1418,7 @@ void BlackHole::finishMe() } exitItem->setPoints(start.x(), start.y(), end.x(), end.y()); - exitItem->tqsetVisible(true); + exitItem->setVisible(true); } void BlackHole::save(KConfig *cfg) @@ -1439,7 +1439,7 @@ BlackHoleExit::BlackHoleExit(BlackHole *blackHole, TQCanvas *canvas) setZ(blackHole->z()); arrow->setZ(z() - .00001); updateArrowLength(); - arrow->tqsetVisible(false); + arrow->setVisible(false); } void BlackHoleExit::aboutToDie() @@ -1484,12 +1484,12 @@ void BlackHoleExit::editModeChanged(bool editing) void BlackHoleExit::showInfo() { - arrow->tqsetVisible(true); + arrow->setVisible(true); } void BlackHoleExit::hideInfo() { - arrow->tqsetVisible(false); + arrow->setVisible(false); } Config *BlackHoleExit::config(TQWidget *parent) @@ -1503,30 +1503,30 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent) : Config(parent) { this->blackHole = blackHole; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); - tqlayout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this)); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); + layout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this)); TQSpinBox *deg = new TQSpinBox(0, 359, 10, this); deg->setSuffix(TQString(" ") + i18n("degrees")); deg->setValue(blackHole->curExitDeg()); deg->setWrapping(true); - tqlayout->addWidget(deg); + layout->addWidget(deg); connect(deg, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(degChanged(int))); - tqlayout->addStretch(); + layout->addStretch(); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this)); KDoubleNumInput *min = new KDoubleNumInput(this); min->setRange(0, 8, 1, true); - htqlayout->addWidget(min); + hlayout->addWidget(min); connect(min, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(minChanged(double))); min->setValue(blackHole->minSpeed()); - htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); + hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); KDoubleNumInput *max = new KDoubleNumInput(this); max->setRange(1, 10, 1, true); - htqlayout->addWidget(max); + hlayout->addWidget(max); connect(max, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(maxChanged(double))); max->setValue(blackHole->maxSpeed()); } @@ -1639,7 +1639,7 @@ void WallPoint::updateVisible() void WallPoint::editModeChanged(bool changed) { editing = changed; - tqsetVisible(true); + setVisible(true); if (!editing) updateVisible(); } @@ -1741,8 +1741,8 @@ Wall::Wall(TQCanvas *canvas) startItem = new WallPoint(true, this, canvas); endItem = new WallPoint(false, this, canvas); - startItem->tqsetVisible(true); - endItem->tqsetVisible(true); + startItem->setVisible(true); + endItem->setVisible(true); setPen(TQPen(darkRed, 3)); setPoints(-15, 10, 15, -5); @@ -1777,10 +1777,10 @@ void Wall::setAlwaysShow(bool yes) void Wall::setVisible(bool yes) { - TQCanvasLine::tqsetVisible(yes); + TQCanvasLine::setVisible(yes); - startItem->tqsetVisible(yes); - endItem->tqsetVisible(yes); + startItem->setVisible(yes); + endItem->setVisible(yes); startItem->updateVisible(); endItem->updateVisible(); } @@ -1959,42 +1959,42 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent) { this->holeInfo = holeInfo; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Course name: "), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Course name: "), this)); KLineEdit *nameEdit = new KLineEdit(holeInfo->untranslatedName(), this); - htqlayout->addWidget(nameEdit); + hlayout->addWidget(nameEdit); connect(nameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &))); - htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Course author: "), this)); + hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Course author: "), this)); KLineEdit *authorEdit = new KLineEdit(holeInfo->author(), this); - htqlayout->addWidget(authorEdit); + hlayout->addWidget(authorEdit); connect(authorEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(authorChanged(const TQString &))); - tqlayout->addStretch(); + layout->addStretch(); - htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Par:"), this)); + hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Par:"), this)); TQSpinBox *par = new TQSpinBox(1, 15, 1, this); par->setValue(holeInfo->par()); - htqlayout->addWidget(par); + hlayout->addWidget(par); connect(par, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(parChanged(int))); - htqlayout->addStretch(); + hlayout->addStretch(); - htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); + hlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); TQSpinBox *maxstrokes = new TQSpinBox(holeInfo->lowestMaxStrokes(), 30, 1, this); TQWhatsThis::add(maxstrokes, i18n("Maximum number of strokes player can take on this hole.")); TQToolTip::add(maxstrokes, i18n("Maximum number of strokes")); maxstrokes->setSpecialValueText(i18n("Unlimited")); maxstrokes->setValue(holeInfo->maxStrokes()); - htqlayout->addWidget(maxstrokes); + hlayout->addWidget(maxstrokes); connect(maxstrokes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxStrokesChanged(int))); TQCheckBox *check = new TQCheckBox(i18n("Show border walls"), this); check->setChecked(holeInfo->borderWalls()); - tqlayout->addWidget(check); + layout->addWidget(check); connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(borderWallsChanged(bool))); } @@ -2212,7 +2212,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi pic.load(locate("appdata", "pics/grass.png")); TQPixmapCache::insert("grass", pic); } - course->tqsetBackgroundPixmap(pic); + course->setBackgroundPixmap(pic); setCanvas(course); move(0, 0); @@ -2225,7 +2225,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi highlighter = new TQCanvasRectangle(course); highlighter->setPen(TQPen(yellow, 1)); highlighter->setBrush(TQBrush(NoBrush)); - highlighter->tqsetVisible(false); + highlighter->setVisible(false); highlighter->setZ(10000); // shows some info about hole @@ -2237,14 +2237,14 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi infoText->move(15, width/2); infoText->setZ(10001); infoText->setFont(font); - infoText->tqsetVisible(false); + infoText->setVisible(false); // create the advanced putting indicator strokeCircle = new StrokeCircle(course); strokeCircle->move(width - 90, height - 90); strokeCircle->setSize(80, 80); strokeCircle->setThickness(8); - strokeCircle->tqsetVisible(false); + strokeCircle->setVisible(false); strokeCircle->setValue(0); strokeCircle->setMaxValue(360); @@ -2252,7 +2252,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi whiteBall = new Ball(course); whiteBall->setGame(this); whiteBall->setColor(white); - whiteBall->tqsetVisible(false); + whiteBall->setVisible(false); whiteBall->setDoDetect(false); int highestLog = 0; @@ -2311,7 +2311,7 @@ void KolfGame::startFirstHole(int hole) { for (; scoreboardHoles < curHole; ++scoreboardHoles) { - cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(scoreboardHoles + 1)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(scoreboardHoles + 1)); emit newHole(cfg->readNumEntry("par", 3)); } @@ -2382,7 +2382,7 @@ void KolfGame::addBorderWall(TQPoint start, TQPoint end) { Wall *wall = new Wall(course); wall->setPoints(start.x(), start.y(), end.x(), end.y()); - wall->tqsetVisible(true); + wall->setVisible(true); wall->setGame(this); wall->setZ(998.7); borderWalls.append(wall); @@ -2420,7 +2420,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e) list.pop_front(); moving = false; - highlighter->tqsetVisible(false); + highlighter->setVisible(false); selectedItem = 0; movingItem = 0; @@ -2458,7 +2458,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e) setCursor(KCursor::sizeAllCursor()); emit newSelectedItem(citem); - highlighter->tqsetVisible(true); + highlighter->setVisible(true); TQRect rect = selectedItem->boundingRect(); highlighter->move(rect.x() + 1, rect.y() + 1); highlighter->setSize(rect.width(), rect.height()); @@ -2553,7 +2553,7 @@ void KolfGame::handleMouseMoveEvent(TQMouseEvent *e) highlighter->moveBy(-(double)moveX, -(double)moveY); movingItem->moveBy(-(double)moveX, -(double)moveY); TQRect brect = movingItem->boundingRect(); - emit newStatusText(TQString("%1x%2").tqarg(brect.x()).tqarg(brect.y())); + emit newStatusText(TQString("%1x%2").arg(brect.x()).arg(brect.y())); storedMousePos = mouse; } @@ -2608,7 +2608,7 @@ void KolfGame::keyPressEvent(TQKeyEvent *e) putting = false; stroking = false; finishStroking = false; - strokeCircle->tqsetVisible(false); + strokeCircle->setVisible(false); putterTimer->stop(); putter->setOrigin((*curPlayer).ball()->x(), (*curPlayer).ball()->y()); break; @@ -2701,7 +2701,7 @@ void KolfGame::puttPress() strokeCircle->move(px + pw / 2 + 10, py + 10); else strokeCircle->move(px + pw / 2 + 10, py - 10 - strokeCircle->height()); - strokeCircle->tqsetVisible(true); + strokeCircle->setVisible(true); } putterTimer->start(putterTimerMsec); } @@ -2741,7 +2741,7 @@ void KolfGame::keyReleaseEvent(TQKeyEvent *e) { lastDelId = citem->curId(); - highlighter->tqsetVisible(false); + highlighter->setVisible(false); items.removeRef(item); citem->hideInfo(); citem->aboutToDelete(); @@ -2907,7 +2907,7 @@ void KolfGame::putterTimeout() { // aborted putting = false; - strokeCircle->tqsetVisible(false); + strokeCircle->setVisible(false); } else if (strength > maxStrength || puttReverse) { @@ -2950,7 +2950,7 @@ void KolfGame::putterTimeout() putter->go(Forwards); else { - strokeCircle->tqsetVisible(false); + strokeCircle->setVisible(false); finishStroking = false; putterTimer->stop(); putting = false; @@ -3084,7 +3084,7 @@ void KolfGame::loadStateList() if ((*curPlayer).id() == info.id) ballMoved(); else - player.ball()->tqsetVisible(!info.beginningOfHole); + player.ball()->setVisible(!info.beginningOfHole); player.setScoreForHole(info.score, curHole); player.ball()->setState(info.state); emit scoreChanged(info.id, curHole, info.score); @@ -3136,7 +3136,7 @@ void KolfGame::shotDone() const TQString placeOutside = i18n("Drop Outside of Hazard"); const TQString rehit = i18n("Rehit From Last Location"); options << placeOutside << rehit; - const TQString choice = KComboBoxDialog::getItem(i18n("What would you like to do for your next shot?"), i18n("%1 is in a Hazard").tqarg((*it).name()), options, placeOutside, "hazardOptions"); + const TQString choice = KComboBoxDialog::getItem(i18n("What would you like to do for your next shot?"), i18n("%1 is in a Hazard").arg((*it).name()), options, placeOutside, "hazardOptions"); if (choice == placeOutside) { @@ -3186,7 +3186,7 @@ void KolfGame::shotDone() } } - ball->tqsetVisible(true); + ball->setVisible(true); ball->setState(Stopped); (*it).ball()->setDoDetect(true); @@ -3207,7 +3207,7 @@ void KolfGame::shotDone() if (curStrokes >= holeInfo.maxStrokes() && holeInfo.hasMaxStrokes()) { ball->setState(Holed); - ball->tqsetVisible(false); + ball->setVisible(false); // move to center in case he/she hit out ball->move(width / 2, height / 2); @@ -3236,7 +3236,7 @@ void KolfGame::shotDone() emit newPlayersTurn(&(*curPlayer)); - (*curPlayer).ball()->tqsetVisible(true); + (*curPlayer).ball()->setVisible(true); putter->setAngle((*curPlayer).ball()); putter->setOrigin((*curPlayer).ball()->x(), (*curPlayer).ball()->y()); @@ -3256,7 +3256,7 @@ void KolfGame::startBall(const Vector &vector) playSound("hit"); emit inPlayStart(); - putter->tqsetVisible(false); + putter->setVisible(false); (*curPlayer).ball()->setState(Rolling); (*curPlayer).ball()->setVector(vector); @@ -3303,14 +3303,14 @@ void KolfGame::sayWhosGoing() { if (players->count() >= 2) { - KMessageBox::information(this, i18n("%1 will start off.").tqarg((*curPlayer).name()), i18n("New Hole"), "newHole"); + KMessageBox::information(this, i18n("%1 will start off.").arg((*curPlayer).name()), i18n("New Hole"), "newHole"); } } void KolfGame::holeDone() { for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it) - (*it).ball()->tqsetVisible(false); + (*it).ball()->setVisible(false); startNextHole(); sayWhosGoing(); } @@ -3407,7 +3407,7 @@ void KolfGame::startNextHole() if ((int)(*it).scores().count() < curHole) (*it).addHole(); (*it).ball()->setVelocity(0, 0); - (*it).ball()->tqsetVisible(false); + (*it).ball()->setVisible(false); } emit newPlayersTurn(&(*curPlayer)); @@ -3429,7 +3429,7 @@ void KolfGame::startNextHole() for (; scoreboardHoles < curHole; ++scoreboardHoles) { - cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(scoreboardHoles + 1)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(scoreboardHoles + 1)); emit newHole(cfg->readNumEntry("par", 3)); } @@ -3437,7 +3437,7 @@ void KolfGame::startNextHole() updateShowInfo(); // this is from shotDone() - (*curPlayer).ball()->tqsetVisible(true); + (*curPlayer).ball()->setVisible(true); putter->setOrigin((*curPlayer).ball()->x(), (*curPlayer).ball()->y()); updateMouse(); @@ -3451,11 +3451,11 @@ void KolfGame::startNextHole() void KolfGame::showInfo() { - TQString text = i18n("Hole %1: par %2, maximum %3 strokes").tqarg(curHole).tqarg(holeInfo.par()).tqarg(holeInfo.maxStrokes()); + TQString text = i18n("Hole %1: par %2, maximum %3 strokes").arg(curHole).arg(holeInfo.par()).arg(holeInfo.maxStrokes()); infoText->move((width - TQFontMetrics(infoText->font()).width(text)) / 2, infoText->y()); infoText->setText(text); // I hate this text! Let's not show it - //infoText->tqsetVisible(true); + //infoText->setVisible(true); emit newStatusText(text); } @@ -3463,9 +3463,9 @@ void KolfGame::showInfo() void KolfGame::showInfoDlg(bool addDontShowAgain) { KMessageBox::information(parentWidget(), - i18n("Course name: %1").tqarg(holeInfo.name()) + TQString("\n") - + i18n("Created by %1").tqarg(holeInfo.author()) + TQString("\n") - + i18n("%1 holes").tqarg(highestHole), + i18n("Course name: %1").arg(holeInfo.name()) + TQString("\n") + + i18n("Created by %1").arg(holeInfo.author()) + TQString("\n") + + i18n("%1 holes").arg(highestHole), i18n("Course Information"), addDontShowAgain? holeInfo.name() + TQString(" ") + holeInfo.author() : TQString()); } @@ -3473,7 +3473,7 @@ void KolfGame::showInfoDlg(bool addDontShowAgain) void KolfGame::hideInfo() { infoText->setText(""); - infoText->tqsetVisible(false); + infoText->setVisible(false); emit newStatusText(TQString()); } @@ -3514,7 +3514,7 @@ void KolfGame::openFile() holeInfo.setUntranslatedName(cfg->readEntryUntranslated("Name", holeInfo.untranslatedName())); emit titleChanged(holeInfo.name()); - cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(curHole)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(curHole)); curPar = cfg->readNumEntry("par", 3); holeInfo.setPar(curPar); holeInfo.borderWallsChanged(cfg->readBoolEntry("borderWalls", holeInfo.borderWalls())); @@ -3593,7 +3593,7 @@ void KolfGame::openFile() newItem->move(x, y); canvasItem->firstMove(x, y); - newItem->tqsetVisible(true); + newItem->setVisible(true); // make things actually show if (!hasFinalLoad) @@ -3616,7 +3616,7 @@ void KolfGame::openFile() if (!missingPlugins.empty()) { - KMessageBox::informationList(this, TQString("<p><http://katzbrown.com/kolf/Plugins/></p><p>") + i18n("This hole uses the following plugins, which you do not have installed:") + TQString("</p>"), missingPlugins, TQString(), TQString("%1 warning").tqarg(holeInfo.untranslatedName() + TQString::number(curHole))); + KMessageBox::informationList(this, TQString("<p><http://katzbrown.com/kolf/Plugins/></p><p>") + i18n("This hole uses the following plugins, which you do not have installed:") + TQString("</p>"), missingPlugins, TQString(), TQString("%1 warning").arg(holeInfo.untranslatedName() + TQString::number(curHole))); } lastDelId = -1; @@ -3634,7 +3634,7 @@ void KolfGame::openFile() clearHole(); setModified(false); for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it) - (*it).ball()->tqsetVisible(false); + (*it).ball()->setVisible(false); return; } @@ -3719,7 +3719,7 @@ void KolfGame::addNewObject(Object *newObj) { TQCanvasItem *newItem = newObj->newObject(course); items.append(newItem); - newItem->tqsetVisible(true); + newItem->setVisible(true); CanvasItem *canvasItem = dynamic_cast<CanvasItem *>(newItem); if (!canvasItem) @@ -3826,11 +3826,11 @@ void KolfGame::addNewHole() // make sure even the current player isn't showing for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it) - (*it).ball()->tqsetVisible(false); + (*it).ball()->setVisible(false); - whiteBall->tqsetVisible(editing); - highlighter->tqsetVisible(false); - putter->tqsetVisible(!editing); + whiteBall->setVisible(editing); + highlighter->setVisible(false); + putter->setVisible(!editing); inPlay = false; // add default objects @@ -3995,7 +3995,7 @@ void KolfGame::save() } // save where ball starts (whiteBall tells all) - cfg->setGroup(TQString("%1-ball@%2,%3").tqarg(curHole).tqarg((int)whiteBall->x()).tqarg((int)whiteBall->y())); + cfg->setGroup(TQString("%1-ball@%2,%3").arg(curHole).arg((int)whiteBall->x()).arg((int)whiteBall->y())); cfg->writeEntry("dummykey", true); cfg->setGroup("0-course@-50,-50"); @@ -4003,7 +4003,7 @@ void KolfGame::save() cfg->writeEntry("Name", holeInfo.untranslatedName()); // save hole info - cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(curHole)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(curHole)); cfg->writeEntry("par", holeInfo.par()); cfg->writeEntry("maxstrokes", holeInfo.maxStrokes()); cfg->writeEntry("borderWalls", holeInfo.borderWalls()); @@ -4066,16 +4066,16 @@ void KolfGame::toggleEditMode() { // curplayer shouldn't be hidden no matter what if ((*it).ball()->beginningOfHole() && it != curPlayer) - (*it).ball()->tqsetVisible(false); + (*it).ball()->setVisible(false); else - (*it).ball()->tqsetVisible(!editing); + (*it).ball()->setVisible(!editing); } - whiteBall->tqsetVisible(editing); - highlighter->tqsetVisible(false); + whiteBall->setVisible(editing); + highlighter->setVisible(false); // shouldn't see putter whilst editing - putter->tqsetVisible(!editing); + putter->setVisible(!editing); if (editing) autoSaveTimer->start(autoSaveMsec); @@ -4103,7 +4103,7 @@ void KolfGame::playSound(TQString file, double vol) } } - file = soundDir + file + TQString::tqfromLatin1(".wav"); + file = soundDir + file + TQString::fromLatin1(".wav"); // not needed when all of the files are in the distribution //if (!TQFile::exists(file)) @@ -4160,7 +4160,7 @@ void KolfGame::print(KPrinter &pr) if (pr.option("kde-kolf-title") == "true") { - TQString text = i18n("%1 - Hole %2; by %3").tqarg(holeInfo.name()).tqarg(curHole).tqarg(holeInfo.author()); + TQString text = i18n("%1 - Hole %2; by %3").arg(holeInfo.name()).arg(curHole).arg(holeInfo.author()); TQFont font(kapp->font()); font.setPointSize(18); TQRect rect = TQFontMetrics(font).boundingRect(text); @@ -4183,7 +4183,7 @@ void KolfGame::setBorderWalls(bool showing) { Wall *wall = 0; for (wall = borderWalls.first(); wall; wall = borderWalls.next()) - wall->tqsetVisible(showing); + wall->setVisible(showing); } void KolfGame::setUseAdvancedPutting(bool yes) @@ -4219,7 +4219,7 @@ void KolfGame::courseInfo(CourseInfo &info, const TQString& filename) unsigned int par= 0; while (1) { - TQString group = TQString("%1-hole@-50,-50|0").tqarg(hole); + TQString group = TQString("%1-hole@-50,-50|0").arg(hole); if (!cfg.hasGroup(group)) { hole--; diff --git a/kolf/game.h b/kolf/game.h index e1766802..8a634d47 100644 --- a/kolf/game.h +++ b/kolf/game.h @@ -14,7 +14,7 @@ #include <tqpainter.h> #include <tqcolor.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqpen.h> #include <tqpoint.h> @@ -207,7 +207,7 @@ private slots: void check2Changed(bool on); protected: - TQVBoxLayout *m_vtqlayout; + TQVBoxLayout *m_vlayout; private: TQLabel *slow1; @@ -557,7 +557,7 @@ protected slots: void rightWallChanged(bool); protected: - TQVBoxLayout *m_vtqlayout; + TQVBoxLayout *m_vlayout; TQCheckBox *top; TQCheckBox *bot; TQCheckBox *left; diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp index 99d86cf8..7a6f5c34 100644 --- a/kolf/kcomboboxdialog.cpp +++ b/kolf/kcomboboxdialog.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kcombobox.h> @@ -124,8 +124,8 @@ TQString KComboBoxDialog::getText(const TQString &_caption, const TQString &_tex KHistoryCombo * const box = dlg.comboBox(); box->setEditable(true); - const TQString historyItem = TQString("%1History").tqarg(configName); - const TQString completionItem = TQString("%1Completion").tqarg(configName); + const TQString historyItem = TQString("%1History").arg(configName); + const TQString completionItem = TQString("%1Completion").arg(configName); if(!configName.isNull()) { diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp index 5e0ce023..0c9d9724 100644 --- a/kolf/kolf.cpp +++ b/kolf/kolf.cpp @@ -32,7 +32,7 @@ #include <tqfileinfo.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <stdlib.h> @@ -65,7 +65,7 @@ Kolf::Kolf() filename = TQString(); dummy = new TQWidget(this); setCentralWidget(dummy); - tqlayout = new TQGridLayout(dummy, 3, 1); + layout = new TQGridLayout(dummy, 3, 1); resize(420, 480); } @@ -176,7 +176,7 @@ void Kolf::startNewGame() players.clear(); delete scoreboard; scoreboard = new ScoreBoard(dummy, "Score Board"); - tqlayout->addWidget(scoreboard, 1, 0); + layout->addWidget(scoreboard, 1, 0); scoreboard->show(); if (loadedGame.isNull()) @@ -264,7 +264,7 @@ void Kolf::startNewGame() game->setShowGuideLine(showGuideLineAction->isChecked()); game->setSound(soundAction->isChecked()); - tqlayout->addWidget(game, 0, 0, AlignCenter); + layout->addWidget(game, 0, 0, AlignCenter); game->show(); game->setFocus(); @@ -372,7 +372,7 @@ void Kolf::createSpacer() spacer = new KolfGame(obj, &spacerPlayers, KGlobal::dirs()->findResource("appdata", "intro"), dummy); spacer->setSound(false); spacer->startFirstHole(1); - tqlayout->addWidget(spacer, 0, 0, AlignCenter); + layout->addWidget(spacer, 0, 0, AlignCenter); spacer->hidePutter(); spacer->ignoreEvents(true); @@ -431,10 +431,10 @@ void Kolf::gameOver() if (names.count() > 1) { TQString winners = names.join(i18n(" and ")); - KMessageBox::information(this, i18n("%1 tied").tqarg(winners)); + KMessageBox::information(this, i18n("%1 tied").arg(winners)); } else - KMessageBox::information(this, i18n("%1 won!").tqarg(names.first())); + KMessageBox::information(this, i18n("%1 won!").arg(names.first())); } if (competition) @@ -459,7 +459,7 @@ void Kolf::gameOver() scoreDialog->addScore((*it).score, info, false, true); } - scoreDialog->setComment(i18n("High Scores for %1").tqarg(courseInfo.name)); + scoreDialog->setComment(i18n("High Scores for %1").arg(courseInfo.name)); scoreDialog->show(); } @@ -475,7 +475,7 @@ void Kolf::showHighScores() game->courseInfo(courseInfo, game->curFilename()); scoreDialog->setConfigGroup(courseInfo.untranslatedName + TQString(" Highscores")); - scoreDialog->setComment(i18n("High Scores for %1").tqarg(courseInfo.name)); + scoreDialog->setComment(i18n("High Scores for %1").arg(courseInfo.name)); scoreDialog->show(); } @@ -537,7 +537,7 @@ void Kolf::saveGame() void Kolf::loadGame() { - loadedGame = KFileDialog::getOpenFileName(":savedkolf", TQString::tqfromLatin1("application/x-kolf"), this, i18n("Pick Kolf Saved Game")); + loadedGame = KFileDialog::getOpenFileName(":savedkolf", TQString::fromLatin1("application/x-kolf"), this, i18n("Pick Kolf Saved Game")); if (loadedGame.isNull()) return; @@ -572,7 +572,7 @@ void Kolf::openURL(KURL url) void Kolf::newPlayersTurn(Player *player) { - tempStatusBarText = i18n("%1's turn").tqarg(player->name()); + tempStatusBarText = i18n("%1's turn").arg(player->name()); if (showInfoAction->isChecked()) statusBar()->message(tempStatusBarText, 5 * 1000); @@ -601,7 +601,7 @@ void Kolf::editingStarted() scoreboard->hide(); - tqlayout->addWidget(editor, 1, 0); + layout->addWidget(editor, 1, 0); editor->show(); clearHoleAction->setEnabled(true); @@ -643,7 +643,7 @@ void Kolf::inPlayEnd() void Kolf::maxStrokesReached(const TQString &name) { - KMessageBox::sorry(this, i18n("%1's score has reached the maximum for this hole.").tqarg(name)); + KMessageBox::sorry(this, i18n("%1's score has reached the maximum for this hole.").arg(name)); } void Kolf::updateHoleMenu(int largest) @@ -697,7 +697,7 @@ void Kolf::print() KPrinter pr; pr.addDialogPage(new PrintDialogPage()); - if (pr.setup(this, i18n("Print %1 - Hole %2").tqarg(game->courseName()).tqarg(game->currentHole()))) + if (pr.setup(this, i18n("Print %1 - Hole %2").arg(game->courseName()).arg(game->currentHole()))) { pr.newPage(); if (game) @@ -785,14 +785,14 @@ void Kolf::initPlugins() void Kolf::showPlugins() { - TQString text = TQString("<h2>%1</h2><ol>").tqarg(i18n("Currently Loaded Plugins")); + TQString text = TQString("<h2>%1</h2><ol>").arg(i18n("Currently Loaded Plugins")); Object *object = 0; for (object = plugins.first(); object; object = plugins.next()) { text.append("<li>"); text.append(object->name()); text.append(" - "); - text.append(i18n("by %1").tqarg(object->author())); + text.append(i18n("by %1").arg(object->author())); text.append("</li>"); } text.append("</ol>"); diff --git a/kolf/kolf.h b/kolf/kolf.h index 62892ea7..ea0f3c29 100644 --- a/kolf/kolf.h +++ b/kolf/kolf.h @@ -88,7 +88,7 @@ private: TQString filename; PlayerList players; PlayerList spacerPlayers; - TQGridLayout *tqlayout; + TQGridLayout *layout; ScoreBoard *scoreboard; KToggleAction *editingAction; KAction *newHoleAction; diff --git a/kolf/main.cpp b/kolf/main.cpp index 137121c4..4f15d026 100644 --- a/kolf/main.cpp +++ b/kolf/main.cpp @@ -57,16 +57,16 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KolfGame::courseInfo(info, filename); cout << info.name.latin1() - << " - " << i18n("By %1").tqarg(info.author).latin1() - << " - " << i18n("%1 holes").tqarg(info.holes).latin1() - << " - " << i18n("par %1").tqarg(info.par).latin1() + << " - " << i18n("By %1").arg(info.author).latin1() + << " - " << i18n("%1 holes").arg(info.holes).latin1() + << " - " << i18n("par %1").arg(info.par).latin1() << endl; return 0; } else { - KCmdLineArgs::usage(i18n("Course %1 does not exist.").tqarg(filename.latin1())); + KCmdLineArgs::usage(i18n("Course %1 does not exist.").arg(filename.latin1())); } } diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp index 8ee1f7c7..36bb795e 100644 --- a/kolf/newgame.cpp +++ b/kolf/newgame.cpp @@ -16,7 +16,7 @@ #include <tqevent.h> #include <tqframe.h> #include <tqpen.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klistbox.h> #include <tqstyle.h> @@ -56,14 +56,14 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ scroller = new TQScrollView(playerPage); bigLayout->addWidget(scroller); - tqlayout = new TQVBox(scroller->viewport()); + layout = new TQVBox(scroller->viewport()); if (!TQPixmapCache::find("grass", grass)) { grass.load(locate("appdata", "pics/grass.png")); TQPixmapCache::insert("grass", grass); } scroller->viewport()->setBackgroundPixmap(grass); - scroller->addChild(tqlayout); + scroller->addChild(layout); TQMap<TQString, TQString> entries = config->entryMap("New Game Dialog"); unsigned int i = 0; @@ -95,7 +95,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ connect(coursesLink, TQT_SIGNAL(leftClickedURL(const TQString &)), kapp, TQT_SLOT(invokeBrowser(const TQString &))); coursePageLayout->addWidget(coursesLink); - TQHBoxLayout *htqlayout = new TQHBoxLayout(coursePageLayout, spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(coursePageLayout, spacingHint()); // following use this group config->setGroup("New Game Dialog Mode"); @@ -128,13 +128,13 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ nameList.append(newName); courseList = new KListBox(coursePage); - htqlayout->addWidget(courseList); + hlayout->addWidget(courseList); courseList->insertStringList(nameList); courseList->setCurrentItem(curItem); connect(courseList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(courseSelected(int))); connect(courseList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - TQVBoxLayout *detailLayout = new TQVBoxLayout(htqlayout, spacingHint()); + TQVBoxLayout *detailLayout = new TQVBoxLayout(hlayout, spacingHint()); name = new TQLabel(coursePage); detailLayout->addWidget(name); author = new TQLabel(coursePage); @@ -170,15 +170,15 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ // options page optionsPage = addPage(i18n("Options"), i18n("Game Options")); - TQVBoxLayout *vtqlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint()); + TQVBoxLayout *vlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint()); mode = new TQCheckBox(i18n("&Strict mode"), optionsPage); - vtqlayout->addWidget(mode); + vlayout->addWidget(mode); mode->setChecked(config->readBoolEntry("competition", false)); TQLabel *desc = new TQLabel(i18n("In strict mode, undo, editing, and switching holes is not allowed. This is generally for competition. Only in strict mode are highscores kept."), optionsPage); desc->setTextFormat(RichText); - vtqlayout->addWidget(desc); + vlayout->addWidget(desc); } void NewGameDialog::slotOk() @@ -212,11 +212,11 @@ void NewGameDialog::courseSelected(int index) CourseInfo &curinfo = info[currentCourse]; - name->setText(TQString("<strong>%1</strong>").tqarg(curinfo.name)); + name->setText(TQString("<strong>%1</strong>").arg(curinfo.name)); - author->setText(i18n("By %1").tqarg(curinfo.author)); - par->setText(i18n("Par %1").tqarg(curinfo.par)); - holes->setText(i18n("%1 Holes").tqarg(curinfo.holes)); + author->setText(i18n("By %1").arg(curinfo.author)); + par->setText(i18n("Par %1").arg(curinfo.par)); + holes->setText(i18n("%1 Holes").arg(curinfo.holes)); } void NewGameDialog::showHighscores() @@ -224,7 +224,7 @@ void NewGameDialog::showHighscores() KScoreDialog *scoreDialog = new KScoreDialog(KScoreDialog::Name | KScoreDialog::Custom1 | KScoreDialog::Score, this); scoreDialog->addField(KScoreDialog::Custom1, i18n("Par"), "Par"); scoreDialog->setConfigGroup(info[currentCourse].untranslatedName + TQString(" Highscores")); - scoreDialog->setComment(i18n("High Scores for %1").tqarg(info[currentCourse].name)); + scoreDialog->setComment(i18n("High Scores for %1").arg(info[currentCourse].name)); scoreDialog->show(); } @@ -253,7 +253,7 @@ void NewGameDialog::selectionChanged() void NewGameDialog::addCourse() { - TQStringList files = KFileDialog::getOpenFileNames(":kourses", TQString::tqfromLatin1("application/x-kourse"), this, i18n("Pick Kolf Course")); + TQStringList files = KFileDialog::getOpenFileNames(":kourses", TQString::fromLatin1("application/x-kourse"), this, i18n("Pick Kolf Course")); bool hasDuplicates = false; @@ -287,7 +287,7 @@ void NewGameDialog::addPlayer() if (editors.count() >= startColors.count()) return; - editors.append(new PlayerEditor(i18n("Player %1").tqarg(editors.count() + 1), *startColors.at(editors.count()), tqlayout)); + editors.append(new PlayerEditor(i18n("Player %1").arg(editors.count() + 1), *startColors.at(editors.count()), layout)); editors.last()->show(); connect(editors.last(), TQT_SIGNAL(deleteEditor(PlayerEditor *)), this, TQT_SLOT(deleteEditor(PlayerEditor *))); @@ -314,7 +314,7 @@ void NewGameDialog::enableButtons() PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *parent, const char *_name) : TQWidget(parent, _name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialogBase::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(this, KDialogBase::spacingHint()); if (!TQPixmapCache::find("grass", grass)) { @@ -324,17 +324,17 @@ PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *par setBackgroundPixmap(grass); editor = new KLineEdit(this); - tqlayout->addWidget(editor); + layout->addWidget(editor); editor->setFrame(false); editor->setText(startName); - tqlayout->addStretch(); - tqlayout->addWidget(colorButton = new KColorButton(startColor, this)); + layout->addStretch(); + layout->addWidget(colorButton = new KColorButton(startColor, this)); colorButton->setAutoMask(true); colorButton->setBackgroundPixmap(grass); KPushButton *remove = new KPushButton(i18n("Remove"), this); remove->setAutoMask(true); - tqlayout->addWidget(remove); + layout->addWidget(remove); remove->setBackgroundPixmap(grass); connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeMe())); } diff --git a/kolf/newgame.h b/kolf/newgame.h index 4d0d1af5..9a8a7493 100644 --- a/kolf/newgame.h +++ b/kolf/newgame.h @@ -74,7 +74,7 @@ private slots: void showHighscores(); private: - TQVBox *tqlayout; + TQVBox *layout; KPushButton *addButton; TQFrame *playerPage; TQScrollView *scroller; diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp index 10a26b9c..8c75bda3 100644 --- a/kolf/objects/poolball/poolball.cpp +++ b/kolf/objects/poolball/poolball.cpp @@ -1,8 +1,8 @@ -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqcanvas.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <klocale.h> @@ -57,17 +57,17 @@ void PoolBall::draw(TQPainter &p) PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent) : Config(parent), m_poolBall(poolBall) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); - tqlayout->addStretch(); + layout->addStretch(); TQLabel *num = new TQLabel(i18n("Number:"), this); - tqlayout->addWidget(num); + layout->addWidget(num); KIntNumInput *slider = new KIntNumInput(m_poolBall->number(), this); slider->setRange(1, 15); - tqlayout->addWidget(slider); + layout->addWidget(slider); - tqlayout->addStretch(); + layout->addStretch(); connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(numberChanged(int))); } diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp index bb3af320..03256a07 100644 --- a/kolf/objects/test/test.cpp +++ b/kolf/objects/test/test.cpp @@ -1,8 +1,8 @@ -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqcanvas.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqslider.h> #include <klocale.h> @@ -41,7 +41,7 @@ void Test::advance(int phase) // random color const TQColor myColor((TQRgb)(kapp->random() % 0x01000000)); - // set the brush, so our tqshape is drawn + // set the brush, so our shape is drawn // with the random color setBrush(TQBrush(myColor)); @@ -68,21 +68,21 @@ void Test::load(KConfig *cfg) TestConfig::TestConfig(Test *test, TQWidget *parent) : Config(parent), m_test(test) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); - tqlayout->addStretch(); + layout->addStretch(); - tqlayout->addWidget(new TQLabel(i18n("Flash speed"), this)); + layout->addWidget(new TQLabel(i18n("Flash speed"), this)); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); TQLabel *slow = new TQLabel(i18n("Slow"), this); - htqlayout->addWidget(slow); + hlayout->addWidget(slow); TQSlider *slider = new TQSlider(1, 100, 5, 101 - m_test->switchEvery(), Qt::Horizontal, this); - htqlayout->addWidget(slider); + hlayout->addWidget(slider); TQLabel *fast = new TQLabel(i18n("Fast"), this); - htqlayout->addWidget(fast); + hlayout->addWidget(fast); - tqlayout->addStretch(); + layout->addStretch(); connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(switchEveryChanged(int))); } diff --git a/kolf/printdialogpage.cpp b/kolf/printdialogpage.cpp index e60de7ea..d5b4e807 100644 --- a/kolf/printdialogpage.cpp +++ b/kolf/printdialogpage.cpp @@ -1,5 +1,5 @@ #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <klocale.h> @@ -13,11 +13,11 @@ PrintDialogPage::PrintDialogPage(TQWidget *parent, const char *name) { setTitle(i18n("Kolf Options")); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); titleCheck = new TQCheckBox(i18n("Draw title text"), this); titleCheck->setChecked(true); - tqlayout->addWidget(titleCheck); + layout->addWidget(titleCheck); } void PrintDialogPage::getOptions(TQMap<TQString, TQString> &opts, bool /*incldef*/) diff --git a/kolf/scoreboard.cpp b/kolf/scoreboard.cpp index 717dbc36..74bf786f 100644 --- a/kolf/scoreboard.cpp +++ b/kolf/scoreboard.cpp @@ -1,7 +1,7 @@ #include <kdebug.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtable.h> #include <tqwidget.h> #include <tqheader.h> diff --git a/kolf/slope.cpp b/kolf/slope.cpp index e18c3a88..a6a1abf1 100644 --- a/kolf/slope.cpp +++ b/kolf/slope.cpp @@ -71,7 +71,7 @@ void Slope::showInfo() arrow->setZ(z() + .01); arrow->setVisible(true); } - text->tqsetVisible(true); + text->setVisible(true); } void Slope::hideInfo() @@ -80,7 +80,7 @@ void Slope::hideInfo() Arrow *arrow = 0; for (arrow = arrows.first(); arrow; arrow = arrows.next()) arrow->setVisible(false); - text->tqsetVisible(false); + text->setVisible(false); } void Slope::aboutToDie() @@ -179,7 +179,7 @@ void Slope::moveArrow() void Slope::editModeChanged(bool changed) { - point->tqsetVisible(changed); + point->setVisible(changed); moveBy(0, 0); } @@ -521,7 +521,7 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent) : Config(parent) { this->slope = slope; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint()); KComboBox *gradient = new KComboBox(this); TQStringList items; TQString curText; @@ -533,28 +533,28 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent) } gradient->insertStringList(items); gradient->setCurrentText(curText); - tqlayout->addWidget(gradient); + layout->addWidget(gradient); connect(gradient, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setGradient(const TQString &))); - tqlayout->addStretch(); + layout->addStretch(); TQCheckBox *reversed = new TQCheckBox(i18n("Reverse direction"), this); reversed->setChecked(slope->isReversed()); - tqlayout->addWidget(reversed); + layout->addWidget(reversed); connect(reversed, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setReversed(bool))); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint()); - htqlayout->addWidget(new TQLabel(i18n("Grade:"), this)); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); + hlayout->addWidget(new TQLabel(i18n("Grade:"), this)); KDoubleNumInput *grade = new KDoubleNumInput(this); grade->setRange(0, 8, 1, true); grade->setValue(slope->curGrade()); - htqlayout->addWidget(grade); + hlayout->addWidget(grade); connect(grade, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(gradeChanged(double))); TQCheckBox *stuck = new TQCheckBox(i18n("Unmovable"), this); TQWhatsThis::add(stuck, i18n("Whether or not this slope can be moved by other objects, like floaters.")); stuck->setChecked(slope->isStuckOnGround()); - tqlayout->addWidget(stuck); + layout->addWidget(stuck); connect(stuck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStuckOnGround(bool))); } diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc index b78053e4..1af7a9b6 100644 --- a/konquest/fleetdlg.cc +++ b/konquest/fleetdlg.cc @@ -1,4 +1,4 @@ -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <klocale.h> #include <math.h> @@ -46,21 +46,21 @@ FleetDlg::FleetDlg( TQWidget *parent, AttackFleetList *fleets ) fleetTable->addColumn(i18n("Ships")); fleetTable->addColumn(i18n("Kill Percentage")); fleetTable->addColumn(i18n("Arrival Turn")); - fleetTable->setMinimumSize( fleetTable->tqsizeHint() ); + fleetTable->setMinimumSize( fleetTable->sizeHint() ); KPushButton *okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->setMinimumSize( okButton->tqsizeHint() ); + okButton->setMinimumSize( okButton->sizeHint() ); okButton->setDefault(true); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this ); - TQHBoxLayout *tqlayout2 = new TQHBoxLayout; + TQVBoxLayout *layout1 = new TQVBoxLayout( this ); + TQHBoxLayout *layout2 = new TQHBoxLayout; - tqlayout1->addWidget( fleetTable, 1 ); - tqlayout1->addLayout( tqlayout2 ); + layout1->addWidget( fleetTable, 1 ); + layout1->addLayout( layout2 ); - tqlayout2->addStretch( 2 ); - tqlayout2->addWidget( okButton ); - tqlayout2->addStretch( 2 ); + layout2->addStretch( 2 ); + layout2->addWidget( okButton ); + layout2->addStretch( 2 ); connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); @@ -79,10 +79,10 @@ FleetDlg::init() while( (curFleet = nextFleet())) { fleetNumber++; new FleetDlgListViewItem(fleetTable, - TQString("%1").tqarg(fleetNumber), + TQString("%1").arg(fleetNumber), curFleet->destination->getName(), - TQString("%1").tqarg(curFleet->getShipCount()), - TQString("%1").tqarg(KGlobal::locale()->formatNumber(curFleet->killPercentage, 3)), - TQString("%1").tqarg((int)ceil(curFleet->arrivalTurn))); + TQString("%1").arg(curFleet->getShipCount()), + TQString("%1").arg(KGlobal::locale()->formatNumber(curFleet->killPercentage, 3)), + TQString("%1").arg((int)ceil(curFleet->arrivalTurn))); } } diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc index 9f1d1a7f..f4b0e25a 100644 --- a/konquest/gameboard.cc +++ b/konquest/gameboard.cc @@ -1,4 +1,4 @@ -#include <tqlayout.h> +#include <layout.h> #include <tqcolor.h> #include <tqlabel.h> #include <tqslider.h> @@ -8,7 +8,7 @@ #include <tqpushbutton.h> #include <tqlineedit.h> #include <tqvalidator.h> -#include <tqtextedit.h> +#include <textedit.h> #include <kapplication.h> #include <klocale.h> @@ -60,10 +60,10 @@ GameBoard::GameBoard( TQWidget *parent ) turnCounter = new TQLabel( this ); turnCounter->setPalette( palette ); turnCounter->setText( "Turn" ); - turnCounter->setMaximumHeight( turnCounter->tqsizeHint().height() ); + turnCounter->setMaximumHeight( turnCounter->sizeHint().height() ); endTurn = new TQPushButton( i18n("End Turn"), this ); - endTurn->setFixedSize( endTurn->tqsizeHint() ); + endTurn->setFixedSize( endTurn->sizeHint() ); endTurn->setPalette( palette ); shipCountEdit = new TQLineEdit( this ); @@ -88,33 +88,33 @@ GameBoard::GameBoard( TQWidget *parent ) //******************************************************************** // Layout the main window //******************************************************************** - TQHBoxLayout *tqlayout1 = new TQHBoxLayout( this ); - TQVBoxLayout *tqlayout2 = new TQVBoxLayout; - TQHBoxLayout *tqlayout3 = new TQHBoxLayout; - TQVBoxLayout *tqlayout4 = new TQVBoxLayout; + TQHBoxLayout *layout1 = new TQHBoxLayout( this ); + TQVBoxLayout *layout2 = new TQVBoxLayout; + TQHBoxLayout *layout3 = new TQHBoxLayout; + TQVBoxLayout *layout4 = new TQVBoxLayout; - tqlayout1->addLayout( tqlayout2 ); - tqlayout2->addLayout( tqlayout3 ); + layout1->addLayout( layout2 ); + layout2->addLayout( layout3 ); - tqlayout3->addSpacing( 5 ); - tqlayout3->addWidget( gameMessage, 10 ); - tqlayout3->addWidget( shipCountEdit, 1 ); - tqlayout3->addWidget( endTurn, 1 ); + layout3->addSpacing( 5 ); + layout3->addWidget( gameMessage, 10 ); + layout3->addWidget( shipCountEdit, 1 ); + layout3->addWidget( endTurn, 1 ); - tqlayout2->addSpacing( 5 ); - tqlayout2->addWidget( mapWidget, 0, AlignTop ); - tqlayout2->addWidget( msgWidget ); - tqlayout2->addStretch( 1 ); + layout2->addSpacing( 5 ); + layout2->addWidget( mapWidget, 0, AlignTop ); + layout2->addWidget( msgWidget ); + layout2->addStretch( 1 ); - tqlayout1->addSpacing( 5 ); - tqlayout1->addLayout( tqlayout4, 10 ); + layout1->addSpacing( 5 ); + layout1->addLayout( layout4, 10 ); - tqlayout4->addWidget( planetInfo, 1 ); - tqlayout4->addSpacing( 10 ); - tqlayout4->addWidget( turnCounter, 1 ); - tqlayout4->addStretch( 1 ); + layout4->addWidget( planetInfo, 1 ); + layout4->addSpacing( 10 ); + layout4->addWidget( turnCounter, 1 ); + layout4->addStretch( 1 ); - tqlayout1->addStretch( 1 ); + layout1->addStretch( 1 ); //********************************************************************** // Set up signal/slot connections @@ -137,7 +137,7 @@ GameBoard::~GameBoard() } #if 0 -TQSize GameBoard::tqsizeHint() const +TQSize GameBoard::sizeHint() const { return TQSize( 600, 550 ); } @@ -315,10 +315,10 @@ GameBoard::turn() TQString msg; msg = i18n("The distance from Planet %1 to Planet %2 is %3 light years.\n" "A ship leaving this turn will arrive on turn %4") - .tqarg(sourcePlanet->getName()) - .tqarg(destPlanet->getName()) - .tqarg(KGlobal::locale()->formatNumber( dist, 2 )) - .tqarg(KGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 )); + .arg(sourcePlanet->getName()) + .arg(destPlanet->getName()) + .arg(KGlobal::locale()->formatNumber( dist, 2 )) + .arg(KGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 )); KMessageBox::information( this, msg, i18n("Distance")); gameState = NONE; @@ -431,7 +431,7 @@ GameBoard::turn() } TQString turnStr; - turnStr = i18n("Turn #: %1 of %2").tqarg(turnNumber).tqarg(lastTurn); + turnStr = i18n("Turn #: %1 of %2").arg(turnNumber).arg(lastTurn); turnCounter->setText( turnStr ); @@ -470,15 +470,15 @@ GameBoard::nextTurn() Player *winner = findWinner(); if (winner) { - mapWidget->tqrepaint(true); + mapWidget->repaint(true); KMessageBox::information(this, - i18n("The mighty %1 has conquered the galaxy!").tqarg(winner->getName()), + i18n("The mighty %1 has conquered the galaxy!").arg(winner->getName()), i18n("Game Over")); } if( (turnNumber == lastTurn) && !winner ) { - mapWidget->tqrepaint(true); + mapWidget->repaint(true); GameEndDlg *dlg = new GameEndDlg( this ); if( dlg->exec() == KDialogBase::Yes ) { @@ -492,7 +492,7 @@ GameBoard::nextTurn() { // Game over, man! Game over. - mapWidget->tqrepaint(true); + mapWidget->repaint(true); gameOver(); }; @@ -565,8 +565,8 @@ GameBoard::gameMsg(const TQString &msg, Player *player, Planet *planet, Player * { if (!player->isAiPlayer()) isHumanInvolved = true; - colorMsg = colorMsg.tqarg(playerString(player)); - plainMsg = plainMsg.tqarg(player->getName()); + colorMsg = colorMsg.arg(playerString(player)); + plainMsg = plainMsg.arg(player->getName()); } if (planet) @@ -577,15 +577,15 @@ GameBoard::gameMsg(const TQString &msg, Player *player, Planet *planet, Player * isHumanInvolved = true; TQString color = planetPlayer->getColor().name(); - colorMsg = colorMsg.tqarg(TQString("<font color=\"%1\">%2</font>").tqarg(color, planet->getName())); - plainMsg = plainMsg.tqarg(planet->getName()); + colorMsg = colorMsg.arg(TQString("<font color=\"%1\">%2</font>").arg(color, planet->getName())); + plainMsg = plainMsg.arg(planet->getName()); } - msgWidget->append(("<qt><font color=\"white\">Turn %1:</font> <font color=\""+color+"\">").tqarg(turnNumber)+colorMsg+"</font></qt>"); + msgWidget->append(("<qt><font color=\"white\">Turn %1:</font> <font color=\""+color+"\">").arg(turnNumber)+colorMsg+"</font></qt>"); msgWidget->scrollToBottom(); if (isHumanInvolved) { - mapWidget->tqrepaint(true); + mapWidget->repaint(true); KMessageBox::information(this, plainMsg); } } @@ -660,7 +660,7 @@ GameBoard::doFleetArrival( AttackFleet *arrivingFleet ) TQString msg; msg = i18n("Reinforcements (%1 ships) have arrived for planet %2.") - .tqarg(arrivingFleet->getShipCount()); + .arg(arrivingFleet->getShipCount()); gameMsg(msg, 0, arrivingFleet->destination); } } else { @@ -717,7 +717,7 @@ GameBoard::doFleetArrival( AttackFleet *arrivingFleet ) } } - mapWidget->tqrepaint(true); + mapWidget->repaint(true); } //************************************************************************ diff --git a/konquest/gameboard.h b/konquest/gameboard.h index e429a4a4..29c803dd 100644 --- a/konquest/gameboard.h +++ b/konquest/gameboard.h @@ -32,7 +32,7 @@ public: bool isGameInProgress(void) const { return gameInProgress; } -// virtual TQSize tqsizeHint() const; +// virtual TQSize sizeHint() const; protected slots: void startNewGame(); diff --git a/konquest/gamecore.cc b/konquest/gamecore.cc index e02c115f..6696cbea 100644 --- a/konquest/gamecore.cc +++ b/konquest/gamecore.cc @@ -482,7 +482,7 @@ Player::getName() TQString Player::getColoredName() { - return TQString("<font color=\"%1\">%2</font>").tqarg(color.name(), name); + return TQString("<font color=\"%1\">%2</font>").arg(color.name(), name); } Player *Player::createPlayer( TQString newName, TQColor color, int playerNum, bool isAi ) diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cc index 726f0561..637e9dc3 100644 --- a/konquest/gameenddlg.cc +++ b/konquest/gameenddlg.cc @@ -1,5 +1,5 @@ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqslider.h> #include <tqvbox.h> @@ -20,7 +20,7 @@ GameEndDlg::GameEndDlg( TQWidget *parent ) // Create controls TQLabel *label1 = new TQLabel( i18n("This is the last turn.\nDo you wish to add extra turns?")+"\n\n", page ); - label1->tqsetAlignment( AlignCenter ); + label1->setAlignment( AlignCenter ); turnCountLbl = new TQLabel( page ); turnCount = new TQSlider( 1, 40, 1, 5, Qt::Horizontal, page ); @@ -71,6 +71,6 @@ GameEndDlg::extraTurns() void GameEndDlg::turnCountChange( int newTurnCount ) { - TQString newLbl = i18n("Extra turns: %1").tqarg( newTurnCount ); + TQString newLbl = i18n("Extra turns: %1").arg( newTurnCount ); turnCountLbl->setText( newLbl); } diff --git a/konquest/map_widget.cc b/konquest/map_widget.cc index 3d0cd67e..a8aa33de 100644 --- a/konquest/map_widget.cc +++ b/konquest/map_widget.cc @@ -149,7 +149,7 @@ ConquestMap::squareBlink() void ConquestMap::mapUpdate() { - viewport()->tqrepaint(false); + viewport()->repaint(false); } diff --git a/konquest/newGameDlg_ui.ui b/konquest/newGameDlg_ui.ui index fd7f782d..55a8a2b9 100644 --- a/konquest/newGameDlg_ui.ui +++ b/konquest/newGameDlg_ui.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -97,7 +97,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -131,7 +131,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -202,7 +202,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -246,7 +246,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -303,7 +303,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -312,7 +312,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -328,7 +328,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -353,7 +353,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/konquest/newgamedlg.cc b/konquest/newgamedlg.cc index a3d2718b..4cc9323f 100644 --- a/konquest/newgamedlg.cc +++ b/konquest/newgamedlg.cc @@ -1,5 +1,5 @@ #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcolor.h> #include <tqlabel.h> #include <tqslider.h> @@ -96,7 +96,7 @@ NewGameDlg::init() for( TQListViewItem *item = w->listPlayers->firstChild(); item; item = item->nextSibling(), plrNum++ ) { - TQString key = TQString("Player_%1").tqarg(plrNum); + TQString key = TQString("Player_%1").arg(plrNum); TQString playerName = config->readEntry(key); if (playerName.isEmpty()) @@ -184,7 +184,7 @@ NewGameDlg::setPlayerCount(int playerCount) while(w->listPlayers->childCount() < playerCount) { - TQString playerName = i18n("Generated AI player name", "Comp%1").tqarg(i+1); + TQString playerName = i18n("Generated AI player name", "Comp%1").arg(i+1); TQPixmap pm(16,16); TQColor color(PlayerColors[i]); pm.fill(color); @@ -229,9 +229,9 @@ NewGameDlg::turns() void NewGameDlg::updateLabels() { - w->labelPlayers->setText(i18n("Number of &players: %1").tqarg(w->sliderPlayers->value())); - w->labelPlanets->setText(i18n("Number of neutral p&lanets: %1").tqarg(w->sliderPlanets->value())); - w->labelTurns->setText(i18n("Number of &turns: %1").tqarg(w->sliderTurns->value())); + w->labelPlayers->setText(i18n("Number of &players: %1").arg(w->sliderPlayers->value())); + w->labelPlanets->setText(i18n("Number of neutral p&lanets: %1").arg(w->sliderPlanets->value())); + w->labelTurns->setText(i18n("Number of &turns: %1").arg(w->sliderTurns->value())); } void @@ -269,7 +269,7 @@ NewGameDlg::save() for( TQListViewItem *item = w->listPlayers->firstChild(); item; item = item->nextSibling() ) { - TQString key = TQString("Player_%1").tqarg(plrNum); + TQString key = TQString("Player_%1").arg(plrNum); TQString playerName = item->text(0); bool ai = (item->text(2) == "A"); if (ai) diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc index 9343fb81..c41c4096 100644 --- a/konquest/planet_info.cc +++ b/konquest/planet_info.cc @@ -1,6 +1,6 @@ #include <tqlabel.h> -#include <tqlayout.h> -#include <tqpalette.h> +#include <layout.h> +#include <palette.h> #include <tqcolor.h> #include <kapplication.h> #include <klocale.h> @@ -27,19 +27,19 @@ PlanetInfo::PlanetInfo( TQWidget *parent, TQPalette palette ) clearDisplay(); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this ); + TQVBoxLayout *layout1 = new TQVBoxLayout( this ); - tqlayout1->addWidget( name ); - tqlayout1->addWidget( owner ); - tqlayout1->addWidget( ships ); - tqlayout1->addWidget( production ); - tqlayout1->addWidget( kill_percent ); - tqlayout1->addStretch(1); + layout1->addWidget( name ); + layout1->addWidget( owner ); + layout1->addWidget( ships ); + layout1->addWidget( production ); + layout1->addWidget( kill_percent ); + layout1->addStretch(1); setMouseTracking( true ); - setMinimumSize( tqsizeHint() ); - setMaximumHeight( tqsizeHint().height() ); + setMinimumSize( sizeHint() ); + setMaximumHeight( sizeHint().height() ); } PlanetInfo::~PlanetInfo() @@ -47,15 +47,15 @@ PlanetInfo::~PlanetInfo() emptyPlanetInfoList(); } -TQSize PlanetInfo::tqsizeHint() const +TQSize PlanetInfo::sizeHint() const { int height; - height = name->tqsizeHint().height() + - owner->tqsizeHint().height() + - ships->tqsizeHint().height() + - production->tqsizeHint().height()+ - kill_percent->tqsizeHint().height(); + height = name->sizeHint().height() + + owner->sizeHint().height() + + ships->sizeHint().height() + + production->sizeHint().height()+ + kill_percent->sizeHint().height(); return TQSize( 100, height ); } @@ -126,7 +126,7 @@ void PlanetInfo::showPlanet( Planet *planet ) TQString temp; - temp = "<qt>" + i18n("Planet name: %1").tqarg(planet->getName()); + temp = "<qt>" + i18n("Planet name: %1").arg(planet->getName()); name->setText( temp ); return; } @@ -141,19 +141,19 @@ void PlanetInfo::showPlanet( Planet *planet ) TQString temp; - temp = "<qt>" + i18n("Planet name: %1").tqarg(p->planet->getName()); + temp = "<qt>" + i18n("Planet name: %1").arg(p->planet->getName()); name->setText( temp ); - temp = "<qt>" + i18n("Owner: %1").tqarg(p->planet->getPlayer()->getColoredName()); + temp = "<qt>" + i18n("Owner: %1").arg(p->planet->getPlayer()->getColoredName()); owner->setText( temp ); - temp = "<qt>" + i18n("Ships: %1").tqarg( KGlobal::locale()->formatNumber(p->ships, 0) ); + temp = "<qt>" + i18n("Ships: %1").arg( KGlobal::locale()->formatNumber(p->ships, 0) ); ships->setText( temp ); - temp = "<qt>" + i18n("Production: %1").tqarg( KGlobal::locale()->formatNumber(p->production, 0) ); + temp = "<qt>" + i18n("Production: %1").arg( KGlobal::locale()->formatNumber(p->production, 0) ); production->setText( temp ); - temp = "<qt>" + i18n("Kill percent: %1").tqarg( KGlobal::locale()->formatNumber(p->killRate, 3) ); + temp = "<qt>" + i18n("Kill percent: %1").arg( KGlobal::locale()->formatNumber(p->killRate, 3) ); kill_percent->setText( temp ); } } diff --git a/konquest/planet_info.h b/konquest/planet_info.h index ade4b9b7..c962ba3f 100644 --- a/konquest/planet_info.h +++ b/konquest/planet_info.h @@ -4,7 +4,7 @@ #include <tqframe.h> #include <tqstring.h> #include <tqptrlist.h> -#include <tqpalette.h> +#include <palette.h> #include "gamecore.h" @@ -31,7 +31,7 @@ public: void setPlanetList( PlanetList &newPlanets ); void rescanPlanets(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: void showPlanet( Planet * ); diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc index 843867bb..794ec97a 100644 --- a/konquest/scoredlg.cc +++ b/konquest/scoredlg.cc @@ -1,4 +1,4 @@ -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <klocale.h> #include <kpushbutton.h> @@ -39,21 +39,21 @@ ScoreDlg::ScoreDlg( TQWidget *parent, const TQString& title, PlayerList *players scoreTable->addColumn(i18n("Fleets Launched")); scoreTable->addColumn(i18n("Fleets Destroyed")); scoreTable->addColumn(i18n("Ships Destroyed")); - scoreTable->setMinimumSize( scoreTable->tqsizeHint() ); + scoreTable->setMinimumSize( scoreTable->sizeHint() ); KPushButton *okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->setMinimumSize( okButton->tqsizeHint() ); + okButton->setMinimumSize( okButton->sizeHint() ); okButton->setDefault(true); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this ); - TQHBoxLayout *tqlayout2 = new TQHBoxLayout; + TQVBoxLayout *layout1 = new TQVBoxLayout( this ); + TQHBoxLayout *layout2 = new TQHBoxLayout; - tqlayout1->addWidget( scoreTable, 1 ); - tqlayout1->addLayout( tqlayout2 ); + layout1->addWidget( scoreTable, 1 ); + layout1->addLayout( layout2 ); - tqlayout2->addStretch( 2 ); - tqlayout2->addWidget( okButton ); - tqlayout2->addStretch( 2 ); + layout2->addStretch( 2 ); + layout2->addWidget( okButton ); + layout2->addStretch( 2 ); connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); @@ -71,10 +71,10 @@ ScoreDlg::init() for( ;(curPlayer = itr()); ) new ScoreDlgListViewItem(scoreTable, curPlayer->getName(), - TQString("%1").tqarg(curPlayer->getShipsBuilt()), - TQString("%1").tqarg(curPlayer->getPlanetsConquered()), - TQString("%1").tqarg(curPlayer->getFleetsLaunched()), - TQString("%1").tqarg(curPlayer->getEnemyFleetsDestroyed()), - TQString("%1").tqarg(curPlayer->getEnemyShipsDestroyed())); + TQString("%1").arg(curPlayer->getShipsBuilt()), + TQString("%1").arg(curPlayer->getPlanetsConquered()), + TQString("%1").arg(curPlayer->getFleetsLaunched()), + TQString("%1").arg(curPlayer->getEnemyFleetsDestroyed()), + TQString("%1").arg(curPlayer->getEnemyShipsDestroyed())); } diff --git a/kpat/CHANGES b/kpat/CHANGES index d6016123..2480f12e 100644 --- a/kpat/CHANGES +++ b/kpat/CHANGES @@ -132,7 +132,7 @@ since kpat-0.2 since kpat-0.1 - - changed shading tqcolorGroup (Paul) + - changed shading colorGroup (Paul) - fixed drawing of suit symbols (Paul) - renamed "very easy" to "cheating" :) (Paul) - fixed spurious core dump(Paul) diff --git a/kpat/card.cpp b/kpat/card.cpp index 30f5d81d..d3dba426 100644 --- a/kpat/card.cpp +++ b/kpat/card.cpp @@ -45,7 +45,7 @@ Card::Card( Rank r, Suit s, TQCanvas* _parent ) { // Set the name of the card // FIXME: i18n() - m_name = TQString("%1 %2").tqarg(suit_names[s-1]).tqarg(rank_names[r-1]).utf8(); + m_name = TQString("%1 %2").arg(suit_names[s-1]).arg(rank_names[r-1]).utf8(); // Default for the card is face up, standard size. m_faceup = true; diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp index d3cdecad..dbd27787 100644 --- a/kpat/dealer.cpp +++ b/kpat/dealer.cpp @@ -99,7 +99,7 @@ const Dealer *Dealer::instance() void Dealer::setBackgroundPixmap(const TQPixmap &background, const TQColor &midcolor) { _midcolor = midcolor; - canvas()->tqsetBackgroundPixmap(background); + canvas()->setBackgroundPixmap(background); for (PileList::Iterator it = piles.begin(); it != piles.end(); ++it) { (*it)->resetCache(); (*it)->initSizes(); @@ -114,7 +114,7 @@ void Dealer::setupActions() { if (actions() & Dealer::Hint) { - ahint = new KAction( i18n("&Hint"), TQString::tqfromLatin1("wizard"), Key_H, TQT_TQOBJECT(this), + ahint = new KAction( i18n("&Hint"), TQString::fromLatin1("wizard"), Key_H, TQT_TQOBJECT(this), TQT_SLOT(hint()), parent()->actionCollection(), "game_hint"); actionlist.append(ahint); @@ -122,7 +122,7 @@ void Dealer::setupActions() { ahint = 0; if (actions() & Dealer::Demo) { - ademo = new KToggleAction( i18n("&Demo"), TQString::tqfromLatin1("1rightarrow"), CTRL+Key_D, TQT_TQOBJECT(this), + ademo = new KToggleAction( i18n("&Demo"), TQString::fromLatin1("1rightarrow"), CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(toggleDemo()), parent()->actionCollection(), "game_demo"); actionlist.append(ademo); @@ -130,14 +130,14 @@ void Dealer::setupActions() { ademo = 0; if (actions() & Dealer::Redeal) { - aredeal = new KAction (i18n("&Redeal"), TQString::tqfromLatin1("queue"), 0, TQT_TQOBJECT(this), + aredeal = new KAction (i18n("&Redeal"), TQString::fromLatin1("queue"), 0, TQT_TQOBJECT(this), TQT_SLOT(redeal()), parent()->actionCollection(), "game_redeal"); actionlist.append(aredeal); } else aredeal = 0; - parent()->guiFactory()->plugActionList( parent(), TQString::tqfromLatin1("game_actions"), actionlist); + parent()->guiFactory()->plugActionList( parent(), TQString::fromLatin1("game_actions"), actionlist); } Dealer::~Dealer() @@ -145,7 +145,7 @@ Dealer::~Dealer() if (!_won) countLoss(); clearHints(); - parent()->guiFactory()->unplugActionList( parent(), TQString::tqfromLatin1("game_actions")); + parent()->guiFactory()->unplugActionList( parent(), TQString::fromLatin1("game_actions")); while (!piles.isEmpty()) delete piles.first(); // removes itself @@ -535,8 +535,8 @@ void Dealer::resizeEvent(TQResizeEvent *e) { int x = width(); int y = height(); - int hs = horizontalScrollBar()->tqsizeHint().height(); - int vs = verticalScrollBar()->tqsizeHint().width(); + int hs = horizontalScrollBar()->sizeHint().height(); + int vs = verticalScrollBar()->sizeHint().width(); int mx = minsize.width(); int my = minsize.height(); @@ -778,7 +778,7 @@ void Dealer::setState(State *st) CardState s = *it; bool target = c->takenDown(); // abused s.source->add(c, s.source_index); - c->tqsetVisible(s.source->isVisible()); + c->setVisible(s.source->isVisible()); c->setAnimated(false); c->setX(s.x); c->setY(s.y); @@ -962,7 +962,7 @@ void Dealer::openGame(TQDomDocument &doc) (*it2)->setX(card.attribute("x").toInt()); (*it2)->setY(card.attribute("y").toInt()); (*it2)->setZ(card.attribute("z").toInt()); - (*it2)->tqsetVisible(p->isVisible()); + (*it2)->setVisible(p->isVisible()); cards.remove(it2); break; } @@ -1160,14 +1160,14 @@ void Dealer::won() { // wrap in own scope to make KConfigGroupSave work KConfig *config = kapp->config(); KConfigGroupSaver kcs(config, scores_group); - unsigned int n = config->readUnsignedNumEntry(TQString("won%1").tqarg(_id),0) + 1; - config->writeEntry(TQString("won%1").tqarg(_id),n); - n = config->readUnsignedNumEntry(TQString("winstreak%1").tqarg(_id),0) + 1; - config->writeEntry(TQString("winstreak%1").tqarg(_id),n); - unsigned int m = config->readUnsignedNumEntry(TQString("maxwinstreak%1").tqarg(_id),0); + unsigned int n = config->readUnsignedNumEntry(TQString("won%1").arg(_id),0) + 1; + config->writeEntry(TQString("won%1").arg(_id),n); + n = config->readUnsignedNumEntry(TQString("winstreak%1").arg(_id),0) + 1; + config->writeEntry(TQString("winstreak%1").arg(_id),n); + unsigned int m = config->readUnsignedNumEntry(TQString("maxwinstreak%1").arg(_id),0); if (n>m) - config->writeEntry(TQString("maxwinstreak%1").tqarg(_id),n); - config->writeEntry(TQString("loosestreak%1").tqarg(_id),0); + config->writeEntry(TQString("maxwinstreak%1").arg(_id),n); + config->writeEntry(TQString("loosestreak%1").arg(_id),0); } // sort cards by increasing z @@ -1430,9 +1430,9 @@ void Dealer::countGame() kdDebug(11111) << "counting game as played." << endl; KConfig *config = kapp->config(); KConfigGroupSaver kcs(config, scores_group); - unsigned int Total = config->readUnsignedNumEntry(TQString("total%1").tqarg(_id),0); + unsigned int Total = config->readUnsignedNumEntry(TQString("total%1").arg(_id),0); ++Total; - config->writeEntry(TQString("total%1").tqarg(_id),Total); + config->writeEntry(TQString("total%1").arg(_id),Total); _gameRecorded = true; } } @@ -1443,12 +1443,12 @@ void Dealer::countLoss() // update score KConfig *config = kapp->config(); KConfigGroupSaver kcs(config, scores_group); - unsigned int n = config->readUnsignedNumEntry(TQString("loosestreak%1").tqarg(_id),0) + 1; - config->writeEntry(TQString("loosestreak%1").tqarg(_id),n); - unsigned int m = config->readUnsignedNumEntry(TQString("maxloosestreak%1").tqarg(_id),0); + unsigned int n = config->readUnsignedNumEntry(TQString("loosestreak%1").arg(_id),0) + 1; + config->writeEntry(TQString("loosestreak%1").arg(_id),n); + unsigned int m = config->readUnsignedNumEntry(TQString("maxloosestreak%1").arg(_id),0); if (n>m) - config->writeEntry(TQString("maxloosestreak%1").tqarg(_id),n); - config->writeEntry(TQString("winstreak%1").tqarg(_id),0); + config->writeEntry(TQString("maxloosestreak%1").arg(_id),n); + config->writeEntry(TQString("winstreak%1").arg(_id),0); } } diff --git a/kpat/freecell-solver/caas.c b/kpat/freecell-solver/caas.c index 8e8f5ebb..82492f34 100644 --- a/kpat/freecell-solver/caas.c +++ b/kpat/freecell-solver/caas.c @@ -531,7 +531,7 @@ GCC_INLINE int freecell_solver_check_and_add_state( /* The new state was not found in the cache, and it was already inserted */ if (new_state->parent) { - new_state->parent->num_active_tqchildren++; + new_state->parent->num_active_children++; } instance->num_states_in_collection++; diff --git a/kpat/freecell-solver/pqueue.c b/kpat/freecell-solver/pqueue.c index 90afc168..47e6280d 100644 --- a/kpat/freecell-solver/pqueue.c +++ b/kpat/freecell-solver/pqueue.c @@ -145,7 +145,7 @@ void *freecell_solver_PQueuePop( PTQUEUE *pq) for( i=PTQ_FIRST_ENTRY; (child = PTQ_LEFT_CHILD_INDEX(i)) <= CurrentSize; i=child ) { - /* set child to the smaller of the two tqchildren... */ + /* set child to the smaller of the two children... */ if( (child != CurrentSize) && (PGetRating(Elements[child + 1]) > PGetRating(Elements[child])) ) diff --git a/kpat/freecell-solver/pqueue.h b/kpat/freecell-solver/pqueue.h index 875741ae..cef1b854 100644 --- a/kpat/freecell-solver/pqueue.h +++ b/kpat/freecell-solver/pqueue.h @@ -47,7 +47,7 @@ typedef struct _PTQUEUE #define PTQ_PARENT_INDEX(i) ((i)>>1) #define PTQ_FIRST_ENTRY (1) -/* left and right tqchildren are index * 2 and (index * 2) +1 respectively */ +/* left and right children are index * 2 and (index * 2) +1 respectively */ #define PTQ_LEFT_CHILD_INDEX(i) ((i)<<1) #define PTQ_RIGHT_CHILD_INDEX(i) (((i)<<1)+1) diff --git a/kpat/freecell-solver/state.h b/kpat/freecell-solver/state.h index 302d6d9a..e52b717c 100644 --- a/kpat/freecell-solver/state.h +++ b/kpat/freecell-solver/state.h @@ -77,7 +77,7 @@ struct fcs_struct_state_with_locations_t int depth; int visited; int visited_iter; - int num_active_tqchildren; + int num_active_children; int scan_visited[MAX_NUM_SCANS_BUCKETS]; }; @@ -237,7 +237,7 @@ struct fcs_struct_state_with_locations_t int depth; int visited; int visited_iter; - int num_active_tqchildren; + int num_active_children; int scan_visited[MAX_NUM_SCANS_BUCKETS]; }; @@ -508,11 +508,11 @@ struct fcs_struct_state_with_locations_t * */ int visited_iter; /* - * This is the number of direct tqchildren of this state which were not + * This is the number of direct children of this state which were not * yet declared as dead ends. Once this counter reaches zero, this * state too is declared as a dead end. * */ - int num_active_tqchildren; + int num_active_children; /* * This is a vector of flags - one for each scan. Each indicates whether * its scan has already visited this state diff --git a/kpat/freecell-solver/test_arr.h b/kpat/freecell-solver/test_arr.h index 911ff511..cfc5cd12 100644 --- a/kpat/freecell-solver/test_arr.h +++ b/kpat/freecell-solver/test_arr.h @@ -88,8 +88,8 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST if (ptr_state != NULL) \ { \ /* Decrease the refcount of the state */ \ - ptr_state->num_active_tqchildren--; \ - while((ptr_state->num_active_tqchildren == 0) && (ptr_state->visited & FCS_VISITED_ALL_TESTS_DONE)) \ + ptr_state->num_active_children--; \ + while((ptr_state->num_active_children == 0) && (ptr_state->visited & FCS_VISITED_ALL_TESTS_DONE)) \ { \ /* Mark as dead end */ \ ptr_state->visited |= FCS_VISITED_DEAD_END; \ @@ -100,7 +100,7 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST break; \ } \ /* Decrease the refcount */ \ - ptr_state->num_active_tqchildren--; \ + ptr_state->num_active_children--; \ } \ } \ } \ diff --git a/kpat/freecell-solver/tests.h b/kpat/freecell-solver/tests.h index 0293ed85..ce0b35b5 100644 --- a/kpat/freecell-solver/tests.h +++ b/kpat/freecell-solver/tests.h @@ -66,8 +66,8 @@ extern "C" { ptr_new_state_with_locations->depth = ptr_state_with_locations->depth + 1; \ /* Mark this state as a state that was not yet visited */ \ ptr_new_state_with_locations->visited = 0; \ - /* It's a newly created state which does not have tqchildren yet. */ \ - ptr_new_state_with_locations->num_active_tqchildren = 0; \ + /* It's a newly created state which does not have children yet. */ \ + ptr_new_state_with_locations->num_active_children = 0; \ memset(ptr_new_state_with_locations->scan_visited, '\0', \ sizeof(ptr_new_state_with_locations->scan_visited) \ ); \ @@ -119,13 +119,13 @@ fcs_move_stack_push(moves, temp_move); \ ); \ if (!(existing_state->visited & FCS_VISITED_DEAD_END)) \ { \ - if ((--existing_state->parent->num_active_tqchildren) == 0) \ + if ((--existing_state->parent->num_active_children) == 0) \ { \ mark_as_dead_end( \ existing_state->parent \ ); \ } \ - ptr_state_with_locations->num_active_tqchildren++; \ + ptr_state_with_locations->num_active_children++; \ } \ existing_state->parent = ptr_state_with_locations; \ existing_state->depth = ptr_state_with_locations->depth + 1; \ diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp index 74d00b68..4575d95b 100644 --- a/kpat/freecell.cpp +++ b/kpat/freecell.cpp @@ -280,8 +280,8 @@ void FreecellBase::resumeSolution() return; emit gameInfo(i18n("%1 tries - depth %2") - .tqarg(freecell_solver_user_get_num_times(solver_instance)) - .tqarg(freecell_solver_user_get_current_depth(solver_instance))); + .arg(freecell_solver_user_get_num_times(solver_instance)) + .arg(freecell_solver_user_get_current_depth(solver_instance))); if (solver_ret == FCS_STATE_WAS_SOLVED) { @@ -296,7 +296,7 @@ void FreecellBase::resumeSolution() int moves = freecell_solver_user_get_num_times(solver_instance); freeSolution(); emit gameInfo(i18n("unsolved after %1 moves") - .tqarg(moves)); + .arg(moves)); stopDemo(); return; } @@ -379,7 +379,7 @@ TQString FreecellBase::solverFormat() const tmp += suitToString(target[i]->top()->suit()) + "-" + rankToString(target[i]->top()->rank()) + " "; } if (!tmp.isEmpty()) - output += TQString::tqfromLatin1("Foundations: %1\n").tqarg(tmp); + output += TQString::fromLatin1("Foundations: %1\n").arg(tmp); tmp.truncate(0); for (uint i = 0; i < freecell.count(); i++) { @@ -389,7 +389,7 @@ TQString FreecellBase::solverFormat() const tmp += rankToString(freecell[i]->top()->rank()) + suitToString(freecell[i]->top()->suit()) + " "; } if (!tmp.isEmpty()) - output += TQString::tqfromLatin1("Freecells: %1\n").tqarg(tmp); + output += TQString::fromLatin1("Freecells: %1\n").arg(tmp); for (uint i = 0; i < store.count(); i++) { @@ -544,7 +544,7 @@ MoveHint *FreecellBase::chooseHint() { if (solver_instance && freecell_solver_user_get_moves_left(solver_instance)) { - emit gameInfo(i18n("%1 moves before finish").tqarg(freecell_solver_user_get_moves_left(solver_instance))); + emit gameInfo(i18n("%1 moves before finish").arg(freecell_solver_user_get_moves_left(solver_instance))); fcs_move_t move; if (!freecell_solver_user_get_next_move(solver_instance, &move)) { diff --git a/kpat/gamestats.ui b/kpat/gamestats.ui index ac2597fd..3efbdaa9 100644 --- a/kpat/gamestats.ui +++ b/kpat/gamestats.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -63,7 +63,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -71,7 +71,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -84,7 +84,7 @@ <property name="text"> <string>%1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -119,7 +119,7 @@ <property name="text"> <string>%1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -138,7 +138,7 @@ <property name="text"> <string>%1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -157,7 +157,7 @@ <property name="text"> <string>%1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>250</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>71</height> @@ -223,7 +223,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpat/gamestatsimpl.cpp b/kpat/gamestatsimpl.cpp index 2850da01..11b95fee 100644 --- a/kpat/gamestatsimpl.cpp +++ b/kpat/gamestatsimpl.cpp @@ -42,16 +42,16 @@ void GameStatsImpl::setGameType(int id) languageChange(); KConfig *config = kapp->config(); KConfigGroupSaver kcs(config, scores_group); - unsigned int t = config->readUnsignedNumEntry(TQString("total%1").tqarg(id),0); - Played->setText(Played->text().tqarg(t)); - unsigned int w = config->readUnsignedNumEntry(TQString("won%1").tqarg(id),0); - Won->setText(Won->text().tqarg(w)); + unsigned int t = config->readUnsignedNumEntry(TQString("total%1").arg(id),0); + Played->setText(Played->text().arg(t)); + unsigned int w = config->readUnsignedNumEntry(TQString("won%1").arg(id),0); + Won->setText(Won->text().arg(w)); if (t) - WonPerc->setText(WonPerc->text().tqarg(w*100/t)); + WonPerc->setText(WonPerc->text().arg(w*100/t)); else - WonPerc->setText(WonPerc->text().tqarg(0)); + WonPerc->setText(WonPerc->text().arg(0)); WinStreak->setText( - WinStreak->text().tqarg(config->readUnsignedNumEntry(TQString("maxwinstreak%1").tqarg(id),0))); + WinStreak->text().arg(config->readUnsignedNumEntry(TQString("maxwinstreak%1").arg(id),0))); LooseStreak->setText( - LooseStreak->text().tqarg(config->readUnsignedNumEntry(TQString("maxloosestreak%1").tqarg(id),0))); + LooseStreak->text().arg(config->readUnsignedNumEntry(TQString("maxloosestreak%1").arg(id),0))); } diff --git a/kpat/pile.cpp b/kpat/pile.cpp index fab94efa..8e6ce1db 100644 --- a/kpat/pile.cpp +++ b/kpat/pile.cpp @@ -32,7 +32,7 @@ Pile::Pile( int _index, Dealer* _dealer) // Make the patience aware of this pile. dealer()->addPile(this); - TQCanvasRectangle::tqsetVisible(true); // default + TQCanvasRectangle::setVisible(true); // default _checkIndex = -1; m_addFlags = 0; m_removeFlags = 0; @@ -193,12 +193,12 @@ bool Pile::legalRemove(const Card *c) const void Pile::setVisible(bool vis) { - TQCanvasRectangle::tqsetVisible(vis); + TQCanvasRectangle::setVisible(vis); dealer()->enlargeCanvas(this); for (CardList::Iterator it = m_cards.begin(); it != m_cards.end(); ++it) { - (*it)->tqsetVisible(vis); + (*it)->setVisible(vis); dealer()->enlargeCanvas(*it); } } diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp index 428981bf..4901d75f 100644 --- a/kpat/pwidget.cpp +++ b/kpat/pwidget.cpp @@ -75,7 +75,7 @@ pWidget::pWidget() actionCollection(), "save"); (void)new KAction(i18n("&Choose Game..."), 0, TQT_TQOBJECT(this), TQT_SLOT(chooseGame()), actionCollection(), "choose_game"); - (void)new KAction(i18n("Restart &Game"), TQString::tqfromLatin1("reload"), 0, + (void)new KAction(i18n("Restart &Game"), TQString::fromLatin1("reload"), 0, TQT_TQOBJECT(this), TQT_SLOT(restart()), actionCollection(), "restart_game"); (void)KStdAction::help(TQT_TQOBJECT(this), TQT_SLOT(helpGame()), actionCollection(), "help_game"); @@ -239,7 +239,7 @@ void pWidget::changeWallpaper() return; background = TQPixmap(bgpath); if (background.isNull()) { - KMessageBox::sorry(this, i18n("<qt>Couldn't load wallpaper<br/>%1</qt>").tqarg(bgpath)); + KMessageBox::sorry(this, i18n("<qt>Couldn't load wallpaper<br/>%1</qt>").arg(bgpath)); return; } @@ -468,11 +468,11 @@ void pWidget::gameLost() // The following code is taken out of kmessagebox.cpp in tdeui. // Is there a better way? KConfig *config = 0; - TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); config = KGlobal::config(); KConfigGroupSaver saver(config, - TQString::tqfromLatin1("Notification Messages")); + TQString::fromLatin1("Notification Messages")); TQString dontAsk = config->readEntry(dontAskAgainName).lower(); // If we are ordered never to ask again and to continue the game, diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp index cbdcad12..52bb39cb 100644 --- a/kpoker/betbox.cpp +++ b/kpoker/betbox.cpp @@ -16,7 +16,7 @@ #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <kglobal.h> #include <klocale.h> @@ -46,10 +46,10 @@ BetBox::BetBox(TQWidget* parent, const char* name) foldButton = new TQPushButton(this); l->addWidget(foldButton, 0); - bet5Up->setText(TQString("+%1").tqarg(KGlobal::locale()->formatMoney(5))); - bet10Up->setText(TQString("+%1").tqarg(KGlobal::locale()->formatMoney(10))); - bet5Down->setText(TQString("-%1").tqarg(KGlobal::locale()->formatMoney(5))); - bet10Down->setText(TQString("-%1").tqarg(KGlobal::locale()->formatMoney(10))); + bet5Up->setText(TQString("+%1").arg(KGlobal::locale()->formatMoney(5))); + bet10Up->setText(TQString("+%1").arg(KGlobal::locale()->formatMoney(10))); + bet5Down->setText(TQString("-%1").arg(KGlobal::locale()->formatMoney(5))); + bet10Down->setText(TQString("-%1").arg(KGlobal::locale()->formatMoney(10))); adjustBet->setText(i18n("Adjust Bet")); foldButton->setText(i18n("Fold")); diff --git a/kpoker/defines.h b/kpoker/defines.h index d4b827de..3da071f6 100644 --- a/kpoker/defines.h +++ b/kpoker/defines.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------- -// Graphical tqlayout +// Graphical layout #define cardHeight 96 diff --git a/kpoker/kpaint.cpp b/kpoker/kpaint.cpp index 2dcc5dbf..99c54145 100644 --- a/kpoker/kpaint.cpp +++ b/kpoker/kpaint.cpp @@ -17,7 +17,7 @@ // QT includes #include <tqdir.h> -#include <tqlayout.h> +#include <layout.h> // KDE includes //#include <kglobal.h> @@ -173,8 +173,8 @@ void CardWidget::repaintDeck() setPixmap(*m_pm); setFixedSize(cardImages->getWidth(), cardImages->getHeight()); - ((TQWidget*) parent())->tqlayout()->tqinvalidate(); - ((TQWidget*) parent())->setFixedSize( ((TQWidget*) parent())->tqsizeHint()); + ((TQWidget*) parent())->layout()->invalidate(); + ((TQWidget*) parent())->setFixedSize( ((TQWidget*) parent())->sizeHint()); } diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp index 92a7df5c..38a62579 100644 --- a/kpoker/kpoker.cpp +++ b/kpoker/kpoker.cpp @@ -22,7 +22,7 @@ #include <tqtimer.h> #include <tqpainter.h> #include <tqtooltip.h> -#include <tqlayout.h> +#include <layout.h> // KDE includes #include <kmessagebox.h> @@ -178,7 +178,7 @@ kpok::kpok(TQWidget *parent, const char *name) // ...and the rest to computer players. for (int unsigned i = 1; i < m_numPlayers; i++) - m_players[i].setName(TQString("Computer %1").tqarg(i-1)); + m_players[i].setName(TQString("Computer %1").arg(i-1)); lastHandText = ""; @@ -269,13 +269,13 @@ void kpok::initWindow() mWonWidget = new TQWidget(this); inputLayout->addWidget(mWonWidget, 2); mWonWidget->setMinimumHeight(50); //FIXME hardcoded value for the wave - mWonWidget->setMinimumWidth(tmp.width(i18n("You won %1").tqarg(KGlobal::locale()->formatMoney(100))) + 20); // workaround for width problem in wave + mWonWidget->setMinimumWidth(tmp.width(i18n("You won %1").arg(KGlobal::locale()->formatMoney(100))) + 20); // workaround for width problem in wave TQHBoxLayout* wonLayout = new TQHBoxLayout(mWonWidget); wonLayout->setAutoAdd(true); wonLabel = new TQLabel(mWonWidget); wonLabel->setFont(wonFont); - wonLabel->tqsetAlignment(AlignCenter); + wonLabel->setAlignment(AlignCenter); wonLabel->hide(); inputLayout->addStretch(1); @@ -686,7 +686,7 @@ void kpok::paintCash() for (unsigned int i = 0; i < m_numPlayers; i++) { playerBox[i]->showCash(); } - potLabel->setText(i18n("Pot: %1").tqarg(KGlobal::locale()->formatMoney(m_game.getPot()))); + potLabel->setText(i18n("Pot: %1").arg(KGlobal::locale()->formatMoney(m_game.getPot()))); } @@ -805,9 +805,9 @@ void kpok::displayWinner_Computer(PokerPlayer* winner, bool othersPassed) // Generate a string with winner info and show it. TQString label; if (winner->getHuman()) - label = i18n("You won %1").tqarg(KGlobal::locale()->formatMoney(m_game.getPot())); + label = i18n("You won %1").arg(KGlobal::locale()->formatMoney(m_game.getPot())); else - label = i18n("%1 won %2").tqarg(winner->getName()).tqarg(KGlobal::locale()->formatMoney(m_game.getPot())); + label = i18n("%1 won %2").arg(winner->getName()).arg(KGlobal::locale()->formatMoney(m_game.getPot())); wonLabel->setText(label); // Start the waving motion of the text. @@ -1028,7 +1028,7 @@ void kpok::stopWave() { waveTimer->stop(); fCount = -1; /* clear image */ - tqrepaint ( FALSE ); + repaint ( FALSE ); waveActive = false; } @@ -1042,7 +1042,7 @@ void kpok::stopDrawing() void kpok::waveTimerEvent() { fCount = (fCount + 1) & 15; - tqrepaint( FALSE ); + repaint( FALSE ); } @@ -1072,7 +1072,7 @@ void kpok::displayWin(const TQString& hand, int cashWon) if (cashWon) { playSound("win.wav"); - buf = i18n("You won %1!").tqarg(KGlobal::locale()->formatMoney(cashWon)); + buf = i18n("You won %1!").arg(KGlobal::locale()->formatMoney(cashWon)); } else { playSound("lose.wav"); buf = i18n("Game Over"); // locale @@ -1307,9 +1307,9 @@ void kpok::saveGame(KConfig* conf) conf->writeEntry("lastHandText", lastHandText); for (int i = 0; i < players; i++) { - conf->writeEntry(TQString("Name_%1").tqarg(i), m_players[i].getName()); - conf->writeEntry(TQString("Human_%1").tqarg(i), m_players[i].getHuman()); - conf->writeEntry(TQString("Cash_%1").tqarg(i), m_players[i].getCash()); + conf->writeEntry(TQString("Name_%1").arg(i), m_players[i].getName()); + conf->writeEntry(TQString("Human_%1").arg(i), m_players[i].getHuman()); + conf->writeEntry(TQString("Cash_%1").arg(i), m_players[i].getCash()); } m_game.clearDirty(); @@ -1407,14 +1407,14 @@ bool kpok::loadGame(KConfig* conf) if (numPlayers > 0) { for (int i = 0; i < numPlayers; i++) { - TQString buf = conf->readEntry(TQString("Name_%1").tqarg(i), + TQString buf = conf->readEntry(TQString("Name_%1").arg(i), "Player"); m_players[i].setName(buf); - bool human = conf->readBoolEntry(TQString("Human_%1").tqarg(i), + bool human = conf->readBoolEntry(TQString("Human_%1").arg(i), false); if (human) m_players[i].setHuman(); // i == 0 - int cash = conf->readNumEntry(TQString("Cash_%1").tqarg(i), + int cash = conf->readNumEntry(TQString("Cash_%1").arg(i), START_MONEY); m_players[i].setCash(cash); m_game.setDirty(); diff --git a/kpoker/kpoker.h b/kpoker/kpoker.h index 7eec697a..732a2af5 100644 --- a/kpoker/kpoker.h +++ b/kpoker/kpoker.h @@ -325,7 +325,7 @@ class kpok : public TQWidget int drawDelay; - // Graphical tqlayout. + // Graphical layout. TQVBoxLayout *topLayout; TQHBoxLayout *inputLayout; TQLabel *potLabel; diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp index ef2bfe0a..d21b7da5 100644 --- a/kpoker/newgamedlg.cpp +++ b/kpoker/newgamedlg.cpp @@ -20,7 +20,7 @@ #include <tqlineedit.h> #include <tqcheckbox.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> // KDE includes #include <klocale.h> @@ -75,7 +75,7 @@ NewGameDlg::NewGameDlg(TQWidget* parent) l = new TQHBoxLayout(topLayout); l->addWidget(new TQLabel(i18n("Players' starting money:"), plainPage())); - moneyOfPlayers = new TQLineEdit(TQString("%1").tqarg(money), plainPage()); + moneyOfPlayers = new TQLineEdit(TQString("%1").arg(money), plainPage()); moneyOfPlayers->setValidator( new KIntValidator( 0,999999,moneyOfPlayers ) ); l->addWidget(moneyOfPlayers); @@ -127,7 +127,7 @@ void NewGameDlg::setPlayerNames(int no, TQString playerName) player1Name->setText(kapp->config()->readEntry("Name_0", i18n("You"))); computerNames->clear(); for (int i = 1; i < MAX_PLAYERS; i++) { - computerNames->insertItem(kapp->config()->readEntry(TQString("Name_%1").tqarg(i), i18n("Computer %1").tqarg(i))); + computerNames->insertItem(kapp->config()->readEntry(TQString("Name_%1").arg(i), i18n("Computer %1").arg(i))); } } else if (no == 0) { player1Name->setText(playerName); diff --git a/kpoker/optionsdlg.cpp b/kpoker/optionsdlg.cpp index 5fdfbfcf..d969e00f 100644 --- a/kpoker/optionsdlg.cpp +++ b/kpoker/optionsdlg.cpp @@ -17,7 +17,7 @@ // QT includes #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // KDE includes #include <klocale.h> diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp index 530ebd81..608f49f8 100644 --- a/kpoker/playerbox.cpp +++ b/kpoker/playerbox.cpp @@ -17,7 +17,7 @@ #include <tqtooltip.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <kglobal.h> @@ -52,7 +52,7 @@ PlayerBox::PlayerBox(bool playerOne, TQWidget* parent, const char* name) vl->addWidget(cardBox, 0); cardBox->setFrameStyle(Box | Sunken); m_cardWidgets[i] = new CardWidget(cardBox); - cardBox->setFixedSize(cardBox->tqsizeHint()); + cardBox->setFixedSize(cardBox->sizeHint()); // Only add the "held" labels if this is the first player (the human one). if (playerOne) { @@ -60,7 +60,7 @@ PlayerBox::PlayerBox(bool playerOne, TQWidget* parent, const char* name) m_heldLabels[i] = new TQLabel(b); m_heldLabels[i]->setText(i18n("Held")); b->setFrameStyle(Box | Sunken); - b->setFixedSize(b->tqsizeHint()); + b->setFixedSize(b->sizeHint()); m_cardWidgets[i]->heldLabel = m_heldLabels[i]; TQHBoxLayout* heldLayout = new TQHBoxLayout(0); @@ -91,7 +91,7 @@ PlayerBox::PlayerBox(bool playerOne, TQWidget* parent, const char* name) } TQToolTip::add(m_cashLabel, - i18n("Money of %1").tqarg("Player"));//change via showName() + i18n("Money of %1").arg("Player"));//change via showName() // Assume that we have a multiplayer game. m_singlePlayer = false; @@ -122,7 +122,7 @@ void PlayerBox::showCash() { // Show the amount of cash the player has. m_cashLabel->setText(i18n("Cash: %1") - .tqarg(KGlobal::locale()->formatMoney(m_player->getCash()))); + .arg(KGlobal::locale()->formatMoney(m_player->getCash()))); // Show how much we have bet during this round. if (m_player->out()) @@ -130,10 +130,10 @@ void PlayerBox::showCash() else { if (m_singlePlayer) m_betLabel->setText(i18n("Cash per round: %1") - .tqarg(KGlobal::locale()->formatMoney(m_cashPerRound))); + .arg(KGlobal::locale()->formatMoney(m_cashPerRound))); else m_betLabel->setText(i18n("Bet: %1") - .tqarg(KGlobal::locale()-> formatMoney(m_player->getCurrentBet()))); + .arg(KGlobal::locale()-> formatMoney(m_player->getCurrentBet()))); } } @@ -145,7 +145,7 @@ void PlayerBox::showName() { setTitle(m_player->getName()); TQToolTip::remove(m_cashLabel); - TQToolTip::add(m_cashLabel, i18n("Money of %1").tqarg(m_player->getName())); + TQToolTip::add(m_cashLabel, i18n("Money of %1").arg(m_player->getName())); } diff --git a/kreversi/Move.cpp b/kreversi/Move.cpp index f1f50872..3916925e 100644 --- a/kreversi/Move.cpp +++ b/kreversi/Move.cpp @@ -66,7 +66,7 @@ TQString SimpleMove::asString() const if (m_x == -1) return TQString("pass"); else - return TQString("%1%2").tqarg(" ABCDEFGH"[m_x]).tqarg(" 12345678"[m_y]); + return TQString("%1%2").arg(" ABCDEFGH"[m_x]).arg(" 12345678"[m_y]); } diff --git a/kreversi/board.cpp b/kreversi/board.cpp index d24dccd1..8950fc8f 100644 --- a/kreversi/board.cpp +++ b/kreversi/board.cpp @@ -308,7 +308,7 @@ void QReversiBoardView::updateBoard (bool force) // If we are showing legal moves, we have to erase the old ones // before we can show the new ones. The easiest way to do that is - // to tqrepaint everything. + // to repaint everything. // // FIXME: A better way, perhaps, is to do the repainting in // drawPiece (which should be renamed drawSquare). @@ -498,7 +498,7 @@ void QReversiBoardView::drawOnePiece(uint row, uint col, int i) } -// We got a tqrepaint event. We make it easy for us and redraw the +// We got a repaint event. We make it easy for us and redraw the // entire board. // diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp index 4c72251b..60d555f3 100644 --- a/kreversi/kreversi.cpp +++ b/kreversi/kreversi.cpp @@ -39,7 +39,7 @@ #include <unistd.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlistbox.h> @@ -329,9 +329,9 @@ void KReversi::slotUndo() } if (m_game->toMove() == computerColor()) { - // Must tqrepaint so that the new move is not shown before the old + // Must repaint so that the new move is not shown before the old // one is removed on the screen. - m_gameView->tqrepaint(); + m_gameView->repaint(); computerMakeMove(); } else @@ -609,21 +609,21 @@ void KReversi::showGameOver(Color color) if ( color == Nobody ) { KNotifyClient::event(winId(), "draw", i18n("Draw!")); TQString s = i18n("Game is drawn!\n\nYou : %1\nComputer: %2") - .tqarg(human).tqarg(computer); + .arg(human).arg(computer); KMessageBox::information(this, s, i18n("Game Ended")); score.setType(KExtHighscore::Draw); } else if ( humanColor() == color ) { KNotifyClient::event(winId(), "won", i18n("Game won!")); TQString s = i18n("Congratulations, you have won!\n\nYou : %1\nComputer: %2") - .tqarg(human).tqarg(computer); + .arg(human).arg(computer); KMessageBox::information(this, s, i18n("Game Ended")); score.setType(KExtHighscore::Won); } else { KNotifyClient::event(winId(), "lost", i18n("Game lost!")); TQString s = i18n("You have lost the game!\n\nYou : %1\nComputer: %2") - .tqarg(human).tqarg(computer); + .arg(human).arg(computer); KMessageBox::information(this, s, i18n("Game Ended")); score.setType(KExtHighscore::Lost); } diff --git a/kreversi/kzoommainwindow.cpp b/kreversi/kzoommainwindow.cpp index dc2820fe..cb7ca04e 100644 --- a/kreversi/kzoommainwindow.cpp +++ b/kreversi/kzoommainwindow.cpp @@ -65,7 +65,7 @@ void KZoomMainWindow::addWidget(TQWidget *widget) { widget->adjustSize(); - TQWidget *tlw = widget->tqtopLevelWidget(); + TQWidget *tlw = widget->topLevelWidget(); KZoomMainWindow *zm = static_cast<KZoomMainWindow *>(tlw->qt_cast("KZoomMainWindow")); @@ -84,7 +84,7 @@ void KZoomMainWindow::widgetDestroyed() bool KZoomMainWindow::eventFilter(TQObject *o, TQEvent *e) { if ( e->type()==TQEvent::LayoutHint ) - setFixedSize(tqminimumSize()); // because K/TQMainWindow + setFixedSize(minimumSize()); // because K/TQMainWindow // does not manage fixed central widget // with hidden menubar... return KMainWindow::eventFilter(o, e); diff --git a/kreversi/kzoommainwindow.h b/kreversi/kzoommainwindow.h index a27b61a4..9885a2e5 100644 --- a/kreversi/kzoommainwindow.h +++ b/kreversi/kzoommainwindow.h @@ -55,7 +55,7 @@ public: /** Add a widget to be managed i.e. the adjustSize() method of the * widget is called whenever the zoom is changed. - * This function assumes that the tqtopLevelWidget() is the KZoomMainWindow. + * This function assumes that the topLevelWidget() is the KZoomMainWindow. */ static void addWidget(TQWidget *widget); diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp index f661d62c..df9bc680 100644 --- a/kreversi/qreversigameview.cpp +++ b/kreversi/qreversigameview.cpp @@ -37,7 +37,7 @@ */ -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <tqlabel.h> @@ -156,30 +156,30 @@ QReversiGameView::~QReversiGameView() void QReversiGameView::createView() { - TQGridLayout *tqlayout = new TQGridLayout(this, 4, 2); + TQGridLayout *layout = new TQGridLayout(this, 4, 2); // The board m_boardView = new QReversiBoardView(this, m_game); m_boardView->loadSettings(); // Load the pixmaps used in the status widgets. - tqlayout->addMultiCellWidget(m_boardView, 0, 3, 0, 0); + layout->addMultiCellWidget(m_boardView, 0, 3, 0, 0); // The status widgets - m_blacktqStatus = new StatusWidget(TQString(), this); - m_blacktqStatus->setPixmap(m_boardView->chipPixmap(Black, 20)); - tqlayout->addWidget(m_blacktqStatus, 0, 1); - m_whitetqStatus = new StatusWidget(TQString(), this); - m_whitetqStatus->setPixmap(m_boardView->chipPixmap(White, 20)); - tqlayout->addWidget(m_whitetqStatus, 1, 1); + m_blackStatus = new StatusWidget(TQString(), this); + m_blackStatus->setPixmap(m_boardView->chipPixmap(Black, 20)); + layout->addWidget(m_blackStatus, 0, 1); + m_whiteStatus = new StatusWidget(TQString(), this); + m_whiteStatus->setPixmap(m_boardView->chipPixmap(White, 20)); + layout->addWidget(m_whiteStatus, 1, 1); // The "Moves" label TQLabel *movesLabel = new TQLabel( i18n("Moves"), this); - movesLabel->tqsetAlignment(AlignCenter); - tqlayout->addWidget(movesLabel, 2, 1); + movesLabel->setAlignment(AlignCenter); + layout->addWidget(movesLabel, 2, 1); // The list of moves. m_movesView = new TQListBox(this, "moves"); m_movesView->setMinimumWidth(150); - tqlayout->addWidget(m_movesView, 3, 1); + layout->addWidget(m_movesView, 3, 1); } @@ -193,7 +193,7 @@ void QReversiGameView::newGame() { m_boardView->updateBoard(true); m_movesView->clear(); - updatetqStatus(); + updateStatus(); } @@ -213,10 +213,10 @@ void QReversiGameView::moveMade(uint moveNum, Move &move) // Insert the new move in the listbox and mark it as the current one. m_movesView->insertItem(TQString("%1. %2 %3") - .tqarg(moveNum) - .tqarg(Prefs::grayscale() ? colorsWB[move.color()] + .arg(moveNum) + .arg(Prefs::grayscale() ? colorsWB[move.color()] : colorsRB[move.color()]) - .tqarg(move.asString())); + .arg(move.asString())); m_movesView->setCurrentItem(moveNum - 1); m_movesView->ensureCurrentVisible(); @@ -225,7 +225,7 @@ void QReversiGameView::moveMade(uint moveNum, Move &move) m_boardView->updateBoard(); // Update the score. - updatetqStatus(); + updateStatus(); } @@ -236,16 +236,16 @@ void QReversiGameView::updateView() { m_boardView->updateBoard(true); updateMovelist(); - updatetqStatus(); + updateStatus(); } // Only updates the status widgets (score). -void QReversiGameView::updatetqStatus() +void QReversiGameView::updateStatus() { - m_blacktqStatus->setScore(m_game->score(Black)); - m_whitetqStatus->setScore(m_game->score(White)); + m_blackStatus->setScore(m_game->score(Black)); + m_whiteStatus->setScore(m_game->score(White)); } @@ -285,12 +285,12 @@ void QReversiGameView::setHumanColor(Color color) m_humanColor = color; if (color == Black) { - m_blacktqStatus->setText(i18n("You")); - m_whitetqStatus->setText(""); + m_blackStatus->setText(i18n("You")); + m_whiteStatus->setText(""); } else { - m_blacktqStatus->setText(""); - m_whitetqStatus->setText(i18n("You")); + m_blackStatus->setText(""); + m_whiteStatus->setText(i18n("You")); } } diff --git a/kreversi/qreversigameview.h b/kreversi/qreversigameview.h index 53d258d7..5f5e4e1f 100644 --- a/kreversi/qreversigameview.h +++ b/kreversi/qreversigameview.h @@ -104,7 +104,7 @@ public: void insertMove(TQString moveString) { m_movesView->insertItem(moveString); } void removeMove(int moveNum) { m_movesView->removeItem(moveNum); - updatetqStatus(); + updateStatus(); } void setCurrentMove(int moveNum) { m_movesView->setCurrentItem(moveNum); @@ -129,7 +129,7 @@ public slots: void moveMade(uint moveNum, Move &move); void updateView(); // Update the entire view. - void updatetqStatus(); // Update the status widgets (score) + void updateStatus(); // Update the status widgets (score) void updateBoard(bool force = FALSE); // Update the board. void updateMovelist(); // Update the move list. @@ -153,8 +153,8 @@ private: // Widgets in the view. QReversiBoardView *m_boardView; TQListBox *m_movesView; - StatusWidget *m_blacktqStatus; - StatusWidget *m_whitetqStatus; + StatusWidget *m_blackStatus; + StatusWidget *m_whiteStatus; }; diff --git a/kreversi/settings.ui b/kreversi/settings.ui index 4d66c5df..ead4757a 100644 --- a/kreversi/settings.ui +++ b/kreversi/settings.ui @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -143,7 +143,7 @@ <property name="text"> <string>Beginner</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -154,7 +154,7 @@ <property name="text"> <string>Expert</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -165,7 +165,7 @@ <property name="text"> <string>Average</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -189,7 +189,7 @@ <property name="text"> <string>Slow</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -200,7 +200,7 @@ <property name="text"> <string>Fast</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp index 3a3f1120..a49db4f7 100644 --- a/ksame/KSameWidget.cpp +++ b/ksame/KSameWidget.cpp @@ -113,7 +113,7 @@ void KSameWidget::saveProperties(KConfig *conf) { } void KSameWidget::sizeChanged() { - stone->setFixedSize(stone->tqsizeHint()); + stone->setFixedSize(stone->sizeHint()); } void KSameWidget::showNumberRemainingToggled() @@ -121,11 +121,11 @@ void KSameWidget::showNumberRemainingToggled() if(showNumberRemaining->isChecked()){ TQStringList list; for(int i=1;i<=stone->colors();i++) - list.append(TQString("%1").tqarg(stone->count(i))); - TQString count = TQString(" (%1)").tqarg(list.join(",")); - status->changeItem(i18n("%1 Colors%2").tqarg(stone->colors()).tqarg(count),1); + list.append(TQString("%1").arg(stone->count(i))); + TQString count = TQString(" (%1)").arg(list.join(",")); + status->changeItem(i18n("%1 Colors%2").arg(stone->colors()).arg(count),1); } - else status->changeItem(i18n("%1 Colors").tqarg(stone->colors()),1); + else status->changeItem(i18n("%1 Colors").arg(stone->colors()),1); KConfig *cfg = kapp->config(); cfg->writeEntry("showRemaining", showNumberRemaining->isChecked()); @@ -162,7 +162,7 @@ void KSameWidget::m_new() { bno.setRange(0, 1000000, 1); bno.setLabel(i18n("Select a board:")); bno.setFocus(); - bno.setFixedSize(bno.tqsizeHint()); + bno.setFixedSize(bno.sizeHint()); bno.setValue(stone->board()); if (dlg.exec()) newGame(bno.value(),default_colors); @@ -188,15 +188,15 @@ void KSameWidget::m_showhs() { } void KSameWidget::setColors(int colors) { - status->changeItem(i18n("%1 Colors").tqarg(colors),1); + status->changeItem(i18n("%1 Colors").arg(colors),1); } void KSameWidget::setBoard(int board) { - status->changeItem(i18n("Board: %1").tqarg(board, 6), 2); + status->changeItem(i18n("Board: %1").arg(board, 6), 2); } void KSameWidget::setMarked(int m) { - status->changeItem(i18n("Marked: %1").tqarg(m, 6),3); + status->changeItem(i18n("Marked: %1").arg(m, 6),3); m_markedStones=m; } @@ -209,11 +209,11 @@ void KSameWidget::setScore(int score) { if(showNumberRemaining->isChecked()){ TQStringList list; for(int i=1;i<=stone->colors();i++) - list.append(TQString("%1").tqarg(stone->count(i))); - TQString count = TQString(" (%1)").tqarg(list.join(",")); - status->changeItem(i18n("%1 Colors%2").tqarg(stone->colors()).tqarg(count),1); + list.append(TQString("%1").arg(stone->count(i))); + TQString count = TQString(" (%1)").arg(list.join(",")); + status->changeItem(i18n("%1 Colors%2").arg(stone->colors()).arg(count),1); } - status->changeItem(i18n("Score: %1").tqarg(score, 6),4); + status->changeItem(i18n("Score: %1").arg(score, 6),4); undo->setEnabled(stone->undoPossible()); restart->setEnabled(!stone->isOriginalBoard()); } @@ -222,11 +222,11 @@ void KSameWidget::gameover() { if (stone->hasBonus()) { KNotifyClient::event(winId(), "game won", i18n("You even removed the last stone, great job! " - "This gave you a score of %1 in total.").tqarg(stone->score())); + "This gave you a score of %1 in total.").arg(stone->score())); } else { KNotifyClient::event(winId(), "game over", i18n("There are no more removeable stones. " - "You got a score of %1 in total.").tqarg(stone->score())); + "You got a score of %1 in total.").arg(stone->score())); } stone->unmark(); KScoreDialog d(KScoreDialog::Name | KScoreDialog::Score, this); diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp index 586aeefd..dc02a1bc 100644 --- a/ksame/StoneWidget.cpp +++ b/ksame/StoneWidget.cpp @@ -136,7 +136,7 @@ StoneWidget::colors() { } TQSize -StoneWidget::tqsizeHint () const { +StoneWidget::sizeHint () const { return TQSize(field_width,field_height); } diff --git a/ksame/StoneWidget.h b/ksame/StoneWidget.h index 616ef835..f4188419 100644 --- a/ksame/StoneWidget.h +++ b/ksame/StoneWidget.h @@ -55,7 +55,7 @@ public: int marked(); TQSize size(); int colors(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; bool undoPossible() const; diff --git a/kshisen/app.cpp b/kshisen/app.cpp index 47f59f1b..5b371c5f 100644 --- a/kshisen/app.cpp +++ b/kshisen/app.cpp @@ -52,7 +52,7 @@ #include <kstdguiitem.h> #include <kconfigdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqlineedit.h> @@ -299,9 +299,9 @@ void App::slotEndOfGame() else { TQString s = i18n("Congratulations! You made it in %1:%2:%3") - .tqarg(TQString().sprintf("%02d", board->getTimeForGame()/3600)) - .tqarg(TQString().sprintf("%02d", (board->getTimeForGame() / 60) % 60)) - .tqarg(TQString().sprintf("%02d", board->getTimeForGame() % 60)); + .arg(TQString().sprintf("%02d", board->getTimeForGame()/3600)) + .arg(TQString().sprintf("%02d", (board->getTimeForGame() / 60) % 60)) + .arg(TQString().sprintf("%02d", board->getTimeForGame() % 60)); KMessageBox::information(this, s, i18n("End of Game")); } @@ -315,18 +315,18 @@ void App::updateScore() { int t = board->getTimeForGame(); TQString s = i18n(" Your time: %1:%2:%3 %4") - .tqarg(TQString().sprintf("%02d", t / 3600 )) - .tqarg(TQString().sprintf("%02d", (t / 60) % 60 )) - .tqarg(TQString().sprintf("%02d", t % 60 )) - .tqarg(board->isPaused()?i18n("(Paused) "):TQString()); + .arg(TQString().sprintf("%02d", t / 3600 )) + .arg(TQString().sprintf("%02d", (t / 60) % 60 )) + .arg(TQString().sprintf("%02d", t % 60 )) + .arg(board->isPaused()?i18n("(Paused) "):TQString()); statusBar()->changeItem(s, SBI_TIME); // Number of tiles int tl = (board->x_tiles() * board->y_tiles()); s = i18n(" Removed: %1/%2 ") - .tqarg(TQString().sprintf("%d", tl - board->tilesLeft())) - .tqarg(TQString().sprintf("%d", tl )); + .arg(TQString().sprintf("%d", tl - board->tilesLeft())) + .arg(TQString().sprintf("%d", tl )); statusBar()->changeItem(s, SBI_TILES); } @@ -356,26 +356,26 @@ TQString App::getPlayerName() TQDialog *dlg = new TQDialog(this, "Hall of Fame", true); TQLabel *l1 = new TQLabel(i18n("You've made it into the \"Hall Of Fame\". Type in\nyour name so mankind will always remember\nyour cool rating."), dlg); - l1->setFixedSize(l1->tqsizeHint()); + l1->setFixedSize(l1->sizeHint()); TQLabel *l2 = new TQLabel(i18n("Your name:"), dlg); - l2->setFixedSize(l2->tqsizeHint()); + l2->setFixedSize(l2->sizeHint()); TQLineEdit *e = new TQLineEdit(dlg); e->setText("XXXXXXXXXXXXXXXX"); - e->setMinimumWidth(e->tqsizeHint().width()); - e->setFixedHeight(e->tqsizeHint().height()); + e->setMinimumWidth(e->sizeHint().width()); + e->setFixedHeight(e->sizeHint().height()); e->setText( lastPlayerName ); e->setFocus(); TQPushButton *b = new KPushButton(KStdGuiItem::ok(), dlg); b->setDefault(true); - b->setFixedSize(b->tqsizeHint()); + b->setFixedSize(b->sizeHint()); connect(b, TQT_SIGNAL(released()), dlg, TQT_SLOT(accept())); connect(e, TQT_SIGNAL(returnPressed()), dlg, TQT_SLOT(accept())); - // create tqlayout + // create layout TQVBoxLayout *tl = new TQVBoxLayout(dlg, 10); TQHBoxLayout *tl1 = new TQHBoxLayout(); tl->addWidget(l1); @@ -603,12 +603,12 @@ void App::showHighscore(int focusitem) f.setPointSize(24); f.setBold(true); l->setFont(f); - l->setFixedSize(l->tqsizeHint()); + l->setFixedSize(l->sizeHint()); l->setFixedWidth(l->width() + 32); - l->tqsetAlignment(AlignCenter); + l->setAlignment(AlignCenter); tl->addWidget(l); - // insert highscores in a gridtqlayout + // insert highscores in a gridlayout TQGridLayout *table = new TQGridLayout(12, 5, 5); tl->addLayout(table, 1); @@ -621,23 +621,23 @@ void App::showHighscore(int focusitem) f.setBold(true); l = new TQLabel(i18n("Rank"), dlg); l->setFont(f); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); table->addWidget(l, 0, 0); l = new TQLabel(i18n("Name"), dlg); l->setFont(f); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); table->addWidget(l, 0, 1); l = new TQLabel(i18n("Time"), dlg); l->setFont(f); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); table->addWidget(l, 0, 2); l = new TQLabel(i18n("Size"), dlg); l->setFont(f); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); table->addWidget(l, 0, 3); l = new TQLabel(i18n("Score"), dlg); l->setFont(f); - l->setMinimumSize(l->tqsizeHint().width()*3, l->tqsizeHint().height()); + l->setMinimumSize(l->sizeHint().width()*3, l->sizeHint().height()); table->addWidget(l, 0, 4); TQString s; @@ -685,8 +685,8 @@ void App::showHighscore(int focusitem) if(i < highscore.size()) { s = TQString("%1 %2") - .tqarg(getScore(hs)) - .tqarg(hs.gravity ? i18n("(gravity)") : TQString("")); + .arg(getScore(hs)) + .arg(hs.gravity ? i18n("(gravity)") : TQString("")); } else { @@ -694,7 +694,7 @@ void App::showHighscore(int focusitem) } e[i][4] = new TQLabel(s, dlg); - e[i][4]->tqsetAlignment(AlignRight); + e[i][4]->setAlignment(AlignRight); } f = font(); @@ -704,12 +704,12 @@ void App::showHighscore(int focusitem) { for(j = 0; j < 5; j++) { - e[i][j]->setMinimumHeight(e[i][j]->tqsizeHint().height()); + e[i][j]->setMinimumHeight(e[i][j]->sizeHint().height()); if(j == 1) - e[i][j]->setMinimumWidth(std::max(e[i][j]->tqsizeHint().width(), 100)); + e[i][j]->setMinimumWidth(std::max(e[i][j]->sizeHint().width(), 100)); else - e[i][j]->setMinimumWidth(std::max(e[i][j]->tqsizeHint().width(), 60)); + e[i][j]->setMinimumWidth(std::max(e[i][j]->sizeHint().width(), 60)); if((int)i == focusitem) e[i][j]->setFont(f); @@ -720,14 +720,14 @@ void App::showHighscore(int focusitem) TQPushButton *b = new KPushButton(KStdGuiItem::close(), dlg); - b->setFixedSize(b->tqsizeHint()); + b->setFixedSize(b->sizeHint()); // connect the "Close"-button to done connect(b, TQT_SIGNAL(clicked()), dlg, TQT_SLOT(accept())); b->setDefault(true); b->setFocus(); - // make tqlayout + // make layout tl->addSpacing(10); tl->addWidget(b); tl->activate(); diff --git a/kshisen/board.cpp b/kshisen/board.cpp index 4173ad4e..ae2fd750 100644 --- a/kshisen/board.cpp +++ b/kshisen/board.cpp @@ -444,7 +444,7 @@ void Board::updateField(int x, int y, bool erase) tiles.tileWidth(), tiles.tileHeight()); - tqrepaint(r, erase); + repaint(r, erase); } void Board::paintEvent(TQPaintEvent *e) @@ -900,7 +900,7 @@ void Board::dumpBoard() const if(tile == EMPTY) row += " --"; else - row += TQString("%1").tqarg(getField(x, y), 3); + row += TQString("%1").arg(getField(x, y), 3); } kdDebug() << row << endl; } @@ -1071,7 +1071,7 @@ bool Board::pause() return paused; } -TQSize Board::tqsizeHint() const +TQSize Board::sizeHint() const { int dpi = TQPaintDeviceMetrics(this).logicalDpiX(); if (dpi < 75) diff --git a/kshisen/board.h b/kshisen/board.h index 1a1f5ab6..634878ed 100644 --- a/kshisen/board.h +++ b/kshisen/board.h @@ -135,7 +135,7 @@ private slots: void gravity(int, bool); protected: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: // functions void initBoard(); diff --git a/kshisen/settings.ui b/kshisen/settings.ui index 773b75a5..9fdac201 100644 --- a/kshisen/settings.ui +++ b/kshisen/settings.ui @@ -78,7 +78,7 @@ <property name="text"> <string>Hard</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -130,7 +130,7 @@ <property name="text"> <string>Fast</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -170,7 +170,7 @@ <property name="text"> <string>18x8</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -181,7 +181,7 @@ <property name="text"> <string>26x14</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -192,7 +192,7 @@ <property name="text"> <string>30x16</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -226,7 +226,7 @@ <property name="text"> <string>24x12</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -242,7 +242,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ksirtet/ksirtet/settings.cpp b/ksirtet/ksirtet/settings.cpp index b35891b8..e6b382c6 100644 --- a/ksirtet/ksirtet/settings.cpp +++ b/ksirtet/ksirtet/settings.cpp @@ -1,7 +1,7 @@ #include "settings.h" #include "settings.moc" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> diff --git a/ksmiletris/gamewidget.cpp b/ksmiletris/gamewidget.cpp index 04d5e543..b0cc3316 100644 --- a/ksmiletris/gamewidget.cpp +++ b/ksmiletris/gamewidget.cpp @@ -206,9 +206,9 @@ void GameWidget::newGame() void GameWidget::repaintChilds() { - screen->tqrepaint(false); - mirror->tqrepaint(false); - next->tqrepaint(false); + screen->repaint(false); + mirror->repaint(false); + next->repaint(false); } void GameWidget::putPiece() @@ -218,7 +218,7 @@ void GameWidget::putPiece() if (piece[2] != bg_sprite) ref(xpos + 0, ypos + 1) = piece[2]; if (piece[3] != bg_sprite) ref(xpos + 1, ypos + 1) = piece[3]; updateMirror(); - screen->tqrepaint(false); + screen->repaint(false); } void GameWidget::getPiece() @@ -241,7 +241,7 @@ void GameWidget::newPiece() next_piece[i] = (Sprite)(Sprite_Block1 + random.getLong(num_pieces_level)); else next_piece[i] = bg_sprite; - next->tqrepaint(false); + next->repaint(false); } void GameWidget::nextPiece() @@ -272,7 +272,7 @@ void GameWidget::updateMirror() mirror_sprites[x] = bg_sprite; mirror_sprites[xpos] = piece[2] == bg_sprite ? piece[0] : piece[2]; mirror_sprites[xpos+1] = piece[3] == bg_sprite ? piece[1] : piece[3]; - mirror->tqrepaint(false); + mirror->repaint(false); } void GameWidget::keyUp() @@ -390,7 +390,7 @@ void GameWidget::broke(int x, int y, bool *xmap) emit changedStats(num_level, num_points); #ifdef HAVE_USLEEP - screen->tqrepaint(false); + screen->repaint(false); usleep(75 * 1000); #endif } diff --git a/ksmiletris/gamewindow.cpp b/ksmiletris/gamewindow.cpp index 2d5824c8..004c60e2 100644 --- a/ksmiletris/gamewindow.cpp +++ b/ksmiletris/gamewindow.cpp @@ -182,8 +182,8 @@ void GameWindow::updateStats(int level, int points) TQString l, p; l.setNum(level); p.setNum(points); - status->changeItem(i18n("Level: %1").tqarg(l), 1); - status->changeItem(i18n("Score: %1").tqarg(p), 2); + status->changeItem(i18n("Level: %1").arg(l), 1); + status->changeItem(i18n("Score: %1").arg(p), 2); } void GameWindow::gameOver() diff --git a/ksnake/appearance.ui b/ksnake/appearance.ui index 7696fc19..d5f49530 100644 --- a/ksnake/appearance.ui +++ b/ksnake/appearance.ui @@ -71,7 +71,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> diff --git a/ksnake/ball.cpp b/ksnake/ball.cpp index dc86d7a0..2881beb9 100644 --- a/ksnake/ball.cpp +++ b/ksnake/ball.cpp @@ -73,7 +73,7 @@ void Ball::nextMove() } } -void Ball::tqrepaint() +void Ball::repaint() { static int i = 0; static bool rotate = true; diff --git a/ksnake/ball.h b/ksnake/ball.h index 609eef95..e7796354 100644 --- a/ksnake/ball.h +++ b/ksnake/ball.h @@ -33,7 +33,7 @@ public: Ball(Board *b, PixServer *p); virtual ~Ball(){} virtual void nextMove(); - void tqrepaint(); + void repaint(); void zero(); protected: Board *board; diff --git a/ksnake/basket.cpp b/ksnake/basket.cpp index 8d124a45..138336cd 100644 --- a/ksnake/basket.cpp +++ b/ksnake/basket.cpp @@ -81,7 +81,7 @@ void Basket::newApples() } } -void Basket::tqrepaint(bool dirty ) +void Basket::repaint(bool dirty ) { Kaffee *g; for ( g = list->first(); g != 0; g = list->next()) { diff --git a/ksnake/basket.h b/ksnake/basket.h index 18386acc..5275d8a8 100644 --- a/ksnake/basket.h +++ b/ksnake/basket.h @@ -56,7 +56,7 @@ class Basket : public TQObject public: Basket(Board *b, PixServer *p); ~Basket(); - void tqrepaint(bool); + void repaint(bool); void newApples(); void clear(); Fruits eaten( int i); diff --git a/ksnake/game.cpp b/ksnake/game.cpp index 29e8b5df..dfae1a4b 100644 --- a/ksnake/game.cpp +++ b/ksnake/game.cpp @@ -88,17 +88,17 @@ Game::~Game() } void Game::scoreChanged(int score){ - statusBar()->changeItem(i18n("Score: %1").tqarg(score), SCORE); + statusBar()->changeItem(i18n("Score: %1").arg(score), SCORE); } void Game::setTrys(int tries){ - statusBar()->changeItem(i18n("Lives: %1").tqarg(tries), LIVES); + statusBar()->changeItem(i18n("Lives: %1").arg(tries), LIVES); } void Game::gameEnd(int score){ KScoreDialog di(KScoreDialog::Name | KScoreDialog::Score | KScoreDialog::Date, this); KScoreDialog::FieldInfo scoreInfo; - TQString date = TQDateTime::tqcurrentDateTime().toString(); + TQString date = TQDateTime::currentDateTime().toString(); scoreInfo.insert(KScoreDialog::Date, date); if (di.addScore(score, scoreInfo, true)) di.exec(); diff --git a/ksnake/general.ui b/ksnake/general.ui index 39e3f45b..9d1eff19 100644 --- a/ksnake/general.ui +++ b/ksnake/general.ui @@ -59,7 +59,7 @@ <property name="text"> <string>Fast</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> diff --git a/ksnake/pixServer.cpp b/ksnake/pixServer.cpp index ed9a2113..244ff17d 100644 --- a/ksnake/pixServer.cpp +++ b/ksnake/pixServer.cpp @@ -181,7 +181,7 @@ void PixServer::initBrickPixmap() { TQPixmap pm = TQPixmap(locate("appdata", "pics/brick.png")); if (pm.isNull()) { - kdFatal() << i18n("error loading %1, aborting\n").tqarg("brick.png"); + kdFatal() << i18n("error loading %1, aborting\n").arg("brick.png"); } int pw = pm.width(); int ph = pm.height(); diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp index 4c68f316..86ab1528 100644 --- a/ksnake/rattler.cpp +++ b/ksnake/rattler.cpp @@ -114,7 +114,7 @@ void Rattler::paintEvent( TQPaintEvent *e) return; TQPixmap levelPix = pix->levelPix(); - basket->tqrepaint(true); + basket->repaint(true); bitBlt(this, rect.x(), rect.y(), &levelPix, rect.x(), rect.y(), rect.width(), rect.height()); @@ -130,14 +130,14 @@ void Rattler::timerEvent( TQTimerEvent * ) for (CompuSnake *c = computerSnakes->first(); c != 0; c = computerSnakes->next()){ if(c) { c->nextMove(); - c->tqrepaint(false); + c->repaint(false); } } for (Ball *b = balls->first(); b != 0; b = balls->next()){ if (b) { b->nextMove(); - b->tqrepaint(); + b->repaint(); } } @@ -147,10 +147,10 @@ void Rattler::timerEvent( TQTimerEvent * ) if(!gameState.testBit(Demo)) { state = samy->nextMove(direction); - samy->tqrepaint( false ); + samy->repaint( false ); } - basket->tqrepaint( false); + basket->repaint( false); if (state == ko) newTry(); @@ -313,8 +313,8 @@ void Rattler::pause() label = new TQLabel(this); label->setFont( TQFont( "Times", 14, TQFont::Bold ) ); label->setText(i18n("Game Paused\n Press %1 to resume\n") - .tqarg(tempPauseAction->shortcutText())); - label->tqsetAlignment( AlignCenter ); + .arg(tempPauseAction->shortcutText())); + label->setAlignment( AlignCenter ); label->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); label->setGeometry(182, 206, 198, 80); label->show(); @@ -351,7 +351,7 @@ void Rattler::restartDemo() level->create(Intro); pix->initRoomPixmap(); init(false); - tqrepaint(); + repaint(); start(); } @@ -374,7 +374,7 @@ void Rattler::demo() level->create(Intro); pix->initRoomPixmap(); } - tqrepaint(rect(), false); + repaint(rect(), false); init(false); run(); first_time = false; @@ -413,7 +413,7 @@ void Rattler::restart() cleanLabel(); - tqrepaint(); + repaint(); TQTimer::singleShot( 2000, this, TQT_SLOT(showRoom()) ); } @@ -426,7 +426,7 @@ void Rattler::newTry() gameState.setBit(Over); level->create(GameOver); pix->initRoomPixmap(); - tqrepaint(); + repaint(); TQTimer::singleShot( 5000, this, TQT_SLOT(demo()) ); emit setScore(points); return; @@ -439,7 +439,7 @@ void Rattler::newTry() level->create(Room); pix->initRoomPixmap(); init(true); - tqrepaint(); + repaint(); TQTimer::singleShot( 1000, this, TQT_SLOT(run()) ); } @@ -456,7 +456,7 @@ void Rattler::levelUp() level->nextLevel(); level->create(Banner); pix->initRoomPixmap(); - tqrepaint(); + repaint(); TQTimer::singleShot( 2000, this, TQT_SLOT(showRoom()) ); } @@ -493,7 +493,7 @@ void Rattler::showRoom() level->create(Room); pix->initRoomPixmap(); init(true); - tqrepaint(); + repaint(); TQTimer::singleShot( 1000, this, TQT_SLOT(run()) ); } diff --git a/ksnake/snake.cpp b/ksnake/snake.cpp index 2d6337ac..c892452b 100644 --- a/ksnake/snake.cpp +++ b/ksnake/snake.cpp @@ -143,7 +143,7 @@ void Snake::reset(int index, int border) } } -void Snake::tqrepaint( bool dirty) +void Snake::repaint( bool dirty) { int x = 0; for ( Samy *sam = list.first(); sam != 0; sam = list.next(), x++) { diff --git a/ksnake/snake.h b/ksnake/snake.h index 206ea126..9b5c1087 100644 --- a/ksnake/snake.h +++ b/ksnake/snake.h @@ -46,7 +46,7 @@ signals: public: Snake(Board *b, PixServer *p, Gate g, PixMap x); ~Snake() {} - void tqrepaint( bool ); + void repaint( bool ); void zero(); protected: diff --git a/ksnake/startroom.cpp b/ksnake/startroom.cpp index 9792ee4b..b1eb3b8d 100644 --- a/ksnake/startroom.cpp +++ b/ksnake/startroom.cpp @@ -29,7 +29,7 @@ #include <tqwmatrix.h> #include <tqspinbox.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include "levels.h" @@ -40,16 +40,16 @@ StartRoom::StartRoom( TQWidget *parent, const char *name) TQSpacerItem* spacer = new TQSpacerItem( 20, 61, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); Form1Layout->addItem( spacer, 2, 1 ); - TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); + TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); TQSpacerItem* spacer_2 = new TQSpacerItem( 91, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout1->addItem( spacer_2 ); + layout1->addItem( spacer_2 ); picture = new TQLabel( this, "picture" ); - tqlayout1->addWidget( picture ); + layout1->addWidget( picture ); TQSpacerItem* spacer_3 = new TQSpacerItem( 41, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout1->addItem( spacer_3 ); + layout1->addItem( spacer_3 ); - Form1Layout->addMultiCellLayout( tqlayout1, 0, 0, 0, 1 ); + Form1Layout->addMultiCellLayout( layout1, 0, 0, 0, 1 ); roomRange = new TQSpinBox( this, "kcfg_StartingRoom" ); roomRange->setMaxValue( 25 ); diff --git a/ksnake/view.cpp b/ksnake/view.cpp index add5cf16..a8503700 100644 --- a/ksnake/view.cpp +++ b/ksnake/view.cpp @@ -51,7 +51,7 @@ void View::resizeEvent( TQResizeEvent * ) rattler->setGeometry(0, BAR_HEIGHT, width(), height()-BAR_HEIGHT); } -TQSize View::tqsizeHint() const +TQSize View::sizeHint() const { return TQSize(490,502); } diff --git a/ksnake/view.h b/ksnake/view.h index 9e05da9f..871cd7a1 100644 --- a/ksnake/view.h +++ b/ksnake/view.h @@ -42,7 +42,7 @@ public: protected: void resizeEvent( TQResizeEvent * ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; }; #endif // VIEW_H diff --git a/ksokoban/ImageData.cpp b/ksokoban/ImageData.cpp index 76fd0f2b..22190469 100644 --- a/ksokoban/ImageData.cpp +++ b/ksokoban/ImageData.cpp @@ -163,10 +163,10 @@ ImageData::brighten(TQImage& img) { void ImageData::wall(TQPainter &p, int x, int y, int index, bool left, bool right) { - if (left) p.tqdrawPixmap(x, y, upperLarge(index-1), halfSize_); + if (left) p.drawPixmap(x, y, upperLarge(index-1), halfSize_); else p.drawPixmap(x, y, leftSmall(index)); - if (right) p.tqdrawPixmap(x+halfSize_, y, upperLarge(index), 0, 0, halfSize_); + if (right) p.drawPixmap(x+halfSize_, y, upperLarge(index), 0, 0, halfSize_); else p.drawPixmap(x+halfSize_, y, rightSmall(index)); p.drawPixmap(x, y+halfSize_, lowerLarge(index)); diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp index 560c4b9d..c0ccbbad 100644 --- a/ksokoban/ModalLabel.cpp +++ b/ksokoban/ModalLabel.cpp @@ -57,7 +57,7 @@ ModalLabel::ModalLabel(const TQString &text, TQWidget *parent, if (width < 300) width = 300; if (height < 75) height = 75; - tqsetAlignment (AlignCenter); + setAlignment (AlignCenter); setFrameStyle (TQFrame::Panel | TQFrame::Raised); setLineWidth (4); setFont (font); @@ -65,7 +65,7 @@ ModalLabel::ModalLabel(const TQString &text, TQWidget *parent, resize (width, height); show (); - TQWidgetList *list = TQApplication::tqallWidgets(); + TQWidgetList *list = TQApplication::allWidgets(); TQWidgetListIt it( *list ); while (it.current()) { it.current()->installEventFilter (this); diff --git a/ksokoban/NEWS b/ksokoban/NEWS index 8c42ec6c..6f1352ed 100644 --- a/ksokoban/NEWS +++ b/ksokoban/NEWS @@ -48,7 +48,7 @@ New features: * Bookmarks * Animation speed menu -* tqStatus bar +* Status bar * Internationalisation ------------------------------------------------------------------------------- diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp index c3fe57fe..77c3b69b 100644 --- a/ksokoban/PlayField.cpp +++ b/ksokoban/PlayField.cpp @@ -599,7 +599,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) { case Key_X: levelMap_->random(); levelChange(); - tqrepaint(false); + repaint(false); break; case Key_R: @@ -620,7 +620,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) { break; case Key_I: history_->redo(levelMap_); - tqrepaint(false); + repaint(false); return; break; @@ -644,7 +644,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) { } updateStepsXpm(); updatePushesXpm(); - tqrepaint(false); + repaint(false); return; break; #endif @@ -855,7 +855,7 @@ this level yet."), this); level(levelMap_->level()+1); levelChange(); - tqrepaint(false); + repaint(false); } void @@ -868,7 +868,7 @@ the current collection."), this); } level(levelMap_->level()-1); levelChange(); - tqrepaint(false); + repaint(false); } void @@ -892,7 +892,7 @@ PlayField::restartLevel() { level(levelMap_->level()); updateStepsXpm(); updatePushesXpm(); - tqrepaint(false); + repaint(false); } void @@ -901,7 +901,7 @@ PlayField::changeCollection(LevelCollection *collection) { levelMap_->changeCollection(collection); levelChange(); //erase(collRect_); - tqrepaint(false); + repaint(false); } void @@ -1030,7 +1030,7 @@ PlayField::goToBookmark(Bookmark *bm) { //updateLevelXpm(); updateStepsXpm(); updatePushesXpm(); - tqrepaint(false); + repaint(false); } bool diff --git a/ksokoban/PlayField.h b/ksokoban/PlayField.h index b4380033..3b6375b9 100644 --- a/ksokoban/PlayField.h +++ b/ksokoban/PlayField.h @@ -26,7 +26,7 @@ #include <tqfontmetrics.h> #include <tqpixmap.h> #include <tqimage.h> -#include <tqbrush.h> +#include <brush.h> #include "ImageData.h" #include "LevelMap.h" diff --git a/kspaceduel/dialogs.cpp b/kspaceduel/dialogs.cpp index 34194ad0..8d4faf26 100644 --- a/kspaceduel/dialogs.cpp +++ b/kspaceduel/dialogs.cpp @@ -3,7 +3,7 @@ #include <tqtabwidget.h> #include <tqslider.h> #include <tqlcdnumber.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> @@ -130,7 +130,7 @@ ConfigSetup::ConfigSetup(SConfig *custom,TQWidget *parent,const char *name) //box=new TQGroupBox(i18n("Config"),this); //setMainWidget( box ); - TQVBoxLayout *boxtqlayout = new TQVBoxLayout( this, 6 ); + TQVBoxLayout *boxlayout = new TQVBoxLayout( this, 6 ); tabs=new TQTabWidget(this); for(i=0;i<TabNum;i++) @@ -157,9 +157,9 @@ ConfigSetup::ConfigSetup(SConfig *custom,TQWidget *parent,const char *name) configCombo->insertItem(i18n(predefinedConfigName[i])); configCombo->insertItem(i18n("Custom")); - boxtqlayout->addSpacing( 2 * 6 ); - boxtqlayout->addWidget(configCombo); - boxtqlayout->addWidget(tabs); + boxlayout->addSpacing( 2 * 6 ); + boxlayout->addWidget(configCombo); + boxlayout->addWidget(tabs); for(i=0;i<EditNum;i++) { diff --git a/kspaceduel/general.ui b/kspaceduel/general.ui index 05d5ba83..db120dd0 100644 --- a/kspaceduel/general.ui +++ b/kspaceduel/general.ui @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index 3f17605a..5b02fc75 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -27,7 +27,7 @@ MyMainView::MyMainView(TQWidget *parent) setMinimumSize(600,400); random.setSeed(0); TQPixmap backgr(locate("appdata", MV_BACKGROUND)); - field.tqsetBackgroundPixmap(backgr); + field.setBackgroundPixmap(backgr); view.setResizePolicy(TQScrollView::AutoOne); view.setHScrollBarMode(TQScrollView::AlwaysOff); @@ -492,7 +492,7 @@ void MyMainView::newRound() field.update(); TQString str = i18n("Press %1 to start") - .tqarg(KShortcut(GAME_START_SHORTCUT).toString()); + .arg(KShortcut(GAME_START_SHORTCUT).toString()); emit(setStatusText(str,IDS_MAIN)); emit( setStatusText( "", IDS_PAUSE ) ); stop( ); @@ -557,7 +557,7 @@ void MyMainView::timerEvent(TQTimerEvent *event) emit(wins(0,w)); } TQString str = i18n("Press %1 for new round") - .tqarg(KShortcut(GAME_START_SHORTCUT).toString()); + .arg(KShortcut(GAME_START_SHORTCUT).toString()); emit(setStatusText(str,IDS_MAIN)); stop( ); } diff --git a/kspaceduel/playerinfo.cpp b/kspaceduel/playerinfo.cpp index dbb5728d..2e1ef91d 100644 --- a/kspaceduel/playerinfo.cpp +++ b/kspaceduel/playerinfo.cpp @@ -34,9 +34,9 @@ PlayerInfo::PlayerInfo(int pnr,TQWidget *parent,const char *name) for(i=0;i<4;i++) { - str = TQString::tqfromLatin1("sprites/playerinfo/ship%1%2.pnm") - .tqarg(pnr+1) - .tqarg(i); + str = TQString::fromLatin1("sprites/playerinfo/ship%1%2.pnm") + .arg(pnr+1) + .arg(i); pix[i]=new TQPixmap(locate("appdata", str)); } diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp index 999f546b..fff04d1f 100644 --- a/kspaceduel/topwidget.cpp +++ b/kspaceduel/topwidget.cpp @@ -3,7 +3,7 @@ #include <kkeydialog.h> #include <kaction.h> #include <kstdgameaction.h> -#include <tqlayout.h> +#include <layout.h> #include <kstatusbar.h> #include "topwidget.h" @@ -25,11 +25,11 @@ void MyTopLevelWidget::initGameWidgets( ){ playerinfo[1]=new PlayerInfo(1,w); playfield=new MyMainView(w); - TQBoxLayout *toptqlayout=new TQHBoxLayout(w); - toptqlayout->addWidget(playerinfo[0]); - toptqlayout->addWidget(playfield); - toptqlayout->addWidget(playerinfo[1]); - toptqlayout->activate(); + TQBoxLayout *toplayout=new TQHBoxLayout(w); + toplayout->addWidget(playerinfo[0]); + toplayout->addWidget(playfield); + toplayout->addWidget(playerinfo[1]); + toplayout->activate(); playfield->setFocusPolicy(TQ_StrongFocus); playfield->setFocus(); diff --git a/ktron/ai.ui b/ktron/ai.ui index dc84bc32..7fcf5df8 100644 --- a/ktron/ai.ui +++ b/ktron/ai.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/ktron/appearance.ui b/ktron/appearance.ui index d6176a69..0c817317 100644 --- a/ktron/appearance.ui +++ b/ktron/appearance.ui @@ -90,7 +90,7 @@ <property name="text"> <string>Large</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -101,7 +101,7 @@ <property name="text"> <string>Small</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -112,7 +112,7 @@ <property name="text"> <string>Medium</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/ktron/general.ui b/ktron/general.ui index 0971ec1a..c2f1cf4b 100644 --- a/ktron/general.ui +++ b/ktron/general.ui @@ -154,7 +154,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -175,7 +175,7 @@ <property name="text"> <string>Default</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -186,7 +186,7 @@ <property name="text"> <string>Fast</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp index 9057f7c0..31437999 100644 --- a/ktron/ktron.cpp +++ b/ktron/ktron.cpp @@ -46,7 +46,7 @@ KTron::KTron(TQWidget *parent, const char *name) : KMainWindow(parent, name) { playerPoints[0]=playerPoints[1]=0; tron=new Tron(this, "Tron"); - connect(tron,TQT_SIGNAL(gameEnds(Player)),TQT_SLOT(changetqStatus(Player))); + connect(tron,TQT_SIGNAL(gameEnds(Player)),TQT_SLOT(changeStatus(Player))); setCentralWidget(tron); tron->setMinimumSize(200,180); @@ -108,17 +108,17 @@ void KTron::updateStatusbar(){ TQString name; if(tron->isComputer(Both)) - name=i18n("Computer(%1)").tqarg(i+1); + name=i18n("Computer(%1)").arg(i+1); else if(tron->isComputer(player)) name=i18n("Computer"); else name=playerName[i]; - TQString string = TQString("%1: %2").tqarg(name).tqarg(playerPoints[i]); + TQString string = TQString("%1: %2").arg(name).arg(playerPoints[i]); statusBar()->changeItem(string,ID_STATUS_BASE+i+1); } } -void KTron::changetqStatus(Player player) { +void KTron::changeStatus(Player player) { // if player=Nobody, then new game if(player==Nobody){ playerPoints[0]=playerPoints[1]=0; @@ -158,12 +158,12 @@ void KTron::showWinner(Player winner){ if(!tron->isComputer(winner)) winnerName = playerName[winner]; - TQString message=i18n("%1 has won!").tqarg(winnerName); + TQString message=i18n("%1 has won!").arg(winnerName); statusBar()->message(message,MESSAGE_TIME); message = i18n("%1 has won versus %2 with %3 : %4 points!"); - message=message.tqarg(winnerName).tqarg(loserName); - message=message.tqarg(playerPoints[winner]).tqarg(playerPoints[loser]); + message=message.arg(winnerName).arg(loserName); + message=message.arg(playerPoints[winner]).arg(playerPoints[loser]); KMessageBox::information(this, message, i18n("Winner")); tron->newGame(); diff --git a/ktron/ktron.h b/ktron/ktron.h index a46c008c..6008009d 100644 --- a/ktron/ktron.h +++ b/ktron/ktron.h @@ -58,7 +58,7 @@ protected: private slots: void loadSettings(); /** updates players points in statusbar and checks if someone has won */ - void changetqStatus(Player); + void changeStatus(Player); void showWinner(Player winner); void showSettings(); diff --git a/ktron/tron.cpp b/ktron/tron.cpp index 9ed00d8c..40a384e4 100644 --- a/ktron/tron.cpp +++ b/ktron/tron.cpp @@ -81,7 +81,7 @@ void Tron::loadSettings(){ // Style if(pixmap){ updatePixmap(); - tqrepaint(); + repaint(); } // Backgroundimage @@ -96,7 +96,7 @@ void Tron::loadSettings(){ setBackgroundPix(pix); } else { TQString msg=i18n("Wasn't able to load wallpaper\n%1"); - msg=msg.tqarg(tmpFile); + msg=msg.arg(tmpFile); KMessageBox::sorry(this, msg); } KIO::NetAccess::removeTempFile(tmpFile); @@ -268,7 +268,7 @@ void Tron::showWinner(Player player) updatePixmap(); } - tqrepaint(); + repaint(); emit gameEnds(player); @@ -313,8 +313,8 @@ void Tron::updatePixmap() } // draw frame - TQColor light=parentWidget()->tqcolorGroup().midlight(); - TQColor dark=parentWidget()->tqcolorGroup().mid(); + TQColor light=parentWidget()->colorGroup().midlight(); + TQColor dark=parentWidget()->colorGroup().mid(); p.setPen(NoPen); p.setBrush(light); @@ -810,7 +810,7 @@ void Tron::showBeginHint() if(players[0].score==0 && players[1].score==0) { beginHint=true; - tqrepaint(); + repaint(); } } } diff --git a/ktuberling/pics/layout.i18n b/ktuberling/pics/layout.i18n index 85c63ed9..373203cb 100644 --- a/ktuberling/pics/layout.i18n +++ b/ktuberling/pics/layout.i18n @@ -1,6 +1,6 @@ /* ------------------------------------------------------------- KDE Tuberling - List of strings in tqlayout.xml that are translatable + List of strings in layout.xml that are translatable mailto:[email protected] ------------------------------------------------------------- */ diff --git a/ktuberling/pics/layout.xml b/ktuberling/pics/layout.xml index e96beb07..c5b02fb8 100644 --- a/ktuberling/pics/layout.xml +++ b/ktuberling/pics/layout.xml @@ -5,7 +5,7 @@ Modify this file if you want to add new playgrounds, new sounds, or modify existing ones. If you do that, don't forget to update: - - tqlayout.i18n (strings that might be translated) + - layout.i18n (strings that might be translated) - ktuberlingui.rc (actions associated with menu items). --> diff --git a/ktuberling/playground.cpp b/ktuberling/playground.cpp index 586f143f..62d2b107 100644 --- a/ktuberling/playground.cpp +++ b/ktuberling/playground.cpp @@ -94,7 +94,7 @@ void PlayGround::repaintAll() editableArea.width() + 20, editableArea.height() + 20); - tqrepaint(dirtyArea, false); + repaint(dirtyArea, false); } // Undo last action @@ -255,10 +255,10 @@ void PlayGround::mousePressEvent( TQMouseEvent *event ) int draggedNumber = draggedObject.getNumber(); TQPixmap object(objectsLayout[draggedNumber].size()); - TQBitmap tqshape(objectsLayout[draggedNumber].size()); + TQBitmap shape(objectsLayout[draggedNumber].size()); bitBlt(&object, TQPoint(0, 0), &gameboard, objectsLayout[draggedNumber], TQt::CopyROP); - bitBlt(&tqshape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP); - object.setMask(tqshape); + bitBlt(&shape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP); + object.setMask(shape); draggedCursor = new TQCursor(object, position.x(), position.y()); setCursor(*draggedCursor); @@ -320,7 +320,7 @@ void PlayGround::mouseReleaseEvent( TQMouseEvent *event ) // Repaint the editable area position.moveBy(XMARGIN, YMARGIN); - tqrepaint(position, false); + repaint(position, false); } @@ -506,7 +506,7 @@ void PlayGround::loadFailure() exit(-1); } -// Set up play ground's tqgeometry +// Set up play ground's geometry void PlayGround::setupGeometry() { int width = gameboard.width() + 2 * XMARGIN, @@ -547,15 +547,15 @@ bool PlayGround::zone(TQPoint &position) draggedObject = *currentObject; draggedNumber = draggedObject.getNumber(); - TQBitmap tqshape(objectsLayout[draggedNumber].size()); + TQBitmap shape(objectsLayout[draggedNumber].size()); TQPoint relative(position.x() - toUpdate.x(), position.y() - toUpdate.y()); - bitBlt(&tqshape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP); - if (!tqshape.convertToImage().pixelIndex(relative.x(), relative.y())) continue; + bitBlt(&shape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP); + if (!shape.convertToImage().pixelIndex(relative.x(), relative.y())) continue; toDraw.remove(draggedZOrder); toUpdate.moveBy(XMARGIN, YMARGIN); - tqrepaint(toUpdate, false); + repaint(toUpdate, false); position = relative; diff --git a/ktuberling/playground.h b/ktuberling/playground.h index 4bd8c210..2883ff1f 100644 --- a/ktuberling/playground.h +++ b/ktuberling/playground.h @@ -62,7 +62,7 @@ private: private: TQPixmap gameboard; // Picture of the game board - TQBitmap masks; // Pictures of the objects' tqshapes + TQBitmap masks; // Pictures of the objects' shapes TQRect editableArea; // Part of the gameboard where the player can lay down objects TQString menuItem, // Menu item describing describing this gameboard editableSound; // Sound associated with this area @@ -73,7 +73,7 @@ private: TQString *textsList, // List of the message numbers associated with categories *soundsList; // List of sounds associated with each object - TQCursor *draggedCursor; // Cursor's tqshape for currently dragged object + TQCursor *draggedCursor; // Cursor's shape for currently dragged object ToDraw draggedObject; // Object currently dragged int draggedZOrder; // Z-order (in to-draw buffer) of this object diff --git a/ktuberling/todraw.cpp b/ktuberling/todraw.cpp index cec7b014..2523a203 100644 --- a/ktuberling/todraw.cpp +++ b/ktuberling/todraw.cpp @@ -49,11 +49,11 @@ void ToDraw::draw(TQPainter &artist, const TQRect &area, if (!position.intersects(area)) return; TQPixmap objectPixmap(objectsLayout[number].size()); - TQBitmap tqshapeBitmap(objectsLayout[number].size()); + TQBitmap shapeBitmap(objectsLayout[number].size()); bitBlt(&objectPixmap, TQPoint(0, 0), gameboard, objectsLayout[number], TQt::CopyROP); - bitBlt(&tqshapeBitmap, TQPoint(0, 0), masks, objectsLayout[number], TQt::CopyROP); - objectPixmap.setMask(tqshapeBitmap); + bitBlt(&shapeBitmap, TQPoint(0, 0), masks, objectsLayout[number], TQt::CopyROP); + objectPixmap.setMask(shapeBitmap); artist.drawPixmap(position.topLeft(), objectPixmap); } diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp index fc0939f0..975672bc 100644 --- a/ktuberling/toplevel.cpp +++ b/ktuberling/toplevel.cpp @@ -15,7 +15,7 @@ #include <kstdgameaction.h> #include <kprinter.h> -#include <tqclipboard.h> +#include <clipboard.h> #include "toplevel.moc" #include "playground.h" @@ -189,7 +189,7 @@ void TopLevel::changeLanguage(uint newLanguage) // Load the layouts file bool TopLevel::loadLayout(TQDomDocument &layoutDocument) { - TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/tqlayout.xml"))); + TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/layout.xml"))); if (!layoutFile.open(IO_ReadOnly)) return false; @@ -408,9 +408,9 @@ void TopLevel::filePrint() KPrinter printer; bool ok; - ok = printer.setup(this, i18n("Print %1").tqarg(actionCollection()->action(gameboardActions[selectedGameboard].latin1())->plainText())); + ok = printer.setup(this, i18n("Print %1").arg(actionCollection()->action(gameboardActions[selectedGameboard].latin1())->plainText())); if (!ok) return; - playGround->tqrepaint(true); + playGround->repaint(true); if (!playGround->printPicture(printer)) KMessageBox::error(this, i18n("Could not print picture.")); @@ -422,7 +422,7 @@ void TopLevel::filePrint() // Copy modified area to clipboard void TopLevel::editCopy() { - TQClipboard *clipboard = TQApplication::tqclipboard(); + TQClipboard *clipboard = TQApplication::clipboard(); TQPixmap picture(playGround->getPicture()); clipboard->setPixmap(picture); diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp index 95293387..12193e31 100644 --- a/libksirtet/base/board.cpp +++ b/libksirtet/base/board.cpp @@ -16,7 +16,7 @@ FixedCanvasView::FixedCanvasView(TQWidget *parent, const char *name) : TQCanvasView(parent, name, WNoAutoErase) {} -TQSize FixedCanvasView::tqsizeHint() const +TQSize FixedCanvasView::sizeHint() const { if ( canvas()==0 ) return TQSize(); return canvas()->size() + 2 * TQSize(frameWidth(), frameWidth()); @@ -24,7 +24,7 @@ TQSize FixedCanvasView::tqsizeHint() const void FixedCanvasView::adjustSize() { - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } //----------------------------------------------------------------------------- diff --git a/libksirtet/base/board.h b/libksirtet/base/board.h index b525ee5b..f78b8168 100644 --- a/libksirtet/base/board.h +++ b/libksirtet/base/board.h @@ -19,7 +19,7 @@ class KDE_EXPORT FixedCanvasView : public TQCanvasView public: FixedCanvasView(TQWidget *parent = 0, const char *name = 0); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: virtual void adjustSize(); diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp index 5f7cf10d..dde0ef0a 100644 --- a/libksirtet/base/field.cpp +++ b/libksirtet/base/field.cpp @@ -1,7 +1,7 @@ #include "field.h" #include <tqwhatsthis.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -41,8 +41,8 @@ void BaseField::init(bool AI, bool multiplayer, bool server, bool first, _flags.multiplayer = multiplayer; _flags.server = server; _flags.first = first; - TQString text = (AI ? i18n("%1\n(AI player)").tqarg(name) - : (multiplayer ? i18n("%1\n(Human player)").tqarg(name) + TQString text = (AI ? i18n("%1\n(AI player)").arg(name) + : (multiplayer ? i18n("%1\n(Human player)").arg(name) : TQString())); if ( first && !server ) text += i18n("\nWaiting for server"); setMessage(text, (first && server ? StartButton : NoButton)); @@ -81,7 +81,7 @@ void BaseField::setMessage(const TQString &label, ButtonType type) TQString str = (isArcade() ? i18n("Arcade game") + '\n' : TQString()) + label; _label = new TQLabel(str, board); - _label->tqsetAlignment(TQt::AlignCenter); + _label->setAlignment(TQt::AlignCenter); _label->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); _boardLayout->addWidget(_label, 0, TQt::AlignCenter); _label->show(); @@ -128,7 +128,7 @@ void BaseField::stop(bool gameover) if ( board->arcadeStage()==bfactory->bbi.nbArcadeStages ) msg = i18n("The End"); else { - msg = i18n("Stage #%1 done").tqarg(board->arcadeStage()); + msg = i18n("Stage #%1 done").arg(board->arcadeStage()); button = ProceedButton; } } diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp index 1d0f5319..8d0521bc 100644 --- a/libksirtet/base/kzoommainwindow.cpp +++ b/libksirtet/base/kzoommainwindow.cpp @@ -58,7 +58,7 @@ void KZoomMainWindow::init(const char *popupName) void KZoomMainWindow::addWidget(TQWidget *widget) { widget->adjustSize(); - TQWidget *tlw = widget->tqtopLevelWidget(); + TQWidget *tlw = widget->topLevelWidget(); KZoomMainWindow *zm = static_cast<KZoomMainWindow *>(tlw->qt_cast("KZoomMainWindow")); Q_ASSERT(zm); @@ -74,7 +74,7 @@ void KZoomMainWindow::widgetDestroyed() bool KZoomMainWindow::eventFilter(TQObject *o, TQEvent *e) { if ( e->type()==TQEvent::LayoutHint ) - setFixedSize(tqminimumSize()); // because K/TQMainWindow + setFixedSize(minimumSize()); // because K/TQMainWindow // does not manage fixed central widget // with hidden menubar... return KMainWindow::eventFilter(o, e); diff --git a/libksirtet/base/kzoommainwindow.h b/libksirtet/base/kzoommainwindow.h index 18e85ddb..3b70eae4 100644 --- a/libksirtet/base/kzoommainwindow.h +++ b/libksirtet/base/kzoommainwindow.h @@ -52,7 +52,7 @@ public: /** Add a widget to be managed i.e. the adjustSize() method of the * widget is called whenever the zoom is changed. - * This function assumes that the tqtopLevelWidget() is the KZoomMainWindow. + * This function assumes that the topLevelWidget() is the KZoomMainWindow. */ static void addWidget(TQWidget *widget); diff --git a/libksirtet/base/settings.cpp b/libksirtet/base/settings.cpp index a695d746..2d8db301 100644 --- a/libksirtet/base/settings.cpp +++ b/libksirtet/base/settings.cpp @@ -3,7 +3,7 @@ #include <tqlabel.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqhgroupbox.h> diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp index 3960291e..4e397cdd 100644 --- a/libksirtet/common/ai.cpp +++ b/libksirtet/common/ai.cpp @@ -6,7 +6,7 @@ #include <tqlabel.h> #include <tqhbox.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgrid.h> #include <tqwhatsthis.h> @@ -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").tqarg(data.name) ); + KConfigSkeletonItem *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").tqarg(data.name) ); + KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").arg(data.name) ); assert(item); return item->property().toInt(); } diff --git a/libksirtet/common/field.cpp b/libksirtet/common/field.cpp index 8b1d3f7b..f8cff64a 100644 --- a/libksirtet/common/field.cpp +++ b/libksirtet/common/field.cpp @@ -3,7 +3,7 @@ #include <tqwhatsthis.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kprogress.h> @@ -39,7 +39,7 @@ Field::Field(TQWidget *parent) // level progress levelLabel = new TQLabel(this); - levelLabel->tqsetAlignment(AlignCenter); + levelLabel->setAlignment(AlignCenter); lcds->addWidget(levelLabel, 5, 0); toLevel = new KProgress(this); toLevel->setTextEnabled(true); @@ -77,7 +77,7 @@ Field::Field(TQWidget *parent) vbl->addStretch(1); labShowNext = new TQLabel(i18n("Next Tile"), this); - labShowNext->tqsetAlignment(AlignCenter); + labShowNext->setAlignment(AlignCenter); vbl->addWidget(labShowNext, 0); showNext = new ShowNextPiece(board, this); _snRootPixmap = new KCanvasRootPixmap(showNext); diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp index fb1642c0..bd9be550 100644 --- a/libksirtet/common/highscores.cpp +++ b/libksirtet/common/highscores.cpp @@ -23,13 +23,13 @@ void CommonHighscores::convertLegacy(uint) KConfigGroupSaver cg(kapp->config(), "High Scores"); for (uint i=0; i<10; i++) { TQString name - = cg.config()->readEntry(TQString("name%1").tqarg(i), TQString()); + = cg.config()->readEntry(TQString("name%1").arg(i), TQString()); if ( name.isNull() ) break; if ( name.isEmpty() ) name = i18n("anonymous"); uint score - = cg.config()->readUnsignedNumEntry(TQString("score%1").tqarg(i), 0); + = cg.config()->readUnsignedNumEntry(TQString("score%1").arg(i), 0); uint level - = cg.config()->readUnsignedNumEntry(TQString("level%1").tqarg(i), 1); + = cg.config()->readUnsignedNumEntry(TQString("level%1").arg(i), 1); Score s(Won); s.setScore(score); s.setData("name", name); diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp index 6638e67a..376c0c57 100644 --- a/libksirtet/common/misc_ui.cpp +++ b/libksirtet/common/misc_ui.cpp @@ -41,7 +41,7 @@ Shadow::Shadow(BaseBoard *board, TQWidget *parent) connect(board, TQT_SIGNAL(updatePieceConfigSignal()), TQT_SLOT(update())); } -TQSize Shadow::tqsizeHint() const +TQSize Shadow::sizeHint() const { return TQSize(_xOffset + _board->matrix().width() * BasePrefs::blockSize(), SHADOW_HEIGHT); @@ -86,11 +86,11 @@ class Led : public TQWidget TQSizePolicy sizePolicy() const { return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); } - TQSize tqsizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); } + TQSize sizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); } - void on() { if (!_on) { _on = TRUE; tqrepaint(); } } - void off() { if (_on) {_on = FALSE; tqrepaint(); } } - void setColor(const TQColor &c) { if (c!=col) { col = c; tqrepaint(); } } + void on() { if (!_on) { _on = TRUE; repaint(); } } + void off() { if (_on) {_on = FALSE; repaint(); } } + void setColor(const TQColor &c) { if (c!=col) { col = c; repaint(); } } protected: void paintEvent(TQPaintEvent *) { @@ -114,9 +114,9 @@ GiftPool::GiftPool(TQWidget *parent) leds.insert(i, new Led(yellow, this)); } -TQSize GiftPool::tqsizeHint() const +TQSize GiftPool::sizeHint() const { - TQSize s = (leds.size() ? leds[0]->tqsizeHint() : TQSize()); + TQSize s = (leds.size() ? leds[0]->sizeHint() : TQSize()); return TQSize((s.width()+LED_SPACING)*leds.size()-LED_SPACING, s.height()); } @@ -182,7 +182,7 @@ PlayerProgress::PlayerProgress(BaseBoard *board, TQWidget *parent, KZoomMainWindow::addWidget(this); } -TQSize PlayerProgress::tqsizeHint() const +TQSize PlayerProgress::sizeHint() const { return TQSize(10, _board->matrix().height() * BasePrefs::blockSize()) + 2 * TQSize(frameWidth(), frameWidth()); diff --git a/libksirtet/common/misc_ui.h b/libksirtet/common/misc_ui.h index 708bd484..181e0b2f 100644 --- a/libksirtet/common/misc_ui.h +++ b/libksirtet/common/misc_ui.h @@ -27,7 +27,7 @@ class LIBKSIRTET_EXPORT Shadow : public TQWidget public: Shadow(BaseBoard *, TQWidget *parent); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQSizePolicy sizePolicy() const; void setDisplay(bool show); @@ -49,7 +49,7 @@ class LIBKSIRTET_EXPORT GiftPool : public TQHBox public: GiftPool(TQWidget *parent); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQSizePolicy sizePolicy() const; void reset(); @@ -75,7 +75,7 @@ class LIBKSIRTET_EXPORT PlayerProgress : public KGameProgress public: PlayerProgress(BaseBoard *board, TQWidget *parent = 0, const char *name = 0); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQSizePolicy sizePolicy() const; private: diff --git a/libksirtet/common/settings.cpp b/libksirtet/common/settings.cpp index 058de034..e54799dc 100644 --- a/libksirtet/common/settings.cpp +++ b/libksirtet/common/settings.cpp @@ -2,7 +2,7 @@ #include "settings.moc" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqwhatsthis.h> diff --git a/libksirtet/lib/defines.cpp b/libksirtet/lib/defines.cpp index 7eef441e..baf91083 100644 --- a/libksirtet/lib/defines.cpp +++ b/libksirtet/lib/defines.cpp @@ -6,7 +6,7 @@ void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent) { TQString str; if ( msg2.isNull() ) str = msg1; - else str = i18n("%1:\n%2").tqarg(msg1).tqarg(msg2); + else str = i18n("%1:\n%2").arg(msg1).arg(msg2); KMessageBox::error(parent, str); } diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp index 599f7372..acf4d7ac 100644 --- a/libksirtet/lib/keys.cpp +++ b/libksirtet/lib/keys.cpp @@ -46,7 +46,7 @@ void KeyData::createActionCollection(uint index, TQWidget *receiver) _cols[index] = new KActionCollection(receiver, this); for (uint k=0; k<_data.size(); k++) { TQString label = i18n(_data[k].label); - TQString name = TQString("%2 %3").tqarg(index+1).tqarg(_data[k].name); + TQString name = TQString("%2 %3").arg(index+1).arg(_data[k].name); const char *slot = (_data[k].slotRelease ? 0 : _data[k].slot); KAction *a = new KAction(label, _keycodes[_cols.size()-1][index][k], TQT_TQOBJECT(receiver), slot, _cols[index], name.utf8()); @@ -78,8 +78,8 @@ void KeyData::setEnabled(uint index, bool enabled) void KeyData::addKeys(KKeyDialog &d) { for (uint i=0; i<_cols.size(); i++) - d.insert(_cols[i], i18n("Shortcuts for player #%1/%2").tqarg(i+1) - .tqarg(_cols.size())); + d.insert(_cols[i], i18n("Shortcuts for player #%1/%2").arg(i+1) + .arg(_cols.size())); } void KeyData::save() diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h index a5227a9b..52099228 100644 --- a/libksirtet/lib/keys.h +++ b/libksirtet/lib/keys.h @@ -37,7 +37,7 @@ class KeyData : public TQObject TQMap<KAction *, SpecialData> _specActions; TQString group() const - { return TQString("Keys (%1 humans)").tqarg(_cols.size()); } + { return TQString("Keys (%1 humans)").arg(_cols.size()); } }; #endif // KEYS_H diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp index 5e0e679f..e35a6cbc 100644 --- a/libksirtet/lib/meeting.cpp +++ b/libksirtet/lib/meeting.cpp @@ -23,7 +23,7 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket, sm.append(socket, SocketManager::ReadWrite); sm[0]->notifier()->setEnabled(TRUE); -/* top tqlayout */ +/* top layout */ TQVBoxLayout *top = new TQVBoxLayout(plainPage(), spacingHint()); top->setResizeMode(TQLayout::Fixed); @@ -37,7 +37,7 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket, top->addWidget(wl); labWait = new TQLabel(i18n("Waiting for clients"), plainPage()); - labWait->tqsetAlignment(AlignCenter); + labWait->setAlignment(AlignCenter); top->addWidget(labWait); // options widget @@ -68,7 +68,7 @@ void NetMeeting::appendLine(const MeetingLineData &pld, bool server) if (pld.own) connect(pl, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &))); else message(i18n("A new client has just arrived (#%1)") - .tqarg(wl->size()+1)); + .arg(wl->size()+1)); pl->setData(pld.ed); connect(pl, TQT_SIGNAL(typeChanged(MeetingCheckBox::Type)), TQT_SLOT(typeChanged(MeetingCheckBox::Type))); @@ -241,7 +241,7 @@ void ServerNetMeeting::writeToAll(uint i) void ServerNetMeeting::netError(uint i, const TQString &type) { Q_ASSERT( i!=0 ); - disconnectHost(i, i18n("%1 client #%2: disconnect it").tqarg(type).tqarg(i)); + disconnectHost(i, i18n("%1 client #%2: disconnect it").arg(type).arg(i)); } void ServerNetMeeting::disconnectHost(uint i, const TQString &str) @@ -265,7 +265,7 @@ void ServerNetMeeting::newHost(int) int res = sm[0]->accept(s); if ( res!=0 ) { message(i18n("Failed to accept incoming client:\n%1") - .tqarg(socketError(s))); + .arg(socketError(s))); return; } players.append(NewPlayer); @@ -301,7 +301,7 @@ void ServerNetMeeting::idFlag(uint i) void ServerNetMeeting::endFlag(uint i) { - disconnectHost(i, i18n("Client #%1 has left").tqarg(i)); + disconnectHost(i, i18n("Client #%1 has left").arg(i)); } void ServerNetMeeting::newFlag(uint i) @@ -462,7 +462,7 @@ ClientNetMeeting::ClientNetMeeting(const cId &id, void ClientNetMeeting::netError(uint, const TQString &str) { - cleanReject(i18n("%1 server: aborting connection.").tqarg(str)); + cleanReject(i18n("%1 server: aborting connection.").arg(str)); } void ClientNetMeeting::writeToAll(uint) @@ -529,7 +529,7 @@ void ClientNetMeeting::delFlag(uint) sm[0]->readingStream() >> k; CHECK_READ(0); removeLine(k-1); - message(i18n("Client %1 has left").tqarg(k)); + message(i18n("Client %1 has left").arg(k)); } void ClientNetMeeting::textChanged(const TQString &text) diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp index dde70adb..ca6030c7 100644 --- a/libksirtet/lib/miscui.cpp +++ b/libksirtet/lib/miscui.cpp @@ -1,7 +1,7 @@ #include "miscui.h" #include "miscui.moc" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp index e28ebdf8..a0a5c10b 100644 --- a/libksirtet/lib/mp_interface.cpp +++ b/libksirtet/lib/mp_interface.cpp @@ -2,7 +2,7 @@ #include "mp_interface.moc" #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kmessagebox.h> @@ -100,14 +100,14 @@ void MPInterface::specialLocalGame(uint nbHumans, uint nbAIs) bd.type = (i<nbHumans ? PlayerComboBox::Human : PlayerComboBox::AI); bd.name = TQString(); t = (PlayerComboBox::Type) - cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).tqarg(i), + cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).arg(i), PlayerComboBox::None); if ( bd.type==t ) - bd.name = cg.config()->readEntry(TQString(MP_PLAYER_NAME).tqarg(i), + bd.name = cg.config()->readEntry(TQString(MP_PLAYER_NAME).arg(i), TQString()); if ( bd.name.isNull() ) - bd.name = (i<nbHumans ? i18n("Human %1").tqarg(i+1) - : i18n("AI %1").tqarg(i-nbHumans+1)); + bd.name = (i<nbHumans ? i18n("Human %1").arg(i+1) + : i18n("AI %1").arg(i-nbHumans+1)); cd.rhd.bds += bd; } cd.server = TRUE; diff --git a/libksirtet/lib/mp_option.h b/libksirtet/lib/mp_option.h index bca42bfa..f0e0f6cc 100644 --- a/libksirtet/lib/mp_option.h +++ b/libksirtet/lib/mp_option.h @@ -28,7 +28,7 @@ * changed. In addition you'll need to implement the method @ref #saveData * to save the configuration in the config file ; so that it will be available * for the initialisation of @ref LocalBoard. - * It seems a good idea that the widget have the same tqlayout + * It seems a good idea that the widget have the same layout * on both (server and client) sides but with the inner widgets all disabled * on the client side. */ diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp index 17515fb0..1b83be40 100644 --- a/libksirtet/lib/mp_simple_interface.cpp +++ b/libksirtet/lib/mp_simple_interface.cpp @@ -9,7 +9,7 @@ #define PAUSE_ACTION \ - ((KToggleAction *)((KMainWindow *)tqtopLevelWidget())->action("game_pause")) + ((KToggleAction *)((KMainWindow *)topLevelWidget())->action("game_pause")) MPSimpleInterface::MPSimpleInterface(const MPGameInfo &gi, uint nbActions, const ActionData *data, diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp index 3a63a0b0..86fde398 100644 --- a/libksirtet/lib/pline.cpp +++ b/libksirtet/lib/pline.cpp @@ -14,7 +14,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, { setFrameStyle(Panel | (serverLine ? Raised : Plain)); - // Top tqlayout + // Top layout hbl = new TQHBoxLayout(this, THIN_BORDER + frameWidth()); /* TriCheckBox */ @@ -26,7 +26,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, /* Name */ lname = new TQLabel(" ", this); - lname->tqsetAlignment(AlignCenter); + lname->setAlignment(AlignCenter); lname->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); lname->setLineWidth(2); lname->setMidLineWidth(3); @@ -34,7 +34,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, f.setBold(TRUE); lname->setFont(f); lname->setFixedSize(lname->fontMetrics().maxWidth()*NAME_MAX_LENGTH, - lname->tqsizeHint().height()); + lname->sizeHint().height()); hbl->addWidget(lname); hbl->addStretch(1); @@ -51,7 +51,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, qle->setMaxLength(TALKER_MAX_LENGTH); qle->setFont( TQFont("fixed", 12, TQFont::Bold) ); qle->setFixedSize(qle->fontMetrics().maxWidth()*TALKER_MAX_LENGTH, - qle->tqsizeHint().height()); + qle->sizeHint().height()); connect(qle, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(_textChanged(const TQString &))); qle->setEnabled(isOwner); @@ -66,8 +66,8 @@ void MeetingLine::setData(const ExtData &ed) if ( bds[i].type==PlayerComboBox::Human ) nbh++; else if ( bds[i].type==PlayerComboBox::AI ) nba++; } - labH->setText(i18n("Hu=%1").tqarg(nbh)); - labAI->setText(i18n("AI=%1").tqarg(nba)); + labH->setText(i18n("Hu=%1").arg(nbh)); + labAI->setText(i18n("AI=%1").arg(nba)); lname->setText(bds[0].name); setType(ed.type); setText(ed.text); @@ -89,7 +89,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, { setFrameStyle(Panel | Raised); - // Top tqlayout + // Top layout TQHBoxLayout *hbl; hbl = new TQHBoxLayout(this, THIN_BORDER + frameWidth()); @@ -102,7 +102,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, edit = new TQLineEdit(txt, this); edit->setMaxLength(NAME_MAX_LENGTH); edit->setFixedSize(edit->fontMetrics().maxWidth()*(NAME_MAX_LENGTH+2), - edit->tqsizeHint().height()); + edit->sizeHint().height()); hbl->addWidget(edit); /* settings button */ diff --git a/libksirtet/lib/pline.h b/libksirtet/lib/pline.h index 5bba6c4b..4927d16d 100644 --- a/libksirtet/lib/pline.h +++ b/libksirtet/lib/pline.h @@ -6,7 +6,7 @@ #include <tqlineedit.h> #include <tqlabel.h> #include <tqptrlist.h> -#include <tqlayout.h> +#include <layout.h> #include "types.h" diff --git a/libksirtet/lib/types.cpp b/libksirtet/lib/types.cpp index 86f7bfba..9d2149d8 100644 --- a/libksirtet/lib/types.cpp +++ b/libksirtet/lib/types.cpp @@ -23,13 +23,13 @@ TQString cId::errorMessage(const cId &id) const case Accepted: return TQString(); case LibIdClash: return i18n("The MultiPlayer library of the server is incompatible") - + str.tqarg(libId).tqarg(id.libId); + + str.arg(libId).arg(id.libId); case GameNameClash: return i18n("Trying to connect a server for another game type") - + str.tqarg(gameName).tqarg(id.gameName); + + str.arg(gameName).arg(id.gameName); case GameIdClash: return i18n("The server game version is incompatible") - + str.tqarg(gameId).tqarg(id.gameId); + + str.arg(gameId).arg(id.gameId); } Q_ASSERT(0); return TQString(); diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp index 29508e26..a3fd4f2b 100644 --- a/libksirtet/lib/wizard.cpp +++ b/libksirtet/lib/wizard.cpp @@ -94,10 +94,10 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) Q_ASSERT( gi.maxNbLocalPlayers>0 ); for (uint i=0; i<gi.maxNbLocalPlayers; i++) { type = (PlayerComboBox::Type) - cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).tqarg(i), + cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).arg(i), (i==0 ? PlayerComboBox::Human : PlayerComboBox::None)); - n = cg.config()->readEntry(TQString(MP_PLAYER_NAME).tqarg(i), - i18n("Player #%1").tqarg(i)); + n = cg.config()->readEntry(TQString(MP_PLAYER_NAME).arg(i), + i18n("Player #%1").arg(i)); pl = new PlayerLine(type, n, gi.humanSettingSlot, gi.AISettingSlot, i!=0, gi.AIAllowed, wl); @@ -122,7 +122,7 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) TQString MPWizard::name(uint i) const { TQString s = wl->widget(i)->name(); - if ( s.length()==0 ) s = i18n("Player #%1").tqarg(i); + if ( s.length()==0 ) s = i18n("Player #%1").arg(i); return s; } @@ -177,7 +177,7 @@ void MPWizard::accept() // do lookup int res = socket->lookup(); if ( checkSocket(res, socket, i18n("Error looking up for \"%1\"") - .tqarg(host), this) ) { + .arg(host), this) ) { delete socket; return; } @@ -206,9 +206,9 @@ void MPWizard::accept() cg.config()->writeEntry(MP_GAMETYPE, (int)type); for (uint i=0; i<wl->size(); i++) { - cg.config()->writeEntry(TQString(MP_PLAYER_TYPE).tqarg(i), + cg.config()->writeEntry(TQString(MP_PLAYER_TYPE).arg(i), (int)wl->widget(i)->type()); - cg.config()->writeEntry(TQString(MP_PLAYER_NAME).tqarg(i), name(i)); + cg.config()->writeEntry(TQString(MP_PLAYER_NAME).arg(i), name(i)); } KWizard::accept(); diff --git a/libtdegames/carddecks/convertpysols b/libtdegames/carddecks/convertpysols index f2434475..5ed10b25 100755 --- a/libtdegames/carddecks/convertpysols +++ b/libtdegames/carddecks/convertpysols @@ -2,68 +2,68 @@ cd $1 -convert -format png -tqgeometry "72x96" 01c.gif 1.png -convert -format png -tqgeometry "72x96" 01s.gif 2.png -convert -format png -tqgeometry "72x96" 01h.gif 3.png -convert -format png -tqgeometry "72x96" 01d.gif 4.png +convert -format png -geometry "72x96" 01c.gif 1.png +convert -format png -geometry "72x96" 01s.gif 2.png +convert -format png -geometry "72x96" 01h.gif 3.png +convert -format png -geometry "72x96" 01d.gif 4.png -convert -format png -tqgeometry "72x96" 13c.gif 5.png -convert -format png -tqgeometry "72x96" 13s.gif 6.png -convert -format png -tqgeometry "72x96" 13h.gif 7.png -convert -format png -tqgeometry "72x96" 13d.gif 8.png +convert -format png -geometry "72x96" 13c.gif 5.png +convert -format png -geometry "72x96" 13s.gif 6.png +convert -format png -geometry "72x96" 13h.gif 7.png +convert -format png -geometry "72x96" 13d.gif 8.png -convert -format png -tqgeometry "72x96" 12c.gif 9.png -convert -format png -tqgeometry "72x96" 12s.gif 10.png -convert -format png -tqgeometry "72x96" 12h.gif 11.png -convert -format png -tqgeometry "72x96" 12d.gif 12.png +convert -format png -geometry "72x96" 12c.gif 9.png +convert -format png -geometry "72x96" 12s.gif 10.png +convert -format png -geometry "72x96" 12h.gif 11.png +convert -format png -geometry "72x96" 12d.gif 12.png -convert -format png -tqgeometry "72x96" 11c.gif 13.png -convert -format png -tqgeometry "72x96" 11s.gif 14.png -convert -format png -tqgeometry "72x96" 11h.gif 15.png -convert -format png -tqgeometry "72x96" 11d.gif 16.png +convert -format png -geometry "72x96" 11c.gif 13.png +convert -format png -geometry "72x96" 11s.gif 14.png +convert -format png -geometry "72x96" 11h.gif 15.png +convert -format png -geometry "72x96" 11d.gif 16.png -convert -format png -tqgeometry "72x96" 10c.gif 17.png -convert -format png -tqgeometry "72x96" 10s.gif 18.png -convert -format png -tqgeometry "72x96" 10h.gif 19.png -convert -format png -tqgeometry "72x96" 10d.gif 20.png +convert -format png -geometry "72x96" 10c.gif 17.png +convert -format png -geometry "72x96" 10s.gif 18.png +convert -format png -geometry "72x96" 10h.gif 19.png +convert -format png -geometry "72x96" 10d.gif 20.png -convert -format png -tqgeometry "72x96" 09c.gif 21.png -convert -format png -tqgeometry "72x96" 09s.gif 22.png -convert -format png -tqgeometry "72x96" 09h.gif 23.png -convert -format png -tqgeometry "72x96" 09d.gif 24.png +convert -format png -geometry "72x96" 09c.gif 21.png +convert -format png -geometry "72x96" 09s.gif 22.png +convert -format png -geometry "72x96" 09h.gif 23.png +convert -format png -geometry "72x96" 09d.gif 24.png -convert -format png -tqgeometry "72x96" 08c.gif 25.png -convert -format png -tqgeometry "72x96" 08s.gif 26.png -convert -format png -tqgeometry "72x96" 08h.gif 27.png -convert -format png -tqgeometry "72x96" 08d.gif 28.png +convert -format png -geometry "72x96" 08c.gif 25.png +convert -format png -geometry "72x96" 08s.gif 26.png +convert -format png -geometry "72x96" 08h.gif 27.png +convert -format png -geometry "72x96" 08d.gif 28.png -convert -format png -tqgeometry "72x96" 07c.gif 29.png -convert -format png -tqgeometry "72x96" 07s.gif 30.png -convert -format png -tqgeometry "72x96" 07h.gif 31.png -convert -format png -tqgeometry "72x96" 07d.gif 32.png +convert -format png -geometry "72x96" 07c.gif 29.png +convert -format png -geometry "72x96" 07s.gif 30.png +convert -format png -geometry "72x96" 07h.gif 31.png +convert -format png -geometry "72x96" 07d.gif 32.png -convert -format png -tqgeometry "72x96" 06c.gif 33.png -convert -format png -tqgeometry "72x96" 06s.gif 34.png -convert -format png -tqgeometry "72x96" 06h.gif 35.png -convert -format png -tqgeometry "72x96" 06d.gif 36.png +convert -format png -geometry "72x96" 06c.gif 33.png +convert -format png -geometry "72x96" 06s.gif 34.png +convert -format png -geometry "72x96" 06h.gif 35.png +convert -format png -geometry "72x96" 06d.gif 36.png -convert -format png -tqgeometry "72x96" 05c.gif 37.png -convert -format png -tqgeometry "72x96" 05s.gif 38.png -convert -format png -tqgeometry "72x96" 05h.gif 39.png -convert -format png -tqgeometry "72x96" 05d.gif 40.png +convert -format png -geometry "72x96" 05c.gif 37.png +convert -format png -geometry "72x96" 05s.gif 38.png +convert -format png -geometry "72x96" 05h.gif 39.png +convert -format png -geometry "72x96" 05d.gif 40.png -convert -format png -tqgeometry "72x96" 04c.gif 41.png -convert -format png -tqgeometry "72x96" 04s.gif 42.png -convert -format png -tqgeometry "72x96" 04h.gif 43.png -convert -format png -tqgeometry "72x96" 04d.gif 44.png +convert -format png -geometry "72x96" 04c.gif 41.png +convert -format png -geometry "72x96" 04s.gif 42.png +convert -format png -geometry "72x96" 04h.gif 43.png +convert -format png -geometry "72x96" 04d.gif 44.png -convert -format png -tqgeometry "72x96" 03c.gif 45.png -convert -format png -tqgeometry "72x96" 03s.gif 46.png -convert -format png -tqgeometry "72x96" 03h.gif 47.png -convert -format png -tqgeometry "72x96" 03d.gif 48.png +convert -format png -geometry "72x96" 03c.gif 45.png +convert -format png -geometry "72x96" 03s.gif 46.png +convert -format png -geometry "72x96" 03h.gif 47.png +convert -format png -geometry "72x96" 03d.gif 48.png -convert -format png -tqgeometry "72x96" 02c.gif 49.png -convert -format png -tqgeometry "72x96" 02s.gif 50.png -convert -format png -tqgeometry "72x96" 02h.gif 51.png -convert -format png -tqgeometry "72x96" 02d.gif 52.png +convert -format png -geometry "72x96" 02c.gif 49.png +convert -format png -geometry "72x96" 02s.gif 50.png +convert -format png -geometry "72x96" 02h.gif 51.png +convert -format png -geometry "72x96" 02d.gif 52.png diff --git a/libtdegames/highscore/kexthighscore.cpp b/libtdegames/highscore/kexthighscore.cpp index d352a266..46010c41 100644 --- a/libtdegames/highscore/kexthighscore.cpp +++ b/libtdegames/highscore/kexthighscore.cpp @@ -19,7 +19,7 @@ #include "kexthighscore.h" -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp index 02ea99b6..eb715273 100644 --- a/libtdegames/highscore/kexthighscore_gui.cpp +++ b/libtdegames/highscore/kexthighscore_gui.cpp @@ -20,8 +20,8 @@ #include "kexthighscore_gui.h" #include "kexthighscore_gui.moc" -#include <tqlayout.h> -#include <tqtextstream.h> +#include <layout.h> +#include <textstream.h> #include <tqheader.h> #include <tqgrid.h> #include <tqvgroupbox.h> @@ -92,7 +92,7 @@ void ScoresList::addLineItem(const ItemArray &items, if (line) line->setText(k, itemText(container, index)); else { addColumn( container.item()->label() ); - setColumnAlignment(k, container.item()->tqalignment()); + setColumnAlignment(k, container.item()->alignment()); } k++; } @@ -289,7 +289,7 @@ void LastMultipleScoresList::addLineItem(const ItemArray &si, if (line) line->setText(i, itemText(*container, index)); else { addColumn( container->item()->label() ); - setColumnAlignment(i, container->item()->tqalignment()); + setColumnAlignment(i, container->item()->alignment()); } } } @@ -333,7 +333,7 @@ void TotalMultipleScoresList::addLineItem(const ItemArray &si, TQString label = (i==2 ? i18n("Won Games") : container->item()->label()); addColumn(label); - setColumnAlignment(i, container->item()->tqalignment()); + setColumnAlignment(i, container->item()->alignment()); } } } diff --git a/libtdegames/highscore/kexthighscore_internal.cpp b/libtdegames/highscore/kexthighscore_internal.cpp index a679002c..4803909a 100644 --- a/libtdegames/highscore/kexthighscore_internal.cpp +++ b/libtdegames/highscore/kexthighscore_internal.cpp @@ -24,7 +24,7 @@ #include <unistd.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdom.h> #include <kglobal.h> @@ -314,7 +314,7 @@ PlayerInfos::PlayerInfos() #ifdef HIGHSCORE_DIRECTORY if (_oldLocalPlayer) { // player already exists in local config file // copy player data - TQString prefix = TQString("%1_").tqarg(_oldLocalId+1); + TQString prefix = TQString("%1_").arg(_oldLocalId+1); TQMap<TQString, TQString> entries = cg.config()->entryMap("KHighscore_players"); TQMap<TQString, TQString>::const_iterator it; @@ -378,8 +378,8 @@ TQString PlayerInfos::histoName(uint i) const const TQMemArray<uint> &sh = _histogram; Q_ASSERT( i<sh.size() || (_bound || i==sh.size()) ); if ( i==sh.size() ) - return TQString("nb scores greater than %1").tqarg(sh[sh.size()-1]); - return TQString("nb scores less than %1").tqarg(sh[i]); + return TQString("nb scores greater than %1").arg(sh[sh.size()-1]); + return TQString("nb scores less than %1").arg(sh[i]); } uint PlayerInfos::histoSize() const @@ -497,10 +497,10 @@ void PlayerInfos::removeKey() TQString sk; do { i++; - sk = str.tqarg(HS_KEY).tqarg(i); + sk = str.arg(HS_KEY).arg(i); } while ( !cg.config()->readEntry(sk, TQString()).isEmpty() ); cg.config()->writeEntry(sk, key()); - cg.config()->writeEntry(str.tqarg(HS_REGISTERED_NAME).tqarg(i), + cg.config()->writeEntry(str.arg(HS_REGISTERED_NAME).arg(i), registeredName()); // clear current key/nickname @@ -609,7 +609,7 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent, TQString tmpFile; if ( !KIO::NetAccess::download(url, tmpFile, parent) ) { - TQString details = i18n("Server URL: %1").tqarg(url.host()); + TQString details = i18n("Server URL: %1").arg(url.host()); KMessageBox::detailedSorry(parent, i18n(UNABLE_TO_CONTACT), details); return false; } @@ -647,7 +647,7 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent, } } TQString msg = i18n("Invalid answer from world-wide highscores server."); - TQString details = i18n("Raw message: %1").tqarg(content); + TQString details = i18n("Raw message: %1").arg(content); KMessageBox::detailedSorry(parent, msg, details); return false; } @@ -660,7 +660,7 @@ bool ManagerPrivate::getFromQuery(const TQDomNamedNodeMap &map, if ( attr.isNull() ) { KMessageBox::sorry(parent, i18n("Invalid answer from world-wide " - "highscores server (missing item: %1).").tqarg(name)); + "highscores server (missing item: %1).").arg(name)); return false; } value = attr.value(); @@ -780,7 +780,7 @@ int ManagerPrivate::submitScore(const Score &ascore, Score score = ascore; score.setData("id", _playerInfos->id() + 1); - score.setData("date", TQDateTime::tqcurrentDateTime()); + score.setData("date", TQDateTime::currentDateTime()); // ask new name if anonymous and winner const char *dontAskAgainName = "highscore_ask_name_dialog"; diff --git a/libtdegames/highscore/kexthighscore_item.cpp b/libtdegames/highscore/kexthighscore_item.cpp index 4b48a0ee..b491d3f8 100644 --- a/libtdegames/highscore/kexthighscore_item.cpp +++ b/libtdegames/highscore/kexthighscore_item.cpp @@ -19,7 +19,7 @@ #include "kexthighscore_item.h" -#include <tqlayout.h> +#include <layout.h> #include <kglobal.h> #include <kdialogbase.h> #include <kdebug.h> @@ -33,8 +33,8 @@ namespace KExtHighscore { //----------------------------------------------------------------------------- -Item::Item(const TQVariant &def, const TQString &label, int tqalignment) - : _default(def), _label(label), _tqalignment(tqalignment), +Item::Item(const TQVariant &def, const TQString &label, int alignment) + : _default(def), _label(label), _alignment(alignment), _format(NoFormat), _special(NoSpecial) {} @@ -287,7 +287,7 @@ void MultiplayerScores::show(TQWidget *parent) vbox = new TQVBox(dialog.plainPage()); hbox->addWidget(vbox); (void)new TQLabel(i18n("Scores for the last %1 games:") - .tqarg(_nbGames[0]), vbox); + .arg(_nbGames[0]), vbox); (void)new TotalMultipleScoresList(ordered, vbox); } diff --git a/libtdegames/highscore/kexthighscore_item.h b/libtdegames/highscore/kexthighscore_item.h index b32f32e7..8379433b 100644 --- a/libtdegames/highscore/kexthighscore_item.h +++ b/libtdegames/highscore/kexthighscore_item.h @@ -79,10 +79,10 @@ class KDE_EXPORT Item * Be sure to cast the value to the required type (for e.g. with uint). * @param label the label corresponding to the item. If empty, the item * is not shown. - * @param tqalignment the tqalignment of the item. + * @param alignment the alignment of the item. */ Item(const TQVariant &def = TQVariant::Invalid, - const TQString &label = TQString(), int tqalignment = TQt::AlignRight); + const TQString &label = TQString(), int alignment = TQt::AlignRight); virtual ~Item(); @@ -114,9 +114,9 @@ class KDE_EXPORT Item TQString label() const { return _label; } /** - * @return the tqalignment. + * @return the alignment. */ - int tqalignment() const { return _tqalignment; } + int alignment() const { return _alignment; } /** * Set default value. @@ -149,7 +149,7 @@ class KDE_EXPORT Item private: TQVariant _default; TQString _label; - int _tqalignment; + int _alignment; Format _format; Special _special; diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp index d47b35a6..811b1132 100644 --- a/libtdegames/highscore/kexthighscore_tab.cpp +++ b/libtdegames/highscore/kexthighscore_tab.cpp @@ -20,7 +20,7 @@ #include "kexthighscore_tab.h" #include "kexthighscore_tab.moc" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqvgroupbox.h> #include <tqgrid.h> @@ -97,7 +97,7 @@ void AdditionalTab::allSelected() TQString AdditionalTab::percent(uint n, uint total, bool withBraces) { if ( n==0 || total==0 ) return TQString(); - TQString s = TQString("%1%").tqarg(100.0 * n / total, 0, 'f', 1); + TQString s = TQString("%1%").arg(100.0 * n / total, 0, 'f', 1); return (withBraces ? TQString("(") + s + ")" : s); } @@ -120,7 +120,7 @@ StatisticsTab::StatisticsTab(TQWidget *parent) : AdditionalTab(parent, "statistics_tab") { // construct GUI - TQVBoxLayout *top = static_cast<TQVBoxLayout *>(tqlayout()); + TQVBoxLayout *top = static_cast<TQVBoxLayout *>(layout()); TQHBoxLayout *hbox = new TQHBoxLayout(top); TQVBoxLayout *vbox = new TQVBoxLayout(hbox); @@ -209,7 +209,7 @@ HistogramTab::HistogramTab(TQWidget *parent) : AdditionalTab(parent, "histogram_tab") { // construct GUI - TQVBoxLayout *top = static_cast<TQVBoxLayout *>(tqlayout()); + TQVBoxLayout *top = static_cast<TQVBoxLayout *>(layout()); _list = new KListView(this); _list->setSelectionMode(TQListView::NoSelection); diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp index 6d696020..3ff2d248 100644 --- a/libtdegames/highscore/khighscore.cpp +++ b/libtdegames/highscore/khighscore.cpp @@ -96,7 +96,7 @@ void KHighscore::init(const char *appname) { #ifdef HIGHSCORE_DIRECTORY const TQString filename = TQString::fromLocal8Bit("%1/%2.scores") - .tqarg(HIGHSCORE_DIRECTORY).tqarg(appname); + .arg(HIGHSCORE_DIRECTORY).arg(appname); int fd = open(filename.local8Bit(), O_RDWR); if ( fd<0 ) kdFatal(11002) << "cannot open global highscore file \"" << filename << "\"" << endl; @@ -169,7 +169,7 @@ void KHighscore::writeEntry(int entry, const TQString& key, const TQVariant& val { Q_ASSERT( isLocked() ); KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); cg.config()->writeEntry(confKey, value); } @@ -177,7 +177,7 @@ void KHighscore::writeEntry(int entry, const TQString& key, int value) { Q_ASSERT( isLocked() ); KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); cg.config()->writeEntry(confKey, value); } @@ -185,35 +185,35 @@ void KHighscore::writeEntry(int entry, const TQString& key, const TQString &valu { Q_ASSERT (isLocked() ); KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); cg.config()->writeEntry(confKey, value); } TQVariant KHighscore::readPropertyEntry(int entry, const TQString& key, const TQVariant& pDefault) const { KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); return cg.config()->readPropertyEntry(confKey, pDefault); } TQString KHighscore::readEntry(int entry, const TQString& key, const TQString& pDefault) const { KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); return cg.config()->readEntry(confKey, pDefault); } int KHighscore::readNumEntry(int entry, const TQString& key, int pDefault) const { KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); return cg.config()->readNumEntry(confKey, pDefault); } bool KHighscore::hasEntry(int entry, const TQString& key) const { KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); return cg.config()->hasKey(confKey); } @@ -248,7 +248,7 @@ TQString KHighscore::group() const if ( highscoreGroup().isNull() ) return (d->global ? TQString() : GROUP); return (d->global ? highscoreGroup() - : TQString("%1_%2").tqarg(GROUP).tqarg(highscoreGroup())); + : TQString("%1_%2").arg(GROUP).arg(highscoreGroup())); } bool KHighscore::hasTable() const diff --git a/libtdegames/highscore/khighscore.h b/libtdegames/highscore/khighscore.h index b7b6fb5e..3cd14e8c 100644 --- a/libtdegames/highscore/khighscore.h +++ b/libtdegames/highscore/khighscore.h @@ -67,7 +67,7 @@ class KHighscorePrivate; * single player, so the "best times" of a player. To write highscores for a * specific player in a specific level you will have to use a more complex way: * \code - * TQString group = TQString("%1_%2").tqarg(player).tqarg(level); + * TQString group = TQString("%1_%2").arg(player).arg(level); * table->setGroup(group); * writeHighscore(table, player, level); * \endcode diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp index e799883b..b22cc232 100644 --- a/libtdegames/highscore/kscoredialog.cpp +++ b/libtdegames/highscore/kscoredialog.cpp @@ -25,7 +25,7 @@ this software. #include "config.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqwidgetstack.h> #include <tqtimer.h> @@ -44,7 +44,7 @@ class KScoreDialog::KScoreDialogPrivate public: TQPtrList<FieldInfo> scores; TQWidget *page; - TQGridLayout *tqlayout; + TQGridLayout *layout; TQLineEdit *edit; TQPtrVector<TQWidgetStack> stack; TQPtrVector<TQLabel> labels; @@ -126,36 +126,36 @@ void KScoreDialog::setupDialog() d->col[field] = d->nrCols++; } - d->tqlayout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint()); - d->tqlayout->addRowSpacing(4, 15); + d->layout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint()); + d->layout->addRowSpacing(4, 15); d->commentLabel = new TQLabel(d->page); - d->commentLabel->tqsetAlignment(AlignVCenter | AlignHCenter); - d->tqlayout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1); + d->commentLabel->setAlignment(AlignVCenter | AlignHCenter); + d->layout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1); TQFont bold = font(); bold.setBold(true); TQLabel *label; - d->tqlayout->addColSpacing(0, 50); + d->layout->addColSpacing(0, 50); label = new TQLabel(i18n("Rank"), d->page); - d->tqlayout->addWidget(label, 3, 0); + d->layout->addWidget(label, 3, 0); label->setFont(bold); for(int field = 1; field < d->fields; field = field * 2) { if (d->fields & field) { - d->tqlayout->addColSpacing(d->col[field], 50); + d->layout->addColSpacing(d->col[field], 50); label = new TQLabel(d->header[field], d->page); - d->tqlayout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight); + d->layout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight); label->setFont(bold); } } KSeparator *sep = new KSeparator(Qt::Horizontal, d->page); - d->tqlayout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1); + d->layout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1); d->labels.resize(d->nrCols * 10); d->stack.resize(10); @@ -164,14 +164,14 @@ void KScoreDialog::setupDialog() for (int i = 1; i <= 10; ++i) { TQLabel *label; num.setNum(i); - label = new TQLabel(i18n("#%1").tqarg(num), d->page); + label = new TQLabel(i18n("#%1").arg(num), d->page); d->labels.insert((i-1)*d->nrCols + 0, label); - d->tqlayout->addWidget(label, i+4, 0); + d->layout->addWidget(label, i+4, 0); if (d->fields & Name) { TQWidgetStack *stack = new TQWidgetStack(d->page); d->stack.insert(i-1, stack); - d->tqlayout->addWidget(stack, i+4, d->col[Name]); + d->layout->addWidget(stack, i+4, d->col[Name]); label = new TQLabel(d->page); d->labels.insert((i-1)*d->nrCols + d->col[Name], label); stack->addWidget(label); @@ -183,7 +183,7 @@ void KScoreDialog::setupDialog() { label = new TQLabel(d->page); d->labels.insert((i-1)*d->nrCols + d->col[field], label); - d->tqlayout->addWidget(label, i+4, d->col[field], AlignRight); + d->layout->addWidget(label, i+4, d->col[field], AlignRight); } } } @@ -202,15 +202,15 @@ void KScoreDialog::aboutToShow() { d->commentLabel->setMinimumSize(TQSize(1,1)); d->commentLabel->hide(); - d->tqlayout->addRowSpacing(0, -15); - d->tqlayout->addRowSpacing(2, -15); + d->layout->addRowSpacing(0, -15); + d->layout->addRowSpacing(2, -15); } else { - d->commentLabel->setMinimumSize(d->commentLabel->tqsizeHint()); + d->commentLabel->setMinimumSize(d->commentLabel->sizeHint()); d->commentLabel->show(); - d->tqlayout->addRowSpacing(0, -10); - d->tqlayout->addRowSpacing(2, 10); + d->layout->addRowSpacing(0, -10); + d->layout->addRowSpacing(2, 10); } d->comment = TQString(); @@ -267,7 +267,7 @@ void KScoreDialog::aboutToShow() } } d->latest = -1; - setFixedSize(tqminimumSizeHint()); + setFixedSize(minimumSizeHint()); } void KScoreDialog::loadScores() diff --git a/libtdegames/kcanvasrootpixmap.cpp b/libtdegames/kcanvasrootpixmap.cpp index 20440458..5e036740 100644 --- a/libtdegames/kcanvasrootpixmap.cpp +++ b/libtdegames/kcanvasrootpixmap.cpp @@ -33,7 +33,7 @@ KCanvasRootPixmap::KCanvasRootPixmap(TQCanvasView *view, const char *name) void KCanvasRootPixmap::backgroundUpdatedSlot(const TQPixmap &pixmap) { if ( _view && _view->canvas() ) - _view->canvas()->tqsetBackgroundPixmap(pixmap); + _view->canvas()->setBackgroundPixmap(pixmap); } #include "kcanvasrootpixmap.moc" diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp index fc73de22..e45e503e 100644 --- a/libtdegames/kcarddialog.cpp +++ b/libtdegames/kcarddialog.cpp @@ -26,7 +26,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqslider.h> #include <tqwmatrix.h> @@ -41,9 +41,9 @@ #include <tqpushbutton.h> #include <kdebug.h> -#define KCARD_DEFAULTDECK TQString::tqfromLatin1("deck0.png") -#define KCARD_DEFAULTCARD TQString::tqfromLatin1("11.png") -#define KCARD_DEFAULTCARDDIR TQString::tqfromLatin1("cards-default/") +#define KCARD_DEFAULTDECK TQString::fromLatin1("deck0.png") +#define KCARD_DEFAULTCARD TQString::fromLatin1("11.png") +#define KCARD_DEFAULTCARDDIR TQString::fromLatin1("cards-default/") // values for the resize slider #define SLIDER_MIN 400 @@ -51,19 +51,19 @@ // KConfig entries #define CONF_GROUP "KCardDialog" -#define CONF_RANDOMDECK TQString::tqfromLatin1("RandomDeck") -#define CONF_DECK TQString::tqfromLatin1("Deck") -#define CONF_CARDDIR TQString::tqfromLatin1("CardDir") -#define CONF_RANDOMCARDDIR TQString::tqfromLatin1("RandomCardDir") -#define CONF_USEGLOBALDECK TQString::tqfromLatin1("GlobalDeck") -#define CONF_USEGLOBALCARDDIR TQString::tqfromLatin1("GlobalCardDir") -#define CONF_SCALE TQString::tqfromLatin1("Scale") +#define CONF_RANDOMDECK TQString::fromLatin1("RandomDeck") +#define CONF_DECK TQString::fromLatin1("Deck") +#define CONF_CARDDIR TQString::fromLatin1("CardDir") +#define CONF_RANDOMCARDDIR TQString::fromLatin1("RandomCardDir") +#define CONF_USEGLOBALDECK TQString::fromLatin1("GlobalDeck") +#define CONF_USEGLOBALCARDDIR TQString::fromLatin1("GlobalCardDir") +#define CONF_SCALE TQString::fromLatin1("Scale") -#define CONF_GLOBAL_GROUP TQString::tqfromLatin1("KCardDialog Settings") -#define CONF_GLOBAL_DECK TQString::tqfromLatin1("GlobalDeck") -#define CONF_GLOBAL_CARDDIR TQString::tqfromLatin1("GlobalCardDir") -#define CONF_GLOBAL_RANDOMDECK TQString::tqfromLatin1("GlobalRandomDeck") -#define CONF_GLOBAL_RANDOMCARDDIR TQString::tqfromLatin1("GlobalRandomCardDir") +#define CONF_GLOBAL_GROUP TQString::fromLatin1("KCardDialog Settings") +#define CONF_GLOBAL_DECK TQString::fromLatin1("GlobalDeck") +#define CONF_GLOBAL_CARDDIR TQString::fromLatin1("GlobalCardDir") +#define CONF_GLOBAL_RANDOMDECK TQString::fromLatin1("GlobalRandomDeck") +#define CONF_GLOBAL_RANDOMCARDDIR TQString::fromLatin1("GlobalRandomCardDir") class KCardDialogPrivate @@ -128,9 +128,9 @@ int KCardDialog::getCardDeck(TQString &pDeck, TQString &pCardDir, TQWidget *pPar // TODO check for global cards/decks!!!! pDeck=dlg.deck(); pCardDir=dlg.cardDir(); - if (!pCardDir.isNull() && pCardDir.right(1)!=TQString::tqfromLatin1("/")) + if (!pCardDir.isNull() && pCardDir.right(1)!=TQString::fromLatin1("/")) { - pCardDir+=TQString::tqfromLatin1("/"); + pCardDir+=TQString::fromLatin1("/"); } if (pRandomDeck) { @@ -218,7 +218,7 @@ void KCardDialog::getConfigCardDeck(KConfig* conf, TQString &pDeck, TQString &pC TQString KCardDialog::getDefaultDeck() { KCardDialog::init(); - return locate("cards", TQString::tqfromLatin1("decks/") + KCARD_DEFAULTDECK); + return locate("cards", TQString::fromLatin1("decks/") + KCARD_DEFAULTDECK); } TQString KCardDialog::getDefaultCardDir() @@ -234,12 +234,12 @@ TQString KCardDialog::getCardPath(const TQString &carddir, int index) KCardDialog::init(); TQString entry = carddir + TQString::number(index); - if (KStandardDirs::exists(entry + TQString::tqfromLatin1(".png"))) - return entry + TQString::tqfromLatin1(".png"); + if (KStandardDirs::exists(entry + TQString::fromLatin1(".png"))) + return entry + TQString::fromLatin1(".png"); // rather theoretical - if (KStandardDirs::exists(entry + TQString::tqfromLatin1(".xpm"))) - return entry + TQString::tqfromLatin1(".xpm"); + if (KStandardDirs::exists(entry + TQString::fromLatin1(".xpm"))) + return entry + TQString::fromLatin1(".xpm"); return TQString(); } @@ -271,11 +271,11 @@ void KCardDialog::setupDialog(bool showResizeBox) if (! (flags() & NoDeck)) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(cardLayout); + TQHBoxLayout* layout = new TQHBoxLayout(cardLayout); // Deck iconview TQGroupBox* grp1 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Backside"), plainPage()); - tqlayout->addWidget(grp1); + layout->addWidget(grp1); d->deckIconView = new KIconView(grp1,"decks"); d->deckIconView->setSpacing(8); @@ -293,13 +293,13 @@ void KCardDialog::setupDialog(bool showResizeBox) d->deckIconView->showToolTips(); // deck select - TQVBoxLayout* l = new TQVBoxLayout(tqlayout); + TQVBoxLayout* l = new TQVBoxLayout(layout); TQGroupBox* grp3 = new TQGroupBox(i18n("Backside"), plainPage()); grp3->setFixedSize(100, 130); l->addWidget(grp3, 0, AlignTop|AlignHCenter); d->deckLabel = new TQLabel(grp3); d->deckLabel->setText(i18n("empty")); - d->deckLabel->tqsetAlignment(AlignHCenter|AlignVCenter); + d->deckLabel->setAlignment(AlignHCenter|AlignVCenter); d->deckLabel->setGeometry(10, 20, 80, 90); d->randomDeck = new TQCheckBox(plainPage()); @@ -325,9 +325,9 @@ void KCardDialog::setupDialog(bool showResizeBox) if (! (flags() & NoCards)) { // Cards iconview - TQHBoxLayout* tqlayout = new TQHBoxLayout(cardLayout); + TQHBoxLayout* layout = new TQHBoxLayout(cardLayout); TQGroupBox* grp2 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Frontside"), plainPage()); - tqlayout->addWidget(grp2); + layout->addWidget(grp2); d->cardIconView =new KIconView(grp2,"cards"); /* @@ -343,13 +343,13 @@ void KCardDialog::setupDialog(bool showResizeBox) d->cardIconView->showToolTips(); // Card select - TQVBoxLayout* l = new TQVBoxLayout(tqlayout); + TQVBoxLayout* l = new TQVBoxLayout(layout); TQGroupBox* grp4 = new TQGroupBox(i18n("Frontside"), plainPage()); grp4->setFixedSize(100, 130); l->addWidget(grp4, 0, AlignTop|AlignHCenter); d->cardLabel = new TQLabel(grp4); d->cardLabel->setText(i18n("empty")); - d->cardLabel->tqsetAlignment(AlignHCenter|AlignVCenter); + d->cardLabel->setAlignment(AlignHCenter|AlignVCenter); d->cardLabel->setGeometry(10, 20, 80, 90 ); d->randomCardDir = new TQCheckBox(plainPage()); @@ -422,10 +422,10 @@ void KCardDialog::setupDialog(bool showResizeBox) // large. This is desired behaviour as i don't want to make the box even // larger but i want the complete pixmap to be displayed. the dialog is not // resized if you make the pixmap smaller again. - TQVBoxLayout* tqlayout = new TQVBoxLayout(topLayout); + TQVBoxLayout* layout = new TQVBoxLayout(topLayout); TQGroupBox* grp = new TQGroupBox(1,Qt::Horizontal, i18n("Resize Cards"), plainPage()); - tqlayout->setResizeMode(TQLayout::Fixed); - tqlayout->addWidget(grp); + layout->setResizeMode(TQLayout::Fixed); + layout->addWidget(grp); TQWidget* box = new TQWidget(grp); TQHBoxLayout* hbox = new TQHBoxLayout(box, 0, spacingHint()); TQVBoxLayout* boxLayout = new TQVBoxLayout(hbox); @@ -465,7 +465,7 @@ void KCardDialog::insertCardIcons() for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig cfg(*it); - cfg.setGroup(TQString::tqfromLatin1("KDE Backdeck")); + cfg.setGroup(TQString::fromLatin1("KDE Backdeck")); TQString path = (*it).left((*it).findRev('/') + 1); assert(path[path.length() - 1] == '/'); TQPixmap pixmap(path + cfg.readEntry("Preview", "12c.png")); @@ -507,7 +507,7 @@ void KCardDialog::insertDeckIcons() // pixmap=pixmap.xForm(m); - cfg.setGroup(TQString::tqfromLatin1("KDE Cards")); + cfg.setGroup(TQString::fromLatin1("KDE Cards")); TQString name=cfg.readEntry("Name", i18n("unnamed")); TQIconViewItem *item= new TQIconViewItem(d->deckIconView,name, pixmap); @@ -562,12 +562,12 @@ void KCardDialog::slotCardClicked(TQIconViewItem *item) TQString KCardDialog::getDeckName(const TQString &desktop) { TQString entry = desktop.left(desktop.length() - strlen(".desktop")); - if (KStandardDirs::exists(entry + TQString::tqfromLatin1(".png"))) - return entry + TQString::tqfromLatin1(".png"); + if (KStandardDirs::exists(entry + TQString::fromLatin1(".png"))) + return entry + TQString::fromLatin1(".png"); // rather theoretical - if (KStandardDirs::exists(entry + TQString::tqfromLatin1(".xpm"))) - return entry + TQString::tqfromLatin1(".xpm"); + if (KStandardDirs::exists(entry + TQString::fromLatin1(".xpm"))) + return entry + TQString::fromLatin1(".xpm"); return TQString(); } @@ -634,8 +634,8 @@ void KCardDialog::slotRandomCardDirToggled(bool on) if (on) { d->cardLabel->setText("random"); setCardDir(getRandomCardDir()); - if (cardDir().length()>0 && cardDir().right(1)!=TQString::tqfromLatin1("/")) { - setCardDir(cardDir() + TQString::tqfromLatin1("/")); + if (cardDir().length()>0 && cardDir().right(1)!=TQString::fromLatin1("/")) { + setCardDir(cardDir() + TQString::fromLatin1("/")); } } else { d->cardLabel->setText("empty"); @@ -742,7 +742,7 @@ void KCardDialog::saveConfig(KConfig* conf) void KCardDialog::slotSetGlobalDeck() { - KSimpleConfig* conf = new KSimpleConfig(TQString::tqfromLatin1("kdeglobals"), false); + KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), false); conf->setGroup(CONF_GLOBAL_GROUP); conf->writeEntry(CONF_GLOBAL_DECK, deck()); @@ -753,7 +753,7 @@ void KCardDialog::slotSetGlobalDeck() void KCardDialog::slotSetGlobalCardDir() { - KSimpleConfig* conf = new KSimpleConfig(TQString::tqfromLatin1("kdeglobals"), false); + KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), false); conf->setGroup(CONF_GLOBAL_GROUP); conf->writePathEntry(CONF_GLOBAL_CARDDIR, cardDir()); @@ -764,7 +764,7 @@ void KCardDialog::slotSetGlobalCardDir() void KCardDialog::getGlobalDeck(TQString& deck, bool& random) { - KSimpleConfig* conf = new KSimpleConfig(TQString::tqfromLatin1("kdeglobals"), true); + KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), true); conf->setGroup(CONF_GLOBAL_GROUP); if (!conf->hasKey(CONF_GLOBAL_DECK) || conf->readBoolEntry(CONF_GLOBAL_RANDOMDECK, false)) { @@ -780,7 +780,7 @@ void KCardDialog::getGlobalDeck(TQString& deck, bool& random) void KCardDialog::getGlobalCardDir(TQString& dir, bool& random) { - KSimpleConfig* conf = new KSimpleConfig(TQString::tqfromLatin1("kdeglobals"), true); + KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), true); conf->setGroup(CONF_GLOBAL_GROUP); if (!conf->hasKey(CONF_GLOBAL_CARDDIR) || conf->readBoolEntry(CONF_GLOBAL_RANDOMCARDDIR, false)) { @@ -799,7 +799,7 @@ void KCardDialog::init() static bool _inited = false; if (_inited) return; - KGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::tqfromLatin1("carddecks/")); + KGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/")); KGlobal::locale()->insertCatalogue("libtdegames"); _inited = true; diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp index 14f74103..06b5b5d5 100644 --- a/libtdegames/kchatbase.cpp +++ b/libtdegames/kchatbase.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqpainter.h> @@ -73,14 +73,14 @@ void KChatBaseText::init() void KChatBaseText::setName(const TQString& n) { // d->mName = n; - d->mName = TQString("%1: ").tqarg(n); - setText(TQString("%1: %2").tqarg(name()).tqarg(message())); // esp. for sorting + d->mName = TQString("%1: ").arg(n); + setText(TQString("%1: %2").arg(name()).arg(message())); // esp. for sorting } void KChatBaseText::setMessage(const TQString& m) { d->mMessage = m; - setText(TQString("%1: %2").tqarg(name()).tqarg(message())); // esp. for sorting + setText(TQString("%1: %2").arg(name()).arg(message())); // esp. for sorting } const TQString& KChatBaseText::name() const @@ -364,11 +364,11 @@ TQListBoxItem* KChatBase::layoutMessage(const TQString& fromName, const TQString if (text.startsWith("/me ")) { // replace "/me" by a nice star. leave one space after the star TQPixmap pix; - pix.load(locate("data", TQString::tqfromLatin1("tdegames/pics/star.png"))); + pix.load(locate("data", TQString::fromLatin1("tdegames/pics/star.png"))); //TODO KChatBasePixmap? Should change the font here! - message = (TQListBoxItem*)new TQListBoxPixmap(pix, i18n("%1 %2").tqarg(fromName).tqarg(text.mid(3))); + message = (TQListBoxItem*)new TQListBoxPixmap(pix, i18n("%1 %2").arg(fromName).arg(text.mid(3))); } else { // the text is not edited in any way. just return an item KChatBaseText* m = new KChatBaseText(fromName, text); @@ -384,7 +384,7 @@ TQListBoxItem* KChatBase::layoutSystemMessage(const TQString& fromName, const TQ //TODO: KChatBaseConfigure? - e.g. color // no need to check for /me etc. - KChatBaseText* m = new KChatBaseText(i18n("--- %1").tqarg(fromName), text); + KChatBaseText* m = new KChatBaseText(i18n("--- %1").arg(fromName), text); m->setNameFont(&d->mSystemNameFont); m->setMessageFont(&d->mSystemMessageFont); return (TQListBoxItem*)m; @@ -406,7 +406,7 @@ void KChatBase::slotReturnPressed(const TQString& text) TQString KChatBase::comboBoxItem(const TQString& name) const { // TODO: such a function for "send to all" and "send to my group" - return i18n("Send to %1").tqarg(name); + return i18n("Send to %1").arg(name); } void KChatBase::slotClear() diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h index 892e5859..33ba3d76 100644 --- a/libtdegames/kchatbase.h +++ b/libtdegames/kchatbase.h @@ -471,7 +471,7 @@ protected: /** * Replace to customise the combo box. * - * Default: i18n("Send to %1).tqarg(name) + * Default: i18n("Send to %1).arg(name) * @param name The name of the player * @return The string as it will be shown in the combo box **/ diff --git a/libtdegames/kchatdialog.cpp b/libtdegames/kchatdialog.cpp index 7e0df7e8..002384a2 100644 --- a/libtdegames/kchatdialog.cpp +++ b/libtdegames/kchatdialog.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <kfontdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -80,42 +80,42 @@ void KChatDialog::init() d = new KChatDialogPrivate; // d->mTextPage = addPage(i18n("&Messages"));// not a good name - game Messages? d->mTextPage = plainPage(); - TQGridLayout* tqlayout = new TQGridLayout(d->mTextPage, 7, 2, KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout* layout = new TQGridLayout(d->mTextPage, 7, 2, KDialog::marginHint(), KDialog::spacingHint()); // General fonts TQPushButton* nameFont = new TQPushButton(i18n("Name Font..."), d->mTextPage); connect(nameFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetNameFont())); - tqlayout->addWidget(nameFont, 0, 0); + layout->addWidget(nameFont, 0, 0); TQPushButton* textFont = new TQPushButton(i18n("Text Font..."), d->mTextPage); connect(textFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetTextFont())); - tqlayout->addWidget(textFont, 0, 1); + layout->addWidget(textFont, 0, 1); TQFrame* messagePreview = new TQFrame(d->mTextPage); messagePreview->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); TQHBoxLayout* messageLayout = new TQHBoxLayout(messagePreview); - tqlayout->addMultiCellWidget(messagePreview, 1, 1, 0, 1); + layout->addMultiCellWidget(messagePreview, 1, 1, 0, 1); d->mNamePreview = new TQLabel(i18n("Player: "), messagePreview); messageLayout->addWidget(d->mNamePreview, 0); d->mTextPreview = new TQLabel(i18n("This is a player message"), messagePreview); messageLayout->addWidget(d->mTextPreview, 1); - tqlayout->addRowSpacing(2, 10); + layout->addRowSpacing(2, 10); // System Message fonts TQLabel* systemMessages = new TQLabel(i18n("System Messages - Messages directly sent from the game"), d->mTextPage); - tqlayout->addMultiCellWidget(systemMessages, 3, 3, 0, 1); + layout->addMultiCellWidget(systemMessages, 3, 3, 0, 1); TQPushButton* systemNameFont = new TQPushButton(i18n("Name Font..."), d->mTextPage); connect(systemNameFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetSystemNameFont())); - tqlayout->addWidget(systemNameFont, 4, 0); + layout->addWidget(systemNameFont, 4, 0); TQPushButton* systemTextFont = new TQPushButton(i18n("Text Font..."), d->mTextPage); connect(systemTextFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetSystemTextFont())); - tqlayout->addWidget(systemTextFont, 4, 1); + layout->addWidget(systemTextFont, 4, 1); TQFrame* systemMessagePreview = new TQFrame(d->mTextPage); systemMessagePreview->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); TQHBoxLayout* systemMessageLayout = new TQHBoxLayout(systemMessagePreview); - tqlayout->addMultiCellWidget(systemMessagePreview, 5, 5, 0, 1); + layout->addMultiCellWidget(systemMessagePreview, 5, 5, 0, 1); d->mSystemNamePreview = new TQLabel(i18n("--- Game: "), systemMessagePreview); systemMessageLayout->addWidget(d->mSystemNamePreview, 0); @@ -124,10 +124,10 @@ void KChatDialog::init() // message count TQLabel* maxMessages = new TQLabel(i18n("Maximal number of messages (-1 = unlimited):"), d->mTextPage); - tqlayout->addWidget(maxMessages, 6, 0); + layout->addWidget(maxMessages, 6, 0); d->mMaxMessages = new TQLineEdit(d->mTextPage); d->mMaxMessages->setText(TQString::number(-1)); - tqlayout->addWidget(d->mMaxMessages, 6, 1); + layout->addWidget(d->mMaxMessages, 6, 1); } void KChatDialog::slotGetNameFont() diff --git a/libtdegames/kgame/COMPAT b/libtdegames/kgame/COMPAT index 4551c679..b85ec9b6 100644 --- a/libtdegames/kgame/COMPAT +++ b/libtdegames/kgame/COMPAT @@ -38,7 +38,7 @@ too! The API stays the same. 11.10.2001 KGameDialogGeneralConfig now doesn't provide setMin/maxPlayers() - anymore. The game should manage this internally. tqlayout() is + anymore. The game should manage this internally. layout() is obsolete as well 18.10.2001 KPlayer::signalNetworkData contained QDataStream& instead of const QByteArray& parameter (oops!). This is fixed now. All apps which diff --git a/libtdegames/kgame/DESIGN b/libtdegames/kgame/DESIGN index cd737e3a..b1c48146 100644 --- a/libtdegames/kgame/DESIGN +++ b/libtdegames/kgame/DESIGN @@ -359,7 +359,7 @@ KDialogBase::addVBoxPage() (for example). 5.1.1 Debug KGame ----------------- The first page, "Debug KGame" shows on the left most or even all status values of -KGame. That contains e.g. minPlayers(), isAdmin(), gametqStatus(), ... +KGame. That contains e.g. minPlayers(), isAdmin(), gameStatus(), ... The right side is probably the more important one. It lists *all* KGameProperties which have been inserted to this KGame object (only to this KGame object - not the ones that have been added to the players!). Most of the status variables of diff --git a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp index 98958ffd..009c4e76 100644 --- a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp +++ b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp @@ -27,7 +27,7 @@ #include <tqlineedit.h> #include <tqcombobox.h> #include <tqvbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqlabel.h> #include <dnssd/servicebrowser.h> diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp index 49623238..11745f21 100644 --- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp +++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp @@ -32,7 +32,7 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <tqintdict.h> #include <tqlabel.h> @@ -56,7 +56,7 @@ public: mGameMaster = 0; mGameAdmin = 0; mGameOffering = 0; - mGametqStatus = 0; + mGameStatus = 0; mGameRunning = 0; mGameMaxPlayers = 0; mGameMinPlayers = 0; @@ -93,7 +93,7 @@ public: TQListViewItem* mGameMaster; TQListViewItem* mGameAdmin; TQListViewItem* mGameOffering; - TQListViewItem* mGametqStatus; + TQListViewItem* mGameStatus; TQListViewItem* mGameRunning; TQListViewItem* mGameMaxPlayers; TQListViewItem* mGameMinPlayers; @@ -142,18 +142,18 @@ void KGameDebugDialog::initGamePage() { d->mGamePage = addPage(i18n("Debug &KGame")); TQVBoxLayout* topLayout = new TQVBoxLayout(d->mGamePage, marginHint(), spacingHint()); - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout); KListView* v = new KListView(d->mGamePage); v->addColumn(i18n("Data")); v->addColumn(i18n("Value")); - tqlayout->addWidget(v); + layout->addWidget(v); d->mGameProperties = new KListView(d->mGamePage); d->mGameProperties->addColumn(i18n("Property")); d->mGameProperties->addColumn(i18n("Value")); d->mGameProperties->addColumn(i18n("Policy")); - tqlayout->addWidget(d->mGameProperties); + layout->addWidget(d->mGameProperties); TQPushButton* b = new TQPushButton(i18n("Update"), d->mGamePage); connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdateGameData())); @@ -166,7 +166,7 @@ void KGameDebugDialog::initGamePage() d->mGameMaster = new TQListViewItem(v, i18n("Is Master")); d->mGameAdmin = new TQListViewItem(v, i18n("Is Admin")); d->mGameOffering = new TQListViewItem(v, i18n("Is Offering Connections")); - d->mGametqStatus = new TQListViewItem(v, i18n("Game Status")); + d->mGameStatus = new TQListViewItem(v, i18n("Game Status")); d->mGameRunning = new TQListViewItem(v, i18n("Game is Running")); d->mGameMaxPlayers = new TQListViewItem(v, i18n("Maximal Players")); d->mGameMinPlayers = new TQListViewItem(v, i18n("Minimal Players")); @@ -177,19 +177,19 @@ void KGameDebugDialog::initPlayerPage() { d->mPlayerPage = addPage(i18n("Debug &Players")); TQVBoxLayout* topLayout = new TQVBoxLayout(d->mPlayerPage, marginHint(), spacingHint()); - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout); //TODO: connect to the KGame signals for joined/removed players!!! - TQVBoxLayout* listLayout = new TQVBoxLayout(tqlayout); + TQVBoxLayout* listLayout = new TQVBoxLayout(layout); TQLabel* listLabel = new TQLabel(i18n("Available Players"), d->mPlayerPage); listLayout->addWidget(listLabel); d->mPlayerList = new KListBox(d->mPlayerPage); connect(d->mPlayerList, TQT_SIGNAL(executed(TQListBoxItem*)), this, TQT_SLOT(slotUpdatePlayerData(TQListBoxItem*))); listLayout->addWidget(d->mPlayerList); - d->mPlayerList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); + d->mPlayerList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); KListView* v = new KListView(d->mPlayerPage); - tqlayout->addWidget(v); + layout->addWidget(v); v->addColumn(i18n("Data")); v->addColumn(i18n("Value")); @@ -197,7 +197,7 @@ void KGameDebugDialog::initPlayerPage() d->mPlayerProperties->addColumn(i18n("Property")); d->mPlayerProperties->addColumn(i18n("Value")); d->mPlayerProperties->addColumn(i18n("Policy")); - tqlayout->addWidget(d->mPlayerProperties); + layout->addWidget(d->mPlayerProperties); TQPushButton* b = new TQPushButton(i18n("Update"), d->mPlayerPage); connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdatePlayerList())); @@ -220,9 +220,9 @@ void KGameDebugDialog::initPlayerPage() void KGameDebugDialog::initMessagePage() { d->mMessagePage = addPage(i18n("Debug &Messages")); - TQGridLayout* tqlayout = new TQGridLayout(d->mMessagePage, 11, 7, marginHint(), spacingHint()); + TQGridLayout* layout = new TQGridLayout(d->mMessagePage, 11, 7, marginHint(), spacingHint()); d->mMessageList = new KListView(d->mMessagePage); - tqlayout->addMultiCellWidget(d->mMessageList, 0, 9, 0, 3); + layout->addMultiCellWidget(d->mMessageList, 0, 9, 0, 3); d->mMessageList->addColumn(i18n("Time")); d->mMessageList->addColumn(i18n("ID")); d->mMessageList->addColumn(i18n("Receiver")); @@ -231,20 +231,20 @@ void KGameDebugDialog::initMessagePage() TQPushButton* hide = new TQPushButton(i18n("&>>"), d->mMessagePage); connect(hide, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotHideId())); - tqlayout->addWidget(hide, 4, 4); + layout->addWidget(hide, 4, 4); TQPushButton* show = new TQPushButton(i18n("&<<"), d->mMessagePage); connect(show, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotShowId())); - tqlayout->addWidget(show, 6, 4); + layout->addWidget(show, 6, 4); TQLabel* l = new TQLabel(i18n("Do not show IDs:"), d->mMessagePage); - tqlayout->addMultiCellWidget(l, 0, 0, 5, 6); + layout->addMultiCellWidget(l, 0, 0, 5, 6); d->mHideIdList = new KListBox(d->mMessagePage); - tqlayout->addMultiCellWidget(d->mHideIdList, 1, 8, 5, 6); + layout->addMultiCellWidget(d->mHideIdList, 1, 8, 5, 6); TQPushButton* clear = new KPushButton(KStdGuiItem::clear(), d->mMessagePage); connect(clear, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearMessages())); - tqlayout->addMultiCellWidget(clear, 10, 10, 0, 6); + layout->addMultiCellWidget(clear, 10, 10, 0, 6); //TODO: "show all but..." and "show nothing but..." } @@ -274,7 +274,7 @@ void KGameDebugDialog::clearGameData() d->mGameMaster->setText(1, ""); d->mGameAdmin->setText(1, ""); d->mGameOffering->setText(1, ""); - d->mGametqStatus->setText(1, ""); + d->mGameStatus->setText(1, ""); d->mGameRunning->setText(1, ""); d->mGameMaxPlayers->setText(1, ""); d->mGameMinPlayers->setText(1, ""); @@ -320,7 +320,7 @@ void KGameDebugDialog::slotUpdateGameData() d->mGameMaster->setText(1, d->mGame->isMaster() ? i18n("True") : i18n("False")); d->mGameAdmin->setText(1, d->mGame->isAdmin() ? i18n("True") : i18n("False")); d->mGameOffering->setText(1, d->mGame->isOfferingConnections() ? i18n("True") : i18n("False")); - d->mGametqStatus->setText(1, TQString::number(d->mGame->gametqStatus())); + d->mGameStatus->setText(1, TQString::number(d->mGame->gameStatus())); d->mGameRunning->setText(1, d->mGame->isRunning() ? i18n("True") : i18n("False")); d->mGameMaxPlayers->setText(1, TQString::number(d->mGame->maxPlayers())); d->mGameMinPlayers->setText(1, TQString::number(d->mGame->minPlayers())); diff --git a/libtdegames/kgame/dialogs/kgamedialog.cpp b/libtdegames/kgame/dialogs/kgamedialog.cpp index c03df4ff..dc85cd6a 100644 --- a/libtdegames/kgame/dialogs/kgamedialog.cpp +++ b/libtdegames/kgame/dialogs/kgamedialog.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <klocale.h> diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp index f6845650..c57ed7f6 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp @@ -31,7 +31,7 @@ #include <klistbox.h> #include <kmessagebox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhgroupbox.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -122,7 +122,7 @@ KGameDialogNetworkConfig::KGameDialogNetworkConfig(TQWidget* parent) // kdDebug(11001) << k_funcinfo << ": this=" << this << endl; d = new KGameDialogNetworkConfigPrivate(); - TQVBoxLayout* topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "toptqlayout"); + TQVBoxLayout* topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "toplayout"); TQHBoxLayout *hb = new TQHBoxLayout(topLayout, KDialog::spacingHint()); @@ -743,7 +743,7 @@ void KGameDialogConnectionConfig::slotKickPlayerOut(TQListBoxItem* item) return; } - if (KMessageBox::questionYesNo(this, i18n("Do you want to ban player \"%1\" from the game?").tqarg( + if (KMessageBox::questionYesNo(this, i18n("Do you want to ban player \"%1\" from the game?").arg( p->name()), TQString(), i18n("Ban Player"), i18n("Do Not Ban")) == KMessageBox::Yes) { kdDebug(11001) << "will remove player " << p << endl; game()->removePlayer(p); diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.h b/libtdegames/kgame/dialogs/kgamedialogconfig.h index c2c36e2a..b91f05d0 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.h +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.h @@ -157,7 +157,7 @@ public: * * @param parent Parent widget for this dialog. * @param initializeGUI If you really don't want to use the - * predefined widget and/or tqlayout use FALSE here. Note that then none + * predefined widget and/or layout use FALSE here. Note that then none * of the predefined widgets (currently only the name of the player) * will exist anymore. * diff --git a/libtdegames/kgame/dialogs/kgameerrordialog.cpp b/libtdegames/kgame/dialogs/kgameerrordialog.cpp index 6ab9d71c..e22211c3 100644 --- a/libtdegames/kgame/dialogs/kgameerrordialog.cpp +++ b/libtdegames/kgame/dialogs/kgameerrordialog.cpp @@ -86,7 +86,7 @@ void KGameErrorDialog::slotClientConnectionLost(TQ_UINT32 /*id*/,bool) //TODO: add IP/port of the client TQString message; // if (c) { -// message = i18n("Connection to client has been lost!\nID: %1\nIP: %2").tqarg(c->id()).tqarg(c->IP()); +// message = i18n("Connection to client has been lost!\nID: %1\nIP: %2").arg(c->id()).arg(c->IP()); // } else { // message = i18n("Connection to client has been lost!"); // } @@ -96,7 +96,7 @@ void KGameErrorDialog::slotClientConnectionLost(TQ_UINT32 /*id*/,bool) void KGameErrorDialog::slotError(int errorNo, TQString text) { - TQString message = i18n("Received a network error!\nError number: %1\nError message: %2").tqarg(errorNo).tqarg(text); + TQString message = i18n("Received a network error!\nError number: %1\nError message: %2").arg(errorNo).arg(text); error(message, (TQWidget*)parent()); } @@ -106,7 +106,7 @@ void KGameErrorDialog::connectionError(TQString s) if (s.isNull()) { message = i18n("No connection could be created."); } else { - message = i18n("No connection could be created.\nThe error message was:\n%1").tqarg(s); + message = i18n("No connection could be created.\nThe error message was:\n%1").arg(s); } error(message, (TQWidget*)parent()); } diff --git a/libtdegames/kgame/kgame.cpp b/libtdegames/kgame/kgame.cpp index 2eebac64..c2f7f583 100644 --- a/libtdegames/kgame/kgame.cpp +++ b/libtdegames/kgame/kgame.cpp @@ -75,7 +75,7 @@ public: //KGamePropertys KGamePropertyInt mMaxPlayer; KGamePropertyUInt mMinPlayer; - KGamePropertyInt mGametqStatus; // Game running? + KGamePropertyInt mGameStatus; // Game running? TQValueList<int> mInactiveIdList; }; @@ -95,8 +95,8 @@ KGame::KGame(int cookie,TQObject* parent) : KGameNetwork(cookie,parent) d->mMaxPlayer.setLocal(-1); // Infinite d->mMinPlayer.registerData(KGamePropertyBase::IdMinPlayer, this, i18n("MinPlayers")); d->mMinPlayer.setLocal(0); // Always ok - d->mGametqStatus.registerData(KGamePropertyBase::IdGametqStatus, this, i18n("GameStatus")); - d->mGametqStatus.setLocal(Init); + d->mGameStatus.registerData(KGamePropertyBase::IdGameStatus, this, i18n("GameStatus")); + d->mGameStatus.setLocal(Init); // d->mUniquePlayerNumber = 0; d->mRandom = new KRandomSequence; d->mRandom->setSeed(0); @@ -542,10 +542,10 @@ void KGame::systemRemovePlayer(KPlayer* player,bool deleteit) kdWarning(11001) << "player " << player << "(" << player->id() << ") Could not be found!" << endl; } - if (gametqStatus()==(int)Run && playerCount()<minPlayers()) + if (gameStatus()==(int)Run && playerCount()<minPlayers()) { kdWarning(11001) << k_funcinfo ": not enough players, PAUSING game\n" << endl; - setGametqStatus(Pause); + setGameStatus(Pause); } } @@ -680,11 +680,11 @@ int KGame::maxPlayers() const uint KGame::playerCount() const { return d->mPlayerList.count(); } -int KGame::gametqStatus() const -{ return d->mGametqStatus.value(); } +int KGame::gameStatus() const +{ return d->mGameStatus.value(); } bool KGame::isRunning() const -{ return d->mGametqStatus.value() == Run; } +{ return d->mGameStatus.value() == Run; } KGamePropertyHandler* KGame::dataHandler() const { return d->mProperties; } @@ -772,7 +772,7 @@ KPlayer * KGame::playerInputFinished(KPlayer *player) { player->setTurn(false); } - setGametqStatus(End); + setGameStatus(End); emit signalGameOver(gameOver,player,this); } else if (!player->asyncInput()) @@ -829,7 +829,7 @@ KPlayer *KGame::nextPlayer(KPlayer *last,bool exclusive) return 0; } -void KGame::setGametqStatus(int status) +void KGame::setGameStatus(int status) { kdDebug(11001) << k_funcinfo << ": GAMESTATUS CHANGED to" << status << endl; if (status==(int)Run && playerCount()<minPlayers()) @@ -837,7 +837,7 @@ void KGame::setGametqStatus(int status) kdDebug(11001) << k_funcinfo << ": not enough players, pausing game\n" << endl; status=Pause; } - d->mGametqStatus = status; + d->mGameStatus = status; } void KGame::networkTransmission(TQDataStream &stream, int msgid, TQ_UINT32 receiver, TQ_UINT32 sender, TQ_UINT32 /*clientID*/) @@ -1244,7 +1244,7 @@ void KGame::Debug() kdDebug(11001) << "------------------- KGAME -------------------------" << endl; kdDebug(11001) << "this: " << this << endl; kdDebug(11001) << "uniquePlayer " << d->mUniquePlayerNumber << endl; - kdDebug(11001) << "gameStatus " << gametqStatus() << endl; + kdDebug(11001) << "gameStatus " << gameStatus() << endl; kdDebug(11001) << "MaxPlayers : " << maxPlayers() << endl; kdDebug(11001) << "NoOfPlayers : " << playerCount() << endl; kdDebug(11001) << "NoOfInactive: " << d->mInactivePlayerList.count() << endl; @@ -1264,7 +1264,7 @@ void KGame::slotServerDisconnected() // Client side kdDebug(11001) << "======= SERVER DISCONNECT ======="<<endl; kdDebug(11001) << "+++ (CLIENT)++++++++" << k_funcinfo << ": our GameID="<<gameId() << endl; - int oldgamestatus=gametqStatus(); + int oldgamestatus=gameStatus(); KPlayer *player; KGamePlayerList removeList; @@ -1326,7 +1326,7 @@ void KGame::slotClientDisconnected(TQ_UINT32 clientID,bool /*broken*/) // server { kdDebug(11001) << "++++(SERVER)+++++++" << k_funcinfo << " clientId=" << clientID << endl; - int oldgamestatus=gametqStatus(); + int oldgamestatus=gameStatus(); KPlayer *player; KGamePlayerList removeList; diff --git a/libtdegames/kgame/kgame.h b/libtdegames/kgame/kgame.h index bf66dcb8..7ad010fc 100644 --- a/libtdegames/kgame/kgame.h +++ b/libtdegames/kgame/kgame.h @@ -118,7 +118,7 @@ public: * The KGame e.g. sets the status to Pause when you have * less player than the minimum amount */ - enum GametqStatus + enum GameStatus { Init = 0, Run = 1, @@ -127,7 +127,7 @@ public: Abort = 4, SystemPause = 5, Intro = 6, - UsertqStatus = 7 + UserStatus = 7 }; // Properties @@ -387,14 +387,14 @@ public: * * @return game status */ - int gametqStatus() const; + int gameStatus() const; /** * sets the game status * * @param status the new status */ - void setGametqStatus(int status); + void setGameStatus(int status); /** * docu: see KPlayer @@ -433,7 +433,7 @@ public: * @param msg the message which will be send. See messages.txt for contents * @param msgid an id for this message * @param sender the id of the sender - * @param group the group of the tqreceivers + * @param group the group of the receivers * @return true if worked */ bool sendGroupMessage(const TQByteArray& msg, int msgid, TQ_UINT32 sender, const TQString& group); diff --git a/libtdegames/kgame/kgamechat.cpp b/libtdegames/kgame/kgamechat.cpp index 11f47f7b..c2469906 100644 --- a/libtdegames/kgame/kgamechat.cpp +++ b/libtdegames/kgame/kgamechat.cpp @@ -92,7 +92,7 @@ void KGameChat::addMessage(int fromId, const TQString& text) { if (!d->mGame) { kdWarning(11001) << "no KGame object has been set" << endl; - addMessage(i18n("Player %1").tqarg(fromId), text); + addMessage(i18n("Player %1").arg(fromId), text); } else { KPlayer* p = d->mGame->findPlayer(fromId); if (p) { @@ -165,7 +165,7 @@ bool KGameChat::isToPlayerMessage(int id) const return d->mSendId2PlayerId.contains(id); } TQString KGameChat::sendToPlayerEntry(const TQString& name) const -{ return i18n("Send to %1").tqarg(name); } +{ return i18n("Send to %1").arg(name); } int KGameChat::playerId(int id) const { @@ -211,7 +211,7 @@ void KGameChat::setFromPlayer(KPlayer* p) removeSendingEntry(d->mToMyGroup); } d->mToMyGroup = nextId(); - addSendingEntry(i18n("Send to My Group (\"%1\")").tqarg(p->group()), d->mToMyGroup); + addSendingEntry(i18n("Send to My Group (\"%1\")").arg(p->group()), d->mToMyGroup); } d->mFromPlayer = p; kdDebug(11001) << k_funcinfo << " player=" << p << endl; diff --git a/libtdegames/kgame/kgameerror.cpp b/libtdegames/kgame/kgameerror.cpp index ef6145fb..4ed64e0d 100644 --- a/libtdegames/kgame/kgameerror.cpp +++ b/libtdegames/kgame/kgameerror.cpp @@ -60,7 +60,7 @@ TQString KGameError::errorText(int errorCode, TQDataStream& s) TQ_INT32 cookie2; s >> cookie1; s >> cookie2; - text = i18n("Cookie mismatch!\nExpected Cookie: %1\nReceived Cookie: %2").tqarg(cookie1).tqarg(cookie2); + text = i18n("Cookie mismatch!\nExpected Cookie: %1\nReceived Cookie: %2").arg(cookie1).arg(cookie2); break; } case Version: @@ -69,11 +69,11 @@ TQString KGameError::errorText(int errorCode, TQDataStream& s) TQ_INT32 version2; s >> version1; s >> version2; - text = i18n("KGame Version mismatch!\nExpected Version: %1\nReceived Version: %2\n").tqarg(version1).tqarg(version2); + text = i18n("KGame Version mismatch!\nExpected Version: %1\nReceived Version: %2\n").arg(version1).arg(version2); break; } default: - text = i18n("Unknown error code %1").tqarg(errorCode); + text = i18n("Unknown error code %1").arg(errorCode); } return text; } diff --git a/libtdegames/kgame/kgameproperty.h b/libtdegames/kgame/kgameproperty.h index f02c4db0..0bb117b8 100644 --- a/libtdegames/kgame/kgameproperty.h +++ b/libtdegames/kgame/kgameproperty.h @@ -51,7 +51,7 @@ public: IdName=5, //KGame - IdGametqStatus=6, + IdGameStatus=6, IdMaxPlayer=7, IdMinPlayer=8, diff --git a/libtdegames/kgame/kgamepropertyhandler.cpp b/libtdegames/kgame/kgamepropertyhandler.cpp index 405d433e..9ad43a69 100644 --- a/libtdegames/kgame/kgamepropertyhandler.cpp +++ b/libtdegames/kgame/kgamepropertyhandler.cpp @@ -174,13 +174,13 @@ TQString KGamePropertyHandler::propertyName(int id) const TQString s; if (d->mIdDict.find(id)) { if (d->mNameMap.contains(id)) { - s = i18n("%1 (%2)").tqarg(d->mNameMap[id]).tqarg(id); + s = i18n("%1 (%2)").arg(d->mNameMap[id]).arg(id); } else { - s = i18n("Unnamed - ID: %1").tqarg(id); + s = i18n("Unnamed - ID: %1").arg(id); } } else { // Should _never_ happen - s = i18n("%1 unregistered").tqarg(id); + s = i18n("%1 unregistered").arg(id); } return s; } diff --git a/libtdegames/kgame/kmessageclient.cpp b/libtdegames/kgame/kmessageclient.cpp index 0233884a..056ca879 100644 --- a/libtdegames/kgame/kmessageclient.cpp +++ b/libtdegames/kgame/kmessageclient.cpp @@ -132,7 +132,7 @@ TQ_UINT16 KMessageClient::peerPort () const TQString KMessageClient::peerName () const { - return d->connection ? d->connection->peerName() : TQString::tqfromLatin1("localhost"); + return d->connection ? d->connection->peerName() : TQString::fromLatin1("localhost"); } // --------------------- Sending messages @@ -228,9 +228,9 @@ void KMessageClient::processMessage (const TQByteArray &msg) case KMessageServer::MSG_FORWARD: { TQ_UINT32 clientID; - TQValueList <TQ_UINT32> tqreceivers; - in_stream >> clientID >> tqreceivers; - emit forwardReceived (in_buffer.readAll(), clientID, tqreceivers); + TQValueList <TQ_UINT32> receivers; + in_stream >> clientID >> receivers; + emit forwardReceived (in_buffer.readAll(), clientID, receivers); } break; diff --git a/libtdegames/kgame/kmessageclient.h b/libtdegames/kgame/kmessageclient.h index 8a35234d..da15f16d 100644 --- a/libtdegames/kgame/kmessageclient.h +++ b/libtdegames/kgame/kmessageclient.h @@ -284,7 +284,7 @@ signals: senderID contains the ID of the client that sent the broadcast message. You can use this e.g. to send a reply message to only that client. - tqreceivers contains the list of the clients that got the message. (If this list + receivers contains the list of the clients that got the message. (If this list only contains one number, this will be your client ID, and it was exclusivly sent to you.) @@ -302,9 +302,9 @@ signals: Then connect the broadcast signal to your slot that analyzes the message. @param msg The message that has been sent to us @param senderID The ID of the client which sent the message - @param tqreceivers All clients which receive this message + @param receivers All clients which receive this message */ - void forwardReceived (const TQByteArray &msg, TQ_UINT32 senderID, const TQValueList <TQ_UINT32> &tqreceivers); + void forwardReceived (const TQByteArray &msg, TQ_UINT32 senderID, const TQValueList <TQ_UINT32> &receivers); /** This signal is emitted when the connection to the KMessageServer is broken. diff --git a/libtdegames/kgame/kmessageio.cpp b/libtdegames/kgame/kmessageio.cpp index b35382b0..b3dd1875 100644 --- a/libtdegames/kgame/kmessageio.cpp +++ b/libtdegames/kgame/kmessageio.cpp @@ -245,7 +245,7 @@ KMessageProcess::KMessageProcess(TQObject *parent, TQString file) : KMessageIO(p mProcessName=file; mProcess=new KProcess; int id=0; - *mProcess << mProcessName << TQString("%1").tqarg(id); + *mProcess << mProcessName << TQString("%1").arg(id); kdDebug(11001) << "@@@KMessageProcess::Init:Id= " << id << endl; kdDebug(11001) << "@@@KMessgeProcess::Init:Processname: " << mProcessName << endl; connect(mProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), diff --git a/libtdegames/kgame/kmessageio.h b/libtdegames/kgame/kmessageio.h index 326476ff..69038df9 100644 --- a/libtdegames/kgame/kmessageio.h +++ b/libtdegames/kgame/kmessageio.h @@ -123,7 +123,7 @@ public: @since 3.2 @return "localhost" in the default implementation. Reimplemented in @ref KMessageSocket */ - virtual TQString peerName () const { return TQString::tqfromLatin1("localhost"); } + virtual TQString peerName () const { return TQString::fromLatin1("localhost"); } signals: diff --git a/libtdegames/kgame/kmessageserver.h b/libtdegames/kgame/kmessageserver.h index 9042fca2..067ea3f9 100644 --- a/libtdegames/kgame/kmessageserver.h +++ b/libtdegames/kgame/kmessageserver.h @@ -83,7 +83,7 @@ class KMessageServerPrivate; TQ_UINT32 clientID; // the ID of the client that sent the broadcast request - TQByteArray << static_cast<TQ_UINT32>( RETQ_FORWARD ) << client_list << raw_data - TQValueList <TQ_UINT32> client_list; // list of tqreceivers + TQValueList <TQ_UINT32> client_list; // list of receivers When the server receives this message, it sends the following message to the clients in client_list: diff --git a/libtdegames/kgame/messages.txt b/libtdegames/kgame/messages.txt index c42d2d91..3a163790 100644 --- a/libtdegames/kgame/messages.txt +++ b/libtdegames/kgame/messages.txt @@ -82,7 +82,7 @@ IdRemovePlayer Q_INT16 playerid IdError Q_INT32 errorcode QString errortext -IdGametqStatus Q_INT32 status +IdGameStatus Q_INT32 status IdPlayerProperty Q_INT16 propertyId user defined -> the property diff --git a/libtdegames/kgamelcd.cpp b/libtdegames/kgamelcd.cpp index cf079a15..f0e9d11c 100644 --- a/libtdegames/kgamelcd.cpp +++ b/libtdegames/kgamelcd.cpp @@ -20,7 +20,7 @@ #include "kgamelcd.h" #include "kgamelcd.moc" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqtimer.h> @@ -217,7 +217,7 @@ void KGameLCDList::init(const TQString &title) top->setColStretch(1, 1); _title = new TQLabel(title, this); - _title->tqsetAlignment(AlignCenter); + _title->setAlignment(AlignCenter); top->addMultiCellWidget(_title, 0, 0, 0, 1, AlignCenter); } @@ -232,11 +232,11 @@ void KGameLCDList::append(const TQString &leading, TQLCDNumber *lcd) TQLabel *label = 0; if ( !leading.isEmpty() ) { label = new TQLabel(leading, this); - static_cast<TQGridLayout *>(tqlayout())->addWidget(label, i+1, 0); + static_cast<TQGridLayout *>(layout())->addWidget(label, i+1, 0); } d->_leadings.push_back(label); _lcds.push_back(lcd); - static_cast<TQGridLayout *>(tqlayout())->addWidget(lcd, i+1, 1); + static_cast<TQGridLayout *>(layout())->addWidget(lcd, i+1, 1); } void KGameLCDList::clear() diff --git a/libtdegames/kgamelcd.h b/libtdegames/kgamelcd.h index 6b84f012..f7bc69e6 100644 --- a/libtdegames/kgamelcd.h +++ b/libtdegames/kgamelcd.h @@ -184,7 +184,7 @@ private: //----------------------------------------------------------------------------- /** - * This widget holds a list of @ref TQLCDNumber arranged in a vertical tqlayout. + * This widget holds a list of @ref TQLCDNumber arranged in a vertical layout. * It also shows a label at the top of the list. * * @since 3.2 diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp index 98876aa3..de32cd14 100644 --- a/libtdegames/kgameprogress.cpp +++ b/libtdegames/kgameprogress.cpp @@ -79,11 +79,11 @@ void KGameProgress::initialize() void KGameProgress::paletteChange() { TQPalette p = kapp->palette(); - const TQColorGroup &tqcolorGroup = p.active(); + const TQColorGroup &colorGroup = p.active(); if (!use_supplied_bar_color) - bar_color = tqcolorGroup.highlight(); - bar_text_color = tqcolorGroup.highlightedText(); - text_color = tqcolorGroup.text(); + bar_color = colorGroup.highlight(); + bar_text_color = colorGroup.highlightedText(); + text_color = colorGroup.text(); setPalette(p); adjustStyle(); @@ -151,7 +151,7 @@ bool KGameProgress::textEnabled() const return text_enabled; } -TQSize KGameProgress::tqsizeHint() const +TQSize KGameProgress::sizeHint() const { TQSize s( size() ); @@ -164,9 +164,9 @@ TQSize KGameProgress::tqsizeHint() const return s; } -TQSize KGameProgress::tqminimumSizeHint() const +TQSize KGameProgress::minimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } TQSizePolicy KGameProgress::sizePolicy() const @@ -196,13 +196,13 @@ int KGameProgress::recalcValue(int range) void KGameProgress::valueChange() { - tqrepaint(contentsRect(), FALSE); + repaint(contentsRect(), FALSE); emit percentageChanged(recalcValue(100)); } void KGameProgress::rangeChange() { - tqrepaint(contentsRect(), FALSE); + repaint(contentsRect(), FALSE); emit percentageChanged(recalcValue(100)); } @@ -213,7 +213,7 @@ void KGameProgress::styleChange(TQStyle&) void KGameProgress::adjustStyle() { - switch (tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)) { + switch (tqstyle().styleHint(TQStyle::SH_GUIStyle)) { case WindowsStyle: setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); break; @@ -242,9 +242,9 @@ void KGameProgress::drawText(TQPainter *p) // the current value and the maximum value respectively. TQString s(format_); - s.replace(TQRegExp(TQString::tqfromLatin1("%p")), TQString::number(recalcValue(100))); - s.replace(TQRegExp(TQString::tqfromLatin1("%v")), TQString::number(value())); - s.replace(TQRegExp(TQString::tqfromLatin1("%m")), TQString::number(maxValue())); + s.replace(TQRegExp(TQString::fromLatin1("%p")), TQString::number(recalcValue(100))); + s.replace(TQRegExp(TQString::fromLatin1("%v")), TQString::number(value())); + s.replace(TQRegExp(TQString::fromLatin1("%m")), TQString::number(maxValue())); p->setPen(text_color); TQFont font = p->font(); diff --git a/libtdegames/kgameprogress.h b/libtdegames/kgameprogress.h index 834b127c..e4144b94 100644 --- a/libtdegames/kgameprogress.h +++ b/libtdegames/kgameprogress.h @@ -162,11 +162,11 @@ public: /** */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** */ diff --git a/lskat/lskat/KChildConnect.cpp b/lskat/lskat/KChildConnect.cpp index b3ecfb18..35ac9408 100644 --- a/lskat/lskat/KChildConnect.cpp +++ b/lskat/lskat/KChildConnect.cpp @@ -30,7 +30,7 @@ KChildConnect::~KChildConnect() { } -KR_STATUS KChildConnect::QuerytqStatus() +KR_STATUS KChildConnect::QueryStatus() { return KR_OK; } diff --git a/lskat/lskat/KChildConnect.h b/lskat/lskat/KChildConnect.h index 99ab31b0..8421f722 100644 --- a/lskat/lskat/KChildConnect.h +++ b/lskat/lskat/KChildConnect.h @@ -42,7 +42,7 @@ class KChildConnect: public TQObject virtual bool SendMsg(KEMessage *msg); virtual bool Send(TQString str); - virtual KR_STATUS QuerytqStatus(); + virtual KR_STATUS QueryStatus(); public slots: diff --git a/lskat/lskat/KConnectEntry.cpp b/lskat/lskat/KConnectEntry.cpp index ed926d6d..870b8cd2 100644 --- a/lskat/lskat/KConnectEntry.cpp +++ b/lskat/lskat/KConnectEntry.cpp @@ -55,18 +55,18 @@ KInteractiveConnect *KConnectEntry::QueryInteractiveConnect() return connect.i; } -KR_STATUS KConnectEntry::QuerytqStatus() +KR_STATUS KConnectEntry::QueryStatus() { switch(type) { case KG_INPUTTYPE_INTERACTIVE: - return connect.i->QuerytqStatus(); + return connect.i->QueryStatus(); break; case KG_INPUTTYPE_REMOTE: - return connect.r->QuerytqStatus(); + return connect.r->QueryStatus(); break; case KG_INPUTTYPE_PROCESS: - return connect.p->QuerytqStatus(); + return connect.p->QueryStatus(); break; default: return KR_INVALID; diff --git a/lskat/lskat/KConnectEntry.h b/lskat/lskat/KConnectEntry.h index 16df7924..73619eac 100644 --- a/lskat/lskat/KConnectEntry.h +++ b/lskat/lskat/KConnectEntry.h @@ -50,7 +50,7 @@ class KConnectEntry KConnectEntry &operator=(KConnectEntry &entry); bool Exit(); bool Init(KG_INPUTTYPE stype,int id=0,KEMessage *msg=0); - KR_STATUS QuerytqStatus(); + KR_STATUS QueryStatus(); bool SendMsg(KEMessage *msg); }; #endif diff --git a/lskat/lskat/KEInput.cpp b/lskat/lskat/KEInput.cpp index b2f53f65..091bf4e1 100644 --- a/lskat/lskat/KEInput.cpp +++ b/lskat/lskat/KEInput.cpp @@ -85,14 +85,14 @@ KG_INPUTTYPE KEInput::QueryType(int no) return playerArray[no].QueryType(); } -KR_STATUS KEInput::QuerytqStatus(int no) +KR_STATUS KEInput::QueryStatus(int no) { if (no==-1) no=QueryNext(); if (no>=number_of_inputs || no<0) { return KR_INVALID; } - return playerArray[no].QuerytqStatus(); + return playerArray[no].QueryStatus(); } bool KEInput::SendMsg(KEMessage *msg,int no) { @@ -122,7 +122,7 @@ bool KEInput::SetInputDevice(int no, KG_INPUTTYPE type,KEMessage *msg) result=playerArray[no].Init(type,no,msg); // if (result) // Connect even if remote connection is not yet build - if (result || playerArray[no].QuerytqStatus()==KR_WAIT_FOR_CLIENT) + if (result || playerArray[no].QueryStatus()==KR_WAIT_FOR_CLIENT) { switch(QueryType(no)) { diff --git a/lskat/lskat/KEInput.h b/lskat/lskat/KEInput.h index 4a97e864..7b6eb0ac 100644 --- a/lskat/lskat/KEInput.h +++ b/lskat/lskat/KEInput.h @@ -56,7 +56,7 @@ class KEInput : public TQObject bool IsRemote(int no=-1); int QueryPrevious(); KG_INPUTTYPE QueryType(int no=-1); - KR_STATUS QuerytqStatus(int no=-1); + KR_STATUS QueryStatus(int no=-1); bool IsInput(int no); bool SetInputDevice(int no, KG_INPUTTYPE type, KEMessage *msg=0); bool RemoveInput(int no); diff --git a/lskat/lskat/KEMessage.cpp b/lskat/lskat/KEMessage.cpp index b11a70a5..38cd2e8d 100644 --- a/lskat/lskat/KEMessage.cpp +++ b/lskat/lskat/KEMessage.cpp @@ -202,7 +202,7 @@ TQString KEMessage::StringToEntry(TQString str,KMessageEntry *entry) cnt=size.toInt(); entry->SetType((KGM_TYPE)type.toInt()); - // I hope this works with tqunicode strings as well + // I hope this works with unicode strings as well p=data.latin1(); q=(char *)calloc(data.length()/2,sizeof(char)); if (!q) return TQString(); diff --git a/lskat/lskat/KRemoteConnect.cpp b/lskat/lskat/KRemoteConnect.cpp index fd5effc5..315d2a96 100644 --- a/lskat/lskat/KRemoteConnect.cpp +++ b/lskat/lskat/KRemoteConnect.cpp @@ -63,7 +63,7 @@ KRemoteConnect::~KRemoteConnect() printf("DESTGRUCTING KRemoteConenct\n"); } -KR_STATUS KRemoteConnect::QuerytqStatus() +KR_STATUS KRemoteConnect::QueryStatus() { return socketStatus; } diff --git a/lskat/lskat/KRemoteConnect.h b/lskat/lskat/KRemoteConnect.h index 5669b330..a666800f 100644 --- a/lskat/lskat/KRemoteConnect.h +++ b/lskat/lskat/KRemoteConnect.h @@ -54,7 +54,7 @@ class KRemoteConnect: public KChildConnect // bool SendMsg(KEMessage *msg); virtual bool Send(TQString str); // void Receive(TQString input); - virtual KR_STATUS QuerytqStatus(); + virtual KR_STATUS QueryStatus(); protected: bool OfferServerSocket(); diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp index c6f21ff1..af0768e9 100644 --- a/lskat/lskat/lskat.cpp +++ b/lskat/lskat/lskat.cpp @@ -50,7 +50,7 @@ LSkatApp::LSkatApp() : KMainWindow(0) config=kapp->config(); // localise data file - TQString file=TQString::tqfromLatin1("lskat/grafix/t1.png"); + TQString file=TQString::fromLatin1("lskat/grafix/t1.png"); mGrafix=kapp->dirs()->findResourceDir("data", file); if (mGrafix.isNull()) mGrafix = TQCString("grafix/"); else mGrafix+=TQCString("lskat/grafix/"); @@ -587,7 +587,7 @@ void LSkatApp::slotStatusNames(){ if (!doc->IsRunning()) msg=i18n("No game running"); else { - msg=i18n("%1 to move...").tqarg(doc->GetName(doc->GetCurrentPlayer())); + msg=i18n("%1 to move...").arg(doc->GetName(doc->GetCurrentPlayer())); } slotStatusMover(msg); } @@ -625,14 +625,14 @@ void LSkatApp::NewGame() } // Connected 0 and we are server else if (mInput->QueryType(0)==KG_INPUTTYPE_REMOTE && - mInput->QuerytqStatus()>0 && doc->IsServer()) + mInput->QueryStatus()>0 && doc->IsServer()) { mInput->Unlock(); mInput->Next(doc->GetStartPlayer()); } // Connected 1 and we are server else if (mInput->QueryType(1)==KG_INPUTTYPE_REMOTE && - mInput->QuerytqStatus()>1 && doc->IsServer()) + mInput->QueryStatus()>1 && doc->IsServer()) { mInput->Unlock(); mInput->Next(doc->GetStartPlayer()); @@ -659,7 +659,7 @@ bool LSkatApp::MakeInputDevice(int no) msg=new KEMessage; PrepareGame(msg); // Build new connection - if ( mInput->QueryType(no)!=type || mInput->QuerytqStatus(no)<=0) + if ( mInput->QueryType(no)!=type || mInput->QueryStatus(no)<=0) { OptionsNetwork(); port=doc->QueryPort(); @@ -677,11 +677,11 @@ bool LSkatApp::MakeInputDevice(int no) tim=10000; if (!host.isEmpty()) { - s=i18n("Remote connection to %1:%2...").tqarg(host).tqarg(port); + s=i18n("Remote connection to %1:%2...").arg(host).arg(port); } else { - s=i18n("Offering remote connection on port %1...").tqarg(port); + s=i18n("Offering remote connection on port %1...").arg(port); } progress=new TQProgressDialog(s, i18n("Abort"), tim, this,0,true ); progress->setCaption(i18n("Lieutenant Skat")); @@ -689,7 +689,7 @@ bool LSkatApp::MakeInputDevice(int no) { progress->setProgress( j ); if ( progress->wasCancelled() ) break; - if (mInput->QuerytqStatus(no)>0) break; + if (mInput->QueryStatus(no)>0) break; usleep(100); } // progress.setProgress(tim); @@ -717,7 +717,7 @@ bool LSkatApp::MakeInputDevice(int no) } } delete msg; - if (mInput->QuerytqStatus(no)>0) + if (mInput->QueryStatus(no)>0) { res=true; } diff --git a/lskat/lskat/lskatdoc.cpp b/lskat/lskat/lskatdoc.cpp index cdb51054..1de66668 100644 --- a/lskat/lskat/lskatdoc.cpp +++ b/lskat/lskat/lskatdoc.cpp @@ -135,7 +135,7 @@ void LSkatDoc::slotUpdateAllViews(LSkatView *sender) for(w=pViewList->first(); w!=0; w=pViewList->next()) { if(w!=sender) - w->tqrepaint(); + w->repaint(); } } } @@ -147,7 +147,7 @@ void LSkatDoc::UpdateViews(int mode) { for(w=pViewList->first(); w!=0; w=pViewList->next()) { - if (mode & UPDATE_STATUS) w->updatetqStatus(); + if (mode & UPDATE_STATUS) w->updateStatus(); } } } @@ -528,8 +528,8 @@ int LSkatDoc::WonMove(int c1,int c2) } -int LSkatDoc::GetMovetqStatus() {return movestatus;} -void LSkatDoc::SetMovetqStatus(int i) { movestatus=i; } +int LSkatDoc::GetMoveStatus() {return movestatus;} +void LSkatDoc::SetMoveStatus(int i) { movestatus=i; } int LSkatDoc::GetCurrentPlayer() {return currentplayer;} void LSkatDoc::SetCurrentPlayer(int i) {currentplayer=i;} int LSkatDoc::GetStartPlayer() {return startplayer;} diff --git a/lskat/lskat/lskatdoc.h b/lskat/lskat/lskatdoc.h index e4b52c17..a90c7ec9 100644 --- a/lskat/lskat/lskatdoc.h +++ b/lskat/lskat/lskatdoc.h @@ -97,8 +97,8 @@ class LSkatDoc : public TQObject bool IsRunning(); CCOLOUR GetTrump(); void SetTrump(CCOLOUR i); - int GetMovetqStatus(); - void SetMovetqStatus(int i); + int GetMoveStatus(); + void SetMoveStatus(int i); int GetCurrentPlayer(); void SetCurrentPlayer(int i); int GetStartPlayer(); @@ -216,7 +216,7 @@ public: int cardvalues[14]; public slots: - /** calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed. + /** calls repaint() on all views connected to the document object and is called by the view by which the document has been changed. * As this view normally repaints itself, it is excluded from the paintEvent. */ void slotUpdateAllViews(LSkatView *sender); diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp index 1905ad48..72b5ffd1 100644 --- a/lskat/lskat/lskatview.cpp +++ b/lskat/lskat/lskatview.cpp @@ -206,7 +206,7 @@ void LSkatView::drawMove(TQPainter *p) int card; TQPoint point; - card=getDocument()->GetMovetqStatus(); + card=getDocument()->GetMoveStatus(); if (card>=0) { @@ -403,7 +403,7 @@ void LSkatView::drawFinal(TQPainter *p) TQRect brect1_3,brect2_3,brect3_3,brect4_3; TQRect brect1_4,brect2_4,brect3_4,brect4_4; - // Calculate tqgeometry + // Calculate geometry line1=i18n("Game over"); rect=p->window(); //rect1.moveBy(0,FINAL_Y0-24); @@ -429,11 +429,11 @@ void LSkatView::drawFinal(TQPainter *p) } else if (sc0>sc1) { - line2=i18n("Player 1 - %1 won ").tqarg(getDocument()->GetName(0)); + line2=i18n("Player 1 - %1 won ").arg(getDocument()->GetName(0)); } else { - line2=i18n("Player 2 - %1 won ").tqarg(getDocument()->GetName(1)); + line2=i18n("Player 2 - %1 won ").arg(getDocument()->GetName(1)); } int hp=getDocument()->mPixTrump[trump].height()+5; rect=TQRect(0,hp>sumrect.height()?hp:sumrect.height(),p->window().width(),p->window().height()); @@ -469,11 +469,11 @@ void LSkatView::drawFinal(TQPainter *p) rect=brect3_3|brect3_4; ts[2]=ts[1]+rect.width()+30; - col4_3=i18n("%1 points").tqarg(pt0); + col4_3=i18n("%1 points").arg(pt0); rect=TQRect(0,0,p->window().width(),p->window().height()); brect4_3=p->boundingRect(rect,TQt::AlignLeft|TQt::SingleLine|TQt::AlignTop,col4_3); - col4_4=i18n("%1 points").tqarg(pt1); + col4_4=i18n("%1 points").arg(pt1); rect=TQRect(0,0,p->window().width(),p->window().height()); brect4_4=p->boundingRect(rect,TQt::AlignLeft|TQt::SingleLine|TQt::AlignTop,col4_4); @@ -492,7 +492,7 @@ void LSkatView::drawFinal(TQPainter *p) p->setFont(font14); if (sc0>=120) { - line5=i18n("%1 won to nil. Congratulations!").tqarg(getDocument()->GetName(0)); + line5=i18n("%1 won to nil. Congratulations!").arg(getDocument()->GetName(0)); rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height()); brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5); sumrect|=brect5; @@ -500,16 +500,16 @@ void LSkatView::drawFinal(TQPainter *p) else if (sc0>=90) { if (sc0==90) - line5=i18n("%1 won with 90 points. Super!").tqarg(getDocument()->GetName(0)); + line5=i18n("%1 won with 90 points. Super!").arg(getDocument()->GetName(0)); else - line5=i18n("%1 won over 90 points. Super!").tqarg(getDocument()->GetName(0)); + line5=i18n("%1 won over 90 points. Super!").arg(getDocument()->GetName(0)); rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height()); brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5); sumrect|=brect5; } if (sc1>=120) { - line5=i18n("%1 won to nil. Congratulations!").tqarg(getDocument()->GetName(1)); + line5=i18n("%1 won to nil. Congratulations!").arg(getDocument()->GetName(1)); rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height()); brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5); sumrect|=brect5; @@ -517,9 +517,9 @@ void LSkatView::drawFinal(TQPainter *p) else if (sc1>=90) { if (sc1==90) - line5=i18n("%1 won with 90 points. Super!").tqarg(getDocument()->GetName(1)); + line5=i18n("%1 won with 90 points. Super!").arg(getDocument()->GetName(1)); else - line5=i18n("%1 won over 90 points. Super!").tqarg(getDocument()->GetName(1)); + line5=i18n("%1 won over 90 points. Super!").arg(getDocument()->GetName(1)); rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height()); brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5); sumrect|=brect5; @@ -611,7 +611,7 @@ void LSkatView::drawTabText(TQPainter *p,TQRect rect,TQString s,int *ts) } // Draw the status field at the right side -void LSkatView::drawtqStatus(TQPainter *p) +void LSkatView::drawStatus(TQPainter *p) { TQPoint p1,p2; int trump; @@ -740,7 +740,7 @@ void LSkatView::drawtqStatus(TQPainter *p) void LSkatView::Paint(TQPainter *p) { // If game is running - drawtqStatus(p); + drawStatus(p); drawDeck(p); if (getDocument()->IsRunning()) { @@ -760,7 +760,7 @@ void LSkatView::paintEvent( TQPaintEvent * e) TQPixmap pm(this->rect().size()); TQPainter p; TQBrush brush; - p.tqbegin(TQT_TQPAINTDEVICE(&pm),this); + p.begin(TQT_TQPAINTDEVICE(&pm),this); brush.setPixmap( getDocument()->mPixBackground ); p.fillRect(0,0,this->rect().width(),this->rect().height(),brush); drawIntro(&p); @@ -793,7 +793,7 @@ void LSkatView::mousePressEvent( TQMouseEvent *mouse ) if (mouse->button()!=Qt::LeftButton) return ; if (!getDocument()->IsRunning()) return ; - if (getDocument()->GetMovetqStatus()!=-1) return ; + if (getDocument()->GetMoveStatus()!=-1) return ; TQPoint point; int mx,my,player; @@ -890,7 +890,7 @@ void LSkatView::introTimerReady() } else if (introcnt<NO_OF_CARDS) { - tqrepaint(false); + repaint(false); } } @@ -925,7 +925,7 @@ void LSkatView::moveTimerReady() } } -void LSkatView::updatetqStatus() +void LSkatView::updateStatus() { update(status_rect1); update(status_rect2); diff --git a/lskat/lskat/lskatview.h b/lskat/lskat/lskatview.h index 20fe80a7..b08f1eea 100644 --- a/lskat/lskat/lskatview.h +++ b/lskat/lskat/lskatview.h @@ -54,13 +54,13 @@ class LSkatView : public TQWidget void paintEvent( TQPaintEvent * p); void Paint(TQPainter *p); void InitMove(int player,int x,int y); - void updatetqStatus(); + void updateStatus(); protected: void drawDeck(TQPainter *p); void drawIntro(TQPainter *p); void drawMove(TQPainter *p); - void drawtqStatus(TQPainter *p); + void drawStatus(TQPainter *p); void drawFinal(TQPainter *p); void drawBorder(TQPainter *p,TQRect rect,int offset,int width,int mode); TQPoint calcCardPos(int x,int y); diff --git a/lskat/lskat/namedlg.cpp b/lskat/lskat/namedlg.cpp index 8267d4ea..328330fe 100644 --- a/lskat/lskat/namedlg.cpp +++ b/lskat/lskat/namedlg.cpp @@ -11,7 +11,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <klocale.h> @@ -45,10 +45,10 @@ NameDlg::NameDlg( TQWidget *parent, const char *name,bool /* modal */, WFlags /* player_names = new TQGroupBox( page, "player_names" ); player_names->setTitle(i18n("Player Names") ); player_names->setColumnLayout(0, Qt::Vertical ); - player_names->tqlayout()->setSpacing( 0 ); - player_names->tqlayout()->setMargin( 0 ); - vbox_2 = new TQVBoxLayout( player_names->tqlayout() ); - vbox_2->tqsetAlignment( TQt::AlignTop ); + player_names->layout()->setSpacing( 0 ); + player_names->layout()->setMargin( 0 ); + vbox_2 = new TQVBoxLayout( player_names->layout() ); + vbox_2->setAlignment( TQt::AlignTop ); vbox_2->setSpacing( 6 ); vbox_2->setMargin( 11 ); diff --git a/lskat/lskat/networkdlg.cpp b/lskat/lskat/networkdlg.cpp index 9fe30baf..e23e50fe 100644 --- a/lskat/lskat/networkdlg.cpp +++ b/lskat/lskat/networkdlg.cpp @@ -28,7 +28,7 @@ extern const char* LSKAT_SERVICE; NetworkDlg::NetworkDlg( TQWidget *parent, const char *name ) : NetworkDlgBase( parent, name, TRUE ) { - browser = new DNSSD::ServiceBrowser(TQString::tqfromLatin1(LSKAT_SERVICE)); + browser = new DNSSD::ServiceBrowser(TQString::fromLatin1(LSKAT_SERVICE)); connect(browser,TQT_SIGNAL(finished()),TQT_SLOT(gamesFound())); browser->startBrowse(); } diff --git a/lskat/lskat/networkdlgbase.ui b/lskat/lskat/networkdlgbase.ui index 5451289b..d064c13b 100644 --- a/lskat/lskat/networkdlgbase.ui +++ b/lskat/lskat/networkdlgbase.ui @@ -144,7 +144,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -165,7 +165,7 @@ <property name="text"> <string>Host:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -194,7 +194,7 @@ <property name="text"> <string>Port:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -220,7 +220,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> diff --git a/lskat/lskatproc/KChildConnect.cpp b/lskat/lskatproc/KChildConnect.cpp index 838847be..6ea4b973 100644 --- a/lskat/lskatproc/KChildConnect.cpp +++ b/lskat/lskatproc/KChildConnect.cpp @@ -30,7 +30,7 @@ KChildConnect::~KChildConnect() { } -KR_STATUS KChildConnect::QuerytqStatus() +KR_STATUS KChildConnect::QueryStatus() { return KR_OK; } diff --git a/lskat/lskatproc/KChildConnect.h b/lskat/lskatproc/KChildConnect.h index 36e9e9a5..8dbacc32 100644 --- a/lskat/lskatproc/KChildConnect.h +++ b/lskat/lskatproc/KChildConnect.h @@ -34,7 +34,7 @@ class KChildConnect: public TQObject virtual bool SendMsg(KEMessage *msg); virtual bool Send(TQString str); - virtual KR_STATUS QuerytqStatus(); + virtual KR_STATUS QueryStatus(); public slots: diff --git a/lskat/lskatproc/KEMessage.cpp b/lskat/lskatproc/KEMessage.cpp index aa88298a..ce8985f3 100644 --- a/lskat/lskatproc/KEMessage.cpp +++ b/lskat/lskatproc/KEMessage.cpp @@ -202,7 +202,7 @@ TQString KEMessage::StringToEntry(TQString str,KMessageEntry *entry) cnt=size.toInt(); entry->SetType((KGM_TYPE)type.toInt()); - // I hope this works with tqunicode strings as well + // I hope this works with unicode strings as well p=data.latin1(); q=(char *)calloc(data.length()/2,sizeof(char)); if (!q) return TQString(); diff --git a/twin4/twin4/kspritecache.cpp b/twin4/twin4/kspritecache.cpp index bd55c418..9e3abddc 100644 --- a/twin4/twin4/kspritecache.cpp +++ b/twin4/twin4/kspritecache.cpp @@ -90,7 +90,7 @@ void KSpriteCache::deleteAllItems() void KSpriteCache::deleteItem(TQString s,int no) { TQCanvasItem *item; - TQString name=s+TQString("_%1").tqarg(no); + TQString name=s+TQString("_%1").arg(no); //kdDebug(11002) << "KSpriteCache::deleteItem name=" << name << endl; item=mItemDict[name]; if (item) @@ -122,7 +122,7 @@ void KSpriteCache::deleteItem(TQCanvasItem *item) TQCanvasItem *KSpriteCache::getItem(TQString name,int no) { - TQString dictname=name+TQString("_%1").tqarg(no); + TQString dictname=name+TQString("_%1").arg(no); TQCanvasItem *item=mItemDict[dictname]; //kdDebug(11002) << " -> getItem("<<name<<","<<no<<") =>"<<dictname<<endl; // Directly found item @@ -496,7 +496,7 @@ void KSpriteCache::createAnimations(KConfig *config,KSprite *sprite) if (!sprite) return ; for (int i=0;i<1000;i++) { - TQString anim=TQString("anim%1").tqarg(i); + TQString anim=TQString("anim%1").arg(i); if (config->hasKey(anim)) { //kdDebug(11002) << "Found animation key " << anim << endl; diff --git a/twin4/twin4/scorewidget.cpp b/twin4/twin4/scorewidget.cpp index 7a070322..53c295b4 100644 --- a/twin4/twin4/scorewidget.cpp +++ b/twin4/twin4/scorewidget.cpp @@ -20,7 +20,7 @@ #include "prefs.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqsizepolicy.h> #include <kdebug.h> @@ -52,14 +52,14 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl ) TextLabel7 = new TQLabel( this, "TextLabel7" ); setPlayer("-----",0); TextLabel7->setBackgroundColor( COL_STATUSFIELD ); - TextLabel7->tqsetAlignment(TQt::AlignHCenter); + TextLabel7->setAlignment(TQt::AlignHCenter); LayoutB->addMultiCellWidget( TextLabel7, row, row,0,2 ); row++; TextLabel8 = new TQLabel( this, "TextLabel8" ); TextLabel8->setText( i18n( "vs" ) ); TextLabel8->setBackgroundColor( COL_STATUSFIELD ); - TextLabel8->tqsetAlignment(TQt::AlignHCenter); + TextLabel8->setAlignment(TQt::AlignHCenter); LayoutB->addMultiCellWidget( TextLabel8, row, row,0,2 ); row++; @@ -68,7 +68,7 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl ) // TextLabel9->setFrameShape(TQFrame::Box ); // TextLabel9->setLineWidth(5); TextLabel9->setBackgroundColor( COL_STATUSFIELD ); - TextLabel9->tqsetAlignment(TQt::AlignHCenter); + TextLabel9->setAlignment(TQt::AlignHCenter); LayoutB->addMultiCellWidget( TextLabel9, row, row,0,2 ); row++; @@ -86,7 +86,7 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl ) TextLabel4 = new TQLabel( this, "L" ); setLevel(Prefs::level()); - TextLabel4->tqsetAlignment(TQt::AlignRight); + TextLabel4->setAlignment(TQt::AlignRight); TextLabel4->setBackgroundColor( COL_STATUSFIELD ); LayoutB->addWidget( TextLabel4, row, 2 ); @@ -100,7 +100,7 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl ) TextLabel5 = new TQLabel( this, "M" ); setMove(0); - TextLabel5->tqsetAlignment(TQt::AlignRight); + TextLabel5->setAlignment(TQt::AlignRight); TextLabel5->setBackgroundColor( COL_STATUSFIELD ); LayoutB->addWidget( TextLabel5, row, 2 ); @@ -114,7 +114,7 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl ) TextLabel6 = new TQLabel( this, "C" ); setChance(0); - TextLabel6->tqsetAlignment(TQt::AlignRight); + TextLabel6->setAlignment(TQt::AlignRight); TextLabel6->setBackgroundColor( COL_STATUSFIELD ); LayoutB->addWidget( TextLabel6, row, 2 ); @@ -148,12 +148,12 @@ void ScoreWidget::Paint(TQPainter *p,TQRect /*cliprect*/) void ScoreWidget::setMove(int i) { - TextLabel5->setText( TQString("%1").tqarg(i)); + TextLabel5->setText( TQString("%1").arg(i)); } void ScoreWidget::setLevel(int i) { - TextLabel4->setText( TQString("%1").tqarg(i)); + TextLabel4->setText( TQString("%1").arg(i)); } void ScoreWidget::setChance(int i) @@ -165,7 +165,7 @@ void ScoreWidget::setChance(int i) else if (i<=-999) TextLabel6->setText(i18n("Loser")); else - TextLabel6->setText(TQString("%1").tqarg(i)); + TextLabel6->setText(TQString("%1").arg(i)); } void ScoreWidget::setPlayer(TQString s,int no) diff --git a/twin4/twin4/settings.ui b/twin4/twin4/settings.ui index c64677c6..7b0568de 100644 --- a/twin4/twin4/settings.ui +++ b/twin4/twin4/settings.ui @@ -81,7 +81,7 @@ <property name="text"> <string>Hard</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/twin4/twin4/statistics.ui b/twin4/twin4/statistics.ui index b02e8be6..06385444 100644 --- a/twin4/twin4/statistics.ui +++ b/twin4/twin4/statistics.ui @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -70,7 +70,7 @@ <property name="text"> <string>Name</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -81,7 +81,7 @@ <property name="text"> <string>Won</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -97,7 +97,7 @@ <property name="text"> <string>Lost</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -118,7 +118,7 @@ <property name="text"> <string>Sum</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -129,13 +129,13 @@ <property name="text"> <string>Aborted</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -201,7 +201,7 @@ <property name="text"> <string>Drawn</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/twin4/twin4/statuswidget.ui b/twin4/twin4/statuswidget.ui index 41d6bef5..a7d2fa6e 100644 --- a/twin4/twin4/statuswidget.ui +++ b/twin4/twin4/statuswidget.ui @@ -38,7 +38,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -69,7 +69,7 @@ <property name="text"> <string>W</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -80,7 +80,7 @@ <property name="text"> <string>D</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -91,7 +91,7 @@ <property name="text"> <string>L</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -102,7 +102,7 @@ <property name="text"> <string>No</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -113,7 +113,7 @@ <property name="text"> <string>Bk</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp index 8500c2e6..aa8df6c5 100644 --- a/twin4/twin4/twin4.cpp +++ b/twin4/twin4/twin4.cpp @@ -17,7 +17,7 @@ // include files for QT #include <tqstring.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhgroupbox.h> #include <tqvbox.h> #include <tqradiobutton.h> @@ -138,7 +138,7 @@ Kwin4App::Kwin4App(TQWidget *parent, const char *name) : KMainWindow(parent,name void Kwin4App::checkMenus(CheckFlags menu) { bool localgame=(!doc->isNetwork()); - bool isRunning = (doc->gametqStatus()==KGame::Run); + bool isRunning = (doc->gameStatus()==KGame::Run); if (!menu || (menu&CheckFileMenu)) { changeAction("hint", !(!isRunning && localgame)); @@ -338,11 +338,11 @@ void Kwin4App::slotSaveGame() void Kwin4App::newGame() { // End the intro if it is running - doc->setGametqStatus(Kwin4Doc::End); + doc->setGameStatus(Kwin4Doc::End); // Init the board and Clear the old game out - doc->setGametqStatus(Kwin4Doc::Init); + doc->setGameStatus(Kwin4Doc::Init); // Run it - doc->setGametqStatus(Kwin4Doc::Run); + doc->setGameStatus(Kwin4Doc::Run); } /** @@ -360,7 +360,7 @@ void Kwin4App::slotNewGame() */ void Kwin4App::endGame() { - doc->setGametqStatus(Kwin4Doc::Abort); + doc->setGameStatus(Kwin4Doc::Abort); } /** @@ -453,7 +453,7 @@ void Kwin4App::EndGame(TABLE mode) */ void Kwin4App::slotStatusNames(){ TQString msg; - if (!(doc->gametqStatus()==KGame::Run)) + if (!(doc->gameStatus()==KGame::Run)) msg=i18n("No game "); else if (doc->QueryCurrentPlayer()==Gelb) msg=TQString(" ")+doc->QueryName(Gelb)+ i18n(" - Yellow "); @@ -480,7 +480,7 @@ void Kwin4App::slotNetworkBroken(int /*id*/, int oldstatus ,KGame * /*game */) doc->getPlayer(doc->QueryCurrentPlayer())->setTurn(true,true); KMessageBox::information(this,i18n("The network game ended!\n")); - doc->setGametqStatus(oldstatus); + doc->setGameStatus(oldstatus); } /** @@ -509,7 +509,7 @@ void Kwin4App::slotGameOver(int status, KPlayer * p, KGame * /*me*/) EndGame(TWin); else EndGame(TLost); - TQString msg=i18n("%1 won the game. Please restart next round.").tqarg(doc->QueryName(((FARBE)p->userId()))); + TQString msg=i18n("%1 won the game. Please restart next round.").arg(doc->QueryName(((FARBE)p->userId()))); slotStatusMsg(msg); } else if (status==2) // Abort @@ -527,7 +527,7 @@ void Kwin4App::slotGameOver(int status, KPlayer * p, KGame * /*me*/) void Kwin4App::slotInitNetwork() { - if (doc->gametqStatus()==Kwin4Doc::Intro) doc->setGametqStatus(Kwin4Doc::Pause); + if (doc->gameStatus()==Kwin4Doc::Intro) doc->setGameStatus(Kwin4Doc::Pause); TQString host = Prefs::host(); int port=Prefs::port(); @@ -539,7 +539,7 @@ void Kwin4App::slotInitNetwork() dlg.networkConfig()->setDiscoveryInfo("_twin4._tcp",Prefs::gamename()); TQVBox *box=dlg.configPage(KGameDialog::NetworkConfig); - TQVBoxLayout *l=(TQVBoxLayout *)(box->tqlayout()); + TQVBoxLayout *l=(TQVBoxLayout *)(box->layout()); mColorGroup=new TQVButtonGroup(box); connect(mColorGroup, TQT_SIGNAL(clicked(int)), TQT_TQOBJECT(this), TQT_SLOT(slotRemoteChanged(int))); diff --git a/twin4/twin4/twin4doc.cpp b/twin4/twin4/twin4doc.cpp index 303fd776..0d09767c 100644 --- a/twin4/twin4/twin4doc.cpp +++ b/twin4/twin4/twin4doc.cpp @@ -90,7 +90,7 @@ Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,TQT_TQOBJECT(par // last in init ResetGame(false); - setGametqStatus(Intro); + setGameStatus(Intro); // Listen to network connect(this,TQT_SIGNAL(signalMessageUpdate(int,TQ_UINT32,TQ_UINT32)), @@ -203,7 +203,7 @@ void Kwin4Doc::preparePlayerTurn() */ void Kwin4Doc::EndGame(TABLE mode) { - setGametqStatus(End); + setGameStatus(End); pView->clearError(); pView->EndGame(); Kwin4Player *yellow=getPlayer(Gelb); @@ -1181,20 +1181,20 @@ void Kwin4Doc::slotPropertyChanged(KGamePropertyBase *prop,KGame *) if (global_debug>1) kdDebug(12010) << "Amzug changed to " << mAmzug.value()<<endl; pView->scoreWidget()->setTurn(mAmzug); } - else if (prop->id()==KGamePropertyBase::IdGametqStatus) + else if (prop->id()==KGamePropertyBase::IdGameStatus) { - if (gametqStatus()==Abort) + if (gameStatus()==Abort) { if (global_debug>1) kdDebug(12010) << "PropertyChanged::status signal game abort +++" << endl; emit signalGameOver(2,getPlayer(QueryCurrentPlayer()),0); // 2 indicates Abort } - else if (gametqStatus()==Run) + else if (gameStatus()==Run) { if (global_debug>1) kdDebug(12010) << "PropertyChanged::status signal game run +++" << endl; preparePlayerTurn(); // Set the current player to play emit signalGameRun(); } - else if (gametqStatus()==Init) + else if (gameStatus()==Init) { if (global_debug>1) kdDebug(12010) << "PropertyChanged::status signal game INIT +++" << endl; ResetGame(true); @@ -1227,7 +1227,7 @@ bool Kwin4Doc::loadgame(TQDataStream &stream,bool network,bool reset) { if (global_debug>1) kdDebug () << "loadgame() network=" << network << " reset="<< reset << endl; - if (!network) setGametqStatus(End); + if (!network) setGameStatus(End); // Clear out the old game if (global_debug>1) kdDebug(12010)<<"loadgame wants to reset the game"<<endl; diff --git a/twin4/twin4/twin4view.cpp b/twin4/twin4/twin4view.cpp index c425f90f..6ee09cc4 100644 --- a/twin4/twin4/twin4view.cpp +++ b/twin4/twin4/twin4view.cpp @@ -200,12 +200,12 @@ void Kwin4View::initView(bool deleteall) TQPixmap *pixmap=loadPixmap("background.png"); if (pixmap) - mCanvas->tqsetBackgroundPixmap(*pixmap); + mCanvas->setBackgroundPixmap(*pixmap); else mCanvas->setBackgroundColor(TQColor(0,0,128)); delete pixmap; - if (doc->gametqStatus()==KGame::Intro) + if (doc->gameStatus()==KGame::Intro) { mScoreWidget->hide(); mStatusWidget->hide(); @@ -481,7 +481,7 @@ void Kwin4View::setSprite(int no, int x, int col, bool enable) { KSprite *sprite; sprite=(KSprite *)(mCache->getItem("piece",no)); - if (sprite) sprite->tqsetVisible(enable); + if (sprite) sprite->setVisible(enable); setArrow(x,col); } @@ -497,7 +497,7 @@ void Kwin4View::setHint(int x,int y,bool enabled) sprite->move(x*(sprite->width()+mSpreadX)+mBoardX, y*(sprite->height()+mSpreadY)+mBoardY); } - sprite->tqsetVisible(enabled); + sprite->setVisible(enabled); } } @@ -601,7 +601,7 @@ bool Kwin4View::wrongPlayer(KPlayer *player,KGameIO::IOMode io) clearError(); int rnd=(kapp->random()%4) +1; TQString m; - m=TQString("text%1").tqarg(rnd); + m=TQString("text%1").arg(rnd); TQString ms; if (rnd==1) ms=i18n("Hold on... the other player has not been yet..."); else if (rnd==2) ms=i18n("Hold your horses..."); |