diff options
572 files changed, 2947 insertions, 2846 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 14fe4724..c8f06ef2 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index c8cc3891..b73f9797 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,11 @@ ########################################### -cmake_minimum_required( VERSION 3.1 ) +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup @@ -32,11 +36,6 @@ include( CheckCXXSourceCompiles ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths include( TDESetupPaths ) @@ -118,14 +117,8 @@ endif( WITH_TEST ) ##### add apidox targets -if( "${CMAKE_VERSION}" VERSION_LESS "3.1" ) - set( CMAKE_ENV "env" ) -else() - set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" ) -endif() - add_custom_target( apidox - COMMAND ${CMAKE_ENV} + COMMAND ${CMAKE_COMMAND} -E env "TQTDOCDIR=/usr/share/tqt3/doc/html" "DOXDATA=${HTML_INSTALL_DIR}/en/common" ${CMAKE_SOURCE_DIR}/admin/doxygen.sh diff --git a/admin b/admin -Subproject a7f75ac0ff587d5b8694a1b78557597161f8104 +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/atlantik/atlanticd/atlanticclient.cpp b/atlantik/atlanticd/atlanticclient.cpp index 0e4e3e12..da167a88 100644 --- a/atlantik/atlanticd/atlanticclient.cpp +++ b/atlantik/atlanticd/atlanticclient.cpp @@ -22,7 +22,7 @@ AtlanticClient::AtlanticClient(TQObject *parent, const char *name) : TQSocket(parent, name) { - connect(this, TQT_SIGNAL(readyRead()), this, TQT_SLOT(readData())); + connect(this, TQ_SIGNAL(readyRead()), this, TQ_SLOT(readData())); } void AtlanticClient::sendData(const TQString &data) @@ -37,7 +37,7 @@ void AtlanticClient::readData() emit clientInput(this, readLine()); // There might be more data - TQTimer::singleShot(0, this, TQT_SLOT(readData())); + TQTimer::singleShot(0, this, TQ_SLOT(readData())); } else { diff --git a/atlantik/atlanticd/atlanticclient.h b/atlantik/atlanticd/atlanticclient.h index b93ae2ca..298b3b13 100644 --- a/atlantik/atlanticd/atlanticclient.h +++ b/atlantik/atlanticd/atlanticclient.h @@ -21,7 +21,7 @@ class AtlanticClient : public TQSocket { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/atlanticd/atlanticdaemon.cpp b/atlantik/atlanticd/atlanticdaemon.cpp index 84a27925..f4f01628 100644 --- a/atlantik/atlanticd/atlanticdaemon.cpp +++ b/atlantik/atlanticd/atlanticdaemon.cpp @@ -28,13 +28,13 @@ AtlanticDaemon::AtlanticDaemon() { m_serverSocket = new ServerSocket(1234, 100); - connect(m_serverSocket, TQT_SIGNAL(newClient(AtlanticClient *)), this, TQT_SLOT(newClient(AtlanticClient *))); + connect(m_serverSocket, TQ_SIGNAL(newClient(AtlanticClient *)), this, TQ_SLOT(newClient(AtlanticClient *))); m_atlanticCore = new AtlanticCore(this, "atlanticCore"); // Create socket for Monopigator m_monopigatorSocket = new TQSocket(); - connect(m_monopigatorSocket, TQT_SIGNAL(connected()), this, TQT_SLOT(monopigatorConnected())); + connect(m_monopigatorSocket, TQ_SIGNAL(connected()), this, TQ_SLOT(monopigatorConnected())); // Register server monopigatorRegister(); @@ -57,14 +57,14 @@ void AtlanticDaemon::monopigatorConnected() m_monopigatorSocket->close(); // Monopigator clears old entries, so keep registering every 180s - TQTimer::singleShot(180000, this, TQT_SLOT(monopigatorRegister())); + TQTimer::singleShot(180000, this, TQ_SLOT(monopigatorRegister())); } void AtlanticDaemon::newClient(AtlanticClient *client) { m_clients.append(client); - connect(client, TQT_SIGNAL(clientInput(AtlanticClient *, const TQString &)), this, TQT_SLOT(clientInput(AtlanticClient *, const TQString &))); + connect(client, TQ_SIGNAL(clientInput(AtlanticClient *, const TQString &)), this, TQ_SLOT(clientInput(AtlanticClient *, const TQString &))); } void AtlanticDaemon::clientInput(AtlanticClient *client, const TQString &data) diff --git a/atlantik/atlanticd/atlanticdaemon.h b/atlantik/atlanticd/atlanticdaemon.h index bd057ef7..d2cbc852 100644 --- a/atlantik/atlanticd/atlanticdaemon.h +++ b/atlantik/atlanticd/atlanticdaemon.h @@ -27,7 +27,7 @@ class ServerSocket; class AtlanticDaemon : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/atlanticd/serversocket.h b/atlantik/atlanticd/serversocket.h index 94f0a412..ac2cdebf 100644 --- a/atlantik/atlanticd/serversocket.h +++ b/atlantik/atlanticd/serversocket.h @@ -23,7 +23,7 @@ class AtlanticClient; class ServerSocket : public TQServerSocket { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index fbbe24ec..9f442da7 100644 --- a/atlantik/client/atlantik.cpp +++ b/atlantik/client/atlantik.cpp @@ -67,12 +67,12 @@ LogTextEdit::LogTextEdit( TQWidget *parent, const char *name ) : TQTextEdit( parent, name ) { #ifdef KDE_3_2_FEATURES - m_clear = KStdAction::clear( TQT_TQOBJECT(this), TQT_SLOT( clear() ), 0 ); + m_clear = KStdAction::clear( this, TQ_SLOT( clear() ), 0 ); #else - m_clear = new TDEAction( i18n("Clear"), "clear", NULL, TQT_TQOBJECT(this), TQT_SLOT( clear() ), static_cast<TDEActionCollection *>(0), "clear" ); + m_clear = new TDEAction( i18n("Clear"), "clear", NULL, this, TQ_SLOT( clear() ), static_cast<TDEActionCollection *>(0), "clear" ); #endif - m_selectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), 0 ); - m_copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), 0 ); + m_selectAll = KStdAction::selectAll( this, TQ_SLOT( selectAll() ), 0 ); + m_copy = KStdAction::copy( this, TQ_SLOT( copy() ), 0 ); } LogTextEdit::~LogTextEdit() @@ -102,13 +102,13 @@ Atlantik::Atlantik () readConfig(); // Toolbar: Game -// KStdGameAction::gameNew(this, TQT_SLOT(slotNewGame()), actionCollection(), "game_new"); - m_showEventLog = new TDEAction(i18n("Show Event &Log")/*, "atlantik_showeventlog"*/, CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showEventLog()), actionCollection(), "showeventlog"); - KStdGameAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection(), "game_quit"); +// KStdGameAction::gameNew(this, TQ_SLOT(slotNewGame()), actionCollection(), "game_new"); + m_showEventLog = new TDEAction(i18n("Show Event &Log")/*, "atlantik_showeventlog"*/, CTRL+Key_L, this, TQ_SLOT(showEventLog()), actionCollection(), "showeventlog"); + KStdGameAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection(), "game_quit"); // Toolbar: Settings - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection()); + KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()), actionCollection()); // Initialize pointers to 0L m_configDialog = 0; @@ -120,29 +120,29 @@ Atlantik::Atlantik () m_atlantikNetwork = 0; // Game and network core - m_atlanticCore = new AtlanticCore(TQT_TQOBJECT(this), "atlanticCore"); - connect(m_atlanticCore, TQT_SIGNAL(createGUI(Player *)), TQT_TQOBJECT(this), TQT_SLOT(newPlayer(Player *))); - connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Player *)), TQT_TQOBJECT(this), TQT_SLOT(removeGUI(Player *))); - connect(m_atlanticCore, TQT_SIGNAL(createGUI(Trade *)), TQT_TQOBJECT(this), TQT_SLOT(newTrade(Trade *))); - connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Trade *)), TQT_TQOBJECT(this), TQT_SLOT(removeGUI(Trade *))); + m_atlanticCore = new AtlanticCore(this, "atlanticCore"); + connect(m_atlanticCore, TQ_SIGNAL(createGUI(Player *)), this, TQ_SLOT(newPlayer(Player *))); + connect(m_atlanticCore, TQ_SIGNAL(removeGUI(Player *)), this, TQ_SLOT(removeGUI(Player *))); + connect(m_atlanticCore, TQ_SIGNAL(createGUI(Trade *)), this, TQ_SLOT(newTrade(Trade *))); + connect(m_atlanticCore, TQ_SIGNAL(removeGUI(Trade *)), this, TQ_SLOT(removeGUI(Trade *))); initEventLog(); initNetworkObject(); // Menu,toolbar: Move - m_roll = KStdGameAction::roll(TQT_TQOBJECT(this), TQT_SIGNAL(rollDice()), actionCollection()); + m_roll = KStdGameAction::roll(this, TQ_SIGNAL(rollDice()), actionCollection()); m_roll->setEnabled(false); - m_buyEstate = new TDEAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, TQT_TQOBJECT(this), TQT_SIGNAL(buyEstate()), actionCollection(), "buy_estate"); + m_buyEstate = new TDEAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, this, TQ_SIGNAL(buyEstate()), actionCollection(), "buy_estate"); m_buyEstate->setEnabled(false); - m_auctionEstate = new TDEAction(i18n("&Auction"), "auction", CTRL+Key_A, TQT_TQOBJECT(this), TQT_SIGNAL(auctionEstate()), actionCollection(), "auction"); + m_auctionEstate = new TDEAction(i18n("&Auction"), "auction", CTRL+Key_A, this, TQ_SIGNAL(auctionEstate()), actionCollection(), "auction"); m_auctionEstate->setEnabled(false); - m_endTurn = KStdGameAction::endTurn(TQT_TQOBJECT(this), TQT_SIGNAL(endTurn()), actionCollection()); + m_endTurn = KStdGameAction::endTurn(this, TQ_SIGNAL(endTurn()), actionCollection()); m_endTurn->setEnabled(false); - m_jailCard = new TDEAction(i18n("Use Card to Leave Jail")/*, "atlantik_move_jail_card"*/, 0, TQT_TQOBJECT(this), TQT_SIGNAL(jailCard()), actionCollection(), "move_jailcard"); + m_jailCard = new TDEAction(i18n("Use Card to Leave Jail")/*, "atlantik_move_jail_card"*/, 0, this, TQ_SIGNAL(jailCard()), actionCollection(), "move_jailcard"); m_jailCard->setEnabled(false); - m_jailPay = new TDEAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SIGNAL(jailPay()), actionCollection(), "move_jailpay"); + m_jailPay = new TDEAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, this, TQ_SIGNAL(jailPay()), actionCollection(), "move_jailpay"); m_jailPay->setEnabled(false); - m_jailRoll = new TDEAction(i18n("Roll to Leave &Jail")/*, "atlantik_move_jail_roll"*/, CTRL+Key_J, TQT_TQOBJECT(this), TQT_SIGNAL(jailRoll()), actionCollection(), "move_jailroll"); + m_jailRoll = new TDEAction(i18n("Roll to Leave &Jail")/*, "atlantik_move_jail_roll"*/, CTRL+Key_J, this, TQ_SIGNAL(jailRoll()), actionCollection(), "move_jailroll"); m_jailRoll->setEnabled(false); // Mix code and XML into GUI @@ -150,7 +150,7 @@ Atlantik::Atlantik () applyMainWindowSettings( TDEGlobal::config(), "AtlantikMainWindow" ); TDEMainWindow::statusBar()->insertItem("Atlantik " ATLANTIK_VERSION_STRING, 0); TDEMainWindow::statusBar()->insertItem(TQString(), 1); - connect(statusBar(), TQT_SIGNAL(released(int)), TQT_TQOBJECT(this), TQT_SLOT(statusBarClick(int))); + connect(statusBar(), TQ_SIGNAL(released(int)), this, TQ_SLOT(statusBarClick(int))); // Main widget, containing all others m_mainWidget = new TQWidget(this, "main"); @@ -192,7 +192,7 @@ Atlantik::Atlantik () m_serverMsgs->setFocusProxy(m_input); - connect(m_input, TQT_SIGNAL(returnPressed()), TQT_TQOBJECT(this), TQT_SLOT(slotSendMsg())); + connect(m_input, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSendMsg())); // Set stretching where we want it. m_mainLayout->setRowStretch(1, 1); // make m_board+m_serverMsgs stretch vertically, not the rest @@ -253,9 +253,9 @@ void Atlantik::newPlayer(Player *player) // we'd better force an update. playerChanged(player); - connect(player, TQT_SIGNAL(changed(Player *)), TQT_TQOBJECT(this), TQT_SLOT(playerChanged(Player *))); - connect(player, TQT_SIGNAL(gainedTurn()), TQT_TQOBJECT(this), TQT_SLOT(gainedTurn())); - connect(player, TQT_SIGNAL(changed(Player *)), m_board, TQT_SLOT(playerChanged(Player *))); + connect(player, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged(Player *))); + connect(player, TQ_SIGNAL(gainedTurn()), this, TQ_SLOT(gainedTurn())); + connect(player, TQ_SIGNAL(changed(Player *)), m_board, TQ_SLOT(playerChanged(Player *))); KNotifyClient::event(winId(), "newplayer"); } @@ -314,8 +314,8 @@ void Atlantik::showSelectServer() m_atlanticCore->reset(true); initNetworkObject(); - connect(m_selectServer, TQT_SIGNAL(serverConnect(const TQString, int)), m_atlantikNetwork, TQT_SLOT(serverConnect(const TQString, int))); - connect(m_selectServer, TQT_SIGNAL(msgStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &))); + connect(m_selectServer, TQ_SIGNAL(serverConnect(const TQString, int)), m_atlantikNetwork, TQ_SLOT(serverConnect(const TQString, int))); + connect(m_selectServer, TQ_SIGNAL(msgStatus(const TQString &)), this, TQ_SLOT(slotMsgStatus(const TQString &))); m_selectServer->slotRefresh( m_config.connectOnStart ); } @@ -354,10 +354,10 @@ void Atlantik::showSelectGame() m_selectConfiguration = 0; } - connect(m_selectGame, TQT_SIGNAL(joinGame(int)), m_atlantikNetwork, TQT_SLOT(joinGame(int))); - connect(m_selectGame, TQT_SIGNAL(newGame(const TQString &)), m_atlantikNetwork, TQT_SLOT(newGame(const TQString &))); - connect(m_selectGame, TQT_SIGNAL(leaveServer()), TQT_TQOBJECT(this), TQT_SLOT(showSelectServer())); - connect(m_selectGame, TQT_SIGNAL(msgStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &))); + connect(m_selectGame, TQ_SIGNAL(joinGame(int)), m_atlantikNetwork, TQ_SLOT(joinGame(int))); + connect(m_selectGame, TQ_SIGNAL(newGame(const TQString &)), m_atlantikNetwork, TQ_SLOT(newGame(const TQString &))); + connect(m_selectGame, TQ_SIGNAL(leaveServer()), this, TQ_SLOT(showSelectServer())); + connect(m_selectGame, TQ_SIGNAL(msgStatus(const TQString &)), this, TQ_SLOT(slotMsgStatus(const TQString &))); } void Atlantik::showSelectConfiguration() @@ -375,15 +375,15 @@ void Atlantik::showSelectConfiguration() m_mainLayout->addMultiCellWidget(m_selectConfiguration, 0, 2, 1, 1); m_selectConfiguration->show(); - connect(m_atlanticCore, TQT_SIGNAL(createGUI(ConfigOption *)), m_selectConfiguration, TQT_SLOT(addConfigOption(ConfigOption *))); - connect(m_atlantikNetwork, TQT_SIGNAL(gameOption(TQString, TQString, TQString, TQString, TQString)), m_selectConfiguration, TQT_SLOT(gameOption(TQString, TQString, TQString, TQString, TQString))); - connect(m_atlantikNetwork, TQT_SIGNAL(gameInit()), m_selectConfiguration, TQT_SLOT(initGame())); - connect(m_selectConfiguration, TQT_SIGNAL(startGame()), m_atlantikNetwork, TQT_SLOT(startGame())); - connect(m_selectConfiguration, TQT_SIGNAL(leaveGame()), m_atlantikNetwork, TQT_SLOT(leaveGame())); - connect(m_selectConfiguration, TQT_SIGNAL(changeOption(int, const TQString &)), m_atlantikNetwork, TQT_SLOT(changeOption(int, const TQString &))); - connect(m_selectConfiguration, TQT_SIGNAL(buttonCommand(TQString)), m_atlantikNetwork, TQT_SLOT(writeData(TQString))); - connect(m_selectConfiguration, TQT_SIGNAL(iconSelected(const TQString &)), m_atlantikNetwork, TQT_SLOT(setImage(const TQString &))); - connect(m_selectConfiguration, TQT_SIGNAL(statusMessage(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &))); + connect(m_atlanticCore, TQ_SIGNAL(createGUI(ConfigOption *)), m_selectConfiguration, TQ_SLOT(addConfigOption(ConfigOption *))); + connect(m_atlantikNetwork, TQ_SIGNAL(gameOption(TQString, TQString, TQString, TQString, TQString)), m_selectConfiguration, TQ_SLOT(gameOption(TQString, TQString, TQString, TQString, TQString))); + connect(m_atlantikNetwork, TQ_SIGNAL(gameInit()), m_selectConfiguration, TQ_SLOT(initGame())); + connect(m_selectConfiguration, TQ_SIGNAL(startGame()), m_atlantikNetwork, TQ_SLOT(startGame())); + connect(m_selectConfiguration, TQ_SIGNAL(leaveGame()), m_atlantikNetwork, TQ_SLOT(leaveGame())); + connect(m_selectConfiguration, TQ_SIGNAL(changeOption(int, const TQString &)), m_atlantikNetwork, TQ_SLOT(changeOption(int, const TQString &))); + connect(m_selectConfiguration, TQ_SIGNAL(buttonCommand(TQString)), m_atlantikNetwork, TQ_SLOT(writeData(TQString))); + connect(m_selectConfiguration, TQ_SIGNAL(iconSelected(const TQString &)), m_atlantikNetwork, TQ_SLOT(setImage(const TQString &))); + connect(m_selectConfiguration, TQ_SIGNAL(statusMessage(const TQString &)), this, TQ_SLOT(slotMsgStatus(const TQString &))); } void Atlantik::initBoard() @@ -394,11 +394,11 @@ void Atlantik::initBoard() m_board = new AtlantikBoard(m_atlanticCore, 40, AtlantikBoard::Play, m_mainWidget, "board"); m_board->setViewProperties(m_config.indicateUnowned, m_config.highliteUnowned, m_config.darkenMortgaged, m_config.quartzEffects, m_config.animateTokens); - connect(m_atlantikNetwork, TQT_SIGNAL(displayDetails(TQString, bool, bool, Estate *)), m_board, TQT_SLOT(insertDetails(TQString, bool, bool, Estate *))); - connect(m_atlantikNetwork, TQT_SIGNAL(addCommandButton(TQString, TQString, bool)), m_board, TQT_SLOT(displayButton(TQString, TQString, bool))); - connect(m_atlantikNetwork, TQT_SIGNAL(addCloseButton()), m_board, TQT_SLOT(addCloseButton())); - connect(m_board, TQT_SIGNAL(tokenConfirmation(Estate *)), m_atlantikNetwork, TQT_SLOT(tokenConfirmation(Estate *))); - connect(m_board, TQT_SIGNAL(buttonCommand(TQString)), m_atlantikNetwork, TQT_SLOT(writeData(TQString))); + connect(m_atlantikNetwork, TQ_SIGNAL(displayDetails(TQString, bool, bool, Estate *)), m_board, TQ_SLOT(insertDetails(TQString, bool, bool, Estate *))); + connect(m_atlantikNetwork, TQ_SIGNAL(addCommandButton(TQString, TQString, bool)), m_board, TQ_SLOT(displayButton(TQString, TQString, bool))); + connect(m_atlantikNetwork, TQ_SIGNAL(addCloseButton()), m_board, TQ_SLOT(addCloseButton())); + connect(m_board, TQ_SIGNAL(tokenConfirmation(Estate *)), m_atlantikNetwork, TQ_SLOT(tokenConfirmation(Estate *))); + connect(m_board, TQ_SIGNAL(buttonCommand(TQString)), m_atlantikNetwork, TQ_SLOT(writeData(TQString))); } void Atlantik::showBoard() @@ -491,7 +491,7 @@ void Atlantik::slotConfigure() m_configDialog = new ConfigDialog(this); m_configDialog->show(); - connect(m_configDialog, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateConfig())); + connect(m_configDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotUpdateConfig())); } void Atlantik::showEventLog() @@ -728,35 +728,35 @@ void Atlantik::initNetworkObject() } m_atlantikNetwork = new AtlantikNetwork(m_atlanticCore); - connect(m_atlantikNetwork, TQT_SIGNAL(msgInfo(TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgInfo(TQString))); - connect(m_atlantikNetwork, TQT_SIGNAL(msgError(TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgError(TQString))); - connect(m_atlantikNetwork, TQT_SIGNAL(msgStatus(const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &, const TQString &))); - connect(m_atlantikNetwork, TQT_SIGNAL(msgChat(TQString, TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgChat(TQString, TQString))); + connect(m_atlantikNetwork, TQ_SIGNAL(msgInfo(TQString)), this, TQ_SLOT(slotMsgInfo(TQString))); + connect(m_atlantikNetwork, TQ_SIGNAL(msgError(TQString)), this, TQ_SLOT(slotMsgError(TQString))); + connect(m_atlantikNetwork, TQ_SIGNAL(msgStatus(const TQString &, const TQString &)), this, TQ_SLOT(slotMsgStatus(const TQString &, const TQString &))); + connect(m_atlantikNetwork, TQ_SIGNAL(msgChat(TQString, TQString)), this, TQ_SLOT(slotMsgChat(TQString, TQString))); - connect(m_atlantikNetwork, TQT_SIGNAL(connectionSuccess()), TQT_TQOBJECT(this), TQT_SLOT(slotNetworkConnected())); - connect(m_atlantikNetwork, TQT_SIGNAL(connectionFailed(int)), TQT_TQOBJECT(this), TQT_SLOT(slotNetworkError(int))); - connect(m_atlantikNetwork, TQT_SIGNAL(closed(int)), TQT_TQOBJECT(this), TQT_SLOT(networkClosed(int))); + connect(m_atlantikNetwork, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotNetworkConnected())); + connect(m_atlantikNetwork, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotNetworkError(int))); + connect(m_atlantikNetwork, TQ_SIGNAL(closed(int)), this, TQ_SLOT(networkClosed(int))); - connect(m_atlantikNetwork, TQT_SIGNAL(receivedHandshake()), TQT_TQOBJECT(this), TQT_SLOT(sendHandshake())); + connect(m_atlantikNetwork, TQ_SIGNAL(receivedHandshake()), this, TQ_SLOT(sendHandshake())); - connect(m_atlantikNetwork, TQT_SIGNAL(gameConfig()), TQT_TQOBJECT(this), TQT_SLOT(showSelectConfiguration())); - connect(m_atlantikNetwork, TQT_SIGNAL(gameInit()), TQT_TQOBJECT(this), TQT_SLOT(initBoard())); - connect(m_atlantikNetwork, TQT_SIGNAL(gameRun()), TQT_TQOBJECT(this), TQT_SLOT(showBoard())); - connect(m_atlantikNetwork, TQT_SIGNAL(gameEnd()), TQT_TQOBJECT(this), TQT_SLOT(freezeBoard())); + connect(m_atlantikNetwork, TQ_SIGNAL(gameConfig()), this, TQ_SLOT(showSelectConfiguration())); + connect(m_atlantikNetwork, TQ_SIGNAL(gameInit()), this, TQ_SLOT(initBoard())); + connect(m_atlantikNetwork, TQ_SIGNAL(gameRun()), this, TQ_SLOT(showBoard())); + connect(m_atlantikNetwork, TQ_SIGNAL(gameEnd()), this, TQ_SLOT(freezeBoard())); - connect(m_atlantikNetwork, TQT_SIGNAL(newEstate(Estate *)), TQT_TQOBJECT(this), TQT_SLOT(newEstate(Estate *))); - connect(m_atlantikNetwork, TQT_SIGNAL(newAuction(Auction *)), TQT_TQOBJECT(this), TQT_SLOT(newAuction(Auction *))); + connect(m_atlantikNetwork, TQ_SIGNAL(newEstate(Estate *)), this, TQ_SLOT(newEstate(Estate *))); + connect(m_atlantikNetwork, TQ_SIGNAL(newAuction(Auction *)), this, TQ_SLOT(newAuction(Auction *))); - connect(m_atlantikNetwork, TQT_SIGNAL(clientCookie(TQString)), TQT_TQOBJECT(this), TQT_SLOT(clientCookie(TQString))); - connect(m_atlantikNetwork, TQT_SIGNAL(networkEvent(const TQString &, const TQString &)), m_eventLog, TQT_SLOT(addEvent(const TQString &, const TQString &))); + connect(m_atlantikNetwork, TQ_SIGNAL(clientCookie(TQString)), this, TQ_SLOT(clientCookie(TQString))); + connect(m_atlantikNetwork, TQ_SIGNAL(networkEvent(const TQString &, const TQString &)), m_eventLog, TQ_SLOT(addEvent(const TQString &, const TQString &))); - connect(this, TQT_SIGNAL(rollDice()), m_atlantikNetwork, TQT_SLOT(rollDice())); - connect(this, TQT_SIGNAL(buyEstate()), m_atlantikNetwork, TQT_SLOT(buyEstate())); - connect(this, TQT_SIGNAL(auctionEstate()), m_atlantikNetwork, TQT_SLOT(auctionEstate())); - connect(this, TQT_SIGNAL(endTurn()), m_atlantikNetwork, TQT_SLOT(endTurn())); - connect(this, TQT_SIGNAL(jailCard()), m_atlantikNetwork, TQT_SLOT(jailCard())); - connect(this, TQT_SIGNAL(jailPay()), m_atlantikNetwork, TQT_SLOT(jailPay())); - connect(this, TQT_SIGNAL(jailRoll()), m_atlantikNetwork, TQT_SLOT(jailRoll())); + connect(this, TQ_SIGNAL(rollDice()), m_atlantikNetwork, TQ_SLOT(rollDice())); + connect(this, TQ_SIGNAL(buyEstate()), m_atlantikNetwork, TQ_SLOT(buyEstate())); + connect(this, TQ_SIGNAL(auctionEstate()), m_atlantikNetwork, TQ_SLOT(auctionEstate())); + connect(this, TQ_SIGNAL(endTurn()), m_atlantikNetwork, TQ_SLOT(endTurn())); + connect(this, TQ_SIGNAL(jailCard()), m_atlantikNetwork, TQ_SLOT(jailCard())); + connect(this, TQ_SIGNAL(jailPay()), m_atlantikNetwork, TQ_SLOT(jailPay())); + connect(this, TQ_SIGNAL(jailRoll()), m_atlantikNetwork, TQ_SLOT(jailRoll())); } void Atlantik::clientCookie(TQString cookie) @@ -812,10 +812,10 @@ PortfolioView *Atlantik::addPortfolioView(Player *player) if ( m_portfolioViews.count() > 0 && m_portfolioScroll->isHidden() ) m_portfolioScroll->show(); - connect(player, TQT_SIGNAL(changed(Player *)), portfolioView, TQT_SLOT(playerChanged())); - connect(portfolioView, TQT_SIGNAL(newTrade(Player *)), m_atlantikNetwork, TQT_SLOT(newTrade(Player *))); - connect(portfolioView, TQT_SIGNAL(kickPlayer(Player *)), m_atlantikNetwork, TQT_SLOT(kickPlayer(Player *))); - connect(portfolioView, TQT_SIGNAL(estateClicked(Estate *)), m_board, TQT_SLOT(prependEstateDetails(Estate *))); + connect(player, TQ_SIGNAL(changed(Player *)), portfolioView, TQ_SLOT(playerChanged())); + connect(portfolioView, TQ_SIGNAL(newTrade(Player *)), m_atlantikNetwork, TQ_SLOT(newTrade(Player *))); + connect(portfolioView, TQ_SIGNAL(kickPlayer(Player *)), m_atlantikNetwork, TQ_SLOT(kickPlayer(Player *))); + connect(portfolioView, TQ_SIGNAL(estateClicked(Estate *)), m_board, TQ_SLOT(prependEstateDetails(Estate *))); m_portfolioLayout->addWidget(portfolioView); portfolioView->show(); diff --git a/atlantik/client/atlantik.h b/atlantik/client/atlantik.h index 2d41c35f..4fac89a7 100644 --- a/atlantik/client/atlantik.h +++ b/atlantik/client/atlantik.h @@ -70,7 +70,7 @@ class Trade; class LogTextEdit : public TQTextEdit { -Q_OBJECT +TQ_OBJECT public: @@ -91,7 +91,7 @@ private: */ class Atlantik : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp index e24244c5..a954cc7b 100644 --- a/atlantik/client/configdlg.cpp +++ b/atlantik/client/configdlg.cpp @@ -128,7 +128,7 @@ ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *parent, const c m_playerIcon = new KPushButton(parent, "playerIcon"); layout->addWidget(m_playerIcon); - connect( m_playerIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseImage()) ); + connect( m_playerIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseImage()) ); layout->addStretch(1); @@ -258,7 +258,7 @@ ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const cha m_configDialog = configDialog; TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint()); - TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game Status Feedback"), parent); + TQGroupBox *box = new TQGroupBox(1, TQt::Horizontal, i18n("Game Status Feedback"), parent); layout->addWidget(box); m_indicateUnowned = new TQCheckBox(i18n("Display title deed card on unowned properties"), box); @@ -291,7 +291,7 @@ ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const cha "will have a Quartz effect similar to the Quartz KWin style.\n"); TQWhatsThis::add(m_quartzEffects, message); -// box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), parent); +// box = new TQGroupBox(1, TQt::Horizontal, i18n("Size"), parent); // layout->addWidget(box); layout->addStretch(1); diff --git a/atlantik/client/configdlg.h b/atlantik/client/configdlg.h index 19db6dc0..4ec0d156 100644 --- a/atlantik/client/configdlg.h +++ b/atlantik/client/configdlg.h @@ -34,7 +34,7 @@ struct AtlantikConfig; class ConfigPlayer : public TQWidget { -Q_OBJECT +TQ_OBJECT public: @@ -58,7 +58,7 @@ private: class ConfigBoard : public TQWidget { -Q_OBJECT +TQ_OBJECT public: @@ -79,7 +79,7 @@ private: class ConfigMonopigator : public TQWidget { -Q_OBJECT +TQ_OBJECT public: @@ -97,7 +97,7 @@ private: class ConfigGeneral : public TQWidget { -Q_OBJECT +TQ_OBJECT public: @@ -114,7 +114,7 @@ private: class ConfigDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/client/event.h b/atlantik/client/event.h index 693082b6..2ed3e6e4 100644 --- a/atlantik/client/event.h +++ b/atlantik/client/event.h @@ -24,7 +24,7 @@ class TQString; class Event : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp index eb60fa3c..49c297eb 100644 --- a/atlantik/client/eventlogwidget.cpp +++ b/atlantik/client/eventlogwidget.cpp @@ -54,7 +54,7 @@ EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *parent, const char { m_eventLog = eventLog; - connect(m_eventLog, TQT_SIGNAL(newEvent(Event *)), this, TQT_SLOT(addEvent(Event *))); + connect(m_eventLog, TQ_SIGNAL(newEvent(Event *)), this, TQ_SLOT(addEvent(Event *))); setCaption(i18n("Event Log")); @@ -75,7 +75,7 @@ EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *parent, const char m_saveButton = new KPushButton(BarIcon("document-save", TDEIcon::SizeSmall), i18n("&Save As..."), this); actionBox->addWidget(m_saveButton); - connect(m_saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save())); + connect(m_saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(save())); // Populate TQPtrList<Event> events = m_eventLog->events(); diff --git a/atlantik/client/eventlogwidget.h b/atlantik/client/eventlogwidget.h index 18972377..d4e1c110 100644 --- a/atlantik/client/eventlogwidget.h +++ b/atlantik/client/eventlogwidget.h @@ -30,7 +30,7 @@ class KPushButton; class EventLog : public TQObject { -Q_OBJECT +TQ_OBJECT public: @@ -49,7 +49,7 @@ private: class EventLogWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/client/monopigator.cpp b/atlantik/client/monopigator.cpp index 178c1a54..dd441ecb 100644 --- a/atlantik/client/monopigator.cpp +++ b/atlantik/client/monopigator.cpp @@ -54,9 +54,9 @@ void Monopigator::loadData(const KURL &url) m_timer->start(10000, true); } - connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); } void Monopigator::slotData(TDEIO::Job *, const TQByteArray &data) @@ -118,8 +118,8 @@ MonopigatorEntry::MonopigatorEntry(TQListView *parent, TQString host, TQString l if ( !ip.isEmpty() ) host = ip; m_latencySocket = new KExtendedSocket( host, port.toInt(), KExtendedSocket::inputBufferedSocket | KExtendedSocket::noResolve ); - connect(m_latencySocket, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(resolved())); - connect(m_latencySocket, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(connected())); + connect(m_latencySocket, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(resolved())); + connect(m_latencySocket, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(connected())); m_latencySocket->startAsyncConnect(); } diff --git a/atlantik/client/monopigator.h b/atlantik/client/monopigator.h index c174b6f4..1a8b37e8 100644 --- a/atlantik/client/monopigator.h +++ b/atlantik/client/monopigator.h @@ -30,7 +30,7 @@ class TQTime; class Monopigator : public TQObject { -Q_OBJECT +TQ_OBJECT public: @@ -58,7 +58,7 @@ private: class MonopigatorEntry : public TQObject, public TQListViewItem { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/client/selectconfiguration_widget.cpp b/atlantik/client/selectconfiguration_widget.cpp index f8f55855..589ba803 100644 --- a/atlantik/client/selectconfiguration_widget.cpp +++ b/atlantik/client/selectconfiguration_widget.cpp @@ -61,7 +61,7 @@ SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *p m_backButton = new KPushButton(SmallIcon("back"), i18n("Leave Game"), this); serverButtons->addWidget(m_backButton); - connect(m_backButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(leaveGame())); + connect(m_backButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(leaveGame())); serverButtons->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); @@ -69,11 +69,11 @@ SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *p serverButtons->addWidget(m_startButton); m_startButton->setEnabled(false); - connect(m_startButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(startGame())); + connect(m_startButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(startGame())); Player *playerSelf = m_atlanticCore->playerSelf(); playerChanged(playerSelf); - connect(playerSelf, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged(Player *))); + connect(playerSelf, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged(Player *))); emit statusMessage(i18n("Retrieving configuration list...")); } @@ -94,8 +94,8 @@ void SelectConfiguration::addConfigOption(ConfigOption *configOption) checkBox->setEnabled( configOption->edit() && m_atlanticCore->selfIsMaster() ); checkBox->show(); - connect(checkBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeOption())); - connect(configOption, TQT_SIGNAL(changed(ConfigOption *)), this, TQT_SLOT(optionChanged(ConfigOption *))); + connect(checkBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeOption())); + connect(configOption, TQ_SIGNAL(changed(ConfigOption *)), this, TQ_SLOT(optionChanged(ConfigOption *))); } void SelectConfiguration::gameOption(TQString title, TQString type, TQString value, TQString edit, TQString command) @@ -118,7 +118,7 @@ void SelectConfiguration::gameOption(TQString title, TQString type, TQString val checkBox->setEnabled(edit.toInt()); checkBox->show(); - connect(checkBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(optionChanged())); + connect(checkBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(optionChanged())); } // TODO: create options other than type=bool @@ -127,11 +127,11 @@ void SelectConfiguration::gameOption(TQString title, TQString type, TQString val void SelectConfiguration::changeOption() { - ConfigOption *configOption = m_configMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()]; + ConfigOption *configOption = m_configMap[(TQObject *)TQObject::sender()]; if (configOption) { - kdDebug() << "checked " << ((TQCheckBox *)TQT_BASE_OBJECT_NAME::sender())->isChecked() << endl; - emit changeOption( configOption->id(), TQString::number( ((TQCheckBox *)TQT_BASE_OBJECT_NAME::sender())->isChecked() ) ); + kdDebug() << "checked " << ((TQCheckBox *)TQObject::sender())->isChecked() << endl; + emit changeOption( configOption->id(), TQString::number( ((TQCheckBox *)TQObject::sender())->isChecked() ) ); } } @@ -148,7 +148,7 @@ void SelectConfiguration::optionChanged(ConfigOption *configOption) void SelectConfiguration::optionChanged() { - TQString command = m_optionCommandMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()]; + TQString command = m_optionCommandMap[(TQObject *)TQObject::sender()]; if (TQCheckBox *checkBox = m_checkBoxMap[command]) { @@ -171,12 +171,12 @@ void SelectConfiguration::playerChanged(Player *player) kdDebug() << "playerChanged::change" << endl; if (m_game) - disconnect(m_game, TQT_SIGNAL(changed(Game *)), this, TQT_SLOT(gameChanged(Game *))); + disconnect(m_game, TQ_SIGNAL(changed(Game *)), this, TQ_SLOT(gameChanged(Game *))); m_game = player->game(); if (m_game) - connect(m_game, TQT_SIGNAL(changed(Game *)), this, TQT_SLOT(gameChanged(Game *))); + connect(m_game, TQ_SIGNAL(changed(Game *)), this, TQ_SLOT(gameChanged(Game *))); } } diff --git a/atlantik/client/selectconfiguration_widget.h b/atlantik/client/selectconfiguration_widget.h index c95f6091..fd95095a 100644 --- a/atlantik/client/selectconfiguration_widget.h +++ b/atlantik/client/selectconfiguration_widget.h @@ -34,7 +34,7 @@ class Player; class SelectConfiguration : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp index ba61c3c1..b7b71a58 100644 --- a/atlantik/client/selectgame_widget.cpp +++ b/atlantik/client/selectgame_widget.cpp @@ -33,8 +33,8 @@ SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char { m_atlanticCore = atlanticCore; - connect(m_atlanticCore, TQT_SIGNAL(createGUI(Game *)), this, TQT_SLOT(addGame(Game *))); - connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Game *)), this, TQT_SLOT(delGame(Game *))); + connect(m_atlanticCore, TQ_SIGNAL(createGUI(Game *)), this, TQ_SLOT(addGame(Game *))); + connect(m_atlanticCore, TQ_SIGNAL(removeGUI(Game *)), this, TQ_SLOT(delGame(Game *))); m_mainLayout = new TQVBoxLayout(this, KDialog::marginHint()); TQ_CHECK_PTR(m_mainLayout); @@ -52,17 +52,17 @@ SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char m_gameList->setAllColumnsShowFocus(true); // m_mainLayout->addWidget(m_gameList); - connect(m_gameList, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(validateConnectButton())); - connect(m_gameList, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(connectClicked())); - connect(m_gameList, TQT_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(validateConnectButton())); - connect(m_gameList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(validateConnectButton())); + connect(m_gameList, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(validateConnectButton())); + connect(m_gameList, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(connectClicked())); + connect(m_gameList, TQ_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(validateConnectButton())); + connect(m_gameList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(validateConnectButton())); TQHBoxLayout *buttonBox = new TQHBoxLayout(m_mainLayout, KDialog::spacingHint()); KPushButton *backButton = new KPushButton(SmallIcon("back"), i18n("Server List"), this); buttonBox->addWidget(backButton); - connect(backButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(leaveServer())); + connect(backButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(leaveServer())); buttonBox->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); @@ -70,13 +70,13 @@ SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char m_connectButton->setEnabled(false); buttonBox->addWidget(m_connectButton); - connect(m_connectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(connectClicked())); + connect(m_connectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(connectClicked())); } void SelectGame::addGame(Game *game) { - connect(game, TQT_SIGNAL(changed(Game *)), this, TQT_SLOT(updateGame(Game *))); + connect(game, TQ_SIGNAL(changed(Game *)), this, TQ_SLOT(updateGame(Game *))); if (game->id() == -1) { @@ -92,7 +92,7 @@ void SelectGame::addGame(Game *game) KNotifyClient::event(winId(), "newgame"); - connect(master, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged(Player *))); + connect(master, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged(Player *))); } // validateConnectButton(); @@ -126,7 +126,7 @@ void SelectGame::updateGame(Game *game) item->setText( 3, TQString::number( game->players() ) ); item->setEnabled( game->canBeJoined() ); - connect(master, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged(Player *))); + connect(master, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged(Player *))); } m_gameList->triggerUpdate(); diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h index 59ed600a..6ea71c0c 100644 --- a/atlantik/client/selectgame_widget.h +++ b/atlantik/client/selectgame_widget.h @@ -29,7 +29,7 @@ class Player; class SelectGame : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp index 9d8f0e3c..cf1cc212 100644 --- a/atlantik/client/selectserver_widget.cpp +++ b/atlantik/client/selectserver_widget.cpp @@ -50,7 +50,7 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe 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())); + connect(connectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(customConnect())); // Server list group TQVButtonGroup *bgroup = new TQVButtonGroup(i18n("Select monopd Server"), this, "bgroup"); @@ -67,10 +67,10 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe m_serverList->setSorting(1); // m_mainLayout->addWidget(m_serverList); - connect(m_serverList, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(validateConnectButton())); - connect(m_serverList, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotConnect())); - connect(m_serverList, TQT_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(validateConnectButton())); - connect(m_serverList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(validateConnectButton())); + connect(m_serverList, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(validateConnectButton())); + connect(m_serverList, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotConnect())); + connect(m_serverList, TQ_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(validateConnectButton())); + connect(m_serverList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(validateConnectButton())); TQHBoxLayout *buttonBox = new TQHBoxLayout(m_mainLayout, KDialog::spacingHint()); buttonBox->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); @@ -79,21 +79,21 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe m_refreshButton = new KPushButton( KGuiItem(useMonopigatorOnStart ? i18n("Reload Server List") : i18n("Get Server List"), useMonopigatorOnStart ? "reload" : "network"), this); buttonBox->addWidget(m_refreshButton); - connect(m_refreshButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRefresh())); + connect(m_refreshButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRefresh())); // Connect m_connectButton = new KPushButton(BarIconSet("forward", TDEIcon::SizeSmall), i18n("Connect"), this); m_connectButton->setEnabled(false); buttonBox->addWidget(m_connectButton); - connect(m_connectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConnect())); + connect(m_connectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConnect())); // Monopigator m_monopigator = new Monopigator(); - connect(m_monopigator, TQT_SIGNAL(monopigatorAdd(TQString, TQString, TQString, TQString, int)), this, TQT_SLOT(slotMonopigatorAdd(TQString, TQString, TQString, TQString, int))); - connect(m_monopigator, TQT_SIGNAL(finished()), TQT_SLOT(monopigatorFinished())); - connect(m_monopigator, TQT_SIGNAL(timeout()), TQT_SLOT(monopigatorTimeout())); + connect(m_monopigator, TQ_SIGNAL(monopigatorAdd(TQString, TQString, TQString, TQString, int)), this, TQ_SLOT(slotMonopigatorAdd(TQString, TQString, TQString, TQString, int))); + connect(m_monopigator, TQ_SIGNAL(finished()), TQ_SLOT(monopigatorFinished())); + connect(m_monopigator, TQ_SIGNAL(timeout()), TQ_SLOT(monopigatorTimeout())); } SelectServer::~SelectServer() @@ -127,7 +127,7 @@ void SelectServer::slotMonopigatorAdd(TQString ip, TQString host, TQString port, if ( item->isDev() ) { item->setVisible( !m_hideDevelopmentServers ); - connect(this, TQT_SIGNAL(showDevelopmentServers(bool)), item, TQT_SLOT(showDevelopmentServers(bool))); + connect(this, TQ_SIGNAL(showDevelopmentServers(bool)), item, TQ_SLOT(showDevelopmentServers(bool))); } validateConnectButton(); diff --git a/atlantik/client/selectserver_widget.h b/atlantik/client/selectserver_widget.h index 485cc8cb..d4e3354f 100644 --- a/atlantik/client/selectserver_widget.h +++ b/atlantik/client/selectserver_widget.h @@ -31,7 +31,7 @@ class KExtendedSocket; class SelectServer : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantic/atlantic_core.h b/atlantik/libatlantic/atlantic_core.h index 9ce2574f..5ab65435 100644 --- a/atlantik/libatlantic/atlantic_core.h +++ b/atlantik/libatlantic/atlantic_core.h @@ -32,7 +32,7 @@ class Auction; class LIBATLANTIC_EXPORT AtlanticCore : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantic/auction.h b/atlantik/libatlantic/auction.h index c701ddae..ffc3482e 100644 --- a/atlantik/libatlantic/auction.h +++ b/atlantik/libatlantic/auction.h @@ -26,7 +26,7 @@ class Estate; class LIBATLANTIC_EXPORT Auction : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantic/configoption.h b/atlantik/libatlantic/configoption.h index ccd7979e..cc7e47be 100644 --- a/atlantik/libatlantic/configoption.h +++ b/atlantik/libatlantic/configoption.h @@ -24,7 +24,7 @@ class LIBATLANTIC_EXPORT ConfigOption : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantic/estate.h b/atlantik/libatlantic/estate.h index 0533315b..a8f091dd 100644 --- a/atlantik/libatlantic/estate.h +++ b/atlantik/libatlantic/estate.h @@ -27,7 +27,7 @@ class Player; class LIBATLANTIC_EXPORT Estate : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantic/estategroup.h b/atlantik/libatlantic/estategroup.h index 134742d6..12bab226 100644 --- a/atlantik/libatlantic/estategroup.h +++ b/atlantik/libatlantic/estategroup.h @@ -23,7 +23,7 @@ class LIBATLANTIC_EXPORT EstateGroup : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantic/game.h b/atlantik/libatlantic/game.h index 431e06f7..fd4d0932 100644 --- a/atlantik/libatlantic/game.h +++ b/atlantik/libatlantic/game.h @@ -27,7 +27,7 @@ class Player; class LIBATLANTIC_EXPORT Game : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantic/player.h b/atlantik/libatlantic/player.h index 815928ec..117cb0ae 100644 --- a/atlantik/libatlantic/player.h +++ b/atlantik/libatlantic/player.h @@ -27,7 +27,7 @@ class Game; class LIBATLANTIC_EXPORT Player : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantic/trade.cpp b/atlantik/libatlantic/trade.cpp index 7bd638c9..edba1e52 100644 --- a/atlantik/libatlantic/trade.cpp +++ b/atlantik/libatlantic/trade.cpp @@ -163,8 +163,8 @@ void Trade::update(bool force) TradeItem::TradeItem(Trade *trade, Player *from, Player *to) : mFrom(from), mTo(to), mTrade(trade) { - connect(from, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged())); - connect(to, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged())); + connect(from, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged())); + connect(to, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged())); } void TradeItem::playerChanged() diff --git a/atlantik/libatlantic/trade.h b/atlantik/libatlantic/trade.h index ec3d9415..4881e402 100644 --- a/atlantik/libatlantic/trade.h +++ b/atlantik/libatlantic/trade.h @@ -30,7 +30,7 @@ class Estate; class LIBATLANTIC_EXPORT TradeItem : public TQObject { -Q_OBJECT +TQ_OBJECT public: @@ -60,7 +60,7 @@ private: class LIBATLANTIC_EXPORT TradeEstate : public TradeItem { -Q_OBJECT +TQ_OBJECT public: @@ -80,7 +80,7 @@ private: class LIBATLANTIC_EXPORT TradeMoney : public TradeItem { -Q_OBJECT +TQ_OBJECT public: @@ -101,7 +101,7 @@ private: class LIBATLANTIC_EXPORT Trade : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikclient/atlantik_network.cpp b/atlantik/libatlantikclient/atlantik_network.cpp index 3dad4bda..ed5505f2 100644 --- a/atlantik/libatlantikclient/atlantik_network.cpp +++ b/atlantik/libatlantikclient/atlantik_network.cpp @@ -43,13 +43,13 @@ AtlantikNetwork::AtlantikNetwork(AtlanticCore *atlanticCore) : KExtendedSocket(0 m_playerId = -1; m_serverVersion = ""; - TQObject::connect(this, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotRead())); - TQObject::connect(this, TQT_SIGNAL(lookupFinished(int)), - this, TQT_SLOT(slotLookupFinished(int))); - TQObject::connect(this, TQT_SIGNAL(connectionSuccess()), - this, TQT_SLOT(slotConnectionSuccess())); - TQObject::connect(this, TQT_SIGNAL(connectionFailed(int)), - this, TQT_SLOT(slotConnectionFailed(int))); + TQObject::connect(this, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotRead())); + TQObject::connect(this, TQ_SIGNAL(lookupFinished(int)), + this, TQ_SLOT(slotLookupFinished(int))); + TQObject::connect(this, TQ_SIGNAL(connectionSuccess()), + this, TQ_SLOT(slotConnectionSuccess())); + TQObject::connect(this, TQ_SIGNAL(connectionFailed(int)), + this, TQ_SLOT(slotConnectionFailed(int))); } AtlantikNetwork::~AtlantikNetwork(void) @@ -212,7 +212,7 @@ void AtlantikNetwork::slotRead() { processMsg(m_textStream->readLine()); // There might be more data - TQTimer::singleShot(0, this, TQT_SLOT(slotRead())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRead())); } else { @@ -614,10 +614,10 @@ void AtlantikNetwork::processNode(TQDomNode n) estate = m_atlanticCore->newEstate(estateId); b_newEstate = true; - TQObject::connect(estate, TQT_SIGNAL(estateToggleMortgage(Estate *)), this, TQT_SLOT(estateToggleMortgage(Estate *))); - TQObject::connect(estate, TQT_SIGNAL(estateHouseBuy(Estate *)), this, TQT_SLOT(estateHouseBuy(Estate *))); - TQObject::connect(estate, TQT_SIGNAL(estateHouseSell(Estate *)), this, TQT_SLOT(estateHouseSell(Estate *))); - TQObject::connect(estate, TQT_SIGNAL(newTrade(Player *)), this, TQT_SLOT(newTrade(Player *))); + TQObject::connect(estate, TQ_SIGNAL(estateToggleMortgage(Estate *)), this, TQ_SLOT(estateToggleMortgage(Estate *))); + TQObject::connect(estate, TQ_SIGNAL(estateHouseBuy(Estate *)), this, TQ_SLOT(estateHouseBuy(Estate *))); + TQObject::connect(estate, TQ_SIGNAL(estateHouseSell(Estate *)), this, TQ_SLOT(estateHouseSell(Estate *))); + TQObject::connect(estate, TQ_SIGNAL(newTrade(Player *)), this, TQ_SLOT(newTrade(Player *))); // Players without estate should get one Player *player = 0; @@ -723,10 +723,10 @@ void AtlantikNetwork::processNode(TQDomNode n) // Create trade object trade = m_atlanticCore->newTrade(tradeId); - TQObject::connect(trade, TQT_SIGNAL(updateEstate(Trade *, Estate *, Player *)), this, TQT_SLOT(tradeUpdateEstate(Trade *, Estate *, Player *))); - TQObject::connect(trade, TQT_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *)), this, TQT_SLOT(tradeUpdateMoney(Trade *, unsigned int, Player *, Player *))); - TQObject::connect(trade, TQT_SIGNAL(reject(Trade *)), this, TQT_SLOT(tradeReject(Trade *))); - TQObject::connect(trade, TQT_SIGNAL(accept(Trade *)), this, TQT_SLOT(tradeAccept(Trade *))); + TQObject::connect(trade, TQ_SIGNAL(updateEstate(Trade *, Estate *, Player *)), this, TQ_SLOT(tradeUpdateEstate(Trade *, Estate *, Player *))); + TQObject::connect(trade, TQ_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *)), this, TQ_SLOT(tradeUpdateMoney(Trade *, unsigned int, Player *, Player *))); + TQObject::connect(trade, TQ_SIGNAL(reject(Trade *)), this, TQ_SLOT(tradeReject(Trade *))); + TQObject::connect(trade, TQ_SIGNAL(accept(Trade *)), this, TQ_SLOT(tradeAccept(Trade *))); } a = e.attributeNode(TQString("revision")); @@ -751,7 +751,7 @@ void AtlantikNetwork::processNode(TQDomNode n) if (trade && player) { trade->addPlayer(player); - TQObject::connect(m_atlanticCore, TQT_SIGNAL(removePlayer(Player *)), trade, TQT_SLOT(removePlayer(Player *))); + TQObject::connect(m_atlanticCore, TQ_SIGNAL(removePlayer(Player *)), trade, TQ_SLOT(removePlayer(Player *))); } } n_player = n_player.nextSibling(); @@ -854,7 +854,7 @@ void AtlantikNetwork::processNode(TQDomNode n) auction = m_atlanticCore->newAuction(auctionId, m_atlanticCore->findEstate(e.attributeNode(TQString("estateid")).value().toInt())); m_auctions[auctionId] = auction; - TQObject::connect(auction, TQT_SIGNAL(bid(Auction *, int)), this, TQT_SLOT(auctionBid(Auction *, int))); + TQObject::connect(auction, TQ_SIGNAL(bid(Auction *, int)), this, TQ_SLOT(auctionBid(Auction *, int))); b_newAuction = true; } diff --git a/atlantik/libatlantikclient/atlantik_network.h b/atlantik/libatlantikclient/atlantik_network.h index 0a7a3f6c..20992b3c 100644 --- a/atlantik/libatlantikclient/atlantik_network.h +++ b/atlantik/libatlantikclient/atlantik_network.h @@ -34,7 +34,7 @@ class Auction; class LIBATLANTIC_EXPORT AtlantikNetwork : public KExtendedSocket { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikclient/monopdprotocol.h b/atlantik/libatlantikclient/monopdprotocol.h index 4be98d3f..114a7439 100644 --- a/atlantik/libatlantikclient/monopdprotocol.h +++ b/atlantik/libatlantikclient/monopdprotocol.h @@ -37,7 +37,7 @@ class Estate; class MonopdProtocol : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp index 0950b1a0..5dbf09bd 100644 --- a/atlantik/libatlantikui/auction_widget.cpp +++ b/atlantik/libatlantikui/auction_widget.cpp @@ -38,9 +38,9 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid m_atlanticCore = atlanticCore; m_auction = auction; - connect(m_auction, TQT_SIGNAL(changed()), this, TQT_SLOT(auctionChanged())); - connect(m_auction, TQT_SIGNAL(updateBid(Player *, int)), this, TQT_SLOT(updateBid(Player *, int))); - connect(this, TQT_SIGNAL(bid(Auction *, int)), m_auction, TQT_SIGNAL(bid(Auction *, int))); + connect(m_auction, TQ_SIGNAL(changed()), this, TQ_SLOT(auctionChanged())); + connect(m_auction, TQ_SIGNAL(updateBid(Player *, int)), this, TQ_SLOT(updateBid(Player *, int))); + connect(this, TQ_SIGNAL(bid(Auction *, int)), m_auction, TQ_SIGNAL(bid(Auction *, int))); m_mainLayout = new TQVBoxLayout(this, KDialog::marginHint()); TQ_CHECK_PTR(m_mainLayout); @@ -67,7 +67,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid item->setPixmap(0, TQPixmap(SmallIcon("preferences-desktop-personal"))); m_playerItems[player] = item; - connect(player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged(Player *))); + connect(player, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged(Player *))); } } @@ -78,7 +78,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid m_bidSpinBox = new TQSpinBox(1, 10000, 1, bidBox); KPushButton *bidButton = new KPushButton(i18n("Make Bid"), bidBox, "bidButton"); - connect(bidButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBidButtonClicked())); + connect(bidButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBidButtonClicked())); // Status label m_statusLabel = new TQLabel(this, "statusLabel"); diff --git a/atlantik/libatlantikui/auction_widget.h b/atlantik/libatlantikui/auction_widget.h index 775944e0..07251f4f 100644 --- a/atlantik/libatlantikui/auction_widget.h +++ b/atlantik/libatlantikui/auction_widget.h @@ -35,7 +35,7 @@ class Auction; class AuctionWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp index bc7402a1..0177f6be 100644 --- a/atlantik/libatlantikui/board.cpp +++ b/atlantik/libatlantikui/board.cpp @@ -50,7 +50,7 @@ AtlantikBoard::AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, Display // Animated token movement m_movingToken = 0; m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotMoveToken())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotMoveToken())); m_resumeTimer = false; m_gridLayout = new TQGridLayout(this, sideLen+1, sideLen+1); @@ -142,16 +142,16 @@ void AtlantikBoard::addEstateView(Estate *estate, bool indicateUnowned, bool hig EstateView *estateView = new EstateView(estate, orientation, icon, indicateUnowned, highliteUnowned, darkenMortgaged, quartzEffects, this, "estateview"); m_estateViews.append(estateView); - connect(estate, TQT_SIGNAL(changed()), estateView, TQT_SLOT(estateChanged())); - connect(estateView, TQT_SIGNAL(estateToggleMortgage(Estate *)), estate, TQT_SIGNAL(estateToggleMortgage(Estate *))); - connect(estateView, TQT_SIGNAL(LMBClicked(Estate *)), estate, TQT_SIGNAL(LMBClicked(Estate *))); - connect(estateView, TQT_SIGNAL(estateHouseBuy(Estate *)), estate, TQT_SIGNAL(estateHouseBuy(Estate *))); - connect(estateView, TQT_SIGNAL(estateHouseSell(Estate *)), estate, TQT_SIGNAL(estateHouseSell(Estate *))); - connect(estateView, TQT_SIGNAL(newTrade(Player *)), estate, TQT_SIGNAL(newTrade(Player *))); + connect(estate, TQ_SIGNAL(changed()), estateView, TQ_SLOT(estateChanged())); + connect(estateView, TQ_SIGNAL(estateToggleMortgage(Estate *)), estate, TQ_SIGNAL(estateToggleMortgage(Estate *))); + connect(estateView, TQ_SIGNAL(LMBClicked(Estate *)), estate, TQ_SIGNAL(LMBClicked(Estate *))); + connect(estateView, TQ_SIGNAL(estateHouseBuy(Estate *)), estate, TQ_SIGNAL(estateHouseBuy(Estate *))); + connect(estateView, TQ_SIGNAL(estateHouseSell(Estate *)), estate, TQ_SIGNAL(estateHouseSell(Estate *))); + connect(estateView, TQ_SIGNAL(newTrade(Player *)), estate, TQ_SIGNAL(newTrade(Player *))); // Designer has its own LMBClicked slot if (m_mode == Play) - connect(estateView, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(prependEstateDetails(Estate *))); + connect(estateView, TQ_SIGNAL(LMBClicked(Estate *)), this, TQ_SLOT(prependEstateDetails(Estate *))); if (estateId<sideLen) m_gridLayout->addWidget(estateView, sideLen, sideLen-estateId); @@ -181,7 +181,7 @@ void AtlantikBoard::addAuctionWidget(Auction *auction) m_displayQueue.prepend(auctionW); updateCenter(); - connect(auction, TQT_SIGNAL(completed()), this, TQT_SLOT(displayDefault())); + connect(auction, TQ_SIGNAL(completed()), this, TQ_SLOT(displayDefault())); } Token *AtlantikBoard::findToken(Player *player) @@ -215,12 +215,12 @@ void AtlantikBoard::addToken(Player *player) Token *token = new Token(player, this, "token"); m_tokens.append(token); - connect(player, TQT_SIGNAL(changed(Player *)), token, TQT_SLOT(playerChanged())); + connect(player, TQ_SIGNAL(changed(Player *)), token, TQ_SLOT(playerChanged())); jumpToken(token); // Timer to reinit the gameboard _after_ event loop - TQTimer::singleShot(100, this, TQT_SLOT(slotResizeAftermath())); + TQTimer::singleShot(100, this, TQ_SLOT(slotResizeAftermath())); } void AtlantikBoard::playerChanged(Player *player) @@ -466,7 +466,7 @@ void AtlantikBoard::resizeEvent(TQResizeEvent *) } */ // Timer to reinit the gameboard _after_ resizeEvent - TQTimer::singleShot(0, this, TQT_SLOT(slotResizeAftermath())); + TQTimer::singleShot(0, this, TQ_SLOT(slotResizeAftermath())); } void AtlantikBoard::slotResizeAftermath() @@ -544,8 +544,8 @@ void AtlantikBoard::insertDetails(TQString text, bool clearText, bool clearButto eDetails = new EstateDetails(estate, text, this); m_lastServerDisplay = eDetails; - connect(eDetails, TQT_SIGNAL(buttonCommand(TQString)), this, TQT_SIGNAL(buttonCommand(TQString))); - connect(eDetails, TQT_SIGNAL(buttonClose()), this, TQT_SLOT(displayDefault())); + connect(eDetails, TQ_SIGNAL(buttonCommand(TQString)), this, TQ_SIGNAL(buttonCommand(TQString))); + connect(eDetails, TQ_SIGNAL(buttonClose()), this, TQ_SLOT(displayDefault())); m_displayQueue.insert(0, eDetails); updateCenter(); @@ -563,8 +563,8 @@ void AtlantikBoard::prependEstateDetails(Estate *estate) eDetails = new EstateDetails(estate, TQString(), this); m_displayQueue.prepend(eDetails); - connect(eDetails, TQT_SIGNAL(buttonCommand(TQString)), this, TQT_SIGNAL(buttonCommand(TQString))); - connect(eDetails, TQT_SIGNAL(buttonClose()), this, TQT_SLOT(displayDefault())); + connect(eDetails, TQ_SIGNAL(buttonCommand(TQString)), this, TQ_SIGNAL(buttonCommand(TQString))); + connect(eDetails, TQ_SIGNAL(buttonClose()), this, TQ_SLOT(displayDefault())); } else { diff --git a/atlantik/libatlantikui/board.h b/atlantik/libatlantikui/board.h index eaf4dbdf..7af0ecc4 100644 --- a/atlantik/libatlantikui/board.h +++ b/atlantik/libatlantikui/board.h @@ -34,7 +34,7 @@ class EstateView; class LIBATLANTIKUI_EXPORT AtlantikBoard : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp index f89ad96e..8a43d6a3 100644 --- a/atlantik/libatlantikui/estatedetails.cpp +++ b/atlantik/libatlantikui/estatedetails.cpp @@ -114,7 +114,7 @@ void EstateDetails::paintEvent(TQPaintEvent *) TQColor greenHouse(0, 255, 0); TQColor redHotel(255, 51, 51); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(m_pixmap), this); + painter.begin(m_pixmap, this); painter.setPen(TQt::black); @@ -136,7 +136,7 @@ void EstateDetails::paintEvent(TQPaintEvent *) quartzBuffer->resize(25, (height()/4)-2); TQPainter quartzPainter; - quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this); + quartzPainter.begin(quartzBuffer, this); painter.setBrush(titleColor); painter.drawRect(0, 0, width(), titleHeight); @@ -258,7 +258,7 @@ void EstateDetails::addButton(TQString command, TQString caption, bool enabled) button->setEnabled(enabled); button->show(); - connect(button, TQT_SIGNAL(pressed()), this, TQT_SLOT(buttonPressed())); + connect(button, TQ_SIGNAL(pressed()), this, TQ_SLOT(buttonPressed())); } void EstateDetails::addCloseButton() @@ -268,7 +268,7 @@ void EstateDetails::addCloseButton() m_closeButton = new KPushButton(KStdGuiItem::close(), this); m_buttonBox->addWidget(m_closeButton); m_closeButton->show(); - connect(m_closeButton, TQT_SIGNAL(pressed()), this, TQT_SIGNAL(buttonClose())); + connect(m_closeButton, TQ_SIGNAL(pressed()), this, TQ_SIGNAL(buttonClose())); } } @@ -321,7 +321,7 @@ void EstateDetails::clearButtons() void EstateDetails::buttonPressed() { - emit buttonCommand(TQString(m_buttonCommandMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()])); + emit buttonCommand(TQString(m_buttonCommandMap[(TQObject *)TQObject::sender()])); } #include "estatedetails.moc" diff --git a/atlantik/libatlantikui/estatedetails.h b/atlantik/libatlantikui/estatedetails.h index f44d3132..b0cb0034 100644 --- a/atlantik/libatlantikui/estatedetails.h +++ b/atlantik/libatlantikui/estatedetails.h @@ -34,7 +34,7 @@ class Estate; class EstateDetails : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp index fe53d63e..4d7ba21e 100644 --- a/atlantik/libatlantikui/estateview.cpp +++ b/atlantik/libatlantikui/estateview.cpp @@ -255,7 +255,7 @@ void EstateView::paintEvent(TQPaintEvent *) TQColor greenHouse(0, 255, 0); TQColor redHotel(255, 51, 51); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(qpixmap), this); + painter.begin(qpixmap, this); painter.setPen(TQt::black); @@ -281,7 +281,7 @@ void EstateView::paintEvent(TQPaintEvent *) quartzBuffer->resize(m_titleWidth-2, 25); TQPainter quartzPainter; - quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this); + quartzPainter.begin(quartzBuffer, this); painter.setBrush(m_estate->color()); switch(m_orientation) @@ -427,12 +427,12 @@ void EstateView::resizeEvent(TQResizeEvent *) m_recreateQuartz = true; b_recreate = true; - TQTimer::singleShot(0, this, TQT_SLOT(slotResizeAftermath())); + TQTimer::singleShot(0, this, TQ_SLOT(slotResizeAftermath())); } void EstateView::mousePressEvent(TQMouseEvent *e) { - if (e->button()==Qt::RightButton && m_estate->isOwned()) + if (e->button()==TQt::RightButton && m_estate->isOwned()) { TDEPopupMenu *rmbMenu = new TDEPopupMenu(this); rmbMenu->insertTitle(m_estate->name()); @@ -482,13 +482,13 @@ void EstateView::mousePressEvent(TQMouseEvent *e) TDEPopupMenu *pm = dynamic_cast<TDEPopupMenu *>(rmbMenu); if (pm) { - connect(pm, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuAction(int))); + connect(pm, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuAction(int))); } TQPoint g = TQCursor::pos(); rmbMenu->exec(g); delete rmbMenu; } - else if (e->button()==Qt::LeftButton) + else if (e->button()==TQt::LeftButton) emit LMBClicked(m_estate); } diff --git a/atlantik/libatlantikui/estateview.h b/atlantik/libatlantikui/estateview.h index d92028b8..8fd94bfb 100644 --- a/atlantik/libatlantikui/estateview.h +++ b/atlantik/libatlantikui/estateview.h @@ -31,7 +31,7 @@ class Estate; class EstateView : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp index 94143bca..ea5c3618 100644 --- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp +++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp @@ -110,7 +110,7 @@ void KWrappedListViewItem::init( TQListView *parent, TQString text, TQString t2 wrapColumn( m_wrapColumn ); - connect( parent->header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(wrapColumn(int))); + connect( parent->header(), TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(wrapColumn(int))); } #include "kwrappedlistviewitem.moc" diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.h b/atlantik/libatlantikui/kwrappedlistviewitem.h index 13907348..fdff9ec2 100644 --- a/atlantik/libatlantikui/kwrappedlistviewitem.h +++ b/atlantik/libatlantikui/kwrappedlistviewitem.h @@ -34,7 +34,7 @@ class KWordWrap; class KWrappedListViewItem : public TQObject, public TDEListViewItem { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikui/portfolioestate.cpp b/atlantik/libatlantikui/portfolioestate.cpp index 1117b6e8..1c165244 100644 --- a/atlantik/libatlantikui/portfolioestate.cpp +++ b/atlantik/libatlantikui/portfolioestate.cpp @@ -89,6 +89,6 @@ void PortfolioEstate::paintEvent(TQPaintEvent *) void PortfolioEstate::mousePressEvent(TQMouseEvent *e) { - if (e->button()==Qt::LeftButton) + if (e->button()==TQt::LeftButton) emit estateClicked(m_estate); } diff --git a/atlantik/libatlantikui/portfolioestate.h b/atlantik/libatlantikui/portfolioestate.h index be08cecf..854f5159 100644 --- a/atlantik/libatlantikui/portfolioestate.h +++ b/atlantik/libatlantikui/portfolioestate.h @@ -28,7 +28,7 @@ class Player; class PortfolioEstate : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp index 19424e3b..9ac9bc49 100644 --- a/atlantik/libatlantikui/portfolioview.cpp +++ b/atlantik/libatlantikui/portfolioview.cpp @@ -104,7 +104,7 @@ void PortfolioView::buildPortfolio() PortfolioEstate *portfolioEstate = new PortfolioEstate(estate, m_player, false, this, "portfolioestate"); m_portfolioEstates.append(portfolioEstate); - connect(portfolioEstate, TQT_SIGNAL(estateClicked(Estate *)), this, TQT_SIGNAL(estateClicked(Estate *))); + connect(portfolioEstate, TQ_SIGNAL(estateClicked(Estate *)), this, TQ_SIGNAL(estateClicked(Estate *))); if (lastPE) { x = lastPE->x() + 2; @@ -130,7 +130,7 @@ void PortfolioView::buildPortfolio() portfolioEstate->setGeometry(x, y, portfolioEstate->width(), portfolioEstate->height()); portfolioEstate->show(); - connect(estate, TQT_SIGNAL(changed()), portfolioEstate, TQT_SLOT(estateChanged())); + connect(estate, TQ_SIGNAL(changed()), portfolioEstate, TQ_SLOT(estateChanged())); lastPE = portfolioEstate; } @@ -196,7 +196,7 @@ void PortfolioView::paintEvent(TQPaintEvent *) qpixmap = new TQPixmap(width(), height()); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(qpixmap), this); + painter.begin(qpixmap, this); painter.setPen(TQt::white); painter.setBrush(TQt::white); @@ -252,7 +252,7 @@ void PortfolioView::mousePressEvent(TQMouseEvent *e) { Player *playerSelf = m_atlanticCore->playerSelf(); - if ( e->button()==Qt::RightButton && (m_player != playerSelf) ) + if ( e->button()==TQt::RightButton && (m_player != playerSelf) ) { TDEPopupMenu *rmbMenu = new TDEPopupMenu(this); rmbMenu->insertTitle(m_player->name()); @@ -269,7 +269,7 @@ void PortfolioView::mousePressEvent(TQMouseEvent *e) rmbMenu->setItemEnabled( 0, m_atlanticCore->selfIsMaster() ); } - connect(rmbMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuAction(int))); + connect(rmbMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuAction(int))); TQPoint g = TQCursor::pos(); rmbMenu->exec(g); } diff --git a/atlantik/libatlantikui/portfolioview.h b/atlantik/libatlantikui/portfolioview.h index 18323b76..1a5279e4 100644 --- a/atlantik/libatlantikui/portfolioview.h +++ b/atlantik/libatlantikui/portfolioview.h @@ -32,7 +32,7 @@ class Estate; class LIBATLANTIKUI_EXPORT PortfolioView : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp index d6534df5..5cf1937f 100644 --- a/atlantik/libatlantikui/token.cpp +++ b/atlantik/libatlantikui/token.cpp @@ -40,7 +40,7 @@ Token::Token(Player *player, AtlantikBoard *parent, const char *name) : TQWidget m_parentBoard = parent; m_player = player; - connect(m_player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged())); + connect(m_player, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged())); m_inJail = m_player->inJail(); m_location = m_player->location(); @@ -127,7 +127,7 @@ void Token::paintEvent(TQPaintEvent *) qpixmap = new TQPixmap(width(), height()); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(qpixmap), this); + painter.begin(qpixmap, this); if (m_image) { diff --git a/atlantik/libatlantikui/token.h b/atlantik/libatlantikui/token.h index 76c46795..128de878 100644 --- a/atlantik/libatlantikui/token.h +++ b/atlantik/libatlantikui/token.h @@ -27,7 +27,7 @@ class AtlantikBoard; class Token : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp index 39ad6c34..4d11bc05 100644 --- a/atlantik/libatlantikui/trade_widget.cpp +++ b/atlantik/libatlantikui/trade_widget.cpp @@ -63,7 +63,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_editTypeCombo->insertItem(i18n("Estate")); m_editTypeCombo->insertItem(i18n("Money")); - connect(m_editTypeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setTypeCombo(int))); + connect(m_editTypeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setTypeCombo(int))); m_estateCombo = new KComboBox(m_updateComponentBox); TQPtrList<Estate> estateList = m_atlanticCore->estates(); @@ -78,7 +78,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p } } - connect(m_estateCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEstateCombo(int))); + connect(m_estateCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEstateCombo(int))); m_moneyBox = new TQSpinBox(0, 10000, 1, m_updateComponentBox); @@ -105,14 +105,14 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_playerTargetMap[m_playerTargetCombo->count() - 1] = player; m_playerTargetRevMap[player] = m_playerTargetCombo->count() - 1; - connect(player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged(Player *))); + connect(player, TQ_SIGNAL(changed(Player *)), this, TQ_SLOT(playerChanged(Player *))); } } m_updateButton = new KPushButton(i18n("Update"), m_updateComponentBox); m_updateButton->setEnabled(false); - connect(m_updateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateComponent())); + connect(m_updateButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateComponent())); m_componentList = new TDEListView(this, "componentList"); listCompBox->addWidget(m_componentList); @@ -122,8 +122,8 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_componentList->addColumn(i18n("Player")); m_componentList->addColumn(i18n("Item")); - connect(m_componentList, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem *, const TQPoint&)), TQT_SLOT(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&))); - connect(m_componentList, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(setCombos(TQListViewItem *))); + connect(m_componentList, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem *, const TQPoint&)), TQ_SLOT(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&))); + connect(m_componentList, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(setCombos(TQListViewItem *))); TQHBoxLayout *actionBox = new TQHBoxLayout(this, 0, KDialog::spacingHint()); listCompBox->addItem(actionBox); @@ -133,13 +133,13 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p m_rejectButton = new KPushButton(BarIcon("cancel", TDEIcon::SizeSmall), i18n("Reject"), this); actionBox->addWidget(m_rejectButton); - connect(m_rejectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(m_rejectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); m_acceptButton = new KPushButton(BarIcon("ok", TDEIcon::SizeSmall), i18n("Accept"), this); // m_acceptButton->setEnabled(false); actionBox->addWidget(m_acceptButton); - connect(m_acceptButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(m_acceptButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); m_status = new TQLabel(this); listCompBox->addWidget(m_status); @@ -149,14 +149,14 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p // mPlayerList->setRootIsDecorated(true); // mPlayerList->setResizeMode(TDEListView::AllColumns); - connect(m_trade, TQT_SIGNAL(itemAdded(TradeItem *)), this, TQT_SLOT(tradeItemAdded(TradeItem *))); - connect(m_trade, TQT_SIGNAL(itemRemoved(TradeItem *)), this, TQT_SLOT(tradeItemRemoved(TradeItem *))); - connect(m_trade, TQT_SIGNAL(changed(Trade *)), this, TQT_SLOT(tradeChanged())); - connect(m_trade, TQT_SIGNAL(rejected(Player *)), this, TQT_SLOT(tradeRejected(Player *))); - connect(this, TQT_SIGNAL(updateEstate(Trade *, Estate *, Player *)), m_trade, TQT_SIGNAL(updateEstate(Trade *, Estate *, Player *))); - connect(this, TQT_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *)), m_trade, TQT_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *))); - connect(this, TQT_SIGNAL(reject(Trade *)), m_trade, TQT_SIGNAL(reject(Trade *))); - connect(this, TQT_SIGNAL(accept(Trade *)), m_trade, TQT_SIGNAL(accept(Trade *))); + connect(m_trade, TQ_SIGNAL(itemAdded(TradeItem *)), this, TQ_SLOT(tradeItemAdded(TradeItem *))); + connect(m_trade, TQ_SIGNAL(itemRemoved(TradeItem *)), this, TQ_SLOT(tradeItemRemoved(TradeItem *))); + connect(m_trade, TQ_SIGNAL(changed(Trade *)), this, TQ_SLOT(tradeChanged())); + connect(m_trade, TQ_SIGNAL(rejected(Player *)), this, TQ_SLOT(tradeRejected(Player *))); + connect(this, TQ_SIGNAL(updateEstate(Trade *, Estate *, Player *)), m_trade, TQ_SIGNAL(updateEstate(Trade *, Estate *, Player *))); + connect(this, TQ_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *)), m_trade, TQ_SIGNAL(updateMoney(Trade *, unsigned int, Player *, Player *))); + connect(this, TQ_SIGNAL(reject(Trade *)), m_trade, TQ_SIGNAL(reject(Trade *))); + connect(this, TQ_SIGNAL(accept(Trade *)), m_trade, TQ_SIGNAL(accept(Trade *))); setTypeCombo(m_editTypeCombo->currentItem()); setEstateCombo(m_estateCombo->currentItem()); @@ -178,7 +178,7 @@ void TradeDisplay::closeEvent(TQCloseEvent *e) void TradeDisplay::tradeItemAdded(TradeItem *tradeItem) { TDEListViewItem *item = new TDEListViewItem(m_componentList, (tradeItem->from() ? tradeItem->from()->name() : TQString("?")), i18n("gives is transitive ;)", "gives"), (tradeItem->to() ? tradeItem->to()->name() : TQString("?")), tradeItem->text()); - connect(tradeItem, TQT_SIGNAL(changed(TradeItem *)), this, TQT_SLOT(tradeItemChanged(TradeItem *))); + connect(tradeItem, TQ_SIGNAL(changed(TradeItem *)), this, TQ_SLOT(tradeItemChanged(TradeItem *))); item->setPixmap(0, TQPixmap(SmallIcon("preferences-desktop-personal"))); item->setPixmap(2, TQPixmap(SmallIcon("preferences-desktop-personal"))); @@ -356,7 +356,7 @@ void TradeDisplay::contextMenu(TDEListView *, TQListViewItem *i, const TQPoint& // rmbMenu->insertTitle( ... ); rmbMenu->insertItem(i18n("Remove From Trade"), 0); - connect(rmbMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(contextMenuClicked(int))); + connect(rmbMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(contextMenuClicked(int))); rmbMenu->exec(p); } diff --git a/atlantik/libatlantikui/trade_widget.h b/atlantik/libatlantikui/trade_widget.h index 6a74f857..e30269fe 100644 --- a/atlantik/libatlantikui/trade_widget.h +++ b/atlantik/libatlantikui/trade_widget.h @@ -38,7 +38,7 @@ class TradeItem; class LIBATLANTIKUI_EXPORT TradeDisplay : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/doc/kenolaba/index.docbook b/doc/kenolaba/index.docbook index 33640bac..eb16faad 100644 --- a/doc/kenolaba/index.docbook +++ b/doc/kenolaba/index.docbook @@ -58,7 +58,7 @@ played by two players.</para> </abstract> <para>&kenolaba; is a simple board strategy game that is played by two players. There are red and yellow pieces for each player. Beginning from a position where each player has 14 pieces, moves are drawn until -one player has pushed 6 of his opponent's pieces out of the +one player has pushed 6 of their opponent's pieces out of the board.</para> <para>The original program was developed in 1993 for DOS and pure @@ -303,8 +303,8 @@ key.</para> <guimenu>Settings</guimenu> menu, and the <guimenuitem>Spy</guimenuitem> option. If it is your turn, you can see the computer's rating of the move you want to play in the status bar. If it's the computer's turn you -can see (in status bar and highlighted pieces) the move he actually -thinks is the best to play. Of course this changes along his +can see (in status bar and highlighted pieces) the move they actually +thinks is the best to play. Of course this changes along their search.</para> </sect1> @@ -576,8 +576,8 @@ your move.</para> </term> <listitem> <para> -When the computer is thinking, his depth search is interrupted and he -draws the best move he has found so far.</para> +When the computer is thinking, its depth search is interrupted and he +draws the best move it has found so far.</para> </listitem> </varlistentry> diff --git a/doc/kenolaba/man-kenolaba.6.docbook b/doc/kenolaba/man-kenolaba.6.docbook index a89a79fd..873f69a9 100644 --- a/doc/kenolaba/man-kenolaba.6.docbook +++ b/doc/kenolaba/man-kenolaba.6.docbook @@ -38,7 +38,7 @@ <para>&kenolaba; is a simple board strategy game that is played by two players. There are red and yellow pieces for each player. Beginning from a start position where each player has 14 pieces, moves are drawn -until one player has pushed 6 of his opponent's pieces out of the +until one player has pushed 6 of their opponent's pieces out of the board. </para> </refsect1> diff --git a/doc/kgoldrunner/index.docbook b/doc/kgoldrunner/index.docbook index 4caafd23..0545f543 100644 --- a/doc/kgoldrunner/index.docbook +++ b/doc/kgoldrunner/index.docbook @@ -75,8 +75,8 @@ will kill you if they catch you!</para> <para>The problem is you have no weapon to kill <emphasis>them</emphasis>. All you can do is run away, dig holes in the floor to trap them or lure them into some area where they cannot -hurt you. After a short time a trapped enemy climbs out of his hole, -but if it closes before that, he will die and reappear somewhere else. +hurt you. After a short time a trapped enemy climbs out of their hole, +but if it closes before that, they will die and reappear somewhere else. </para> <para>If you have never played before, try the <quote>Tutorial</quote> @@ -97,16 +97,16 @@ solving — all in one game. Good luck!</para> <para>Below is a typical game in progress. The hero (green) is at level 4 in the Advanced Tutorial game. The window's status bar shows -how many lives he has left and how many points he has scored. It also -shows that there is a hint available for this level (as there always +how many lives they have left and how many points they have scored. +It also shows that there is a hint available for this level (as there always is in tutorial games) and that the action is stopped (while taking this snapshot), but can be continued by pressing <keycap>P</keycap> or <keycap>Esc</keycap>.</para> <para>The hero started at the top left, dug a hole and dropped into a -line of false bricks and gold where you can now see him falling. The -enemy above him will fall into the hole, then climb out and be trapped -up there till the end of the level. He could cause the hero some +line of false bricks and gold where you can now see them falling. The +enemy above them will fall into the hole, then climb out and be trapped +up there till the end of the level. They could cause the hero some problems then, because that is where the hidden ladders appear when all the gold is gone. The hero has to use them to get to the next level.</para> @@ -120,8 +120,8 @@ level.</para> </screenshot> <para>The enemy on the right is falling and carrying some gold. -Notice his gold outline. The third enemy is about to come down a ladder to -chase the hero. He will have to dodge both enemies when he reaches +Notice their gold outline. The third enemy is about to come down a ladder to +chase the hero. They will have to dodge both enemies when they reach the floor ... This level also shows diggable bricks and undiggable concrete and has lots of traps (false bricks), which look just like ordinary bricks.</para> @@ -152,15 +152,15 @@ level completed.</para> <title>Moving Around</title> <para>By default you control the hero (green) with the mouse, but you -can also control him with the keyboard (<link -linkend="keyboard-control">see below</link>). He moves towards -wherever you place the mouse pointer. He cannot move as fast as you -can move the mouse, but he will try hard to catch up. If the mouse -pointer is above or below his level, he will always go up or down when -there is a ladder available or a place to fall into. Otherwise he will -move horizontally until he is above, below or right at the mouse -pointer. You can make him follow simple paths (like _ | L or U), but -be careful not to get too many twists and turns ahead of him.</para> +can also control them with the keyboard (<link +linkend="keyboard-control">see below</link>). They move towards +wherever you place the mouse pointer. They cannot move as fast as you +can move the mouse, but they will try hard to catch up. If the mouse +pointer is above or below their level, they will always go up or down when +there is a ladder available or a place to fall into. Otherwise they will +move horizontally until they are above, below or right at the mouse +pointer. You can make them follow simple paths (like _ | L or U), but +be careful not to get too many twists and turns ahead of them.</para> <para>You can move left or right over bricks, concrete, ladders or bars and up or down over ladders. If you are on an empty square or a @@ -195,10 +195,10 @@ menu.</para> <para>The movement keys (<keycap>I</keycap>, <keycap>J</keycap>, <keycap>K</keycap>, <keycap>L</keycap> or arrows) start the hero -moving up, down, left or right. He continues moving in that direction, -if he can, until you press another movement key or -<keycap>Space</keycap> to stop. In mouse mode, he stops automatically -when he gets to the mouse pointer.</para> +moving up, down, left or right. They continue moving in that direction, +if they can, until you press another movement key or +<keycap>Space</keycap> to stop. In mouse mode, they stop automatically +when they gets to the mouse pointer.</para> <para>A word of warning: using the keyboard is much harder, in the long run, than using the mouse. Think of the mouse as a @@ -253,13 +253,13 @@ linkend="rules-of-digging">Rules of Digging</link> below). They will pick up gold either always or at random, depending on the game settings, and will drop gold at random on brick, concrete or the top of a ladder. An enemy who is carrying gold has a gold outline. You -must get the gold away from him before you can finish the +must get the gold away from them before you can finish the level.</para> <para>If an enemy touches you or you move down onto one, you die and must start the level again, if you have any lives left. However, it is possible to walk or stand on an enemy's head and you can ride an enemy -down when he is falling. Some advanced levels require such a +down when they are falling. Some advanced levels require such a move.</para> </sect2> @@ -290,8 +290,8 @@ mouse button, or use one of the digging keys (defaults <keycap>O</keycap>.)</para> <para>You can dodge an oncoming enemy by digging a hole, waiting for -him to fall in and then running quickly over his head. At the same -time you can collect any gold he was carrying. Usually you can dig two +him to fall in and then running quickly over their head. At the same +time you can collect any gold they were carrying. Usually you can dig two holes to capture and run over two enemies who are close together, but this rarely works if the enemies are separated or there are more than two of them.</para> @@ -329,7 +329,7 @@ will always climb UP to get out of it. Their time in the hole is less than the time the hole stays open, so to kill enemies you usually have to dig several holes in quick succession. Enemies always give up gold as they fall into a hole, so you can quickly run onto the enemy's head -and grab the gold before he climbs out.</para> +and grab the gold before they climb out.</para> <para>Enemies will never fall down through a hole from above, but depending on the game rules and <guimenu>Settings</guimenu>, they can @@ -404,7 +404,7 @@ enemies choose a path to the hero.</para> <listitem> <para>In the <quote>Traditional</quote> search method, enemies look for vertical paths (ladders and falls) and they try to stay above the -hero or at the same height. They go below him only as a last +hero or at the same height. They go below them only as a last resort. The enemies make no attempt to chase the hero in the horizontal direction until they are at the same height and can find a horizontal path. This leads to situations where you can @@ -442,7 +442,7 @@ both types of play.</para> <quote>Traditional</quote> play but not in <quote>&kgoldrunner;</quote> play. The trick in several <quote>Traditional</quote> levels depends on releasing an enemy from -behind a brick wall. When you dig away the bricks, he runs out through +behind a brick wall. When you dig away the bricks, they run out through the hole.</para> </listitem> <listitem> @@ -786,7 +786,7 @@ on every level.</para> </menuchoice> </term> <listitem> -<para>Kills the hero when he is in a position from which he cannot +<para>Kills the hero when they are in a position from which they cannot escape.</para> </listitem> </varlistentry> @@ -1210,7 +1210,7 @@ else if you prefer and you do not have to use the whole 28x20 area. Lots of interesting levels use smaller areas. </para> <para>The minimum requirement for a level to be playable is to have a -hero, a gold nugget he can get to and a visible or hidden ladder +hero, a gold nugget they can get to and a visible or hidden ladder leading to the top of the playing area. You do not have to have enemies, bars or even bricks. There are many challenging levels that have no enemies or no bricks.</para> @@ -1292,7 +1292,7 @@ release the mouse button. If you make a mistake, you can use the <guiicon>Empty space</guiicon> icon to erase it.</para> <para>The hero icon works differently, because there can be only one -hero. When you paint the hero, he moves from his previous position to +hero. When you paint the hero, they move from their previous position to wherever you release the mouse button.</para> </sect2> @@ -1418,9 +1418,9 @@ Solving Difficult Levels</link></para> <itemizedlist> <listitem> -<para>You can always trap a single oncoming enemy in one hole, get his -gold and run on over him without killing him. It is often a good idea -to dig behind you and delay him further, but that might kill him. In +<para>You can always trap a single oncoming enemy in one hole, get their +gold and run on over them without killing them. It is often a good idea +to dig behind you and delay them further, but that might kill them. In some levels it is not a good idea to kill enemies.</para> </listitem> <listitem> @@ -1444,13 +1444,13 @@ collect gold while they run along behind you.</para> takes three to nine holes to kill one to five enemies.</para> </listitem> <listitem> -<para>It is possible to kill an enemy with one hole if he is far +<para>It is possible to kill an enemy with one hole if they are far enough away when you dig it.</para> </listitem> <listitem> <para>In the <quote>Traditional</quote> game, you can trap an enemy permanently in a pit of brick or concrete. Stand near the edge of the -pit on the opposite side to the enemy. As he approaches the pit, move +pit on the opposite side to the enemy. As they approach the pit, move down one square (to the level of the floor of the pit) and the enemy will usually run into the pit.</para> </listitem> @@ -1513,7 +1513,7 @@ position.</para> </listitem> <listitem> <para>In some situations an enemy can be killed without giving up the -gold he is carrying. The gold becomes a <quote>lost +gold they are carrying. The gold becomes a <quote>lost nugget</quote>. You score no points for making an enemy lose a nugget, but at least you can finish the level.</para> </listitem> @@ -1547,7 +1547,7 @@ easier stages.</para> <listitem> <para>In digging puzzles, look for false bricks you can fall into and thus have one less brick to dig. Or consider using an enemy to go -ahead of you, so that you can stand on his head and dig.</para> +ahead of you, so that you can stand on their head and dig.</para> </listitem> <listitem> <para>Look for a theme or trick in the level, such as riding down on @@ -1555,7 +1555,7 @@ an enemy's head, trapping all the enemies in a pit, luring the enemies to a corner where they will stay and not chase you, luring the enemies into pits you must cross to get to some gold, getting the enemies to fetch gold for you or finding spots where you can stand and make an -enemy move to where you want him.</para> +enemy move to where you want them.</para> </listitem> </itemizedlist> </sect1> diff --git a/doc/kpoker/index.docbook b/doc/kpoker/index.docbook index 2f588615..f4bc368f 100644 --- a/doc/kpoker/index.docbook +++ b/doc/kpoker/index.docbook @@ -307,7 +307,7 @@ you think you are ready then click again on the <guibutton>Draw New Cards</guibu button - you will probably get new cards.</para> <para>Perhaps you do not get new cards - then the computer player has -quite good cards (or at least not very bad cards) and he has +quite good cards (or at least not very bad cards) and they have raised. You have to decide to adjust your bet or to get out of the round. By default you will adjust your bet. Click again on the <guibutton>Draw New Cards</guibutton> button when ready.</para></listitem> diff --git a/doc/kreversi/index.docbook b/doc/kreversi/index.docbook index 525137bb..30b782c2 100644 --- a/doc/kreversi/index.docbook +++ b/doc/kreversi/index.docbook @@ -66,7 +66,7 @@ computer. The playing field is an 8 by 8 square board divided into 64 squares. The game piece used is a colored stone - one side of it is red, the other blue. If a piece is captured by an opposing player, that piece is turned to reveal the color of that player. A winner is declared when one player has -more pieces of his own color on the board and if there are no more possible +more pieces of their own color on the board and if there are no more possible moves.</para> </sect1> @@ -187,7 +187,7 @@ another square later in the game.</para> <para>When it is no longer possible for either player to move, the game is over. Discs are then counted and the player with the majority -of his or her color discs on the board is declared the winner.</para> +of their color discs on the board is declared the winner.</para> <note><para>It is possible for a game to end before all 64 squares are filled.</para></note> diff --git a/doc/kspaceduel/index.docbook b/doc/kspaceduel/index.docbook index 62043531..b52e99bf 100644 --- a/doc/kspaceduel/index.docbook +++ b/doc/kspaceduel/index.docbook @@ -61,7 +61,7 @@ other.</para> <chapter id="the-game"> <title>The Game</title> -<para>The idea of the game is simple (but addictive). You try to destroy your opponent before he destroys you.</para> +<para>The idea of the game is simple (but addictive). You try to destroy your opponent before they destroy you.</para> <para>Be careful not to hit the sun.</para> <sect1 id="rules-of-the-game"> <title>Rules of the Game</title> diff --git a/doc/ktron/index.docbook b/doc/ktron/index.docbook index e8b11dc5..7b9e8641 100644 --- a/doc/ktron/index.docbook +++ b/doc/ktron/index.docbook @@ -142,7 +142,7 @@ xtron-1.1.</para> </listitem> <listitem> <para>At skill levels Average and Expert, the computer tries to hinder the -opponent when he comes near.</para> +opponent when they come near.</para> </listitem> </itemizedlist> diff --git a/doc/ktuberling/index.docbook b/doc/ktuberling/index.docbook index bb9c16b8..8ac74926 100644 --- a/doc/ktuberling/index.docbook +++ b/doc/ktuberling/index.docbook @@ -105,7 +105,7 @@ include them in the museum if he gets some spare time. <para> &ktuberling; can also <quote>speak</quote>. It will spell out the name of the objects you drag and drop. It will <quote>speak</quote> in a language -that you can chose. You can even use it to learn a bit of vocabulary +that you can choose. You can even use it to learn a bit of vocabulary in foreign languages. Currently, &ktuberling; can <quote>speak</quote> Danish, German, English, Spanish, French, Italian, Dutch, Portuguese, Romanian, Serbian, Slovak, Slovenian and Swedish. diff --git a/doc/lskat/index.docbook b/doc/lskat/index.docbook index dbdf16e9..f816a7d2 100644 --- a/doc/lskat/index.docbook +++ b/doc/lskat/index.docbook @@ -140,7 +140,7 @@ holding for any <emphasis>trump</emphasis>):</para> </simplelist> <para> -The player who wins both cards will add their value to his score. The +The player who wins both cards will add their value to their score. The values of the cards are:</para> <informaltable> diff --git a/doc/man/atlantik/CMakeLists.txt b/doc/man/atlantik/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/atlantik/CMakeLists.txt +++ b/doc/man/atlantik/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kasteroids/CMakeLists.txt b/doc/man/kasteroids/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kasteroids/CMakeLists.txt +++ b/doc/man/kasteroids/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/katomic/CMakeLists.txt b/doc/man/katomic/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/katomic/CMakeLists.txt +++ b/doc/man/katomic/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kbackgammon/CMakeLists.txt b/doc/man/kbackgammon/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kbackgammon/CMakeLists.txt +++ b/doc/man/kbackgammon/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kbattleship/CMakeLists.txt b/doc/man/kbattleship/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kbattleship/CMakeLists.txt +++ b/doc/man/kbattleship/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kblackbox/CMakeLists.txt b/doc/man/kblackbox/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kblackbox/CMakeLists.txt +++ b/doc/man/kblackbox/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kbounce/CMakeLists.txt b/doc/man/kbounce/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kbounce/CMakeLists.txt +++ b/doc/man/kbounce/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kenolaba/CMakeLists.txt b/doc/man/kenolaba/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kenolaba/CMakeLists.txt +++ b/doc/man/kenolaba/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kenolaba/kenolaba.6 b/doc/man/kenolaba/kenolaba.6 index 42654a08..97d10a12 100644 --- a/doc/man/kenolaba/kenolaba.6 +++ b/doc/man/kenolaba/kenolaba.6 @@ -11,7 +11,7 @@ kenolaba \- Abalone board game for TDE KEnolaba is a simple board strategy game that is played by two players. There are red and yellow pieces for each player. Beginning from a start position where each player has 14 pieces, moves are drawn until -one player has pushed 6 of his opponent's pieces out of the board. +one player has pushed 6 of their opponent's pieces out of the board. The original program was developed in 1993 for DOS and pure Xlib. For TDE there was a major rewrite. diff --git a/doc/man/kfouleggs/CMakeLists.txt b/doc/man/kfouleggs/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kfouleggs/CMakeLists.txt +++ b/doc/man/kfouleggs/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kgoldrunner/CMakeLists.txt b/doc/man/kgoldrunner/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kgoldrunner/CMakeLists.txt +++ b/doc/man/kgoldrunner/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kjumpingcube/CMakeLists.txt b/doc/man/kjumpingcube/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kjumpingcube/CMakeLists.txt +++ b/doc/man/kjumpingcube/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/klickety/CMakeLists.txt b/doc/man/klickety/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/klickety/CMakeLists.txt +++ b/doc/man/klickety/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/klines/CMakeLists.txt b/doc/man/klines/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/klines/CMakeLists.txt +++ b/doc/man/klines/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kmahjongg/CMakeLists.txt b/doc/man/kmahjongg/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kmahjongg/CMakeLists.txt +++ b/doc/man/kmahjongg/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kmines/CMakeLists.txt b/doc/man/kmines/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kmines/CMakeLists.txt +++ b/doc/man/kmines/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/knetwalk/CMakeLists.txt b/doc/man/knetwalk/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/knetwalk/CMakeLists.txt +++ b/doc/man/knetwalk/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kolf/CMakeLists.txt b/doc/man/kolf/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kolf/CMakeLists.txt +++ b/doc/man/kolf/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/konquest/CMakeLists.txt b/doc/man/konquest/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/konquest/CMakeLists.txt +++ b/doc/man/konquest/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kpat/CMakeLists.txt b/doc/man/kpat/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kpat/CMakeLists.txt +++ b/doc/man/kpat/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kpoker/CMakeLists.txt b/doc/man/kpoker/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kpoker/CMakeLists.txt +++ b/doc/man/kpoker/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kreversi/CMakeLists.txt b/doc/man/kreversi/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kreversi/CMakeLists.txt +++ b/doc/man/kreversi/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kreversi/kreversi.6 b/doc/man/kreversi/kreversi.6 index a0cf3399..77443e55 100644 --- a/doc/man/kreversi/kreversi.6 +++ b/doc/man/kreversi/kreversi.6 @@ -14,7 +14,7 @@ playing field is an 8 by 8 square board divided into 64 squares. The game piece used is a colored stone - one side of it is red, the other blue. If a piece is captured by an opposing player, that piece is turned to reveal the color of that player. A winner is declared when -one player has more pieces of his own color on the board and if there +one player has more pieces of their own color on the board and if there are no more possible moves. <Insert here> .SH GENERIC OPTIONS diff --git a/doc/man/ksame/CMakeLists.txt b/doc/man/ksame/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/ksame/CMakeLists.txt +++ b/doc/man/ksame/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kshisen/CMakeLists.txt b/doc/man/kshisen/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kshisen/CMakeLists.txt +++ b/doc/man/kshisen/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/ksirtet/CMakeLists.txt b/doc/man/ksirtet/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/ksirtet/CMakeLists.txt +++ b/doc/man/ksirtet/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/ksmiletris/CMakeLists.txt b/doc/man/ksmiletris/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/ksmiletris/CMakeLists.txt +++ b/doc/man/ksmiletris/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/ksnake/CMakeLists.txt b/doc/man/ksnake/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/ksnake/CMakeLists.txt +++ b/doc/man/ksnake/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/ksokoban/CMakeLists.txt b/doc/man/ksokoban/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/ksokoban/CMakeLists.txt +++ b/doc/man/ksokoban/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/kspaceduel/CMakeLists.txt b/doc/man/kspaceduel/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/kspaceduel/CMakeLists.txt +++ b/doc/man/kspaceduel/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/ktron/CMakeLists.txt b/doc/man/ktron/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/ktron/CMakeLists.txt +++ b/doc/man/ktron/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/ktuberling/CMakeLists.txt b/doc/man/ktuberling/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/ktuberling/CMakeLists.txt +++ b/doc/man/ktuberling/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/lskat/CMakeLists.txt b/doc/man/lskat/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/lskat/CMakeLists.txt +++ b/doc/man/lskat/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/lskat/lskat.6 b/doc/man/lskat/lskat.6 index f0bece5e..ebff8a34 100644 --- a/doc/man/lskat/lskat.6 +++ b/doc/man/lskat/lskat.6 @@ -12,8 +12,8 @@ Lieutnant skat (from German \fIOffiziersskat\fP) is a card game for two players. It is roughly played according to the rules of Skat but with only two players and simplified rules. -Every player has a set of cards in front of him/her, half of them -covered and half of them open. Both players try to win more than 60 of +Every player has a set of cards in front of them, half of which is +covered and the other half open. Both players try to win more than 60 of the 120 possible points. After 16 moves all cards are played and the game ends. diff --git a/doc/man/tdefifteen/CMakeLists.txt b/doc/man/tdefifteen/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/tdefifteen/CMakeLists.txt +++ b/doc/man/tdefifteen/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/man/twin4/CMakeLists.txt b/doc/man/twin4/CMakeLists.txt index 8f52e818..701d24c4 100644 --- a/doc/man/twin4/CMakeLists.txt +++ b/doc/man/twin4/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _mans RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.6 ) -INSTALL( +install( FILES ${_mans} DESTINATION ${MAN_INSTALL_DIR}/man6 COMPONENT doc diff --git a/doc/twin4/index.docbook b/doc/twin4/index.docbook index 69349e83..0f305dc3 100644 --- a/doc/twin4/index.docbook +++ b/doc/twin4/index.docbook @@ -102,7 +102,8 @@ connection). It further shows the level of the computer opponent, the number of moves done as well as the computer calculated chance of winning. This chance is calculated only if the computer opponent makes a move. A positive number means that the player has an advantage, a -negative number means that the computer thinks he is better. +negative number means that the computer thinks it is better than the +player. </para> <para> diff --git a/kasteroids/ledmeter.h b/kasteroids/ledmeter.h index 786438d3..4fbe960b 100644 --- a/kasteroids/ledmeter.h +++ b/kasteroids/ledmeter.h @@ -13,7 +13,7 @@ class KALedMeter : public TQFrame { - Q_OBJECT + TQ_OBJECT public: KALedMeter( TQWidget *parent ); diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp index 303219d7..41e12e79 100644 --- a/kasteroids/toplevel.cpp +++ b/kasteroids/toplevel.cpp @@ -79,10 +79,10 @@ KAstTopLevel::KAstTopLevel() mainWin->setFixedSize(640, 480); view = new KAsteroidsView( mainWin ); - connect( view, TQT_SIGNAL( shipKilled() ), TQT_SLOT( slotShipKilled() ) ); - connect( view, TQT_SIGNAL( rockHit(int) ), TQT_SLOT( slotRockHit(int) ) ); - connect( view, TQT_SIGNAL( rocksRemoved() ), TQT_SLOT( slotRocksRemoved() ) ); - connect( view, TQT_SIGNAL( updateVitals() ), TQT_SLOT( slotUpdateVitals() ) ); + connect( view, TQ_SIGNAL( shipKilled() ), TQ_SLOT( slotShipKilled() ) ); + connect( view, TQ_SIGNAL( rockHit(int) ), TQ_SLOT( slotRockHit(int) ) ); + connect( view, TQ_SIGNAL( rocksRemoved() ), TQ_SLOT( slotRocksRemoved() ) ); + connect( view, TQ_SIGNAL( updateVitals() ), TQ_SLOT( slotUpdateVitals() ) ); TQVBoxLayout *vb = new TQVBoxLayout( mainWin ); TQHBoxLayout *hb = new TQHBoxLayout; @@ -252,7 +252,7 @@ KAstTopLevel::KAstTopLevel() setupGUI( TDEMainWindow::Save | Create ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); #ifdef KA_ENABLE_SOUND @@ -280,14 +280,14 @@ KAstTopLevel::~KAstTopLevel() void KAstTopLevel::initTDEAction() { // game - KStdGameAction::gameNew( TQT_TQOBJECT(this), TQT_SLOT( slotNewGame() ), actionCollection() ); - KStdGameAction::highscores( TQT_TQOBJECT(this), TQT_SLOT( slotShowHighscores() ), actionCollection() ); - KStdGameAction::pause( TQT_TQOBJECT(this), TQT_SLOT( slotPause() ), actionCollection() ); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); + KStdGameAction::gameNew( this, TQ_SLOT( slotNewGame() ), actionCollection() ); + KStdGameAction::highscores( this, TQ_SLOT( slotShowHighscores() ), actionCollection() ); + KStdGameAction::pause( this, TQ_SLOT( slotPause() ), actionCollection() ); + KStdGameAction::quit(this, TQ_SLOT( close() ), actionCollection()); // settings - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT( slotKeyConfig() ), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPref() ), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT( slotKeyConfig() ), actionCollection()); + KStdAction::preferences(this, TQ_SLOT( slotPref() ), actionCollection()); // keyboard-only actions keycodes.insert(Thrust, new TDEAction(i18n("Thrust"), TQt::Key_Up, 0, 0, actionCollection(), "Thrust")); @@ -297,7 +297,7 @@ void KAstTopLevel::initTDEAction() // keycodes.insert(Teleport, new TDEAction(i18n("Teleport"), TQt::Key_Z, 0, 0, actionCollection(), "Teleport")); keycodes.insert(Brake, new TDEAction(i18n("Brake"), TQt::Key_X, 0, 0, actionCollection(), "Brake")); keycodes.insert(Shield, new TDEAction(i18n("Shield"), TQt::Key_S, 0, 0, actionCollection(), "Shield")); - launchAction = new TDEAction(i18n("Launch"), TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotLaunch()), actionCollection(), "Launch"); + launchAction = new TDEAction(i18n("Launch"), TQt::Key_L, this, TQ_SLOT(slotLaunch()), actionCollection(), "Launch"); } @@ -336,7 +336,7 @@ return; // remove this and the above when the sound below is working correctly bool KAstTopLevel::eventFilter( TQObject* /* object */, TQEvent *event ) { - TQKeyEvent *e = TQT_TQKEYEVENT(event); + TQKeyEvent *e = static_cast<TQKeyEvent*>(event); if (event->type() == TQEvent::AccelOverride) { if (processKeyPress(e)) return true; @@ -529,7 +529,7 @@ void KAstTopLevel::slotShipKilled() } else { - TQTimer::singleShot(1000, TQT_TQOBJECT(this), TQT_SLOT(slotGameOver())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotGameOver())); } } } @@ -613,7 +613,7 @@ void KAstTopLevel::slotPref() /* Done */ dialog->addPage(w, i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); dialog->show(); } diff --git a/kasteroids/toplevel.h b/kasteroids/toplevel.h index 77111603..2cdd017b 100644 --- a/kasteroids/toplevel.h +++ b/kasteroids/toplevel.h @@ -22,7 +22,7 @@ class KDialogBase; class KAstTopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: KAstTopLevel(); diff --git a/kasteroids/view.cpp b/kasteroids/view.cpp index 1a45c044..081a0498 100644 --- a/kasteroids/view.cpp +++ b/kasteroids/view.cpp @@ -91,7 +91,7 @@ KAsteroidsView::KAsteroidsView( TQWidget *parent, const char *name ) readSprites(); shieldTimer = new TQTimer( this ); - connect( shieldTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideShield()) ); + connect( shieldTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideShield()) ); mTimerId = -1; shipPower = MAX_POWER_LEVEL; diff --git a/kasteroids/view.h b/kasteroids/view.h index 57b5ac39..e71550e2 100644 --- a/kasteroids/view.h +++ b/kasteroids/view.h @@ -19,7 +19,7 @@ class KAsteroidsView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KAsteroidsView( TQWidget *parent = 0, const char *name = 0 ); diff --git a/katomic/configbox.cpp b/katomic/configbox.cpp index c8a9fcd5..5b482ec8 100644 --- a/katomic/configbox.cpp +++ b/katomic/configbox.cpp @@ -33,10 +33,10 @@ ConfigBox::ConfigBox ( TQWidget *parent, const char *name) glay->addWidget(disp, 1, 2); disp->display(1); - speed = new TQSlider(1, 10, 1, 1, Qt::Horizontal, page); + speed = new TQSlider(1, 10, 1, 1, TQt::Horizontal, page); glay->addMultiCellWidget(speed, 2, 2, 2, 3); - connect(speed, TQT_SIGNAL(valueChanged(int)), disp, TQT_SLOT(display(int))); + connect(speed, TQ_SIGNAL(valueChanged(int)), disp, TQ_SLOT(display(int))); speed->setValue(settings.anim_speed); incInitialSize(TQSize(20,20), true); diff --git a/katomic/configbox.h b/katomic/configbox.h index c65f7ce0..ee3d0f47 100644 --- a/katomic/configbox.h +++ b/katomic/configbox.h @@ -15,7 +15,7 @@ class ConfigBox : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/katomic/feld.cpp b/katomic/feld.cpp index 3411b7fb..17b8472e 100644 --- a/katomic/feld.cpp +++ b/katomic/feld.cpp @@ -45,7 +45,7 @@ Feld::Feld( TQWidget *parent, const char *name ) : setMouseTracking(true); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setBackgroundColor( TQColor( 0, 0, 0) ); setFixedSize(15 * 30, 15 * 30); @@ -70,7 +70,7 @@ void Feld::resetValidDirs() void Feld::load (const KSimpleConfig& config) { if(moving) - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); mol->load(config); @@ -492,7 +492,7 @@ void Feld::timerEvent (TQTimerEvent *) if (frames <= 0) { moving = false; - TQT_TQOBJECT(this)->killTimers (); + this->killTimers (); done(); dir = None; } diff --git a/katomic/feld.h b/katomic/feld.h index 715aea52..5f8d5cc4 100644 --- a/katomic/feld.h +++ b/katomic/feld.h @@ -29,7 +29,7 @@ class Molek; class Feld : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index 9d0ddf1a..e688ac74 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -188,17 +188,17 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) // scrollbar scrl = new TQScrollBar(1, nlevels, 1, - 5, 1, Qt::Horizontal, vb, "scrl" ); - connect (scrl, TQT_SIGNAL (valueChanged (int)), TQT_SLOT (updateLevel (int))); + 5, 1, TQt::Horizontal, vb, "scrl" ); + connect (scrl, TQ_SIGNAL (valueChanged (int)), TQ_SLOT (updateLevel (int))); // molek�l molek = new Molek (vb, "molek"); feld->setMolek(molek); - connect (feld, TQT_SIGNAL (gameOver(int)), TQT_SLOT(gameOver(int))); - connect (feld, TQT_SIGNAL (sendMoves(int)), TQT_SLOT(getMoves(int))); - connect (feld, TQT_SIGNAL (enableRedo(bool)), TQT_SIGNAL(enableRedo(bool))); - connect (feld, TQT_SIGNAL (enableUndo(bool)), TQT_SIGNAL(enableUndo(bool))); + connect (feld, TQ_SIGNAL (gameOver(int)), TQ_SLOT(gameOver(int))); + connect (feld, TQ_SIGNAL (sendMoves(int)), TQ_SLOT(getMoves(int))); + connect (feld, TQ_SIGNAL (enableRedo(bool)), TQ_SIGNAL(enableRedo(bool))); + connect (feld, TQ_SIGNAL (enableUndo(bool)), TQ_SIGNAL(enableUndo(bool))); highScore = new KScoreDialog(KScoreDialog::Name | KScoreDialog::Score, this); diff --git a/katomic/gamewidget.h b/katomic/gamewidget.h index ec6722ff..039f433d 100644 --- a/katomic/gamewidget.h +++ b/katomic/gamewidget.h @@ -12,7 +12,7 @@ class KScoreDialog; class GameWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/katomic/molek.h b/katomic/molek.h index 561f1e0e..b019595c 100644 --- a/katomic/molek.h +++ b/katomic/molek.h @@ -22,7 +22,7 @@ class KSimpleConfig; class Molek : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp index 5603f505..6270430e 100644 --- a/katomic/toplevel.cpp +++ b/katomic/toplevel.cpp @@ -40,27 +40,27 @@ extern Options settings; void AtomTopLevel::createMenu() { - TDEAction *act = KStdGameAction::highscores(TQT_TQOBJECT(main), TQT_SLOT(showHighscores()), actionCollection()); + TDEAction *act = KStdGameAction::highscores(main, TQ_SLOT(showHighscores()), actionCollection()); act->setText(i18n("Show &Highscores")); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdGameAction::restart(TQT_TQOBJECT(main), TQT_SLOT(restartLevel()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdGameAction::restart(main, TQ_SLOT(restartLevel()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configopts()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(configopts()), actionCollection()); - undoAction = KStdGameAction::undo (TQT_TQOBJECT(main), TQT_SLOT(doUndo()), actionCollection()); - redoAction = KStdGameAction::redo (TQT_TQOBJECT(main), TQT_SLOT(doRedo()), actionCollection()); + undoAction = KStdGameAction::undo (main, TQ_SLOT(doUndo()), actionCollection()); + redoAction = KStdGameAction::redo (main, TQ_SLOT(doRedo()), actionCollection()); undoAction->setEnabled(false); redoAction->setEnabled(false); - connect (main, TQT_SIGNAL (enableRedo(bool)), TQT_SLOT(enableRedo(bool))); - connect (main, TQT_SIGNAL (enableUndo(bool)), TQT_SLOT(enableUndo(bool))); + connect (main, TQ_SIGNAL (enableRedo(bool)), TQ_SLOT(enableRedo(bool))); + connect (main, TQ_SIGNAL (enableUndo(bool)), TQ_SLOT(enableUndo(bool))); - new TDEAction(i18n("Atom Up"), Key_Up, TQT_TQOBJECT(main), TQT_SLOT(moveUp()), actionCollection(), "atom_up"); - new TDEAction(i18n("Atom Down"), Key_Down, TQT_TQOBJECT(main), TQT_SLOT(moveDown()), actionCollection(), "atom_down"); - new TDEAction(i18n("Atom Left"), Key_Left, TQT_TQOBJECT(main), TQT_SLOT(moveLeft()), actionCollection(), "atom_left"); - new TDEAction(i18n("Atom Right"), Key_Right, TQT_TQOBJECT(main), TQT_SLOT(moveRight()), actionCollection(), "atom_right"); + new TDEAction(i18n("Atom Up"), Key_Up, main, TQ_SLOT(moveUp()), actionCollection(), "atom_up"); + new TDEAction(i18n("Atom Down"), Key_Down, main, TQ_SLOT(moveDown()), actionCollection(), "atom_down"); + new TDEAction(i18n("Atom Left"), Key_Left, main, TQ_SLOT(moveLeft()), actionCollection(), "atom_left"); + new TDEAction(i18n("Atom Right"), Key_Right, main, TQ_SLOT(moveRight()), actionCollection(), "atom_right"); - new TDEAction(i18n("Next Atom"), Key_Tab, TQT_TQOBJECT(main), TQT_SLOT(nextAtom()), actionCollection(), "next_atom"); - new TDEAction(i18n("Previous Atom"), SHIFT+Key_Tab, TQT_TQOBJECT(main), TQT_SLOT(previousAtom()), actionCollection(), "prev_atom"); + new TDEAction(i18n("Next Atom"), Key_Tab, main, TQ_SLOT(nextAtom()), actionCollection(), "next_atom"); + new TDEAction(i18n("Previous Atom"), SHIFT+Key_Tab, main, TQ_SLOT(previousAtom()), actionCollection(), "prev_atom"); } void AtomTopLevel::configopts() diff --git a/katomic/toplevel.h b/katomic/toplevel.h index 5d997004..e57c02cc 100644 --- a/katomic/toplevel.h +++ b/katomic/toplevel.h @@ -23,7 +23,7 @@ class TDEConfig; class AtomTopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/CMakeLists.txt b/kbackgammon/engines/CMakeLists.txt index 6a4e4be2..7f33aa33 100644 --- a/kbackgammon/engines/CMakeLists.txt +++ b/kbackgammon/engines/CMakeLists.txt @@ -28,8 +28,6 @@ link_directories( ) -file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" ) - ##### kbgengines (static) ####################### tde_add_library( kbgengines STATIC_PIC AUTOMOC @@ -37,3 +35,5 @@ tde_add_library( kbgengines STATIC_PIC AUTOMOC LINK kbgoffline-static kbggnubg-static kbggeneric-static kbgfibs-static kbgnextgen-static ) + +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp index 4f30a87c..e1399b85 100644 --- a/kbackgammon/engines/fibs/kbgfibs.cpp +++ b/kbackgammon/engines/fibs/kbgfibs.cpp @@ -272,7 +272,7 @@ void KBgEngineFIBS::getSetupPages(KDialogBase *nb) lem[i] = new TQLineEdit(autoMsg[i], gbm); gl->addWidget(cbm[i], i, 0); gl->addWidget(lem[i], i, 1); - connect(cbm[i], TQT_SIGNAL(toggled(bool)), lem[i], TQT_SLOT(setEnabled(bool))); + connect(cbm[i], TQ_SIGNAL(toggled(bool)), lem[i], TQ_SLOT(setEnabled(bool))); cbm[i]->setChecked(useAutoMsg[i]); lem[i]->setEnabled(useAutoMsg[i]); TQWhatsThis::add(lem[i], TQWhatsThis::textFor(cbm[i])); @@ -838,8 +838,8 @@ void KBgEngineFIBS::fibsRequestInvitation(const TQString &player) if (!invitationDlg) { TQString p = player; invitationDlg = new KBgInvite("invite"); - connect(invitationDlg, TQT_SIGNAL(inviteCommand(const TQString &)), this, TQT_SLOT(handleCommand(const TQString &))); - connect(invitationDlg, TQT_SIGNAL(dialogDone()), this, TQT_SLOT(invitationDone())); + connect(invitationDlg, TQ_SIGNAL(inviteCommand(const TQString &)), this, TQ_SLOT(handleCommand(const TQString &))); + connect(invitationDlg, TQ_SIGNAL(dialogDone()), this, TQ_SLOT(invitationDone())); } invitationDlg->setPlayer(player); invitationDlg->show(); @@ -2094,55 +2094,55 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen /* * No connection, not playing, ready for login */ - connection = new TQSocket(TQT_TQOBJECT(parent), "fibs connection"); + connection = new TQSocket(parent, "fibs connection"); playing = false; login = true; - connect(connection, TQT_SIGNAL(hostFound()), this, TQT_SLOT(hostFound())); - connect(connection, TQT_SIGNAL(connected()), this, TQT_SLOT(connected())); - connect(connection, TQT_SIGNAL(error(int)), this, TQT_SLOT(connError(int))); - connect(connection, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(connectionClosed())); - connect(connection, TQT_SIGNAL(delayedCloseFinished()), this, TQT_SLOT(connectionClosed())); - connect(connection, TQT_SIGNAL(readyRead()), this, TQT_SLOT(readData())); + connect(connection, TQ_SIGNAL(hostFound()), this, TQ_SLOT(hostFound())); + connect(connection, TQ_SIGNAL(connected()), this, TQ_SLOT(connected())); + connect(connection, TQ_SIGNAL(error(int)), this, TQ_SLOT(connError(int))); + connect(connection, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(connectionClosed())); + connect(connection, TQ_SIGNAL(delayedCloseFinished()), this, TQ_SLOT(connectionClosed())); + connect(connection, TQ_SIGNAL(readyRead()), this, TQ_SLOT(readData())); - connect(this, TQT_SIGNAL(serverString(const TQString &)), this, TQT_SLOT(sendData(const TQString &))); + connect(this, TQ_SIGNAL(serverString(const TQString &)), this, TQ_SLOT(sendData(const TQString &))); /* * No invitation dialog */ invitationDlg = 0; - connect(this, TQT_SIGNAL(fibsWhoInfo(const TQString &)), this, TQT_SLOT(changeJoin(const TQString &))); - connect(this, TQT_SIGNAL(fibsLogout (const TQString &)), this, TQT_SLOT(cancelJoin(const TQString &))); - connect(this, TQT_SIGNAL(gameOver()), this, TQT_SLOT(endGame())); + connect(this, TQ_SIGNAL(fibsWhoInfo(const TQString &)), this, TQ_SLOT(changeJoin(const TQString &))); + connect(this, TQ_SIGNAL(fibsLogout (const TQString &)), this, TQ_SLOT(cancelJoin(const TQString &))); + connect(this, TQ_SIGNAL(gameOver()), this, TQ_SLOT(endGame())); /* * Creating, initializing and connecting the player list */ playerlist = new KFibsPlayerList(0, "fibs player list"); - connect(this, TQT_SIGNAL(fibsWhoInfo(const TQString &)), playerlist, TQT_SLOT(changePlayer(const TQString &))); - 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(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 &))); + connect(this, TQ_SIGNAL(fibsWhoInfo(const TQString &)), playerlist, TQ_SLOT(changePlayer(const TQString &))); + connect(this, TQ_SIGNAL(fibsLogout (const TQString &)), playerlist, TQ_SLOT(deletePlayer(const TQString &))); + connect(this, TQ_SIGNAL(fibsWhoEnd()), playerlist, TQ_SLOT(stopUpdate())); + connect(this, TQ_SIGNAL(fibsConnectionClosed()), playerlist, TQ_SLOT(stopUpdate())); + connect(this, TQ_SIGNAL(changePlayerStatus(const TQString &, int, bool)), + playerlist, TQ_SLOT(changePlayerStatus(const TQString &, int, bool))); + connect(playerlist, TQ_SIGNAL(fibsCommand(const TQString &)), this, TQ_SLOT(handleCommand(const TQString &))); + connect(playerlist, TQ_SIGNAL(fibsInvite(const TQString &)), this, TQ_SLOT(fibsRequestInvitation(const TQString &))); /* * Create, initialize and connect the chat window */ chatWindow = new KBgChat(0, "chat window"); - connect(this, TQT_SIGNAL(chatMessage(const TQString &)), chatWindow, TQT_SLOT(handleData(const TQString &))); - connect(this, TQT_SIGNAL(fibsStartNewGame(const TQString &)), chatWindow, TQT_SLOT(startGame(const TQString &))); - connect(this, TQT_SIGNAL(gameOver()), chatWindow, TQT_SLOT(endGame())); - connect(this, TQT_SIGNAL(fibsLogout (const TQString &)), chatWindow, TQT_SLOT(deletePlayer(const TQString &))); - connect(chatWindow, TQT_SIGNAL(fibsCommand(const TQString &)), this, TQT_SLOT(handleCommand(const TQString &))); - connect(chatWindow, TQT_SIGNAL(fibsRequestInvitation(const TQString &)), this, TQT_SLOT(fibsRequestInvitation(const TQString &))); - connect(chatWindow, TQT_SIGNAL(personalMessage(const TQString &)), this, TQT_SLOT(personalMessage(const TQString &))); - connect(playerlist, TQT_SIGNAL(fibsTalk(const TQString &)), chatWindow, TQT_SLOT(fibsTalk(const TQString &))); + connect(this, TQ_SIGNAL(chatMessage(const TQString &)), chatWindow, TQ_SLOT(handleData(const TQString &))); + connect(this, TQ_SIGNAL(fibsStartNewGame(const TQString &)), chatWindow, TQ_SLOT(startGame(const TQString &))); + connect(this, TQ_SIGNAL(gameOver()), chatWindow, TQ_SLOT(endGame())); + connect(this, TQ_SIGNAL(fibsLogout (const TQString &)), chatWindow, TQ_SLOT(deletePlayer(const TQString &))); + connect(chatWindow, TQ_SIGNAL(fibsCommand(const TQString &)), this, TQ_SLOT(handleCommand(const TQString &))); + connect(chatWindow, TQ_SIGNAL(fibsRequestInvitation(const TQString &)), this, TQ_SLOT(fibsRequestInvitation(const TQString &))); + connect(chatWindow, TQ_SIGNAL(personalMessage(const TQString &)), this, TQ_SLOT(personalMessage(const TQString &))); + connect(playerlist, TQ_SIGNAL(fibsTalk(const TQString &)), chatWindow, TQ_SLOT(fibsTalk(const TQString &))); /* * Creating, initializing and connecting the menu @@ -2156,9 +2156,9 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen /* * Initialize the FIBS submenu - this is also put in the play menu */ - conAction = new TDEAction(i18n("&Connect"), 0, this, TQT_SLOT( connectFIBS()), this); - newAction = new TDEAction(i18n("New Account"), 0, this, TQT_SLOT( newAccount()), this); - disAction = new TDEAction(i18n("&Disconnect"), 0, this, TQT_SLOT(disconnectFIBS()), this); + conAction = new TDEAction(i18n("&Connect"), 0, this, TQ_SLOT( connectFIBS()), this); + newAction = new TDEAction(i18n("New Account"), 0, this, TQ_SLOT( newAccount()), this); + disAction = new TDEAction(i18n("&Disconnect"), 0, this, TQ_SLOT(disconnectFIBS()), this); conAction->setEnabled(true ); conAction->plug(menu); disAction->setEnabled(false); disAction->plug(menu); @@ -2166,7 +2166,7 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen menu->insertSeparator(); - (invAction = new TDEAction(i18n("&Invite..."), 0, this, TQT_SLOT(inviteDialog()), this))->plug(menu); + (invAction = new TDEAction(i18n("&Invite..."), 0, this, TQ_SLOT(inviteDialog()), this))->plug(menu); /* * Create and fill the response menu. This is for all these: type this or @@ -2174,8 +2174,8 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen */ cmdMenuID = menu->insertItem(i18n("&Commands"), cmdMenu); { - (actAway = new TDEAction(i18n("Away"), 0, this, TQT_SLOT(away()), this))->plug(cmdMenu); - (actBack = new TDEAction(i18n("Back"), 0, this, TQT_SLOT(back()), this))->plug(cmdMenu); + (actAway = new TDEAction(i18n("Away"), 0, this, TQ_SLOT(away()), this))->plug(cmdMenu); + (actBack = new TDEAction(i18n("Back"), 0, this, TQ_SLOT(back()), this))->plug(cmdMenu); actAway->setEnabled(true); actBack->setEnabled(false); @@ -2192,14 +2192,14 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen fibsOpt[i] = 0; fibsOpt[OptReady] = new TDEToggleAction(i18n("Ready to Play"), - 0, this, TQT_SLOT(toggle_ready()), this); + 0, this, TQ_SLOT(toggle_ready()), this); fibsOpt[OptRatings] = new TDEToggleAction(i18n("Show Rating Computations"), - 0, this, TQT_SLOT(toggle_ratings()), this); + 0, this, TQ_SLOT(toggle_ratings()), this); fibsOpt[OptRatings]->setCheckedState(i18n("Hide Rating Computations")); fibsOpt[OptGreedy] = new TDEToggleAction(i18n("Greedy Bearoffs"), - 0, this, TQT_SLOT(toggle_greedy()), this); + 0, this, TQ_SLOT(toggle_greedy()), this); fibsOpt[OptDouble] = new TDEToggleAction(i18n("Ask for Doubles"), - 0, this, TQT_SLOT(toggle_double()), this); + 0, this, TQ_SLOT(toggle_double()), this); for (int i = 0; i < NumFIBSOpt; i++) if (fibsOpt[i]) @@ -2213,16 +2213,16 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen */ respMenuID = menu->insertItem(i18n("&Response"), respMenu); { - (actAccept = new TDEAction(i18n("Accept"), 0, this, TQT_SLOT(accept()), this))->plug(respMenu); - (actReject = new TDEAction(i18n("Reject"), 0, this, TQT_SLOT(reject()), this))->plug(respMenu); + (actAccept = new TDEAction(i18n("Accept"), 0, this, TQ_SLOT(accept()), this))->plug(respMenu); + (actReject = new TDEAction(i18n("Reject"), 0, this, TQ_SLOT(reject()), this))->plug(respMenu); actAccept->setEnabled(false); actReject->setEnabled(false); respMenu->insertSeparator(); - (actConti = new TDEAction(i18n("Join"), 0, this, TQT_SLOT(match_conti()), this))->plug(respMenu); - (actLeave = new TDEAction(i18n("Leave"), 0, this, TQT_SLOT(match_leave()), this))->plug(respMenu); + (actConti = new TDEAction(i18n("Join"), 0, this, TQ_SLOT(match_conti()), this))->plug(respMenu); + (actLeave = new TDEAction(i18n("Leave"), 0, this, TQ_SLOT(match_leave()), this))->plug(respMenu); actConti->setEnabled(false); actLeave->setEnabled(false); @@ -2235,14 +2235,14 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen joinMenuID = menu->insertItem(i18n("&Join"), joinMenu); { numJoin = -1; - actJoin[0] = new TDEAction("", 0, this, TQT_SLOT(join_0()), this); - actJoin[1] = new TDEAction("", 0, this, TQT_SLOT(join_1()), this); - actJoin[2] = new TDEAction("", 0, this, TQT_SLOT(join_2()), this); - actJoin[3] = new TDEAction("", 0, this, TQT_SLOT(join_3()), this); - actJoin[4] = new TDEAction("", 0, this, TQT_SLOT(join_4()), this); - actJoin[5] = new TDEAction("", 0, this, TQT_SLOT(join_5()), this); - actJoin[6] = new TDEAction("", 0, this, TQT_SLOT(join_6()), this); - actJoin[7] = new TDEAction("", 0, this, TQT_SLOT(join_7()), this); + actJoin[0] = new TDEAction("", 0, this, TQ_SLOT(join_0()), this); + actJoin[1] = new TDEAction("", 0, this, TQ_SLOT(join_1()), this); + actJoin[2] = new TDEAction("", 0, this, TQ_SLOT(join_2()), this); + actJoin[3] = new TDEAction("", 0, this, TQ_SLOT(join_3()), this); + actJoin[4] = new TDEAction("", 0, this, TQ_SLOT(join_4()), this); + actJoin[5] = new TDEAction("", 0, this, TQ_SLOT(join_5()), this); + actJoin[6] = new TDEAction("", 0, this, TQ_SLOT(join_6()), this); + actJoin[7] = new TDEAction("", 0, this, TQ_SLOT(join_7()), this); } menu->setItemEnabled(joinMenuID, false); @@ -2255,11 +2255,11 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen */ menu->insertSeparator(); - (listAct = new TDEToggleAction(i18n("&Player List"), 0, this, TQT_SLOT(showList()), this))->plug(menu); - (chatAct = new TDEToggleAction(i18n("&Chat"), 0, this, TQT_SLOT(showChat()), this))->plug(menu); + (listAct = new TDEToggleAction(i18n("&Player List"), 0, this, TQ_SLOT(showList()), this))->plug(menu); + (chatAct = new TDEToggleAction(i18n("&Chat"), 0, this, TQ_SLOT(showChat()), this))->plug(menu); - connect(playerlist, TQT_SIGNAL(windowVisible(bool)), listAct, TQT_SLOT(setChecked(bool))); - connect(chatWindow, TQT_SIGNAL(windowVisible(bool)), chatAct, TQT_SLOT(setChecked(bool))); + connect(playerlist, TQ_SIGNAL(windowVisible(bool)), listAct, TQ_SLOT(setChecked(bool))); + connect(chatWindow, TQ_SIGNAL(windowVisible(bool)), chatAct, TQ_SLOT(setChecked(bool))); /* * Create message IDs. This sets up a lot of regular expressions. @@ -2287,7 +2287,7 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen // FIXME: move the start to connect... keepaliveTimer = new TQTimer(this); - connect(keepaliveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(keepAlive())); + connect(keepaliveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(keepAlive())); keepaliveTimer->start(1200000); } diff --git a/kbackgammon/engines/fibs/kbgfibs.h b/kbackgammon/engines/fibs/kbgfibs.h index 9e74a497..76b388fd 100644 --- a/kbackgammon/engines/fibs/kbgfibs.h +++ b/kbackgammon/engines/fibs/kbgfibs.h @@ -58,7 +58,7 @@ class TDEToggleAction; */ class KBgEngineFIBS : public KBgEngine { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp index 19a4a7a2..cb77962d 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.cpp +++ b/kbackgammon/engines/fibs/kbgfibschat.cpp @@ -205,10 +205,10 @@ KBgChat::KBgChat(TQWidget *parent, const char *name) if (!addSendingEntry(i18n("Whisper to watchers only"), CLIP_YOU_WHISPER)) kdDebug(10500) << "adding whisper" << endl; - connect(this, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(contextMenu(TQListBoxItem *, const TQPoint &))); - connect(this, TQT_SIGNAL(signalSendMessage(int, const TQString &)), - this, TQT_SLOT(handleCommand(int, const TQString &))); + connect(this, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(contextMenu(TQListBoxItem *, const TQPoint &))); + connect(this, TQ_SIGNAL(signalSendMessage(int, const TQString &)), + this, TQ_SLOT(handleCommand(int, const TQString &))); d->mName2ID = new TQDict<int>(17, true); d->mName2ID->setAutoDelete(true); @@ -231,32 +231,32 @@ KBgChat::KBgChat(TQWidget *parent, const char *name) d->mAct[KBgChatPrivate::Inquire] = new TDEAction(i18n("Info On"), TQIconSet(kapp->iconLoader()->loadIcon( "help.xpm", TDEIcon::Small)), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotInquire()), actions); + 0, this, TQ_SLOT(slotInquire()), actions); d->mAct[KBgChatPrivate::Talk] = new TDEAction(i18n("Talk To"), TQIconSet(kapp->iconLoader()->loadIcon( PROG_NAME "-chat.png", TDEIcon::Small)), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()), actions); - - d->mAct[KBgChatPrivate::InviteD] = new TDEAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInviteD()), actions); - d->mAct[KBgChatPrivate::Invite1] = new TDEAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite1()), actions); - d->mAct[KBgChatPrivate::Invite2] = new TDEAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite2()), actions); - d->mAct[KBgChatPrivate::Invite3] = new TDEAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite3()), actions); - d->mAct[KBgChatPrivate::Invite4] = new TDEAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite4()), actions); - d->mAct[KBgChatPrivate::Invite5] = new TDEAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite5()), actions); - d->mAct[KBgChatPrivate::Invite6] = new TDEAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite6()), actions); - d->mAct[KBgChatPrivate::Invite7] = new TDEAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite7()), actions); - d->mAct[KBgChatPrivate::InviteU] = new TDEAction(i18n("Unlimited"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInviteU()), actions); - d->mAct[KBgChatPrivate::InviteR] = new TDEAction(i18n("Resume"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInviteR()), actions); + 0, this, TQ_SLOT(slotTalk()), actions); + + d->mAct[KBgChatPrivate::InviteD] = new TDEAction(i18n("Use Dialog"), 0, this, + TQ_SLOT(slotInviteD()), actions); + d->mAct[KBgChatPrivate::Invite1] = new TDEAction(i18n("1 Point Match"), 0, this, + TQ_SLOT(slotInvite1()), actions); + d->mAct[KBgChatPrivate::Invite2] = new TDEAction(i18n("2 Point Match"), 0, this, + TQ_SLOT(slotInvite2()), actions); + d->mAct[KBgChatPrivate::Invite3] = new TDEAction(i18n("3 Point Match"), 0, this, + TQ_SLOT(slotInvite3()), actions); + d->mAct[KBgChatPrivate::Invite4] = new TDEAction(i18n("4 Point Match"), 0, this, + TQ_SLOT(slotInvite4()), actions); + d->mAct[KBgChatPrivate::Invite5] = new TDEAction(i18n("5 Point Match"), 0, this, + TQ_SLOT(slotInvite5()), actions); + d->mAct[KBgChatPrivate::Invite6] = new TDEAction(i18n("6 Point Match"), 0, this, + TQ_SLOT(slotInvite6()), actions); + d->mAct[KBgChatPrivate::Invite7] = new TDEAction(i18n("7 Point Match"), 0, this, + TQ_SLOT(slotInvite7()), actions); + d->mAct[KBgChatPrivate::InviteU] = new TDEAction(i18n("Unlimited"), 0, this, + TQ_SLOT(slotInviteU()), actions); + d->mAct[KBgChatPrivate::InviteR] = new TDEAction(i18n("Resume"), 0, this, + TQ_SLOT(slotInviteR()), actions); d->mAct[KBgChatPrivate::InviteD]->plug(d->mInvt); @@ -275,13 +275,13 @@ KBgChat::KBgChat(TQWidget *parent, const char *name) d->mAct[KBgChatPrivate::InviteU]->plug(d->mInvt); d->mAct[KBgChatPrivate::InviteR]->plug(d->mInvt); - d->mAct[KBgChatPrivate::Gag] = new TDEAction(i18n("Gag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGag()), actions); - d->mAct[KBgChatPrivate::Ungag] = new TDEAction(i18n("Ungag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUngag()), actions); - d->mAct[KBgChatPrivate::Cleargag] = new TDEAction(i18n("Clear Gag List"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleargag()), actions); - d->mAct[KBgChatPrivate::Copy] = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions); - d->mAct[KBgChatPrivate::Clear] = new TDEAction(i18n("Clear"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actions); - d->mAct[KBgChatPrivate::Close] = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(hide()), actions); - d->mAct[KBgChatPrivate::Silent] = new TDEToggleAction(i18n("Silent"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSilent()), actions); + d->mAct[KBgChatPrivate::Gag] = new TDEAction(i18n("Gag"), 0, this, TQ_SLOT(slotGag()), actions); + d->mAct[KBgChatPrivate::Ungag] = new TDEAction(i18n("Ungag"), 0, this, TQ_SLOT(slotUngag()), actions); + d->mAct[KBgChatPrivate::Cleargag] = new TDEAction(i18n("Clear Gag List"), 0, this, TQ_SLOT(slotCleargag()), actions); + d->mAct[KBgChatPrivate::Copy] = KStdAction::copy(this, TQ_SLOT(slotCopy()), actions); + d->mAct[KBgChatPrivate::Clear] = new TDEAction(i18n("Clear"), 0, this, TQ_SLOT(slotClear()), actions); + d->mAct[KBgChatPrivate::Close] = KStdAction::close(this, TQ_SLOT(hide()), actions); + d->mAct[KBgChatPrivate::Silent] = new TDEToggleAction(i18n("Silent"), 0, this, TQ_SLOT(slotSilent()), actions); } diff --git a/kbackgammon/engines/fibs/kbgfibschat.h b/kbackgammon/engines/fibs/kbgfibschat.h index f2863397..b444672d 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.h +++ b/kbackgammon/engines/fibs/kbgfibschat.h @@ -53,7 +53,7 @@ class KBgChatPrivate; */ class KBgChat : public KChat { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/fibs/kbginvite.cpp b/kbackgammon/engines/fibs/kbginvite.cpp index ef186f03..fd4b35a7 100644 --- a/kbackgammon/engines/fibs/kbginvite.cpp +++ b/kbackgammon/engines/fibs/kbginvite.cpp @@ -116,11 +116,11 @@ KBgInvite::KBgInvite(const char *name) /* * Connect the buttons */ - connect(d->mUnlimited, TQT_SIGNAL(clicked()), TQT_SLOT(unlimitedClicked())); - connect(d->mResume, TQT_SIGNAL(clicked()), TQT_SLOT(resumeClicked())); - connect(d->mInvite, TQT_SIGNAL(clicked()), TQT_SLOT(inviteClicked())); - connect(d->mClose, TQT_SIGNAL(clicked()), TQT_SLOT(hide())); - connect(d->mCancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelClicked())); + connect(d->mUnlimited, TQ_SIGNAL(clicked()), TQ_SLOT(unlimitedClicked())); + connect(d->mResume, TQ_SIGNAL(clicked()), TQ_SLOT(resumeClicked())); + connect(d->mInvite, TQ_SIGNAL(clicked()), TQ_SLOT(inviteClicked())); + connect(d->mClose, TQ_SIGNAL(clicked()), TQ_SLOT(hide())); + connect(d->mCancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancelClicked())); } /* diff --git a/kbackgammon/engines/fibs/kbginvite.h b/kbackgammon/engines/fibs/kbginvite.h index 0c0aaf43..220e012a 100644 --- a/kbackgammon/engines/fibs/kbginvite.h +++ b/kbackgammon/engines/fibs/kbginvite.h @@ -44,7 +44,7 @@ class KBgInvitePrivate; */ class KBgInvite : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp index deffaa91..c7ce8ab6 100644 --- a/kbackgammon/engines/fibs/kplayerlist.cpp +++ b/kbackgammon/engines/fibs/kplayerlist.cpp @@ -288,42 +288,42 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name) d->mAct[KFibsPlayerListPrivate::Info] = new TDEAction(i18n("Info"), TQIconSet(kapp->iconLoader()->loadIcon ("help.xpm", TDEIcon::Small)), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actions); + 0, this, TQ_SLOT(slotInfo()), actions); d->mAct[KFibsPlayerListPrivate::Talk] = new TDEAction(i18n("Talk"), TQIconSet(kapp->iconLoader()->loadIcon (PROG_NAME "-chat.png", TDEIcon::Small)), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()), actions); - - d->mAct[KFibsPlayerListPrivate::Look] = new TDEAction(i18n("Look"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLook()), actions); - d->mAct[KFibsPlayerListPrivate::Watch] = new TDEAction(i18n("Watch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWatch()), actions); - d->mAct[KFibsPlayerListPrivate::Unwatch] = new TDEAction(i18n("Unwatch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnwatch()),actions); - d->mAct[KFibsPlayerListPrivate::BlindAct] = new TDEAction(i18n("Blind"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlind()), actions); - d->mAct[KFibsPlayerListPrivate::Update] = new TDEAction(i18n("Update"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdate()), actions); - - d->mAct[KFibsPlayerListPrivate::Reload] = KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(slotReload()), actions); - d->mAct[KFibsPlayerListPrivate::Mail] = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actions); - d->mAct[KFibsPlayerListPrivate::Close] = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(hide()), actions); - - d->mAct[KFibsPlayerListPrivate::InviteD] = new TDEAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInviteD()), actions); - d->mAct[KFibsPlayerListPrivate::Invite1] = new TDEAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite1()), actions); - d->mAct[KFibsPlayerListPrivate::Invite2] = new TDEAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite2()), actions); - d->mAct[KFibsPlayerListPrivate::Invite3] = new TDEAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite3()), actions); - d->mAct[KFibsPlayerListPrivate::Invite4] = new TDEAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite4()), actions); - d->mAct[KFibsPlayerListPrivate::Invite5] = new TDEAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite5()), actions); - d->mAct[KFibsPlayerListPrivate::Invite6] = new TDEAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite6()), actions); - d->mAct[KFibsPlayerListPrivate::Invite7] = new TDEAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInvite7()), actions); - d->mAct[KFibsPlayerListPrivate::InviteU] = new TDEAction(i18n("Unlimited"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInviteU()), actions); - d->mAct[KFibsPlayerListPrivate::InviteR] = new TDEAction(i18n("Resume"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInviteR()), actions); + 0, this, TQ_SLOT(slotTalk()), actions); + + d->mAct[KFibsPlayerListPrivate::Look] = new TDEAction(i18n("Look"), 0, this, TQ_SLOT(slotLook()), actions); + d->mAct[KFibsPlayerListPrivate::Watch] = new TDEAction(i18n("Watch"), 0, this, TQ_SLOT(slotWatch()), actions); + d->mAct[KFibsPlayerListPrivate::Unwatch] = new TDEAction(i18n("Unwatch"), 0, this, TQ_SLOT(slotUnwatch()),actions); + d->mAct[KFibsPlayerListPrivate::BlindAct] = new TDEAction(i18n("Blind"), 0, this, TQ_SLOT(slotBlind()), actions); + d->mAct[KFibsPlayerListPrivate::Update] = new TDEAction(i18n("Update"), 0, this, TQ_SLOT(slotUpdate()), actions); + + d->mAct[KFibsPlayerListPrivate::Reload] = KStdAction::redisplay(this, TQ_SLOT(slotReload()), actions); + d->mAct[KFibsPlayerListPrivate::Mail] = KStdAction::mail(this, TQ_SLOT(slotMail()), actions); + d->mAct[KFibsPlayerListPrivate::Close] = KStdAction::close(this, TQ_SLOT(hide()), actions); + + d->mAct[KFibsPlayerListPrivate::InviteD] = new TDEAction(i18n("Use Dialog"), 0, this, + TQ_SLOT(slotInviteD()), actions); + d->mAct[KFibsPlayerListPrivate::Invite1] = new TDEAction(i18n("1 Point Match"), 0, this, + TQ_SLOT(slotInvite1()), actions); + d->mAct[KFibsPlayerListPrivate::Invite2] = new TDEAction(i18n("2 Point Match"), 0, this, + TQ_SLOT(slotInvite2()), actions); + d->mAct[KFibsPlayerListPrivate::Invite3] = new TDEAction(i18n("3 Point Match"), 0, this, + TQ_SLOT(slotInvite3()), actions); + d->mAct[KFibsPlayerListPrivate::Invite4] = new TDEAction(i18n("4 Point Match"), 0, this, + TQ_SLOT(slotInvite4()), actions); + d->mAct[KFibsPlayerListPrivate::Invite5] = new TDEAction(i18n("5 Point Match"), 0, this, + TQ_SLOT(slotInvite5()), actions); + d->mAct[KFibsPlayerListPrivate::Invite6] = new TDEAction(i18n("6 Point Match"), 0, this, + TQ_SLOT(slotInvite6()), actions); + d->mAct[KFibsPlayerListPrivate::Invite7] = new TDEAction(i18n("7 Point Match"), 0, this, + TQ_SLOT(slotInvite7()), actions); + d->mAct[KFibsPlayerListPrivate::InviteU] = new TDEAction(i18n("Unlimited"), 0, this, + TQ_SLOT(slotInviteU()), actions); + d->mAct[KFibsPlayerListPrivate::InviteR] = new TDEAction(i18n("Resume"), 0, this, + TQ_SLOT(slotInviteR()), actions); /* * Fill normal context menu @@ -362,10 +362,10 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name) /* * Right mouse button gets context menu, double click gets player info */ - connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - this, TQT_SLOT(showContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(getPlayerInfo(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + this, TQ_SLOT(showContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(getPlayerInfo(TQListViewItem *, const TQPoint &, int))); } /* @@ -482,7 +482,7 @@ void KFibsPlayerList::getSetupPages(KTabCtl *nb, int space) */ nb->addTab(w, i18n("&Playerlist")); - connect(nb, TQT_SIGNAL(applyButtonPressed()), TQT_TQOBJECT(this), TQT_SLOT(setupOk())); + connect(nb, TQ_SIGNAL(applyButtonPressed()), this, TQ_SLOT(setupOk())); } /* diff --git a/kbackgammon/engines/fibs/kplayerlist.h b/kbackgammon/engines/fibs/kplayerlist.h index 56513e65..85c561aa 100644 --- a/kbackgammon/engines/fibs/kplayerlist.h +++ b/kbackgammon/engines/fibs/kplayerlist.h @@ -44,7 +44,7 @@ class KFibsPlayerListPrivate; */ class KFibsPlayerList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/generic/kbgengine.cpp b/kbackgammon/engines/generic/kbgengine.cpp index 3e193984..677c8b49 100644 --- a/kbackgammon/engines/generic/kbgengine.cpp +++ b/kbackgammon/engines/generic/kbgengine.cpp @@ -38,7 +38,7 @@ KBgEngine::KBgEngine(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) menu = pmenu; cl = -1; ct = new TQTimer(this); - connect(ct, TQT_SIGNAL(timeout()), this, TQT_SLOT(done())); + connect(ct, TQ_SIGNAL(timeout()), this, TQ_SLOT(done())); } /* diff --git a/kbackgammon/engines/generic/kbgengine.h b/kbackgammon/engines/generic/kbgengine.h index 75d1cc6d..6964e065 100644 --- a/kbackgammon/engines/generic/kbgengine.h +++ b/kbackgammon/engines/generic/kbgengine.h @@ -59,7 +59,7 @@ class KBgStatus; */ class KBgEngine:public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp index 6b49a78d..72f683c8 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.cpp +++ b/kbackgammon/engines/gnubg/kbggnubg.cpp @@ -433,12 +433,12 @@ KBgEngineGNU::KBgEngineGNU(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) * internal statue variables */ rollingAllowed = undoPossible = gameRunning = donePossible = false; - connect(this, TQT_SIGNAL(allowCommand(int, bool)), this, TQT_SLOT(setAllowed(int, bool))); + connect(this, TQ_SIGNAL(allowCommand(int, bool)), this, TQ_SLOT(setAllowed(int, bool))); /* * Setup of menu */ - resAction = new TDEAction(i18n("&Restart GNU Backgammon"), 0, this, TQT_SLOT(startGNU()), this); + resAction = new TDEAction(i18n("&Restart GNU Backgammon"), 0, this, TQ_SLOT(startGNU()), this); resAction->setEnabled(false); resAction->plug(menu); /* @@ -468,7 +468,7 @@ void KBgEngineGNU::start() * Will be started later */ cmdTimer = new TQTimer(this); - connect(cmdTimer, TQT_SIGNAL(timeout()), TQT_SLOT(nextCommand()) ); + connect(cmdTimer, TQ_SIGNAL(timeout()), TQ_SLOT(nextCommand()) ); emit infoText(i18n("This is experimental code which currently requires a specially " "patched version of GNU Backgammon.<br/><br/>")); @@ -483,12 +483,12 @@ void KBgEngineGNU::start() */ gnubg << "gnubg" << "--tty"; - connect(&gnubg, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(gnubgExit(TDEProcess *))); - connect(&gnubg, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(receiveData(TDEProcess *, char *, int))); - connect(&gnubg, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(receiveData(TDEProcess *, char *, int))); - connect(&gnubg, TQT_SIGNAL(wroteStdin(TDEProcess *)), this, TQT_SLOT(wroteStdin(TDEProcess *))); + connect(&gnubg, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(gnubgExit(TDEProcess *))); + connect(&gnubg, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(receiveData(TDEProcess *, char *, int))); + connect(&gnubg, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(receiveData(TDEProcess *, char *, int))); + connect(&gnubg, TQ_SIGNAL(wroteStdin(TDEProcess *)), this, TQ_SLOT(wroteStdin(TDEProcess *))); startGNU(); } diff --git a/kbackgammon/engines/gnubg/kbggnubg.h b/kbackgammon/engines/gnubg/kbggnubg.h index dcde6f1f..d4bff597 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.h +++ b/kbackgammon/engines/gnubg/kbggnubg.h @@ -42,7 +42,7 @@ */ class KBgEngineGNU : public KBgEngine { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/nextgen/kbggame.h b/kbackgammon/engines/nextgen/kbggame.h index c224f7d2..7a577fab 100644 --- a/kbackgammon/engines/nextgen/kbggame.h +++ b/kbackgammon/engines/nextgen/kbggame.h @@ -38,7 +38,7 @@ class KPlayer; */ class KDE_EXPORT KBgGame : public KGame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/nextgen/kbgng.cpp b/kbackgammon/engines/nextgen/kbgng.cpp index aadb536f..a9e1ac56 100644 --- a/kbackgammon/engines/nextgen/kbgng.cpp +++ b/kbackgammon/engines/nextgen/kbgng.cpp @@ -67,13 +67,13 @@ KBgEngineNg::KBgEngineNg(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) for (int i = 0; i < MaxTypes; i++) list.append(label[i]); - _gameSelect = new TDESelectAction(i18n("&Types"), 0, this, TQT_SLOT(setGame()), this); + _gameSelect = new TDESelectAction(i18n("&Types"), 0, this, TQ_SLOT(setGame()), this); _gameSelect->setItems(list); _gameSelect->plug(menu); menu->insertSeparator(); - _connectAction = new TDEAction(i18n("&Names..."), 0, this, TQT_SLOT(changeName()), this); + _connectAction = new TDEAction(i18n("&Names..."), 0, this, TQ_SLOT(changeName()), this); _connectAction->plug(menu); // Restore last settings @@ -588,8 +588,8 @@ KBgPlayer * KBgEngineNg::createPlayer(int i, TQString name) p->findProperty(KGamePropertyBase::IdName)->setEmittingSignal(true); - connect(p, TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *, KPlayer *)), - this, TQT_SLOT(slotPropertyChanged(KGamePropertyBase *, KPlayer *))); + connect(p, TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *, KPlayer *)), + this, TQ_SLOT(slotPropertyChanged(KGamePropertyBase *, KPlayer *))); return (_player[i] = p); } @@ -602,20 +602,20 @@ void KBgEngineNg::initGame() _game = new KBgGame(PROG_COOKIE); _game->random()->setSeed(getpid()*time(NULL)); - connect(_game, TQT_SIGNAL(signalPlayerJoinedGame(KPlayer *)), - this, TQT_SLOT(slotPlayerJoinedGame(KPlayer *))); - connect(_game, TQT_SIGNAL(signalCreatePlayer(KPlayer *&, int, int, bool, KGame *)), - this, TQT_SLOT(slotCreatePlayer(KPlayer *&, int, int, bool, KGame *))); + connect(_game, TQ_SIGNAL(signalPlayerJoinedGame(KPlayer *)), + this, TQ_SLOT(slotPlayerJoinedGame(KPlayer *))); + connect(_game, TQ_SIGNAL(signalCreatePlayer(KPlayer *&, int, int, bool, KGame *)), + this, TQ_SLOT(slotCreatePlayer(KPlayer *&, int, int, bool, KGame *))); - connect(_game, TQT_SIGNAL(signalClientConnected(TQ_UINT32)), - this, TQT_SLOT(slotClientConnected(TQ_UINT32))); - connect(_game, TQT_SIGNAL(signalClientDisconnected(TQ_UINT32, bool)), - this, TQT_SLOT(slotClientDisconnected(TQ_UINT32, bool))); + connect(_game, TQ_SIGNAL(signalClientConnected(TQ_UINT32)), + this, TQ_SLOT(slotClientConnected(TQ_UINT32))); + connect(_game, TQ_SIGNAL(signalClientDisconnected(TQ_UINT32, bool)), + this, TQ_SLOT(slotClientDisconnected(TQ_UINT32, bool))); - connect(_game, TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *, KGame *)), - this, TQT_SLOT(slotPropertyChanged(KGamePropertyBase *, KGame *))); - connect(_game, TQT_SIGNAL(signalNetworkData(int,const TQByteArray &, TQ_UINT32, TQ_UINT32)), - this, TQT_SLOT(slotNetworkData(int,const TQByteArray &, TQ_UINT32, TQ_UINT32))); + connect(_game, TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *, KGame *)), + this, TQ_SLOT(slotPropertyChanged(KGamePropertyBase *, KGame *))); + connect(_game, TQ_SIGNAL(signalNetworkData(int,const TQByteArray &, TQ_UINT32, TQ_UINT32)), + this, TQ_SLOT(slotNetworkData(int,const TQByteArray &, TQ_UINT32, TQ_UINT32))); } // EOF diff --git a/kbackgammon/engines/nextgen/kbgng.h b/kbackgammon/engines/nextgen/kbgng.h index 42468f1d..a03db0c6 100644 --- a/kbackgammon/engines/nextgen/kbgng.h +++ b/kbackgammon/engines/nextgen/kbgng.h @@ -49,7 +49,7 @@ */ class KBgEngineNg : public KBgEngine { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/nextgen/kbgplayer.h b/kbackgammon/engines/nextgen/kbgplayer.h index 244a4aeb..a860b6e4 100644 --- a/kbackgammon/engines/nextgen/kbgplayer.h +++ b/kbackgammon/engines/nextgen/kbgplayer.h @@ -39,7 +39,7 @@ class KGame; */ class KBgPlayer : public KPlayer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/engines/offline/kbgoffline.cpp b/kbackgammon/engines/offline/kbgoffline.cpp index ce8dd54d..f1a16189 100644 --- a/kbackgammon/engines/offline/kbgoffline.cpp +++ b/kbackgammon/engines/offline/kbgoffline.cpp @@ -119,11 +119,11 @@ KBgEngineOffline::KBgEngineOffline(TQWidget *parent, TQString *name, TQPopupMenu /* * Create engine specific actions */ - d->mNew = new TDEAction(i18n("&New Game..."), 0, this, TQT_SLOT(newGame()), this); - d->mSwap = new TDEAction(i18n("&Swap Colors"), 0, this, TQT_SLOT(swapColors()), this); + d->mNew = new TDEAction(i18n("&New Game..."), 0, this, TQ_SLOT(newGame()), this); + d->mSwap = new TDEAction(i18n("&Swap Colors"), 0, this, TQ_SLOT(swapColors()), this); d->mEdit = new TDEToggleAction(i18n("&Edit Mode"), 0, this, - TQT_SLOT(toggleEditMode()), this); + TQ_SLOT(toggleEditMode()), this); d->mEdit->setChecked(false); /* @@ -143,13 +143,13 @@ KBgEngineOffline::KBgEngineOffline(TQWidget *parent, TQString *name, TQPopupMenu * initialize the commit timeout */ ct = new TQTimer(this); - connect(ct, TQT_SIGNAL(timeout()), this, TQT_SLOT(done())); + connect(ct, TQ_SIGNAL(timeout()), this, TQ_SLOT(done())); /* * internal statue variables */ d->mRollFlag = d->mUndoFlag = d->mGameFlag = d->mDoneFlag = false; - connect(this, TQT_SIGNAL(allowCommand(int, bool)), this, TQT_SLOT(setAllowed(int, bool))); + connect(this, TQ_SIGNAL(allowCommand(int, bool)), this, TQ_SLOT(setAllowed(int, bool))); /* * Restore last stored settings diff --git a/kbackgammon/engines/offline/kbgoffline.h b/kbackgammon/engines/offline/kbgoffline.h index 673e94a1..9f38efa3 100644 --- a/kbackgammon/engines/offline/kbgoffline.h +++ b/kbackgammon/engines/offline/kbgoffline.h @@ -47,7 +47,7 @@ class KBgEngineOfflinePrivate; */ class KBgEngineOffline : public KBgEngine { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp index 696d9b7f..6034d670 100644 --- a/kbackgammon/kbg.cpp +++ b/kbackgammon/kbg.cpp @@ -88,7 +88,7 @@ KBg::KBg() /* * The main view is shared between the board and a small text window */ - panner = new TQSplitter(Qt::Vertical, this, "panner"); + panner = new TQSplitter(TQt::Vertical, this, "panner"); board = new KBgBoardSetup(panner, "board"); status = new KBgTextView(panner, "status"); setCentralWidget(panner); @@ -96,45 +96,45 @@ KBg::KBg() /* * Create all actions needed by the application */ - newAction = KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); + newAction = KStdGameAction::gameNew(this, TQ_SLOT(openNew()), actionCollection()); newAction->setEnabled(false); - KStdGameAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdGameAction::print(this, TQ_SLOT(print()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); TQStringList list; for (int i = 0; i < MaxEngine; i++) list.append(engineString[i]); - engineSet = new TDESelectAction(i18n("&Engine"), 0, TQT_TQOBJECT(this), TQT_SLOT(setupEngine()), actionCollection(), + engineSet = new TDESelectAction(i18n("&Engine"), 0, this, TQ_SLOT(setupEngine()), actionCollection(), "move_engine"); engineSet->setItems(list); // AB: what the heck has this to do with redisplay? perhaps use reload instead? - loadAction = KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(load()), actionCollection(), "move_load"); + loadAction = KStdAction::redisplay(this, TQ_SLOT(load()), actionCollection(), "move_load"); loadAction->setEnabled(false); - undoAction = KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection()); + undoAction = KStdGameAction::undo(this, TQ_SLOT(undo()), actionCollection()); undoAction->setEnabled(false); - redoAction = KStdGameAction::redo(TQT_TQOBJECT(this), TQT_SLOT(redo()), actionCollection()); + redoAction = KStdGameAction::redo(this, TQ_SLOT(redo()), actionCollection()); redoAction->setEnabled(false); - rollAction = KStdGameAction::roll(TQT_TQOBJECT(this), TQT_SLOT(roll()), actionCollection()); + rollAction = KStdGameAction::roll(this, TQ_SLOT(roll()), actionCollection()); rollAction->setEnabled(false); - endAction = KStdGameAction::endTurn(TQT_TQOBJECT(this), TQT_SLOT(done()), actionCollection()); + endAction = KStdGameAction::endTurn(this, TQ_SLOT(done()), actionCollection()); endAction->setEnabled(false); cubeAction = new TDEAction(i18n("Double Cube"), TQIconSet(kapp->iconLoader()->loadIcon (PROG_NAME "-double.xpm", TDEIcon::Toolbar)), - 0, TQT_TQOBJECT(this), TQT_SLOT(cube()), actionCollection(), "move_cube"); + 0, this, TQ_SLOT(cube()), actionCollection(), "move_cube"); cubeAction->setEnabled(false); - KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(setupDlg()), actionCollection()); - KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveConfig()), actionCollection()); + KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(setupDlg()), actionCollection()); + KStdAction::saveOptions(this, TQ_SLOT(saveConfig()), actionCollection()); TDEPopupMenu *p = (new TDEActionMenu(i18n("&Backgammon on the Web"), actionCollection(), "help_www"))->popupMenu(); - (new TDEAction(helpTopic[FIBSHome][0], 0, TQT_TQOBJECT(this), TQT_SLOT(wwwFIBS()), + (new TDEAction(helpTopic[FIBSHome][0], 0, this, TQ_SLOT(wwwFIBS()), actionCollection(), "help_www_fibs"))->plug(p); - (new TDEAction(helpTopic[RuleHome][0], 0, TQT_TQOBJECT(this), TQT_SLOT(wwwRule()), + (new TDEAction(helpTopic[RuleHome][0], 0, this, TQ_SLOT(wwwRule()), actionCollection(), "help_www_rule"))->plug(p); /* @@ -148,7 +148,7 @@ KBg::KBg() actionCmdLine->setAutoSized(true); cmdLine->completionObject()->setOrder(TDECompletion::Weighted); - connect(cmdLine, TQT_SIGNAL(returnPressed(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(handleCmd(const TQString &))); + connect(cmdLine, TQ_SIGNAL(returnPressed(const TQString &)), this, TQ_SLOT(handleCmd(const TQString &))); /* * Done with the actions, create the XML-defined parts of the * user interface @@ -172,8 +172,8 @@ KBg::KBg() * Set up configuration handling. * FIXME: support session management */ - connect(this, TQT_SIGNAL(readSettings()), board, TQT_SLOT(readConfig())); - connect(this, TQT_SIGNAL(saveSettings()), board, TQT_SLOT(saveConfig())); + connect(this, TQ_SIGNAL(readSettings()), board, TQ_SLOT(readConfig())); + connect(this, TQ_SIGNAL(saveSettings()), board, TQ_SLOT(saveConfig())); /* * Set up some whatis messages for the online help @@ -274,26 +274,26 @@ void KBg::setupEngine() newAction->setEnabled(engine[currEngine]->haveNewGame()); // engine -> this - connect(engine[currEngine], TQT_SIGNAL(statText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(updateCaption(const TQString &))); - connect(engine[currEngine], TQT_SIGNAL(infoText(const TQString &)), status, TQT_SLOT(write(const TQString &))); - connect(engine[currEngine], TQT_SIGNAL(allowCommand(int, bool)), this, TQT_SLOT(allowCommand(int, bool))); + connect(engine[currEngine], TQ_SIGNAL(statText(const TQString &)), this, TQ_SLOT(updateCaption(const TQString &))); + connect(engine[currEngine], TQ_SIGNAL(infoText(const TQString &)), status, TQ_SLOT(write(const TQString &))); + connect(engine[currEngine], TQ_SIGNAL(allowCommand(int, bool)), this, TQ_SLOT(allowCommand(int, bool))); // this -> engine - connect(this, TQT_SIGNAL(readSettings()), engine[currEngine], TQT_SLOT(readConfig())); - connect(this, TQT_SIGNAL(saveSettings()), engine[currEngine], TQT_SLOT(saveConfig())); + connect(this, TQ_SIGNAL(readSettings()), engine[currEngine], TQ_SLOT(readConfig())); + connect(this, TQ_SIGNAL(saveSettings()), engine[currEngine], TQ_SLOT(saveConfig())); // board -> engine - connect(board, TQT_SIGNAL(rollDice(const int)), engine[currEngine], TQT_SLOT(rollDice(const int))); - connect(board, TQT_SIGNAL(doubleCube(const int)), engine[currEngine], TQT_SLOT(doubleCube(const int))); - connect(board, TQT_SIGNAL(currentMove(TQString *)), engine[currEngine], TQT_SLOT(handleMove(TQString *))); + connect(board, TQ_SIGNAL(rollDice(const int)), engine[currEngine], TQ_SLOT(rollDice(const int))); + connect(board, TQ_SIGNAL(doubleCube(const int)), engine[currEngine], TQ_SLOT(doubleCube(const int))); + connect(board, TQ_SIGNAL(currentMove(TQString *)), engine[currEngine], TQ_SLOT(handleMove(TQString *))); // engine -> board - connect(engine[currEngine], TQT_SIGNAL(undoMove()), board, TQT_SLOT(undoMove())); - 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(KBgStatus *)), board, TQT_SLOT(getState(KBgStatus *))); - connect(engine[currEngine], TQT_SIGNAL(newState(const KBgStatus &)), board, TQT_SLOT(setState(const KBgStatus &))); + connect(engine[currEngine], TQ_SIGNAL(undoMove()), board, TQ_SLOT(undoMove())); + connect(engine[currEngine], TQ_SIGNAL(redoMove()), board, TQ_SLOT(redoMove())); + connect(engine[currEngine], TQ_SIGNAL(setEditMode(const bool)), board, TQ_SLOT(setEditMode(const bool))); + connect(engine[currEngine], TQ_SIGNAL(allowMoving(const bool)), board, TQ_SLOT(allowMoving(const bool))); + connect(engine[currEngine], TQ_SIGNAL(getState(KBgStatus *)), board, TQ_SLOT(getState(KBgStatus *))); + connect(engine[currEngine], TQ_SIGNAL(newState(const KBgStatus &)), board, TQ_SLOT(setState(const KBgStatus &))); // now that all signals are connected, start the engine engine[currEngine]->start(); @@ -535,7 +535,7 @@ void KBg::setupDlg() sbt->setLabel(i18n("Move timeout in seconds:")); sbt->setValue(config->readDoubleNumEntry("timeout", 2.5)); - connect(cbt, TQT_SIGNAL(toggled(bool)), sbt, TQT_SLOT(setEnabled(bool))); + connect(cbt, TQ_SIGNAL(toggled(bool)), sbt, TQ_SLOT(setEnabled(bool))); sbt->setEnabled(cbt->isChecked()); TQGridLayout *gl = new TQGridLayout(gbt, 2, 1, 20); @@ -577,7 +577,7 @@ void KBg::setupDlg() lab->setMaximumSize(lab->sizeHint()); gle->addWidget(lab, 0, 0); - connect(lab, TQT_SIGNAL(leftClickedURL(const TQString &)), TQT_SLOT(startKCM(const TQString &))); + connect(lab, TQ_SIGNAL(leftClickedURL(const TQString &)), TQ_SLOT(startKCM(const TQString &))); /* * Board settings @@ -606,7 +606,7 @@ void KBg::setupDlg() engine[i] = new KBgEngineNg(nb, &s, dummyPopup); break; } - connect(this, TQT_SIGNAL(saveSettings()), engine[i], TQT_SLOT(saveConfig())); + connect(this, TQ_SIGNAL(saveSettings()), engine[i], TQ_SLOT(saveConfig())); } engine[i]->getSetupPages(nb); } @@ -614,12 +614,12 @@ void KBg::setupDlg() /* * Connect the signals of nb */ - connect(nb, TQT_SIGNAL(okClicked()), this, TQT_SLOT(setupOk())); - connect(nb, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(setupOk())); - connect(nb, TQT_SIGNAL(cancelClicked()), TQT_TQOBJECT(this), TQT_SLOT(setupCancel())); - connect(nb, TQT_SIGNAL(defaultClicked()),this, TQT_SLOT(setupDefault())); + connect(nb, TQ_SIGNAL(okClicked()), this, TQ_SLOT(setupOk())); + connect(nb, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(setupOk())); + connect(nb, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(setupCancel())); + connect(nb, TQ_SIGNAL(defaultClicked()),this, TQ_SLOT(setupDefault())); - connect(nb, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(setupDone())); + connect(nb, TQ_SIGNAL(finished()), this, TQ_SLOT(setupDone())); nb->resize(nb->minimumSize()); nb->show(); @@ -685,7 +685,7 @@ void KBg::configureToolbars() { saveMainWindowSettings(TDEGlobal::config(), "kedittoolbar settings"); // temp group KEditToolbar dlg(actionCollection(), xmlFile(), true, this); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig())); dlg.exec(); TDEGlobal::config()->deleteGroup( "kedittoolbar settings" ); // delete temp group } diff --git a/kbackgammon/kbg.h b/kbackgammon/kbg.h index c4e740fd..b60e55be 100644 --- a/kbackgammon/kbg.h +++ b/kbackgammon/kbg.h @@ -46,7 +46,7 @@ class KBgBoardSetup; class KBg : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/kbgboard.cpp b/kbackgammon/kbgboard.cpp index 166b2a3a..cfc2d631 100644 --- a/kbackgammon/kbgboard.cpp +++ b/kbackgammon/kbgboard.cpp @@ -173,9 +173,9 @@ void KBgBoardSetup::getSetupPages(KDialogBase *nb) blc->addWidget(pbc_3, 0, 1); blc->addMultiCellWidget(pbc_1, 1, 1, 0, 1); - connect(pbc_1, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectBackgroundColor())); - connect(pbc_2, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectBaseColorOne())); - connect(pbc_3, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectBaseColorTwo())); + connect(pbc_1, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectBackgroundColor())); + connect(pbc_2, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectBaseColorOne())); + connect(pbc_3, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectBaseColorTwo())); /* * Moving style @@ -470,11 +470,11 @@ KBgBoardQCube::KBgBoardQCube(int val, bool us, bool them) cb[0]->setFocus(); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); - connect(cb[0], TQT_SIGNAL(activated(int)), TQT_SLOT(changePlayer(int))); - connect(cb[1], TQT_SIGNAL(activated(int)), TQT_SLOT(changeValue (int))); + connect(cb[0], TQ_SIGNAL(activated(int)), TQ_SLOT(changePlayer(int))); + connect(cb[1], TQ_SIGNAL(activated(int)), TQ_SLOT(changeValue (int))); } /* @@ -576,8 +576,8 @@ KBgBoardQDice::KBgBoardQDice(const char *name) sb[0]->setFocus(); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); sb[0]->setValue(1); sb[1]->setValue(1); @@ -1102,7 +1102,7 @@ void KBgBoardHome::drawDiceFrame(TQPainter *p, int col, int num, */ void KBgBoardCell::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) board->showContextMenu(); else mouseButton = e->button(); @@ -1141,7 +1141,7 @@ int KBgBoard::getShortMoveMode() */ void KBgBoardCell::checkAndMakeShortMove(TQMouseEvent *e, int m) { - if ((e->button() == Qt::LeftButton) && + if ((e->button() == TQt::LeftButton) && (board->getShortMoveMode() == m) && (dragPossible()) && (!board->getEditMode())) @@ -1317,7 +1317,7 @@ int KBgBoard::getPipCount(const int& w) const */ void KBgBoardHome::mouseDoubleClickEvent(TQMouseEvent * e) { - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) return; /* * Check whether this is the bookkeeping home... @@ -1434,7 +1434,7 @@ bool KBgBoard::moveOffPossible() const KBgBoardCell* KBgBoard::getCellByPos(const TQPoint& p) const { for (int i = 0; i < 30; ++i) { - if (TQT_TQRECT_OBJECT(cells[i]->rect()).contains(cells[i]->mapFromParent(p))) + if (cells[i]->rect().contains(cells[i]->mapFromParent(p))) return cells[i]; } return NULL; @@ -1745,10 +1745,10 @@ KBgBoardCell::KBgBoardCell(TQWidget * parent, int numID) stateChanged = false; colorChanged = false; directionChanged = false; - mouseButton = Qt::NoButton; + mouseButton = TQt::NoButton; dragInProgress = false; - connect(parent, TQT_SIGNAL(finishedUpdate()), this, TQT_SLOT(refresh())); + connect(parent, TQ_SIGNAL(finishedUpdate()), this, TQ_SLOT(refresh())); } /* @@ -2150,7 +2150,7 @@ void KBgBoard::setState(const KBgStatus &st) */ void KBgBoardCell::mouseMoveEvent(TQMouseEvent *) { - if ((mouseButton == Qt::LeftButton) && dragPossible()) { + if ((mouseButton == TQt::LeftButton) && dragPossible()) { dragInProgress = true; TQRect cr(0, 0, 1+getCheckerDiameter(), 1+getCheckerDiameter()); cr.moveBottomLeft(rect().bottomLeft()); @@ -2169,7 +2169,7 @@ void KBgBoardCell::mouseMoveEvent(TQMouseEvent *) board->storeTurn(pcs); getPiece(); } - mouseButton = Qt::NoButton; + mouseButton = TQt::NoButton; } /* diff --git a/kbackgammon/kbgboard.h b/kbackgammon/kbgboard.h index fc05bc60..94b3b0a7 100644 --- a/kbackgammon/kbgboard.h +++ b/kbackgammon/kbgboard.h @@ -96,7 +96,7 @@ class KBgBoardQDice; */ class KBgBoard : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class KBgBoardCell; @@ -460,7 +460,7 @@ protected: */ class KBgBoardCell : public TQLabel { - Q_OBJECT + TQ_OBJECT public: @@ -615,7 +615,7 @@ protected: */ class KBgBoardHome : public KBgBoardCell { - Q_OBJECT + TQ_OBJECT public: @@ -678,7 +678,7 @@ class KBgBoardHome : public KBgBoardCell */ class KBgBoardBar : public KBgBoardCell { - Q_OBJECT + TQ_OBJECT public: @@ -726,7 +726,7 @@ class KBgBoardBar : public KBgBoardCell */ class KBgBoardField : public KBgBoardCell { - Q_OBJECT + TQ_OBJECT public: @@ -822,7 +822,7 @@ class KBgBoardMove */ class KBgBoardQDice : public TQDialog { - Q_OBJECT + TQ_OBJECT public: @@ -856,7 +856,7 @@ public slots: */ class KBgBoardQCube : public TQDialog { - Q_OBJECT + TQ_OBJECT public: @@ -902,7 +902,7 @@ protected slots: */ class KBgBoardSetup : public KBgBoard { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/kbgstatus.h b/kbackgammon/kbgstatus.h index ce48bec2..a1e9ad8f 100644 --- a/kbackgammon/kbgstatus.h +++ b/kbackgammon/kbgstatus.h @@ -46,7 +46,7 @@ class KBgStatus : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbackgammon/kbgtextview.h b/kbackgammon/kbgtextview.h index 5398d681..ff7c694c 100644 --- a/kbackgammon/kbgtextview.h +++ b/kbackgammon/kbgtextview.h @@ -34,7 +34,7 @@ */ class KBgTextView : public KTextBrowser { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbattleship/kbattleship/kbaiplayer.h b/kbattleship/kbattleship/kbaiplayer.h index c8e24b62..6cf4f4e5 100644 --- a/kbattleship/kbattleship/kbaiplayer.h +++ b/kbattleship/kbattleship/kbaiplayer.h @@ -28,7 +28,7 @@ class KBAIPlayer : public TQObject { - Q_OBJECT + TQ_OBJECT public: KBAIPlayer(); diff --git a/kbattleship/kbattleship/kbattlefield.cpp b/kbattleship/kbattleship/kbattlefield.cpp index dc567d2b..c4a9e422 100644 --- a/kbattleship/kbattleship/kbattlefield.cpp +++ b/kbattleship/kbattleship/kbattlefield.cpp @@ -91,7 +91,7 @@ void KBattleField::drawOwnField() if(!m_canDraw) return; - KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->parent()->parent())); + KBattleshipWindow *window = static_cast<KBattleshipWindow *>(m_parent->parent()->parent()); KShip *ship = 0; int data; @@ -151,7 +151,7 @@ void KBattleField::drawEnemyField() if(!m_canDraw) return; - KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->parent()->parent())); + KBattleshipWindow *window = static_cast<KBattleshipWindow *>(m_parent->parent()->parent()); for(int i = 0; i != m_enemyfieldx; i++) { diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp index a241696e..2db6be26 100644 --- a/kbattleship/kbattleship/kbattleship.cpp +++ b/kbattleship/kbattleship/kbattleship.cpp @@ -92,16 +92,16 @@ void KBattleshipWindow::initStatusBar() void KBattleshipWindow::initActions() { - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection()); - m_gameServerConnect = new TDEAction(i18n("&Connect to Server..."), "connect_no", Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotServerConnect()), actionCollection(), "game_serverconnect"); - m_gameNewServer = new TDEAction(i18n("&Start Server..."), "network", Key_F3, TQT_TQOBJECT(this), TQT_SLOT(slotNewServer()), actionCollection(), "game_newserver"); - m_gameSingle = new TDEAction(i18n("S&ingle Player..."), "gear", Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotSinglePlayer()), actionCollection(), "game_singleplayer"); - m_gameQuit = KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(slotHighscore()), actionCollection()); - m_gameEnemyInfo = new TDEAction(i18n("&Enemy Info"), "view_text", Key_F11, TQT_TQOBJECT(this), TQT_SLOT(slotEnemyClientInfo()), actionCollection(), "game_enemyinfo"); + KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection()); + m_gameServerConnect = new TDEAction(i18n("&Connect to Server..."), "connect_no", Key_F2, this, TQ_SLOT(slotServerConnect()), actionCollection(), "game_serverconnect"); + m_gameNewServer = new TDEAction(i18n("&Start Server..."), "network", Key_F3, this, TQ_SLOT(slotNewServer()), actionCollection(), "game_newserver"); + m_gameSingle = new TDEAction(i18n("S&ingle Player..."), "gear", Key_F4, this, TQ_SLOT(slotSinglePlayer()), actionCollection(), "game_singleplayer"); + m_gameQuit = KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdGameAction::highscores(this, TQ_SLOT(slotHighscore()), actionCollection()); + m_gameEnemyInfo = new TDEAction(i18n("&Enemy Info"), "view_text", Key_F11, this, TQ_SLOT(slotEnemyClientInfo()), actionCollection(), "game_enemyinfo"); m_configSound = new TDEToggleAction(i18n("&Play Sounds"), 0, actionCollection(), "options_configure_sound"); - m_configGrid = new TDEToggleAction(i18n("&Show Grid"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowGrid()), actionCollection(), "options_show_grid"); + m_configGrid = new TDEToggleAction(i18n("&Show Grid"), 0, this, TQ_SLOT(slotShowGrid()), actionCollection(), "options_show_grid"); m_configGrid->setCheckedState(i18n("Hide Grid")); m_gameEnemyInfo->setEnabled(false); @@ -111,9 +111,9 @@ void KBattleshipWindow::initActions() void KBattleshipWindow::initChat() { - connect(m_chat, TQT_SIGNAL(sigSendMessage(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotSendChatMessage(const TQString &))); - connect(m_chat, TQT_SIGNAL(sigChangeEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_chat, TQT_SIGNAL(sigChangeOwnNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangedNickCommand(const TQString &))); + connect(m_chat, TQ_SIGNAL(sigSendMessage(const TQString &)), this, TQ_SLOT(slotSendChatMessage(const TQString &))); + connect(m_chat, TQ_SIGNAL(sigChangeEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_chat, TQ_SIGNAL(sigChangeOwnNickname(const TQString &)), this, TQ_SLOT(slotChangedNickCommand(const TQString &))); } void KBattleshipWindow::changeShipPlacementDirection(){ @@ -122,8 +122,8 @@ void KBattleshipWindow::changeShipPlacementDirection(){ void KBattleshipWindow::initShipPlacing() { - connect(m_ownshiplist, TQT_SIGNAL(sigOwnFieldDataChanged(int, int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeOwnFieldData(int, int, int))); - connect(m_ownshiplist, TQT_SIGNAL(sigLastShipAdded()), TQT_TQOBJECT(this), TQT_SLOT(slotShipsReady())); + connect(m_ownshiplist, TQ_SIGNAL(sigOwnFieldDataChanged(int, int, int)), this, TQ_SLOT(slotChangeOwnFieldData(int, int, int))); + connect(m_ownshiplist, TQ_SIGNAL(sigLastShipAdded()), this, TQ_SLOT(slotShipsReady())); } void KBattleshipWindow::initView() @@ -148,10 +148,10 @@ void KBattleshipWindow::initView() m_view->startDrawing(); setFocusProxy(m_view); - connect(m_view, TQT_SIGNAL(sigEnemyFieldClicked(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotEnemyFieldClick(int, int))); - connect(m_view, TQT_SIGNAL(sigOwnFieldClicked(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotPlaceShip(int, int))); - connect(m_view, TQT_SIGNAL(sigMouseOverField(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotPlaceShipPreview(int, int))); - connect(m_view, TQT_SIGNAL(changeShipPlacementDirection()), TQT_TQOBJECT(this), TQT_SLOT(changeShipPlacementDirection())); + connect(m_view, TQ_SIGNAL(sigEnemyFieldClicked(int, int)), this, TQ_SLOT(slotEnemyFieldClick(int, int))); + connect(m_view, TQ_SIGNAL(sigOwnFieldClicked(int, int)), this, TQ_SLOT(slotPlaceShip(int, int))); + connect(m_view, TQ_SIGNAL(sigMouseOverField(int, int)), this, TQ_SLOT(slotPlaceShipPreview(int, int))); + connect(m_view, TQ_SIGNAL(changeShipPlacementDirection()), this, TQ_SLOT(changeShipPlacementDirection())); } void KBattleshipWindow::slotDeleteAI() @@ -317,11 +317,11 @@ void KBattleshipWindow::slotEnemyFieldClick(int fieldx, int fieldy) switch(KMessageBox::questionYesNo(this, i18n("Do you want to restart the game?"),TQString(),i18n("Restart"),i18n("Do Not Restart"))) { case KMessageBox::Yes: - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestartAI())); break; case KMessageBox::No: - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeleteAI())); break; } return; @@ -697,8 +697,8 @@ void KBattleshipWindow::slotServerConnect() slotStatusMsg(i18n("Loading Connect-Server dialog...")); m_client = new KClientDialog(this); - connect(m_client, TQT_SIGNAL(sigConnectServer()), TQT_TQOBJECT(this), TQT_SLOT(slotConnectToBattleshipServer())); - connect(m_client, TQT_SIGNAL(sigCancelConnect()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteConnectDialog())); + connect(m_client, TQ_SIGNAL(sigConnectServer()), this, TQ_SLOT(slotConnectToBattleshipServer())); + connect(m_client, TQ_SIGNAL(sigCancelConnect()), this, TQ_SLOT(slotDeleteConnectDialog())); m_client->show(); slotStatusMsg(i18n("Ready")); @@ -806,8 +806,8 @@ void KBattleshipWindow::slotNewServer() slotStatusMsg(i18n("Loading Start-Server dialog...")); m_server = new TDEServerDialog(this); - connect(m_server, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotStartBattleshipServer())); - connect(m_server, TQT_SIGNAL(cancelClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteServerDialog())); + connect(m_server, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotStartBattleshipServer())); + connect(m_server, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotDeleteServerDialog())); m_server->show(); slotStatusMsg(i18n("Ready")); @@ -828,7 +828,7 @@ void KBattleshipWindow::slotSendVersion() msg->versionMessage(); slotSendMessage(msg); - TQTimer::singleShot(150, TQT_TQOBJECT(this), TQT_SLOT(slotSendGreet())); + TQTimer::singleShot(150, this, TQ_SLOT(slotSendGreet())); } void KBattleshipWindow::slotSendGreet() @@ -862,49 +862,49 @@ void KBattleshipWindow::slotStartBattleshipServer() if(m_connection == 0) { m_connection = new KonnectionHandling(this, m_kbserver); - connect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigSendNickname()), TQT_TQOBJECT(this), TQT_SLOT(slotSendGreet())); - connect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - connect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - connect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - connect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - connect(m_connection, TQT_SIGNAL(sigClientLost()), TQT_TQOBJECT(this), TQT_SLOT(slotClientLost())); - connect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - connect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplayRequest())); - connect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - connect(m_connection, TQT_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); - connect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + connect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigSendNickname()), this, TQ_SLOT(slotSendGreet())); + connect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + connect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + connect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + connect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + connect(m_connection, TQ_SIGNAL(sigClientLost()), this, TQ_SLOT(slotClientLost())); + connect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + connect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplayRequest())); + connect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + connect(m_connection, TQ_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), this, TQ_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); + connect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); } else { if(m_connection->type() == KonnectionHandling::CLIENT) { - disconnect(m_kbclient, TQT_SIGNAL(sigConnected()), TQT_TQOBJECT(this), TQT_SLOT(slotSendVersion())); - disconnect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - disconnect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - disconnect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - disconnect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - disconnect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - disconnect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - disconnect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - disconnect(m_connection, TQT_SIGNAL(sigServerLost()), TQT_TQOBJECT(this), TQT_SLOT(slotServerLost())); - disconnect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplay())); - disconnect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - disconnect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + disconnect(m_kbclient, TQ_SIGNAL(sigConnected()), this, TQ_SLOT(slotSendVersion())); + disconnect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + disconnect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + disconnect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + disconnect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + disconnect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + disconnect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + disconnect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + disconnect(m_connection, TQ_SIGNAL(sigServerLost()), this, TQ_SLOT(slotServerLost())); + disconnect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplay())); + disconnect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + disconnect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); m_connection->updateInternal(m_kbserver); - connect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigSendNickname()), TQT_TQOBJECT(this), TQT_SLOT(slotSendGreet())); - connect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - connect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - connect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - connect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - connect(m_connection, TQT_SIGNAL(sigClientLost()), TQT_TQOBJECT(this), TQT_SLOT(slotClientLost())); - connect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - connect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplayRequest())); - connect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - connect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + connect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigSendNickname()), this, TQ_SLOT(slotSendGreet())); + connect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + connect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + connect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + connect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + connect(m_connection, TQ_SIGNAL(sigClientLost()), this, TQ_SLOT(slotClientLost())); + connect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + connect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplayRequest())); + connect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + connect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); } else m_connection->updateInternal(m_kbserver); @@ -1119,51 +1119,51 @@ void KBattleshipWindow::slotConnectToBattleshipServer(const TQString &host, int if(m_connection == 0) { m_connection = new KonnectionHandling(this, m_kbclient); - connect(m_kbclient, TQT_SIGNAL(sigConnected()), TQT_TQOBJECT(this), TQT_SLOT(slotSendVersion())); - connect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - connect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - connect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - connect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - connect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - connect(m_connection, TQT_SIGNAL(sigServerLost()), TQT_TQOBJECT(this), TQT_SLOT(slotServerLost())); - connect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplay())); - connect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - connect(m_connection, TQT_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); - connect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + connect(m_kbclient, TQ_SIGNAL(sigConnected()), this, TQ_SLOT(slotSendVersion())); + connect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + connect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + connect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + connect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + connect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + connect(m_connection, TQ_SIGNAL(sigServerLost()), this, TQ_SLOT(slotServerLost())); + connect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplay())); + connect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + connect(m_connection, TQ_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), this, TQ_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); + connect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); } else { if(m_connection->type() == KonnectionHandling::SERVER) { - disconnect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - disconnect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - disconnect(m_connection, TQT_SIGNAL(sigSendNickname()), TQT_TQOBJECT(this), TQT_SLOT(slotSendGreet())); - disconnect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - disconnect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - disconnect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - disconnect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - disconnect(m_connection, TQT_SIGNAL(sigClientLost()), TQT_TQOBJECT(this), TQT_SLOT(slotClientLost())); - disconnect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - disconnect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplayRequest())); - disconnect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - disconnect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + disconnect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + disconnect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + disconnect(m_connection, TQ_SIGNAL(sigSendNickname()), this, TQ_SLOT(slotSendGreet())); + disconnect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + disconnect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + disconnect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + disconnect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + disconnect(m_connection, TQ_SIGNAL(sigClientLost()), this, TQ_SLOT(slotClientLost())); + disconnect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + disconnect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplayRequest())); + disconnect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + disconnect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); m_connection->updateInternal(m_kbclient); - connect(m_kbclient, TQT_SIGNAL(sigConnected()), TQT_TQOBJECT(this), TQT_SLOT(slotSendVersion())); - connect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - connect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - connect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - connect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - connect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - connect(m_connection, TQT_SIGNAL(sigServerLost()), TQT_TQOBJECT(this), TQT_SLOT(slotServerLost())); - connect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplay())); - connect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + connect(m_kbclient, TQ_SIGNAL(sigConnected()), this, TQ_SLOT(slotSendVersion())); + connect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + connect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + connect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + connect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + connect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + connect(m_connection, TQ_SIGNAL(sigServerLost()), this, TQ_SLOT(slotServerLost())); + connect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplay())); + connect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); m_kbclient->init(); - connect(m_connection, TQT_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); - connect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + connect(m_connection, TQ_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), this, TQ_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); + connect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); } else m_connection->updateInternal(m_kbclient); @@ -1234,7 +1234,7 @@ void KBattleshipWindow::slotSinglePlayer() slotStatusMsg(i18n("Ready")); m_stat->clear(); m_chat->clear(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeleteAI())); cleanup(false); } } @@ -1269,8 +1269,8 @@ void KBattleshipWindow::slotStartBattleshipGame(bool clearstat) { m_aiPlayer = new KBAIPlayer(); m_aiPlayer->init(m_view->field(), m_enemyshiplist); - connect(m_aiPlayer, TQT_SIGNAL(sigReady()), TQT_TQOBJECT(this), TQT_SLOT(slotAIReady())); - connect(m_aiPlayer, TQT_SIGNAL(sigShootAt(const TQPoint)), TQT_TQOBJECT(this), TQT_SLOT(slotAIShootsAt(const TQPoint))); + connect(m_aiPlayer, TQ_SIGNAL(sigReady()), this, TQ_SLOT(slotAIReady())); + connect(m_aiPlayer, TQ_SIGNAL(sigShootAt(const TQPoint)), this, TQ_SLOT(slotAIShootsAt(const TQPoint))); } m_aiPlayer->slotRestart(); } @@ -1320,11 +1320,11 @@ void KBattleshipWindow::slotAIShootsAt(const TQPoint pos) switch(KMessageBox::questionYesNo(this, i18n("Do you want to restart the game?"), TQString(), i18n("Restart"), i18n("Do Not Restart"))) { case KMessageBox::Yes: - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestartAI())); break; case KMessageBox::No: - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeleteAI())); break; } } diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h index c834491d..c32ec452 100644 --- a/kbattleship/kbattleship/kbattleship.h +++ b/kbattleship/kbattleship/kbattleship.h @@ -46,7 +46,7 @@ class KBattleshipWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: enum{ID_STATUS_MSG, ID_PLAYER_OWN, ID_PLAYER_ENEMY}; diff --git a/kbattleship/kbattleship/kbattleshipclient.cpp b/kbattleship/kbattleship/kbattleshipclient.cpp index d895e934..cad29b29 100644 --- a/kbattleship/kbattleship/kbattleshipclient.cpp +++ b/kbattleship/kbattleship/kbattleshipclient.cpp @@ -43,8 +43,8 @@ void KBattleshipClient::init() return; } - m_readNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, TQT_TQOBJECT(this)); - TQT_BASE_OBJECT_NAME::connect(m_readNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReadData())); + m_readNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, this); + TQObject::connect(m_readNotifier, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReadData())); emit sigConnected(); } diff --git a/kbattleship/kbattleship/kbattleshipclient.h b/kbattleship/kbattleship/kbattleshipclient.h index b76d4396..6cfa8622 100644 --- a/kbattleship/kbattleship/kbattleshipclient.h +++ b/kbattleship/kbattleship/kbattleshipclient.h @@ -24,7 +24,7 @@ class KBattleshipClient : public KExtendedSocket { - Q_OBJECT + TQ_OBJECT public: KBattleshipClient(const TQString &host, int port); diff --git a/kbattleship/kbattleship/kbattleshipserver.cpp b/kbattleship/kbattleship/kbattleshipserver.cpp index a864cb61..36d3ff70 100644 --- a/kbattleship/kbattleship/kbattleshipserver.cpp +++ b/kbattleship/kbattleship/kbattleshipserver.cpp @@ -49,8 +49,8 @@ void KBattleshipServer::init() m_service.setType(BATTLESHIP_SERVICE); m_service.setPort(m_port); m_service.publishAsync(); - m_connectNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, TQT_TQOBJECT(this)); - TQT_BASE_OBJECT_NAME::connect(m_connectNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(slotNewConnection())); + m_connectNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, this); + TQObject::connect(m_connectNotifier, TQ_SIGNAL(activated(int)), TQ_SLOT(slotNewConnection())); } void KBattleshipServer::slotNewConnection() @@ -61,8 +61,8 @@ void KBattleshipServer::slotNewConnection() { m_service.stop(); m_serverSocket = sock; - m_readNotifier = new TQSocketNotifier(sock->fd(), TQSocketNotifier::Read, TQT_TQOBJECT(this)); - TQObject::connect(m_readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadClient())); + m_readNotifier = new TQSocketNotifier(sock->fd(), TQSocketNotifier::Read, this); + TQObject::connect(m_readNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadClient())); emit sigNewConnect(); } else diff --git a/kbattleship/kbattleship/kbattleshipserver.h b/kbattleship/kbattleship/kbattleshipserver.h index b1c9cc4d..f488685a 100644 --- a/kbattleship/kbattleship/kbattleshipserver.h +++ b/kbattleship/kbattleship/kbattleshipserver.h @@ -25,7 +25,7 @@ class KBattleshipServer : public KExtendedSocket { - Q_OBJECT + TQ_OBJECT public: KBattleshipServer(int port, const TQString& name); diff --git a/kbattleship/kbattleship/kbattleshipview.cpp b/kbattleship/kbattleship/kbattleshipview.cpp index 42b699bb..4008803e 100644 --- a/kbattleship/kbattleship/kbattleshipview.cpp +++ b/kbattleship/kbattleship/kbattleshipview.cpp @@ -152,7 +152,7 @@ bool KBattleshipView::eventFilter(TQObject *object, TQEvent *event) { if(event->type() == TQEvent::KeyPress && m_decide) { - TQKeyEvent *keyEvent = TQT_TQKEYEVENT(event); + TQKeyEvent *keyEvent = static_cast<TQKeyEvent*>(event); if(keyEvent->key() == Key_Shift){ emit sigMouseOverField(m_lastX, m_lastY); emit changeShipPlacementDirection(); @@ -160,7 +160,7 @@ bool KBattleshipView::eventFilter(TQObject *object, TQEvent *event) } else if(event->type() == TQEvent::KeyRelease && m_decide) { - TQKeyEvent *keyEvent = TQT_TQKEYEVENT(event); + TQKeyEvent *keyEvent = static_cast<TQKeyEvent*>(event); if(keyEvent->key() == Key_Shift){ emit sigMouseOverField(m_lastX, m_lastY); emit changeShipPlacementDirection(); @@ -170,15 +170,15 @@ bool KBattleshipView::eventFilter(TQObject *object, TQEvent *event) { m_decide = false; - TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT(event); + TQMouseEvent *mouseEvent = static_cast<TQMouseEvent*>(event); - if(mouseEvent->button() == Qt::RightButton){ + if(mouseEvent->button() == TQt::RightButton){ emit sigMouseOverField(m_lastX, m_lastY); emit changeShipPlacementDirection(); return true; } - if(mouseEvent->button() != Qt::LeftButton) + if(mouseEvent->button() != TQt::LeftButton) return false; TQPoint point(mouseEvent->x(), mouseEvent->y()); @@ -237,7 +237,7 @@ bool KBattleshipView::eventFilter(TQObject *object, TQEvent *event) setFocus(); m_decide = true; - TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT(event); + TQMouseEvent *mouseEvent = static_cast<TQMouseEvent*>(event); TQPoint point(mouseEvent->x(), mouseEvent->y()); TQRect ownRect = m_battlefield->ownRect(); diff --git a/kbattleship/kbattleship/kbattleshipview.h b/kbattleship/kbattleship/kbattleshipview.h index 399931ae..b970f7e4 100644 --- a/kbattleship/kbattleship/kbattleshipview.h +++ b/kbattleship/kbattleship/kbattleshipview.h @@ -32,7 +32,7 @@ class KBattleshipView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KBattleshipView(TQWidget *parent = 0, const char *name = 0, bool draw = false); diff --git a/kbattleship/kbattleship/kchatwidget.cpp b/kbattleship/kbattleship/kchatwidget.cpp index f6b804ee..15449eaf 100644 --- a/kbattleship/kbattleship/kchatwidget.cpp +++ b/kbattleship/kbattleship/kchatwidget.cpp @@ -20,8 +20,8 @@ KChatWidget::KChatWidget(TQWidget *parent, const char *name) : chatDlg(parent, name) { - connect(sendBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotComputeMessage())); - connect(commentEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotComputeMessage())); + connect(sendBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotComputeMessage())); + connect(commentEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotComputeMessage())); chatView->setFocusProxy(commentEdit); chatView->setMinimumSize(0, 50); commentEdit->installEventFilter(this); @@ -61,9 +61,9 @@ void KChatWidget::slotReceivedMessage(const TQString &nickname, const TQString & bool KChatWidget::eventFilter(TQObject *obj, TQEvent *e) { - if(TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(commentEdit) && e->type() == TQEvent::Wheel) + if(obj == commentEdit && e->type() == TQEvent::Wheel) { - kapp->notify(TQT_TQOBJECT(chatView), e); + kapp->notify(chatView, e); return true; } return chatDlg::eventFilter(obj, e); diff --git a/kbattleship/kbattleship/kchatwidget.h b/kbattleship/kbattleship/kchatwidget.h index aebbcf93..bc3f5da7 100644 --- a/kbattleship/kbattleship/kchatwidget.h +++ b/kbattleship/kbattleship/kchatwidget.h @@ -26,7 +26,7 @@ class KChatWidget : public chatDlg { - Q_OBJECT + TQ_OBJECT public: KChatWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/kbattleship/kbattleship/kclientdialog.cpp b/kbattleship/kbattleship/kclientdialog.cpp index e5a65cf7..022dd60b 100644 --- a/kbattleship/kbattleship/kclientdialog.cpp +++ b/kbattleship/kbattleship/kclientdialog.cpp @@ -38,14 +38,14 @@ KClientDialog::KClientDialog(TQWidget *parent, const char *name) KUser u; m_mainWidget->nicknameEdit->setText(u.loginName()); - connect(m_mainWidget->serverEdit, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &))); - connect(m_mainWidget->serverEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckEnableOk())); + connect(m_mainWidget->serverEdit, TQ_SIGNAL(returnPressed(const TQString &)), this, TQ_SLOT(slotReturnPressed(const TQString &))); + connect(m_mainWidget->serverEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckEnableOk())); m_config->setGroup("History"); m_browser = new DNSSD::ServiceBrowser(TQString::fromLatin1(BATTLESHIP_SERVICE)); - connect(m_browser,TQT_SIGNAL(finished()),TQT_SLOT(nextBatch())); + connect(m_browser,TQ_SIGNAL(finished()),TQ_SLOT(nextBatch())); m_browser->startBrowse(); - connect(m_mainWidget->lanBox,TQT_SIGNAL(activated(int)),TQT_SLOT(gameSelected(int))); + connect(m_mainWidget->lanBox,TQ_SIGNAL(activated(int)),TQ_SLOT(gameSelected(int))); m_mainWidget->serverEdit->completionObject()->setItems(m_config->readListEntry("CompletionList")); m_mainWidget->serverEdit->setMaxCount(5); diff --git a/kbattleship/kbattleship/kclientdialog.h b/kbattleship/kbattleship/kclientdialog.h index f5998fca..732424db 100644 --- a/kbattleship/kbattleship/kclientdialog.h +++ b/kbattleship/kbattleship/kclientdialog.h @@ -31,7 +31,7 @@ class KClientDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KClientDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/kbattleship/kbattleship/kgridwidget.cpp b/kbattleship/kbattleship/kgridwidget.cpp index b848484b..1a94b873 100644 --- a/kbattleship/kbattleship/kgridwidget.cpp +++ b/kbattleship/kbattleship/kgridwidget.cpp @@ -412,5 +412,5 @@ void KGridWidget::finished() void KGridWidget::cleanBuffer() { - m_doubleBuffer->fill(TQApplication::palette().color(TQPalette::Normal, TQColorGroup::Background)); + m_doubleBuffer->fill(TQApplication::palette().color(TQPalette::Active, TQColorGroup::Background)); } diff --git a/kbattleship/kbattleship/konnectionhandling.cpp b/kbattleship/kbattleship/konnectionhandling.cpp index 5d5c1026..e243a747 100644 --- a/kbattleship/kbattleship/konnectionhandling.cpp +++ b/kbattleship/kbattleship/konnectionhandling.cpp @@ -24,11 +24,11 @@ KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipServer *serv m_kbserver = server; m_kbclient = 0; m_type = KonnectionHandling::SERVER; - connect(server, TQT_SIGNAL(sigServerFailure()), this, TQT_SIGNAL(sigAbortNetworkGame())); - connect(server, TQT_SIGNAL(sigNewConnect()), this, TQT_SLOT(slotNewClient())); - connect(server, TQT_SIGNAL(sigEndConnect()), this, TQT_SLOT(slotLostClient())); - connect(server, TQT_SIGNAL(sigNewMessage(KMessage *)), this, TQT_SLOT(slotNewMessage(KMessage *))); - connect(server, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *))); + connect(server, TQ_SIGNAL(sigServerFailure()), this, TQ_SIGNAL(sigAbortNetworkGame())); + connect(server, TQ_SIGNAL(sigNewConnect()), this, TQ_SLOT(slotNewClient())); + connect(server, TQ_SIGNAL(sigEndConnect()), this, TQ_SLOT(slotLostClient())); + connect(server, TQ_SIGNAL(sigNewMessage(KMessage *)), this, TQ_SLOT(slotNewMessage(KMessage *))); + connect(server, TQ_SIGNAL(sigMessageSent(KMessage *)), this, TQ_SLOT(slotMessageSent(KMessage *))); } KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipClient *client) : TQObject(parent) @@ -36,10 +36,10 @@ KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipClient *clie m_kbclient = client; m_kbserver = 0; m_type = KonnectionHandling::CLIENT; - connect(client, TQT_SIGNAL(sigEndConnect()), this, TQT_SLOT(slotLostServer())); - connect(client, TQT_SIGNAL(sigSocketFailure(int)), this, TQT_SLOT(slotSocketError(int))); - connect(client, TQT_SIGNAL(sigNewMessage(KMessage *)), this, TQT_SLOT(slotNewMessage(KMessage *))); - connect(client, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *))); + connect(client, TQ_SIGNAL(sigEndConnect()), this, TQ_SLOT(slotLostServer())); + connect(client, TQ_SIGNAL(sigSocketFailure(int)), this, TQ_SLOT(slotSocketError(int))); + connect(client, TQ_SIGNAL(sigNewMessage(KMessage *)), this, TQ_SLOT(slotNewMessage(KMessage *))); + connect(client, TQ_SIGNAL(sigMessageSent(KMessage *)), this, TQ_SLOT(slotMessageSent(KMessage *))); } void KonnectionHandling::updateInternal(KBattleshipServer *server) @@ -47,11 +47,11 @@ void KonnectionHandling::updateInternal(KBattleshipServer *server) m_kbserver = server; m_kbclient = 0; m_type = KonnectionHandling::SERVER; - connect(server, TQT_SIGNAL(sigServerFailure()), this, TQT_SIGNAL(sigAbortNetworkGame())); - connect(server, TQT_SIGNAL(sigNewConnect()), this, TQT_SLOT(slotNewClient())); - connect(server, TQT_SIGNAL(sigEndConnect()), this, TQT_SLOT(slotLostClient())); - connect(server, TQT_SIGNAL(sigNewMessage(KMessage *)), this, TQT_SLOT(slotNewMessage(KMessage *))); - connect(server, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *))); + connect(server, TQ_SIGNAL(sigServerFailure()), this, TQ_SIGNAL(sigAbortNetworkGame())); + connect(server, TQ_SIGNAL(sigNewConnect()), this, TQ_SLOT(slotNewClient())); + connect(server, TQ_SIGNAL(sigEndConnect()), this, TQ_SLOT(slotLostClient())); + connect(server, TQ_SIGNAL(sigNewMessage(KMessage *)), this, TQ_SLOT(slotNewMessage(KMessage *))); + connect(server, TQ_SIGNAL(sigMessageSent(KMessage *)), this, TQ_SLOT(slotMessageSent(KMessage *))); } void KonnectionHandling::updateInternal(KBattleshipClient *client) @@ -59,10 +59,10 @@ void KonnectionHandling::updateInternal(KBattleshipClient *client) m_kbclient = client; m_kbserver = 0; m_type = KonnectionHandling::CLIENT; - connect(client, TQT_SIGNAL(sigEndConnect()), this, TQT_SLOT(slotLostServer())); - connect(client, TQT_SIGNAL(sigSocketFailure(int)), this, TQT_SLOT(slotSocketError(int))); - connect(client, TQT_SIGNAL(sigNewMessage(KMessage *)), this, TQT_SLOT(slotNewMessage(KMessage *))); - connect(client, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *))); + connect(client, TQ_SIGNAL(sigEndConnect()), this, TQ_SLOT(slotLostServer())); + connect(client, TQ_SIGNAL(sigSocketFailure(int)), this, TQ_SLOT(slotSocketError(int))); + connect(client, TQ_SIGNAL(sigNewMessage(KMessage *)), this, TQ_SLOT(slotNewMessage(KMessage *))); + connect(client, TQ_SIGNAL(sigMessageSent(KMessage *)), this, TQ_SLOT(slotMessageSent(KMessage *))); } void KonnectionHandling::slotNewClient() diff --git a/kbattleship/kbattleship/konnectionhandling.h b/kbattleship/kbattleship/konnectionhandling.h index b78895b7..bc1e6adf 100644 --- a/kbattleship/kbattleship/konnectionhandling.h +++ b/kbattleship/kbattleship/konnectionhandling.h @@ -29,7 +29,7 @@ class KonnectionHandling : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum{SERVER, CLIENT}; diff --git a/kbattleship/kbattleship/kserverdialog.h b/kbattleship/kbattleship/kserverdialog.h index 90fca2d7..83d419b2 100644 --- a/kbattleship/kbattleship/kserverdialog.h +++ b/kbattleship/kbattleship/kserverdialog.h @@ -30,7 +30,7 @@ class TDEServerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: TDEServerDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/kbattleship/kbattleship/kshiplist.cpp b/kbattleship/kbattleship/kshiplist.cpp index e490fd0a..538b57e3 100644 --- a/kbattleship/kbattleship/kshiplist.cpp +++ b/kbattleship/kbattleship/kshiplist.cpp @@ -118,7 +118,7 @@ bool KShipList::canAddShips() void KShipList::addNewShip(int button, int fieldx, int fieldy) { - if(!addNewShip(!(button == Qt::LeftButton), fieldx, fieldy)) + if(!addNewShip(!(button == TQt::LeftButton), fieldx, fieldy)) KMessageBox::information(0L, i18n("You cannot place the ship here.")); } diff --git a/kbattleship/kbattleship/kshiplist.h b/kbattleship/kbattleship/kshiplist.h index c7dcb8a6..80e8c6eb 100644 --- a/kbattleship/kbattleship/kshiplist.h +++ b/kbattleship/kbattleship/kshiplist.h @@ -27,7 +27,7 @@ class KShipList : public TQObject { - Q_OBJECT + TQ_OBJECT public: KShipList(); diff --git a/kbattleship/kbattleship/kstatdialog.h b/kbattleship/kbattleship/kstatdialog.h index d4375b89..4ba29c34 100644 --- a/kbattleship/kbattleship/kstatdialog.h +++ b/kbattleship/kbattleship/kstatdialog.h @@ -22,7 +22,7 @@ class KStatDialog : public statDlg { - Q_OBJECT + TQ_OBJECT public: KStatDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp index 01fc7bc4..6a4baae4 100644 --- a/kblackbox/kbbgame.cpp +++ b/kblackbox/kbbgame.cpp @@ -89,12 +89,12 @@ KBBGame::KBBGame() initTDEAction(); - connect( gr, TQT_SIGNAL(inputAt(int,int,int)), - this, TQT_SLOT(gotInputAt(int,int,int)) ); - connect( this, TQT_SIGNAL(gameRuns(bool)), - gr, TQT_SLOT(setInputAccepted(bool)) ); - connect( gr, TQT_SIGNAL(endMouseClicked()), - this, TQT_SLOT(gameFinished()) ); + connect( gr, TQ_SIGNAL(inputAt(int,int,int)), + this, TQ_SLOT(gotInputAt(int,int,int)) ); + connect( this, TQ_SIGNAL(gameRuns(bool)), + gr, TQ_SLOT(setInputAccepted(bool)) ); + connect( gr, TQ_SIGNAL(endMouseClicked()), + this, TQ_SLOT(gameFinished()) ); /* TQToolTip::add( doneButton, i18n( @@ -622,7 +622,7 @@ void KBBGame::gotInputAt( int col, int row, int state ) int w = gameBoard->width() - 2; int h = gameBoard->height() - 2; - if (state & Qt::LeftButton) { + if (state & TQt::LeftButton) { switch (type) { case WBALLBBG: // because of the tutorial mode case INNERBBG: @@ -681,7 +681,7 @@ void KBBGame::gotInputAt( int col, int row, int state ) } break; } - } else if (state & Qt::RightButton) { + } else if (state & TQt::RightButton) { switch (type) { case INNERBBG: r->set( col, row, MARK1BBG ); @@ -698,37 +698,37 @@ void KBBGame::gotInputAt( int col, int row, int state ) void KBBGame::initTDEAction() { // game - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection()); - (void)new TDEAction( i18n("&Give Up"), SmallIcon("giveup"), 0, TQT_TQOBJECT(this), TQT_SLOT(giveUp()), actionCollection(), "game_giveup" ); - (void)new TDEAction( i18n("&Done"), SmallIcon("done"), 0, TQT_TQOBJECT(this), TQT_SLOT(gameFinished()), actionCollection(), "game_done" ); - (void)new TDEAction( i18n("&Resize"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotResize()), actionCollection(), "game_resize" ); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection()); + (void)new TDEAction( i18n("&Give Up"), SmallIcon("giveup"), 0, this, TQ_SLOT(giveUp()), actionCollection(), "game_giveup" ); + (void)new TDEAction( i18n("&Done"), SmallIcon("done"), 0, this, TQ_SLOT(gameFinished()), actionCollection(), "game_done" ); + (void)new TDEAction( i18n("&Resize"), 0, this, TQ_SLOT(slotResize()), actionCollection(), "game_resize" ); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); // settings - sizeAction = new TDESelectAction( i18n("&Size"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSize()), actionCollection(), "options_size"); + sizeAction = new TDESelectAction( i18n("&Size"), 0, this, TQ_SLOT(slotSize()), actionCollection(), "options_size"); TQStringList list; list.append(i18n(" 8 x 8 ")); list.append(i18n(" 10 x 10 ")); list.append(i18n(" 12 x 12 ")); sizeAction->setItems(list); - ballsAction = new TDESelectAction( i18n("&Balls"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBalls()), actionCollection(), "options_balls"); + ballsAction = new TDESelectAction( i18n("&Balls"), 0, this, TQ_SLOT(slotBalls()), actionCollection(), "options_balls"); list.clear(); list.append(i18n(" 4 ")); list.append(i18n(" 6 ")); list.append(i18n(" 8 ")); ballsAction->setItems(list); - tutorialAction = new TDEToggleAction( i18n("&Tutorial"), 0, TQT_TQOBJECT(this), TQT_SLOT(tutorialSwitch()), actionCollection(), "options_tutorial" ); -// KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + tutorialAction = new TDEToggleAction( i18n("&Tutorial"), 0, this, TQ_SLOT(tutorialSwitch()), actionCollection(), "options_tutorial" ); +// KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), //actionCollection()); // keyboard only - (void)new TDEAction( i18n("Move Down"), TQt::Key_Down, TQT_TQOBJECT(gr), TQT_SLOT(slotDown()), actionCollection(), "move_down" ); - (void)new TDEAction( i18n("Move Up"), TQt::Key_Up, TQT_TQOBJECT(gr), TQT_SLOT(slotUp()), actionCollection(), "move_up" ); - (void)new TDEAction( i18n("Move Left"), TQt::Key_Left, TQT_TQOBJECT(gr), TQT_SLOT(slotLeft()), actionCollection(), "move_left" ); - (void)new TDEAction( i18n("Move Right"), TQt::Key_Right, TQT_TQOBJECT(gr), TQT_SLOT(slotRight()), actionCollection(), "move_right" ); - (void)new TDEAction( i18n("Trigger Action"), TQt::Key_Return, TQT_TQOBJECT(gr), TQT_SLOT(slotInput()), actionCollection(), "move_trigger" ); + (void)new TDEAction( i18n("Move Down"), TQt::Key_Down, gr, TQ_SLOT(slotDown()), actionCollection(), "move_down" ); + (void)new TDEAction( i18n("Move Up"), TQt::Key_Up, gr, TQ_SLOT(slotUp()), actionCollection(), "move_up" ); + (void)new TDEAction( i18n("Move Left"), TQt::Key_Left, gr, TQ_SLOT(slotLeft()), actionCollection(), "move_left" ); + (void)new TDEAction( i18n("Move Right"), TQt::Key_Right, gr, TQ_SLOT(slotRight()), actionCollection(), "move_right" ); + (void)new TDEAction( i18n("Trigger Action"), TQt::Key_Return, gr, TQ_SLOT(slotInput()), actionCollection(), "move_trigger" ); } void KBBGame::slotResize() diff --git a/kblackbox/kbbgame.h b/kblackbox/kbbgame.h index 94837871..d014c4e6 100644 --- a/kblackbox/kbbgame.h +++ b/kblackbox/kbbgame.h @@ -49,7 +49,7 @@ class TDEToggleAction; class KBBGame : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: KBBGame(); diff --git a/kblackbox/kbbgfx.cpp b/kblackbox/kbbgfx.cpp index 0becd126..3aff0369 100644 --- a/kblackbox/kbbgfx.cpp +++ b/kblackbox/kbbgfx.cpp @@ -28,7 +28,7 @@ KBBGraphic::KBBGraphic( TQPixmap **p, TQWidget* parent, const char* name ) int i; curRow = curCol = 0; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setBackgroundColor( gray ); setCellWidth( CELLW ); // set width of cell in pixels setCellHeight( CELLH ); // set height of cell in pixels @@ -342,7 +342,7 @@ void KBBGraphic::mousePressEvent( TQMouseEvent* e ) /* * Middle click finishes the game. */ - if (e->button() == Qt::MidButton) { + if (e->button() == TQt::MidButton) { emit endMouseClicked(); return; } @@ -413,7 +413,7 @@ void KBBGraphic::slotInput() if ( !inputAccepted ) { return; } - emit inputAt( curCol, curRow, Qt::LeftButton ); + emit inputAt( curCol, curRow, TQt::LeftButton ); // updateElement( curCol, curRow ); } @@ -454,8 +454,8 @@ void KBBGraphic::focusOutEvent( TQFocusEvent* ) void KBBGraphic::setInputAccepted( bool b ) { inputAccepted = b; - if (b) setFocusPolicy( TQ_StrongFocus ); - else setFocusPolicy( TQ_NoFocus ); + if (b) setFocusPolicy( TQWidget::StrongFocus ); + else setFocusPolicy( TQWidget::NoFocus ); } /* diff --git a/kblackbox/kbbgfx.h b/kblackbox/kbbgfx.h index 15e87c27..b3cb5d68 100644 --- a/kblackbox/kbbgfx.h +++ b/kblackbox/kbbgfx.h @@ -52,7 +52,7 @@ class KBBGraphic : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KBBGraphic( TQPixmap** p=0, TQWidget* parent=0, const char* name=0 ); diff --git a/kbounce/game.cpp b/kbounce/game.cpp index 4b60df2e..0f1895de 100644 --- a/kbounce/game.cpp +++ b/kbounce/game.cpp @@ -326,13 +326,13 @@ JezzView::JezzView(TQCanvas* viewing, TQWidget* parent, const char* name, WFlags void JezzView::viewportMouseReleaseEvent( TQMouseEvent *ev ) { - if ( ev->button() & Qt::RightButton ) + if ( ev->button() & TQt::RightButton ) { m_vertical = !m_vertical; if ( m_vertical ) setCursor( sizeVerCursor ); else setCursor( sizeHorCursor ); } - if ( ev->button() & Qt::LeftButton ) + if ( ev->button() & TQt::LeftButton ) { emit buildWall( ev->x()/TILE_SIZE, ev->y()/TILE_SIZE, m_vertical ); } @@ -363,7 +363,7 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c "kbounce/sounds/"; // create field - m_field = new JezzField( tiles, background, TQT_TQOBJECT(this), "m_field" ); + m_field = new JezzField( tiles, background, this, "m_field" ); m_field->resize( TILE_SIZE*FIELD_WIDTH, TILE_SIZE*FIELD_HEIGHT ); for ( int x=0; x<FIELD_WIDTH; x++ ) @@ -378,13 +378,13 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c for ( int x=0; x<FIELD_WIDTH; x++ ) m_field->setTile( x, FIELD_HEIGHT-1, TILE_BORDER ); - connect( m_field, TQT_SIGNAL(ballCollision(Ball *, int, int, int)), this, TQT_SLOT(ballCollision(Ball *, int, int, int)) ); + connect( m_field, TQ_SIGNAL(ballCollision(Ball *, int, int, int)), this, TQ_SLOT(ballCollision(Ball *, int, int, int)) ); // create view m_view = new JezzView( m_field, this, "m_view" ); m_view->move( 0, 0 ); m_view->adjustSize(); - connect( m_view, TQT_SIGNAL(buildWall(int, int, bool)), this, TQT_SLOT(buildWall(int, int, bool)) ); + connect( m_view, TQ_SIGNAL(buildWall(int, int, bool)), this, TQ_SLOT(buildWall(int, int, bool)) ); // create balls for ( int n=0; n<ballNum; n++ ) @@ -403,7 +403,7 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c // create game clock m_clock = new TQTimer( this ); - connect( m_clock, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick()) ); + connect( m_clock, TQ_SIGNAL(timeout()), this, TQ_SLOT(tick()) ); m_clock->start( GAME_DELAY ); // setup geometry @@ -617,18 +617,18 @@ void JezzGame::buildWall( int x, int y, bool vertical ) m_wall1 = new Wall( m_field, x, y, vertical? Wall::Up : Wall::Left, vertical? TILE_WALLUP : TILE_WALLLEFT, - TQT_TQOBJECT(this), "m_wall1" ); - connect( m_wall1, TQT_SIGNAL(finished(Wall *, int)), - this, TQT_SLOT(wallFinished(Wall *, int)) ); } + this, "m_wall1" ); + connect( m_wall1, TQ_SIGNAL(finished(Wall *, int)), + this, TQ_SLOT(wallFinished(Wall *, int)) ); } if ( !m_wall2 ) { m_wall2 = new Wall( m_field, x, y, vertical? Wall::Down: Wall::Right, vertical? TILE_WALLDOWN : TILE_WALLRIGHT, - TQT_TQOBJECT(this), "m_wall2" ); - connect( m_wall2, TQT_SIGNAL(finished(Wall *, int)), - this, TQT_SLOT(wallFinished(Wall *, int)) ); + this, "m_wall2" ); + connect( m_wall2, TQ_SIGNAL(finished(Wall *, int)), + this, TQ_SLOT(wallFinished(Wall *, int)) ); } } } diff --git a/kbounce/game.h b/kbounce/game.h index cb7fd66d..761d1235 100644 --- a/kbounce/game.h +++ b/kbounce/game.h @@ -54,7 +54,7 @@ class Ball : public TQCanvasSprite class Wall : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Direction { Up, Down, Left, Right }; @@ -88,7 +88,7 @@ private: class JezzField : public TQCanvas { - Q_OBJECT + TQ_OBJECT public: JezzField( const TQPixmap &tiles, const TQPixmap &background, TQObject* parent = 0, const char* name = 0 ); @@ -114,7 +114,7 @@ private: class JezzView : public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: JezzView(TQCanvas* viewing=0, TQWidget* parent=0, const char* name=0, WFlags f=0); @@ -132,7 +132,7 @@ private: class JezzGame : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp index 9fcb3c63..1c9062e9 100644 --- a/kbounce/kbounce.cpp +++ b/kbounce/kbounce.cpp @@ -89,13 +89,13 @@ KJezzball::KJezzball() // create timers m_nextLevelTimer = new TQTimer( this, "m_nextLevelTimer" ); - connect( m_nextLevelTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(switchLevel()) ); + connect( m_nextLevelTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(switchLevel()) ); m_gameOverTimer = new TQTimer( this, "m_gameOverTimer" ); - connect( m_gameOverTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(gameOverNow()) ); + connect( m_gameOverTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(gameOverNow()) ); m_timer = new TQTimer( this, "m_timer" ); - connect( m_timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(second()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(second()) ); // create demo game createLevel( 1 ); @@ -103,7 +103,7 @@ KJezzball::KJezzball() .arg(m_newAction->shortcut().toString()) ); //m_gameWidget->display( i18n("Press <Space> to start a game!") ); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setFocus(); setupGUI(); } @@ -119,23 +119,23 @@ KJezzball::~KJezzball() */ void KJezzball::initXMLUI() { - m_newAction = KStdGameAction::gameNew( TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection() ); + m_newAction = KStdGameAction::gameNew( this, TQ_SLOT(newGame()), actionCollection() ); // AB: originally KBounce/KJezzball used Space for new game - but Ctrl+N is // default. We solve this by providing space as an alternative key TDEShortcut s = m_newAction->shortcut(); s.append(KKeySequence(TQKeySequence(Key_Space))); m_newAction->setShortcut(s); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscore()), actionCollection() ); - m_pauseButton = KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pauseGame()), actionCollection()); - KStdGameAction::end(TQT_TQOBJECT(this), TQT_SLOT(closeGame()), actionCollection()); - KStdGameAction::configureHighscores(TQT_TQOBJECT(this), TQT_SLOT(configureHighscores()),actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection() ); + KStdGameAction::highscores(this, TQ_SLOT(showHighscore()), actionCollection() ); + m_pauseButton = KStdGameAction::pause(this, TQ_SLOT(pauseGame()), actionCollection()); + KStdGameAction::end(this, TQ_SLOT(closeGame()), actionCollection()); + KStdGameAction::configureHighscores(this, TQ_SLOT(configureHighscores()),actionCollection()); - new TDEAction( i18n("&Select Background Folder..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectBackground()), + new TDEAction( i18n("&Select Background Folder..."), 0, this, TQ_SLOT(selectBackground()), actionCollection(), "background_select" ); m_backgroundShowAction = - new TDEToggleAction( i18n("Show &Backgrounds"), 0, TQT_TQOBJECT(this), TQT_SLOT(showBackground()), + new TDEToggleAction( i18n("Show &Backgrounds"), 0, this, TQ_SLOT(showBackground()), actionCollection(), "background_show" ); m_backgroundShowAction->setCheckedState(i18n("Hide &Backgrounds")); m_backgroundShowAction->setEnabled( !m_backgroundDir.isEmpty() ); @@ -400,9 +400,9 @@ void KJezzball::createLevel( int level ) m_gameWidget->show(); m_layout->addWidget( m_gameWidget, 0, 0 ); - connect( m_gameWidget, TQT_SIGNAL(died()), TQT_TQOBJECT(this), TQT_SLOT(died()) ); - connect( m_gameWidget, TQT_SIGNAL(newPercent(int)), TQT_TQOBJECT(this), TQT_SLOT(newPercent(int)) ); - connect( m_soundAction, TQT_SIGNAL(toggled(bool)), m_gameWidget, TQT_SLOT(setSound(bool)) ); + connect( m_gameWidget, TQ_SIGNAL(died()), this, TQ_SLOT(died()) ); + connect( m_gameWidget, TQ_SIGNAL(newPercent(int)), this, TQ_SLOT(newPercent(int)) ); + connect( m_soundAction, TQ_SIGNAL(toggled(bool)), m_gameWidget, TQ_SLOT(setSound(bool)) ); // update displays m_level.lifes = level+1; diff --git a/kbounce/kbounce.h b/kbounce/kbounce.h index 884e3298..130e54b4 100644 --- a/kbounce/kbounce.h +++ b/kbounce/kbounce.h @@ -29,7 +29,7 @@ class TDEAction; class KJezzball : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp index 51a54532..911fd61f 100644 --- a/kenolaba/AbTop.cpp +++ b/kenolaba/AbTop.cpp @@ -63,12 +63,12 @@ AbTop::AbTop() timer = new TQTimer; - connect( timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(timerDone()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); board = new Board(); setMoveNo(0); - connect( board, TQT_SIGNAL(searchBreak()), TQT_TQOBJECT(this), TQT_SLOT(searchBreak()) ); + connect( board, TQ_SIGNAL(searchBreak()), this, TQ_SLOT(searchBreak()) ); TQ_CHECK_PTR(board); boardWidget = new BoardWidget(*board,this); @@ -76,8 +76,8 @@ AbTop::AbTop() spy = new Spy(*board); #endif - connect( boardWidget, TQT_SIGNAL(updateSpy(TQString)), - TQT_TQOBJECT(this), TQT_SLOT(updateSpy(TQString)) ); + connect( boardWidget, TQ_SIGNAL(updateSpy(TQString)), + this, TQ_SLOT(updateSpy(TQString)) ); setCentralWidget(boardWidget); boardWidget->show(); @@ -88,17 +88,17 @@ AbTop::AbTop() setMinimumSize(200,300); // RMB context menu - connect( boardWidget, TQT_SIGNAL(rightButtonPressed(int,const TQPoint&)), - TQT_TQOBJECT(this), TQT_SLOT(rightButtonPressed(int,const TQPoint&)) ); + connect( boardWidget, TQ_SIGNAL(rightButtonPressed(int,const TQPoint&)), + this, TQ_SLOT(rightButtonPressed(int,const TQPoint&)) ); - connect( boardWidget, TQT_SIGNAL(edited(int)), - TQT_TQOBJECT(this), TQT_SLOT(edited(int)) ); + connect( boardWidget, TQ_SIGNAL(edited(int)), + this, TQ_SLOT(edited(int)) ); - connect( board, TQT_SIGNAL(updateBestMove(Move&,int)), - TQT_TQOBJECT(this), TQT_SLOT(updateBestMove(Move&,int)) ); + connect( board, TQ_SIGNAL(updateBestMove(Move&,int)), + this, TQ_SLOT(updateBestMove(Move&,int)) ); - connect( boardWidget, TQT_SIGNAL(moveChoosen(Move&)), - TQT_TQOBJECT(this), TQT_SLOT(moveChoosen(Move&)) ); + connect( boardWidget, TQ_SIGNAL(moveChoosen(Move&)), + this, TQ_SLOT(moveChoosen(Move&)) ); /* default */ setLevel(Easy); @@ -132,61 +132,61 @@ AbTop::~AbTop() void AbTop::setupActions() { - newAction = KStdGameAction::gameNew( TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection() ); - KStdGameAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); + newAction = KStdGameAction::gameNew( this, TQ_SLOT(newGame()), actionCollection() ); + KStdGameAction::quit( this, TQ_SLOT(close()), actionCollection() ); - stopAction = new TDEAction( i18n("&Stop Search"), "process-stop", Key_S, TQT_TQOBJECT(this), - TQT_SLOT(stopSearch()), actionCollection(), "move_stop"); + stopAction = new TDEAction( i18n("&Stop Search"), "process-stop", Key_S, this, + TQ_SLOT(stopSearch()), actionCollection(), "move_stop"); backAction = new TDEAction( i18n("Take &Back"), "back", - TDEStdAccel::shortcut(TDEStdAccel::Prior), TQT_TQOBJECT(this), - TQT_SLOT(back()), actionCollection(), "move_back"); + TDEStdAccel::shortcut(TDEStdAccel::Prior), this, + TQ_SLOT(back()), actionCollection(), "move_back"); forwardAction = new TDEAction( i18n("&Forward"), "forward", - TDEStdAccel::shortcut(TDEStdAccel::Next), TQT_TQOBJECT(this), - TQT_SLOT(forward()), actionCollection(), "move_forward"); + TDEStdAccel::shortcut(TDEStdAccel::Next), this, + TQ_SLOT(forward()), actionCollection(), "move_forward"); - hintAction = KStdGameAction::hint(TQT_TQOBJECT(this), TQT_SLOT(suggestion()), actionCollection()); + hintAction = KStdGameAction::hint(this, TQ_SLOT(suggestion()), actionCollection()); - KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection()); - pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection()); + KStdAction::copy( this, TQ_SLOT(copy()), actionCollection()); + pasteAction = KStdAction::paste( this, TQ_SLOT(paste()), actionCollection()); (void) new TDEAction( i18n("&Restore Position"), TDEStdAccel::shortcut(TDEStdAccel::Open), - TQT_TQOBJECT(this), TQT_SLOT(restorePosition()), + this, TQ_SLOT(restorePosition()), actionCollection(), "edit_restore" ); (void) new TDEAction( i18n("&Save Position"), TDEStdAccel::shortcut(TDEStdAccel::Save), - TQT_TQOBJECT(this), TQT_SLOT(savePosition()), + this, TQ_SLOT(savePosition()), actionCollection(), "edit_save" ); TDEToggleAction *ta; ta = new TDEToggleAction( i18n("&Network Play"), "network", Key_N, actionCollection(), "game_net"); - connect(ta, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(gameNetwork(bool))); + connect(ta, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(gameNetwork(bool))); editAction = new TDEToggleAction( i18n("&Modify"), "edit", CTRL+Key_Insert, actionCollection(), "edit_modify"); - connect(editAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT( editModify(bool))); + connect(editAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT( editModify(bool))); - showMenubar = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); - KStdAction::saveOptions( TQT_TQOBJECT(this), TQT_SLOT(writeConfig()), actionCollection()); + showMenubar = KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection()); + KStdAction::saveOptions( this, TQ_SLOT(writeConfig()), actionCollection()); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection()); + KStdAction::preferences( this, TQ_SLOT(configure()), actionCollection()); moveSlowAction = new TDEToggleAction( i18n("&Move Slow"), 0, actionCollection(), "options_moveSlow"); - connect(moveSlowAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(optionMoveSlow(bool))); + connect(moveSlowAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(optionMoveSlow(bool))); renderBallsAction = new TDEToggleAction( i18n("&Render Balls"), 0, actionCollection(), "options_renderBalls"); - connect(renderBallsAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(optionRenderBalls(bool))); + connect(renderBallsAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(optionRenderBalls(bool))); showSpyAction = new TDEToggleAction( i18n("&Spy"), 0, actionCollection(), "options_showSpy"); - connect(showSpyAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(optionShowSpy(bool))); + connect(showSpyAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(optionShowSpy(bool))); levelAction = KStdGameAction::chooseGameType(0, 0, actionCollection()); @@ -194,14 +194,14 @@ void AbTop::setupActions() for (uint i=0; i<Nb_Levels; i++) list.append( i18n(LEVEL[i].label) ); levelAction->setItems(list); - connect(levelAction, TQT_SIGNAL(activated(int)), TQT_SLOT(setLevel(int))); + connect(levelAction, TQ_SIGNAL(activated(int)), TQ_SLOT(setLevel(int))); iplayAction = new TDESelectAction(i18n("&Computer Play"), 0, actionCollection(), "options_iplay"); list.clear(); for (uint i=0; i<Nb_IPlays; i++) list.append( i18n(IPLAY[i].label) ); iplayAction->setItems(list); - connect(iplayAction, TQT_SIGNAL(activated(int)), TQT_SLOT(setIPlay(int))); + connect(iplayAction, TQ_SIGNAL(activated(int)), TQ_SLOT(setIPlay(int))); } void AbTop::toggleMenubar() @@ -421,8 +421,8 @@ void AbTop::setupStatusBar() spyPopup->insertItem(spy1, 1); spyPopup->insertItem(spy2, 2); spyPopup->insertItem(spy3, 3); - connect( spyPopup, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(this), TQT_SLOT(setSpy(int)) ); + connect( spyPopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(setSpy(int)) ); tb->insertButton(spy0, 30, spyPopup, TRUE, i18n("Spy")); } @@ -800,8 +800,8 @@ void AbTop::gameNetwork(bool on) h2[i]=0; net->addListener(h2, p); } - TQObject::connect(net, TQT_SIGNAL(gotPosition(const char *)), - TQT_TQOBJECT(this), TQT_SLOT(pastePosition(const char *)) ); + TQObject::connect(net, TQ_SIGNAL(gotPosition(const char *)), + this, TQ_SLOT(pastePosition(const char *)) ); } diff --git a/kenolaba/AbTop.h b/kenolaba/AbTop.h index 317ccbfc..25457733 100644 --- a/kenolaba/AbTop.h +++ b/kenolaba/AbTop.h @@ -33,7 +33,7 @@ class Spy; class AbTop: public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kenolaba/Ball.cpp b/kenolaba/Ball.cpp index 8590a059..04d11be0 100644 --- a/kenolaba/Ball.cpp +++ b/kenolaba/Ball.cpp @@ -229,7 +229,7 @@ BallWidget::BallWidget( int _freq, int bFr, TQWidget *parent, const char *name ) ballFraction = bFr; realSize = -1; timer = new TQTimer(this); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(animate()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(animate()) ); } BallWidget::~BallWidget() @@ -314,7 +314,7 @@ void BallWidget::resizeEvent(TQResizeEvent *) void BallWidget::paintEvent(TQPaintEvent *) { - paint(TQT_TQPAINTDEVICE(this)); + paint(this); } diff --git a/kenolaba/Ball.h b/kenolaba/Ball.h index cb7b6526..dfeb29da 100644 --- a/kenolaba/Ball.h +++ b/kenolaba/Ball.h @@ -96,7 +96,7 @@ class BallPosition { class BallWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -140,7 +140,7 @@ class BallWidget : public TQWidget class BallTest: public BallWidget { - Q_OBJECT + TQ_OBJECT public: BallTest(TQWidget *parent=0, const char *name=0 ); diff --git a/kenolaba/Board.h b/kenolaba/Board.h index bbe794d6..a91f67e9 100644 --- a/kenolaba/Board.h +++ b/kenolaba/Board.h @@ -43,7 +43,7 @@ private: class Board : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kenolaba/BoardWidget.cpp b/kenolaba/BoardWidget.cpp index 456bb75c..fbf31eb1 100644 --- a/kenolaba/BoardWidget.cpp +++ b/kenolaba/BoardWidget.cpp @@ -44,8 +44,8 @@ BoardWidget::BoardWidget(Board& b, TQWidget *parent, const char *name) #ifdef HAVE_KIR m_backRenderer = KIRManager::attach( this, "Background" ); - connect( m_backRenderer, TQT_SIGNAL(rendered()), - this, TQT_SLOT(drawBoard()) ); + connect( m_backRenderer, TQ_SIGNAL(rendered()), + this, TQ_SLOT(drawBoard()) ); #endif /* setup cursors */ @@ -164,7 +164,7 @@ void BoardWidget::paintEvent(TQPaintEvent *) { if (renderMode) { pm = boardPM; - BallWidget::paint(TQT_TQPAINTDEVICE(&pm)); + BallWidget::paint(&pm); } else draw(); @@ -834,7 +834,7 @@ void BoardWidget::mousePressEvent( TQMouseEvent* pEvent ) int pos = positionOf( pEvent->x(), pEvent->y() ); int f = fieldOf(pos); - if (pEvent->button() == Qt::RightButton) { + if (pEvent->button() == TQt::RightButton) { emit rightButtonPressed(f, pEvent->globalPos()); return; } @@ -846,9 +846,9 @@ void BoardWidget::mousePressEvent( TQMouseEvent* pEvent ) if (editMode) { - editColor = (pEvent->button() == Qt::MidButton) ? + editColor = (pEvent->button() == TQt::MidButton) ? Board::color2 : Board::color1; - int newColor = (pEvent->button() == Qt::MidButton) ? + int newColor = (pEvent->button() == TQt::MidButton) ? Board::color2bright : Board::color1bright; if (field[f] == Board::free) { @@ -877,7 +877,7 @@ void BoardWidget::mousePressEvent( TQMouseEvent* pEvent ) return; } - startValid = isValidStart(pos, (pEvent->button() == Qt::MidButton)); + startValid = isValidStart(pos, (pEvent->button() == TQt::MidButton)); kdDebug(12011) << "Start pos " << pos << " is valid: " << startValid << endl; // actMove.print(); @@ -918,7 +918,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent ) if (!startValid) { /* We haven't a valid move yet. Check if we are over a valid start */ - startValid = isValidStart(pos, (pEvent->button() == Qt::MidButton)); + startValid = isValidStart(pos, (pEvent->button() == TQt::MidButton)); kdDebug(12011) << "Start pos " << pos << " is valid: " << startValid << endl; // actMove.print(); diff --git a/kenolaba/BoardWidget.h b/kenolaba/BoardWidget.h index 94bbaaa0..3b5dd3ad 100644 --- a/kenolaba/BoardWidget.h +++ b/kenolaba/BoardWidget.h @@ -14,7 +14,7 @@ class KIRenderer; class BoardWidget : public BallWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kenolaba/EvalDlgImpl.cpp b/kenolaba/EvalDlgImpl.cpp index dddbcd2b..0e254a02 100644 --- a/kenolaba/EvalDlgImpl.cpp +++ b/kenolaba/EvalDlgImpl.cpp @@ -26,9 +26,9 @@ EvalDlgImpl::EvalDlgImpl(TQWidget* parent, Board* board) _origScheme = board->evalScheme(); _scheme = new EvalScheme(*_origScheme); - connect( evalDelete, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteEntry() ) ); - connect( evalSaveAs, TQT_SIGNAL( clicked() ), this, TQT_SLOT( saveas() ) ); - connect( evalList, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( select(int) ) ); + connect( evalDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteEntry() ) ); + connect( evalSaveAs, TQ_SIGNAL( clicked() ), this, TQ_SLOT( saveas() ) ); + connect( evalList, TQ_SIGNAL( highlighted(int) ), this, TQ_SLOT( select(int) ) ); TDEConfig* config = kapp->config(); config->setGroup("General"); @@ -52,33 +52,33 @@ EvalDlgImpl::~EvalDlgImpl() void EvalDlgImpl::connectEditLines() { - connect( moveEval1, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateMove()) ); - connect( moveEval2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateMove()) ); - connect( moveEval3, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateMove()) ); - connect( moveEval4, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateMove()) ); - connect( moveEval5, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateMove()) ); - connect( moveEval6, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateMove()) ); - connect( moveEval7, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateMove()) ); - connect( moveEval8, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateMove()) ); - connect( moveEval9, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateMove()) ); - connect( posEval1, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateFields()) ); - connect( posEval2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateFields()) ); - connect( posEval3, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateFields()) ); - connect( posEval4, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateFields()) ); - connect( posEval5, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateFields()) ); - connect( diffEval2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateFields()) ); - connect( diffEval3, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateFields()) ); - connect( diffEval4, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateFields()) ); - connect( diffEval5, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateFields()) ); - connect( rowEval2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateInARow()) ); - connect( rowEval3, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateInARow()) ); - connect( rowEval4, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateInARow()) ); - connect( rowEval5, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateInARow()) ); - connect( countEval1, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateCount()) ); - connect( countEval2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateCount()) ); - connect( countEval3, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateCount()) ); - connect( countEval4, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateCount()) ); - connect( countEval5, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateCount()) ); + connect( moveEval1, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateMove()) ); + connect( moveEval2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateMove()) ); + connect( moveEval3, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateMove()) ); + connect( moveEval4, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateMove()) ); + connect( moveEval5, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateMove()) ); + connect( moveEval6, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateMove()) ); + connect( moveEval7, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateMove()) ); + connect( moveEval8, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateMove()) ); + connect( moveEval9, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateMove()) ); + connect( posEval1, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateFields()) ); + connect( posEval2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateFields()) ); + connect( posEval3, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateFields()) ); + connect( posEval4, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateFields()) ); + connect( posEval5, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateFields()) ); + connect( diffEval2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateFields()) ); + connect( diffEval3, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateFields()) ); + connect( diffEval4, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateFields()) ); + connect( diffEval5, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateFields()) ); + connect( rowEval2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateInARow()) ); + connect( rowEval3, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateInARow()) ); + connect( rowEval4, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateInARow()) ); + connect( rowEval5, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateInARow()) ); + connect( countEval1, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateCount()) ); + connect( countEval2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateCount()) ); + connect( countEval3, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateCount()) ); + connect( countEval4, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateCount()) ); + connect( countEval5, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateCount()) ); } void EvalDlgImpl::disconnectEditLines() diff --git a/kenolaba/EvalDlgImpl.h b/kenolaba/EvalDlgImpl.h index ee3d27a7..bc12fe82 100644 --- a/kenolaba/EvalDlgImpl.h +++ b/kenolaba/EvalDlgImpl.h @@ -13,7 +13,7 @@ class Board; class EvalDlgImpl: public EvalDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/kenolaba/Network.cpp b/kenolaba/Network.cpp index 9be7c0c0..4079feae 100644 --- a/kenolaba/Network.cpp +++ b/kenolaba/Network.cpp @@ -62,8 +62,8 @@ Network::Network(int port) } sn = new TQSocketNotifier( fd, TQSocketNotifier::Read ); - TQObject::connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(gotConnection()) ); + TQObject::connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(gotConnection()) ); } Network::~Network() diff --git a/kenolaba/Network.h b/kenolaba/Network.h index b209f8cd..d7390b52 100644 --- a/kenolaba/Network.h +++ b/kenolaba/Network.h @@ -27,7 +27,7 @@ class Listener { class Network: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kenolaba/Spy.cpp b/kenolaba/Spy.cpp index 37b5406c..8f9680d2 100644 --- a/kenolaba/Spy.cpp +++ b/kenolaba/Spy.cpp @@ -43,7 +43,7 @@ Spy::Spy(Board& b) b2->addWidget( actBoard[i] ); b2->addWidget( actLabel[i] ); - connect( actBoard[i], TQT_SIGNAL(mousePressed()), this, TQT_SLOT(nextStep()) ); + connect( actBoard[i], TQ_SIGNAL(mousePressed()), this, TQ_SLOT(nextStep()) ); } l = new TQLabel(this); @@ -68,13 +68,13 @@ Spy::Spy(Board& b) b2->addWidget( bestBoard[i] ); b2->addWidget( bestLabel[i] ); - connect( bestBoard[i], TQT_SIGNAL(mousePressed()), this, TQT_SLOT(nextStep()) ); + connect( bestBoard[i], TQ_SIGNAL(mousePressed()), this, TQ_SLOT(nextStep()) ); } - connect( &board, TQT_SIGNAL(update(int,int,Move&,bool)), - this, TQT_SLOT(update(int,int,Move&,bool)) ); - connect( &board, TQT_SIGNAL(updateBest(int,int,Move&,bool)), - this, TQT_SLOT(updateBest(int,int,Move&,bool)) ); + connect( &board, TQ_SIGNAL(update(int,int,Move&,bool)), + this, TQ_SLOT(update(int,int,Move&,bool)) ); + connect( &board, TQ_SIGNAL(updateBest(int,int,Move&,bool)), + this, TQ_SLOT(updateBest(int,int,Move&,bool)) ); top->activate(); setCaption(i18n("Spy")); // KWM::setDecoration(winId(), 2); diff --git a/kenolaba/Spy.h b/kenolaba/Spy.h index 188e32f3..19b02006 100644 --- a/kenolaba/Spy.h +++ b/kenolaba/Spy.h @@ -16,7 +16,7 @@ class TQLabel; class Spy: public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kfouleggs/ai.h b/kfouleggs/ai.h index 1f8c1365..b1a3afeb 100644 --- a/kfouleggs/ai.h +++ b/kfouleggs/ai.h @@ -6,7 +6,7 @@ class FEAI : public AI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kfouleggs/board.h b/kfouleggs/board.h index fdd0df02..8d70d95e 100644 --- a/kfouleggs/board.h +++ b/kfouleggs/board.h @@ -6,7 +6,7 @@ class FEBoard : public Board { - Q_OBJECT + TQ_OBJECT public: FEBoard(bool graphic, TQWidget *parent); diff --git a/kfouleggs/field.h b/kfouleggs/field.h index 5e9ae69f..de043738 100644 --- a/kfouleggs/field.h +++ b/kfouleggs/field.h @@ -7,7 +7,7 @@ class FEField : public Field { - Q_OBJECT + TQ_OBJECT public: FEField(TQWidget *parent); diff --git a/kfouleggs/main.h b/kfouleggs/main.h index a844ae71..d4526a35 100644 --- a/kfouleggs/main.h +++ b/kfouleggs/main.h @@ -26,7 +26,7 @@ class FEFactory : public CommonFactory //----------------------------------------------------------------------------- class FEMainWindow : public MainWindow { - Q_OBJECT + TQ_OBJECT public: FEMainWindow() { init(); } diff --git a/kgoldrunner/src/data_messages.cpp b/kgoldrunner/src/data_messages.cpp index f905168b..4c456077 100644 --- a/kgoldrunner/src/data_messages.cpp +++ b/kgoldrunner/src/data_messages.cpp @@ -29,19 +29,19 @@ i18n("TRANSLATORS: Please see the notes in the data_messages.cpp file."); i18n("Hi !!"); i18n("Hi ! Welcome to KGoldrunner ! The idea of the game is to pick up all the gold nuggets, then climb to the top of the playing area and move up to the next level. A hidden ladder will appear as you collect the last nugget." "\n" -"\nThe hero (the green figure) is your deputy. To collect the nuggets, just point the mouse where you want him to go. At first gravity takes over and he falls ..." +"\nThe hero (the green figure) is your deputy. To collect the nuggets, just point the mouse where you want the hero to go. At first gravity takes over and the hero falls ..." ); // From levels/tute002.grl (in levels.tar). i18n("Navigation"); -i18n("This is an exercise in moving around. Follow the track of gold nuggets until the ladder pops up at the right. The hero can only follow the mouse along simple paths (like _ | L or U), so be careful not to get too far ahead of him." +i18n("This is an exercise in moving around. Follow the track of gold nuggets until the ladder pops up at the right. The hero can only follow the mouse along simple paths (like _ | L or U), so be careful not to get too far ahead of them." "\n" "\nDANGER: Try not to fall off the ladder or bar into the concrete pit at the bottom right. If you do get trapped there, the only way out is to kill the hero (press key Q for quit) and start the level again." ); // From levels/tute003.grl (in levels.tar). i18n("Digging"); -i18n("Now you have to dig to get the gold! Just use the left and right mouse buttons to dig left or right of the hero's position. The hero can then jump into and through the hole he has dug. He can also dig several holes in a row and run sideways through the dug holes. Be careful though. After a while the holes close up and you can get trapped and killed." +i18n("Now you have to dig to get the gold! Just use the left and right mouse buttons to dig left or right of the hero's position. The hero can then jump into and through the hole they have dug. They can also dig several holes in a row and run sideways through the dug holes. Be careful though. After a while the holes close up and you can get trapped and killed." "\n" "\nIn the third box down, you have to dig two holes, jump in and quickly dig one more, to get through two layers. On the right, you have to dig three, then two then one to get through. There are also two little puzzles to work out along the way. Good luck!" "\n" @@ -54,9 +54,9 @@ i18n("Well, it's been nice and easy up to now, but the game would be no fun with "\n" "\nYou can handle enemies by running away, digging a hole or luring them into part of the playing area where they get stranded." "\n" -"\nIf an enemy falls into a hole, he gives up any gold he is carrying, then gets stuck in the hole for a time and climbs out. If the hole closes while he is in it, he dies and reappears somewhere else on the screen. You can deliberately kill enemies by digging several holes in a row." +"\nIf an enemy falls into a hole, they give up any gold they are carrying, then get stuck in the hole for a time and climb out. If the hole closes while they are in it, they die and reappear somewhere else on the screen. You can deliberately kill enemies by digging several holes in a row." "\n" -"\nMore importantly, you can run over an enemy's head. You must do that right at the start of this level. Dig a hole, trap the enemy, wait for him to fall all the way in, then run over him, with the other enemy in hot pursuit..." +"\nMore importantly, you can run over an enemy's head. You must do that right at the start of this level. Dig a hole, trap the enemy, wait for them to fall all the way in, then run over them, with the other enemy in hot pursuit..." ); // From levels/tute005.grl (in levels.tar). @@ -82,7 +82,7 @@ i18n("This is just a nice easy level to finish up with. Have fun with the other i18n("Bars and Ladders"); i18n("There's nowhere to dig, so you must dodge the enemies and avoid falling to the concrete at the wrong time. Try to keep the enemies together." "\n" -"\nIf an enemy has a gold outline, he is holding a nugget. He might drop it as he runs over the concrete or maybe at the top of a ladder ...... patience, patience !!" +"\nIf an enemy has a gold outline, they are holding a nugget. They might drop it as they run over the concrete or maybe at the top of a ladder ...... patience, patience !!" ); // From levels/tutea002.grl (in levels.tar). @@ -96,7 +96,7 @@ i18n("You cannot get up to the gold, so you must get the enemies to bring it dow i18n("... Or not to kill?"); i18n("It is best not to kill the enemy. Try it and you will find out why ... Heh, heh, heh !! ... ;-)" "\n" -"\nIf you do kill him unintentionally, before you have collected the gold at the top left, you can still finish the level by digging away the side of the pit he is in." +"\nIf you do kill them unintentionally, before you have collected the gold at the top left, you can still finish the level by digging away the side of the pit they are in." ); // From levels/tutea004.grl (in levels.tar). diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 4362bb5d..8d417c8d 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -88,10 +88,10 @@ KGoldrunner::KGoldrunner() initStatusBar(); // Connect the game actions to the menu and toolbar displays. - connect(game, TQT_SIGNAL (setEditMenu (bool)), TQT_SLOT (setEditMenu (bool))); - connect(game, TQT_SIGNAL (markRuleType (char)), TQT_SLOT (markRuleType (char))); - connect(game, TQT_SIGNAL (hintAvailable(bool)), TQT_SLOT (adjustHintAction(bool))); - connect(game, TQT_SIGNAL (defaultEditObj()), TQT_SLOT (defaultEditObj())); + connect(game, TQ_SIGNAL (setEditMenu (bool)), TQ_SLOT (setEditMenu (bool))); + connect(game, TQ_SIGNAL (markRuleType (char)), TQ_SLOT (markRuleType (char))); + connect(game, TQ_SIGNAL (hintAvailable(bool)), TQ_SLOT (adjustHintAction(bool))); + connect(game, TQ_SIGNAL (defaultEditObj()), TQ_SLOT (defaultEditObj())); // Apply the saved mainwindow settings, if any, and ask the mainwindow // to automatically save settings if changed: window size, toolbar @@ -157,22 +157,22 @@ void KGoldrunner::setupActions() TDEAction * newAction = KStdGameAction:: gameNew ( game, - TQT_SLOT(startLevelOne()), actionCollection()); + TQ_SLOT(startLevelOne()), actionCollection()); newAction-> setText (i18n("&New Game...")); TDEAction * loadGame = KStdGameAction:: load ( - game, TQT_SLOT(loadGame()), actionCollection()); + game, TQ_SLOT(loadGame()), actionCollection()); loadGame-> setText (i18n("&Load Saved Game...")); (void) new TDEAction ( i18n("&Play Any Level..."), 0, - game, TQT_SLOT(startAnyLevel()), actionCollection(), + game, TQ_SLOT(startAnyLevel()), actionCollection(), "play_any"); (void) new TDEAction ( i18n("Play &Next Level..."), 0, game, - TQT_SLOT(startNextLevel()), actionCollection(), + TQ_SLOT(startNextLevel()), actionCollection(), "play_next"); // Save Game... @@ -181,7 +181,7 @@ void KGoldrunner::setupActions() saveGame = KStdGameAction:: save ( - game, TQT_SLOT(saveGame()), actionCollection()); + game, TQ_SLOT(saveGame()), actionCollection()); saveGame-> setText (i18n("&Save Game...")); saveGame-> setShortcut (Key_S); // Alternate key. @@ -193,20 +193,20 @@ void KGoldrunner::setupActions() myPause = KStdGameAction:: pause ( - TQT_TQOBJECT(this), TQT_SLOT(stopStart()), actionCollection()); + this, TQ_SLOT(stopStart()), actionCollection()); myPause-> setShortcut (Key_Escape); // Alternate key. highScore = KStdGameAction:: highscores ( - game, TQT_SLOT(showHighScores()), actionCollection()); + game, TQ_SLOT(showHighScores()), actionCollection()); hintAction = new TDEAction ( i18n("&Get Hint"), "ktip", 0, - game, TQT_SLOT(showHint()), actionCollection(), + game, TQ_SLOT(showHint()), actionCollection(), "get_hint"); killHero = new TDEAction ( i18n("&Kill Hero"), Key_Q, - game, TQT_SLOT(herosDead()), actionCollection(), + game, TQ_SLOT(herosDead()), actionCollection(), "kill_hero"); // Quit @@ -214,7 +214,7 @@ void KGoldrunner::setupActions() (void) KStdGameAction:: quit ( - TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + this, TQ_SLOT(close()), actionCollection()); /**************************************************************************/ /*************************** GAME EDITOR MENU **************************/ @@ -228,17 +228,17 @@ void KGoldrunner::setupActions() (void) new TDEAction ( i18n("&Create Level"), 0, - TQT_TQOBJECT(game), TQT_SLOT(createLevel()), actionCollection(), + game, TQ_SLOT(createLevel()), actionCollection(), "create"); (void) new TDEAction ( i18n("&Edit Any Level..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(updateLevel()), actionCollection(), + game, TQ_SLOT(updateLevel()), actionCollection(), "edit_any"); (void) new TDEAction ( i18n("Edit &Next Level..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(updateNext()), actionCollection(), + game, TQ_SLOT(updateNext()), actionCollection(), "edit_next"); // Save Edits... @@ -249,20 +249,20 @@ void KGoldrunner::setupActions() saveEdits = new TDEAction ( i18n("&Save Edits..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(saveLevelFile()), actionCollection(), + game, TQ_SLOT(saveLevelFile()), actionCollection(), "save_edits"); saveEdits->setEnabled (FALSE); // Nothing to save, yet. (void) new TDEAction ( i18n("&Move Level..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(moveLevelFile()), actionCollection(), + game, TQ_SLOT(moveLevelFile()), actionCollection(), "move_level"); (void) new TDEAction ( i18n("&Delete Level..."), 0, - TQT_TQOBJECT(game), - TQT_SLOT(deleteLevelFile()), actionCollection(), + game, + TQ_SLOT(deleteLevelFile()), actionCollection(), "delete_level"); // Create a Game @@ -272,13 +272,13 @@ void KGoldrunner::setupActions() (void) new TDEAction ( i18n("Create Game..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(createGame()), actionCollection(), + this, TQ_SLOT(createGame()), actionCollection(), "create_game"); (void) new TDEAction ( i18n("Edit Game Info..."), 0, - TQT_TQOBJECT(this), - TQT_SLOT(editGameInfo()), actionCollection(), + this, + TQ_SLOT(editGameInfo()), actionCollection(), "edit_game"); /**************************************************************************/ @@ -290,27 +290,27 @@ void KGoldrunner::setupActions() setKGoldrunner = new TDERadioAction ( "K&Goldrunner", 0, // Default Shift+G - TQT_TQOBJECT(this), TQT_SLOT(lsKGoldrunner()), actionCollection(), + this, TQ_SLOT(lsKGoldrunner()), actionCollection(), "kgoldrunner"); setAppleII = new TDERadioAction ( "&Apple II", 0, // Default Shift+A - TQT_TQOBJECT(this), TQT_SLOT(lsApple2()), actionCollection(), + this, TQ_SLOT(lsApple2()), actionCollection(), "apple_2"); setIceCave = new TDERadioAction ( i18n("&Ice Cave"), 0, // Default Shift+I - TQT_TQOBJECT(this), TQT_SLOT(lsIceCave()), actionCollection(), + this, TQ_SLOT(lsIceCave()), actionCollection(), "ice_cave"); setMidnight = new TDERadioAction ( i18n("&Midnight"), 0, // Default Shift+M - TQT_TQOBJECT(this), TQT_SLOT(lsMidnight()), actionCollection(), + this, TQ_SLOT(lsMidnight()), actionCollection(), "midnight"); setKDEKool = new TDERadioAction ( i18n("&TDE Kool"), 0, // Default Shift+K - TQT_TQOBJECT(this), TQT_SLOT(lsKDEKool()), actionCollection(), + this, TQ_SLOT(lsKDEKool()), actionCollection(), "kde_kool"); setKGoldrunner-> setExclusiveGroup ("landscapes"); @@ -331,14 +331,14 @@ void KGoldrunner::setupActions() setMouse = new TDERadioAction ( i18n("&Mouse Controls Hero"), 0, - TQT_TQOBJECT(this), - TQT_SLOT(setMouseMode()), actionCollection(), + this, + TQ_SLOT(setMouseMode()), actionCollection(), "mouse_mode"); setKeyboard = new TDERadioAction ( i18n("&Keyboard Controls Hero"), 0, - TQT_TQOBJECT(this), - TQT_SLOT(setKeyBoardMode()), actionCollection(), + this, + TQ_SLOT(setKeyBoardMode()), actionCollection(), "keyboard_mode"); setMouse-> setExclusiveGroup ("control"); @@ -355,27 +355,27 @@ void KGoldrunner::setupActions() TDERadioAction * nSpeed = new TDERadioAction ( i18n("Normal Speed"), 0, - TQT_TQOBJECT(this), TQT_SLOT(normalSpeed()), actionCollection(), + this, TQ_SLOT(normalSpeed()), actionCollection(), "normal_speed"); TDERadioAction * bSpeed = new TDERadioAction ( i18n("Beginner Speed"), 0, - TQT_TQOBJECT(this), TQT_SLOT(beginSpeed()), actionCollection(), + this, TQ_SLOT(beginSpeed()), actionCollection(), "beginner_speed"); TDERadioAction * cSpeed = new TDERadioAction ( i18n("Champion Speed"), 0, - TQT_TQOBJECT(this), TQT_SLOT(champSpeed()), actionCollection(), + this, TQ_SLOT(champSpeed()), actionCollection(), "champion_speed"); (void) new TDEAction ( // Repeatable action. i18n("Increase Speed"), Key_Plus, - TQT_TQOBJECT(this), TQT_SLOT(incSpeed()), actionCollection(), + this, TQ_SLOT(incSpeed()), actionCollection(), "increase_speed"); (void) new TDEAction ( // Repeatable action. i18n("Decrease Speed"), Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT(decSpeed()), actionCollection(), + this, TQ_SLOT(decSpeed()), actionCollection(), "decrease_speed"); nSpeed-> setExclusiveGroup ("speed"); @@ -390,12 +390,12 @@ void KGoldrunner::setupActions() tradRules = new TDERadioAction ( i18n("&Traditional Rules"), 0, - TQT_TQOBJECT(this), TQT_SLOT(setTradRules()), actionCollection(), + this, TQ_SLOT(setTradRules()), actionCollection(), "trad_rules"); kgrRules = new TDERadioAction ( i18n("K&Goldrunner Rules"), 0, - TQT_TQOBJECT(this), TQT_SLOT(setKGrRules()), actionCollection(), + this, TQ_SLOT(setKGrRules()), actionCollection(), "kgr_rules"); tradRules-> setExclusiveGroup ("rules"); @@ -409,12 +409,12 @@ void KGoldrunner::setupActions() (void) new TDEAction ( i18n("Larger Playing Area"), 0, - TQT_TQOBJECT(this), TQT_SLOT(makeLarger()), actionCollection(), + this, TQ_SLOT(makeLarger()), actionCollection(), "larger_area"); (void) new TDEAction ( i18n("Smaller Playing Area"), 0, - TQT_TQOBJECT(this), TQT_SLOT(makeSmaller()), actionCollection(), + this, TQ_SLOT(makeSmaller()), actionCollection(), "smaller_area"); // Configure Shortcuts... @@ -422,10 +422,10 @@ void KGoldrunner::setupActions() // -------------------------- KStdAction::keyBindings ( - TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), + this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); // KStdAction::configureToolbars ( - // this, TQT_SLOT(optionsConfigureToolbars()), + // this, TQ_SLOT(optionsConfigureToolbars()), // actionCollection()); /**************************************************************************/ @@ -435,19 +435,19 @@ void KGoldrunner::setupActions() // Two-handed KB controls and alternate one-handed controls for the hero. (void) new TDEAction (i18n("Move Up"), Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "move_up"); + this, TQ_SLOT(goUp()), actionCollection(), "move_up"); (void) new TDEAction (i18n("Move Right"), Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(goR()), actionCollection(), "move_right"); + this, TQ_SLOT(goR()), actionCollection(), "move_right"); (void) new TDEAction (i18n("Move Down"), Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(goDown()), actionCollection(), "move_down"); + this, TQ_SLOT(goDown()), actionCollection(), "move_down"); (void) new TDEAction (i18n("Move Left"), Key_Left, - TQT_TQOBJECT(this), TQT_SLOT(goL()), actionCollection(), "move_left"); + this, TQ_SLOT(goL()), actionCollection(), "move_left"); (void) new TDEAction (i18n("Stop"), Key_Space, - TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "stop"); + this, TQ_SLOT(stop()), actionCollection(), "stop"); (void) new TDEAction (i18n("Dig Right"), Key_C, - TQT_TQOBJECT(this), TQT_SLOT(digR()), actionCollection(), "dig_right"); + this, TQ_SLOT(digR()), actionCollection(), "dig_right"); (void) new TDEAction (i18n("Dig Left"), Key_Z, - TQT_TQOBJECT(this), TQT_SLOT(digL()), actionCollection(), "dig_left"); + this, TQ_SLOT(digL()), actionCollection(), "dig_left"); // Alternate one-handed controls. Set up in "kgoldrunnerui.rc". @@ -463,31 +463,31 @@ void KGoldrunner::setupActions() // Authors' debugging aids. (void) new TDEAction (i18n("Step"), Key_Period, - game, TQT_SLOT(doStep()), actionCollection(), "do_step"); + game, TQ_SLOT(doStep()), actionCollection(), "do_step"); (void) new TDEAction (i18n("Test Bug Fix"), Key_B, - game, TQT_SLOT(bugFix()), actionCollection(), "bug_fix"); + game, TQ_SLOT(bugFix()), actionCollection(), "bug_fix"); (void) new TDEAction (i18n("Show Positions"), Key_D, - game, TQT_SLOT(showFigurePositions()), actionCollection(), "step"); + game, TQ_SLOT(showFigurePositions()), actionCollection(), "step"); (void) new TDEAction (i18n("Start Logging"), Key_G, - game, TQT_SLOT(startLogging()), actionCollection(), "logging"); + game, TQ_SLOT(startLogging()), actionCollection(), "logging"); (void) new TDEAction (i18n("Show Hero"), Key_H, - game, TQT_SLOT(showHeroState()), actionCollection(), "show_hero"); + game, TQ_SLOT(showHeroState()), actionCollection(), "show_hero"); (void) new TDEAction (i18n("Show Object"), Key_Question, - game, TQT_SLOT(showObjectState()), actionCollection(), "show_obj"); + game, TQ_SLOT(showObjectState()), actionCollection(), "show_obj"); (void) new TDEAction (i18n("Show Enemy") + "0", Key_0, - this, TQT_SLOT(showEnemy0()), actionCollection(), "show_enemy_0"); + this, TQ_SLOT(showEnemy0()), actionCollection(), "show_enemy_0"); (void) new TDEAction (i18n("Show Enemy") + "1", Key_1, - this, TQT_SLOT(showEnemy1()), actionCollection(), "show_enemy_1"); + this, TQ_SLOT(showEnemy1()), actionCollection(), "show_enemy_1"); (void) new TDEAction (i18n("Show Enemy") + "2", Key_2, - this, TQT_SLOT(showEnemy2()), actionCollection(), "show_enemy_2"); + this, TQ_SLOT(showEnemy2()), actionCollection(), "show_enemy_2"); (void) new TDEAction (i18n("Show Enemy") + "3", Key_3, - this, TQT_SLOT(showEnemy3()), actionCollection(), "show_enemy_3"); + this, TQ_SLOT(showEnemy3()), actionCollection(), "show_enemy_3"); (void) new TDEAction (i18n("Show Enemy") + "4", Key_4, - this, TQT_SLOT(showEnemy4()), actionCollection(), "show_enemy_4"); + this, TQ_SLOT(showEnemy4()), actionCollection(), "show_enemy_4"); (void) new TDEAction (i18n("Show Enemy") + "5", Key_5, - this, TQT_SLOT(showEnemy5()), actionCollection(), "show_enemy_5"); + this, TQ_SLOT(showEnemy5()), actionCollection(), "show_enemy_5"); (void) new TDEAction (i18n("Show Enemy") + "6", Key_6, - this, TQT_SLOT(showEnemy6()), actionCollection(), "show_enemy_6"); + this, TQ_SLOT(showEnemy6()), actionCollection(), "show_enemy_6"); #endif /**************************************************************************/ @@ -529,10 +529,10 @@ void KGoldrunner::initStatusBar() statusBar()->setItemFixed (ID_SCORE, -1); statusBar()->setItemFixed (ID_LEVEL, -1); - connect(game, TQT_SIGNAL (showLives (long)), TQT_SLOT (showLives (long))); - connect(game, TQT_SIGNAL (showScore (long)), TQT_SLOT (showScore (long))); - connect(game, TQT_SIGNAL (showLevel (int)), TQT_SLOT (showLevel (int))); - connect(game, TQT_SIGNAL (gameFreeze (bool)), TQT_SLOT (gameFreeze (bool))); + connect(game, TQ_SIGNAL (showLives (long)), TQ_SLOT (showLives (long))); + connect(game, TQ_SIGNAL (showScore (long)), TQ_SLOT (showScore (long))); + connect(game, TQ_SIGNAL (showLevel (int)), TQ_SLOT (showLevel (int))); + connect(game, TQ_SIGNAL (gameFreeze (bool)), TQ_SLOT (gameFreeze (bool))); } void KGoldrunner::showLives (long newLives) @@ -999,51 +999,51 @@ void KGoldrunner::makeEditToolbar() editToolbar->insertSeparator(); - editToolbar->insertButton ("document-new", 0, TQT_SIGNAL(clicked()), game, - TQT_SLOT(createLevel()), TRUE, i18n("&Create a Level")); - editToolbar->insertButton ("document-open", 1, TQT_SIGNAL(clicked()), game, - TQT_SLOT(updateLevel()), TRUE, i18n("&Edit Any Level...")); - editToolbar->insertButton ("document-save", 2, TQT_SIGNAL(clicked()), game, - TQT_SLOT(saveLevelFile()),TRUE, i18n("&Save Edits...")); + editToolbar->insertButton ("document-new", 0, TQ_SIGNAL(clicked()), game, + TQ_SLOT(createLevel()), TRUE, i18n("&Create a Level")); + editToolbar->insertButton ("document-open", 1, TQ_SIGNAL(clicked()), game, + TQ_SLOT(updateLevel()), TRUE, i18n("&Edit Any Level...")); + editToolbar->insertButton ("document-save", 2, TQ_SIGNAL(clicked()), game, + TQ_SLOT(saveLevelFile()),TRUE, i18n("&Save Edits...")); editToolbar->insertSeparator(); editToolbar->insertSeparator(); - editToolbar->insertButton ("ktip", 3, TQT_SIGNAL(clicked()), game, - TQT_SLOT(editNameAndHint()),TRUE,i18n("Edit Name/Hint")); + editToolbar->insertButton ("ktip", 3, TQ_SIGNAL(clicked()), game, + TQ_SLOT(editNameAndHint()),TRUE,i18n("Edit Name/Hint")); editToolbar->insertSeparator(); editToolbar->insertSeparator(); - editToolbar->insertButton (freebg, (int)FREE, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT(freeSlot()), TRUE, i18n("Empty space")); + editToolbar->insertButton (freebg, (int)FREE, TQ_SIGNAL(clicked()), this, + TQ_SLOT(freeSlot()), TRUE, i18n("Empty space")); editToolbar->insertSeparator(); - editToolbar->insertButton (edherobg, (int)HERO, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (edheroSlot()), TRUE, i18n("Hero")); + editToolbar->insertButton (edherobg, (int)HERO, TQ_SIGNAL(clicked()), this, + TQ_SLOT (edheroSlot()), TRUE, i18n("Hero")); editToolbar->insertSeparator(); - editToolbar->insertButton (edenemybg, (int)ENEMY, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (edenemySlot()), TRUE, i18n("Enemy")); + editToolbar->insertButton (edenemybg, (int)ENEMY, TQ_SIGNAL(clicked()), this, + TQ_SLOT (edenemySlot()), TRUE, i18n("Enemy")); editToolbar->insertSeparator(); - editToolbar->insertButton (brickbg, (int)BRICK, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (brickSlot()), TRUE, i18n("Brick (can dig)")); + editToolbar->insertButton (brickbg, (int)BRICK, TQ_SIGNAL(clicked()), this, + TQ_SLOT (brickSlot()), TRUE, i18n("Brick (can dig)")); editToolbar->insertSeparator(); - editToolbar->insertButton (betonbg, (int)BETON, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (betonSlot()), TRUE, i18n("Concrete (cannot dig)")); + editToolbar->insertButton (betonbg, (int)BETON, TQ_SIGNAL(clicked()), this, + TQ_SLOT (betonSlot()), TRUE, i18n("Concrete (cannot dig)")); editToolbar->insertSeparator(); - editToolbar->insertButton (fbrickbg, (int)FBRICK, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (fbrickSlot()), TRUE, i18n("Trap (can fall through)")); + editToolbar->insertButton (fbrickbg, (int)FBRICK, TQ_SIGNAL(clicked()), this, + TQ_SLOT (fbrickSlot()), TRUE, i18n("Trap (can fall through)")); editToolbar->insertSeparator(); - editToolbar->insertButton (ladderbg, (int)LADDER, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (ladderSlot()), TRUE, i18n("Ladder")); + editToolbar->insertButton (ladderbg, (int)LADDER, TQ_SIGNAL(clicked()), this, + TQ_SLOT (ladderSlot()), TRUE, i18n("Ladder")); editToolbar->insertSeparator(); - editToolbar->insertButton (hladderbg, (int)HLADDER, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (hladderSlot()), TRUE, i18n("Hidden ladder")); + editToolbar->insertButton (hladderbg, (int)HLADDER, TQ_SIGNAL(clicked()), this, + TQ_SLOT (hladderSlot()), TRUE, i18n("Hidden ladder")); editToolbar->insertSeparator(); - editToolbar->insertButton (polebg, (int)POLE, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (poleSlot()), TRUE, i18n("Pole (or bar)")); + editToolbar->insertButton (polebg, (int)POLE, TQ_SIGNAL(clicked()), this, + TQ_SLOT (poleSlot()), TRUE, i18n("Pole (or bar)")); editToolbar->insertSeparator(); - editToolbar->insertButton (nuggetbg, (int)NUGGET, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (nuggetSlot()), TRUE, i18n("Gold nugget")); + editToolbar->insertButton (nuggetbg, (int)NUGGET, TQ_SIGNAL(clicked()), this, + TQ_SLOT (nuggetSlot()), TRUE, i18n("Gold nugget")); editToolbar->setToggle ((int) FREE, TRUE); editToolbar->setToggle ((int) HERO, TRUE); diff --git a/kgoldrunner/src/kgoldrunner.h b/kgoldrunner/src/kgoldrunner.h index 1b2e1437..3f6e122f 100644 --- a/kgoldrunner/src/kgoldrunner.h +++ b/kgoldrunner/src/kgoldrunner.h @@ -39,7 +39,7 @@ class KGrHero; */ class KGoldrunner : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kgoldrunner/src/kgrcanvas.h b/kgoldrunner/src/kgrcanvas.h index 884fc40e..2eaec845 100644 --- a/kgoldrunner/src/kgrcanvas.h +++ b/kgoldrunner/src/kgrcanvas.h @@ -30,7 +30,7 @@ class KGrCanvas : public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: KGrCanvas (TQWidget * parent = 0, const char *name = 0); diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index def7af7d..4e7a8dba 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -99,7 +99,7 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, // Initial range 1->150, small step 1, big step 10 and default value 1. number = new TQScrollBar (1, 150, 1, 10, 1, - Qt::Horizontal, dad); + TQt::Horizontal, dad); grid->addWidget (number, 1, 1); TQHBox * numberPair = new TQHBox (dad); @@ -213,36 +213,36 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, slPaintLevel(); thumbNail->show(); - connect (colln, TQT_SIGNAL (highlighted (int)), this, TQT_SLOT (slColln (int))); - connect (collnA, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slAboutColln ())); + connect (colln, TQ_SIGNAL (highlighted (int)), this, TQ_SLOT (slColln (int))); + connect (collnA, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slAboutColln ())); - connect (display, TQT_SIGNAL (textChanged (const TQString &)), - this, TQT_SLOT (slUpdate (const TQString &))); + connect (display, TQ_SIGNAL (textChanged (const TQString &)), + this, TQ_SLOT (slUpdate (const TQString &))); - connect (number, TQT_SIGNAL (valueChanged(int)), this, TQT_SLOT(slShowLevel(int))); + connect (number, TQ_SIGNAL (valueChanged(int)), this, TQ_SLOT(slShowLevel(int))); // Only enable name and hint dialog here if saving a new or edited level. // At other times the name and hint have not been loaded or initialised yet. if ((slAction == SL_CREATE) || (slAction == SL_SAVE)) { - connect (levelNH, TQT_SIGNAL (clicked()), game, TQT_SLOT (editNameAndHint())); + connect (levelNH, TQ_SIGNAL (clicked()), game, TQ_SLOT (editNameAndHint())); } else { levelNH->setEnabled (FALSE); levelNH->hide(); } - connect (colln, TQT_SIGNAL (highlighted (int)), this, TQT_SLOT (slPaintLevel ())); - connect (number, TQT_SIGNAL (sliderReleased()), this, TQT_SLOT (slPaintLevel())); - connect (number, TQT_SIGNAL (nextLine()), this, TQT_SLOT (slPaintLevel())); - connect (number, TQT_SIGNAL (prevLine()), this, TQT_SLOT (slPaintLevel())); - connect (number, TQT_SIGNAL (nextPage()), this, TQT_SLOT (slPaintLevel())); - connect (number, TQT_SIGNAL (prevPage()), this, TQT_SLOT (slPaintLevel())); + connect (colln, TQ_SIGNAL (highlighted (int)), this, TQ_SLOT (slPaintLevel ())); + connect (number, TQ_SIGNAL (sliderReleased()), this, TQ_SLOT (slPaintLevel())); + connect (number, TQ_SIGNAL (nextLine()), this, TQ_SLOT (slPaintLevel())); + connect (number, TQ_SIGNAL (prevLine()), this, TQ_SLOT (slPaintLevel())); + connect (number, TQ_SIGNAL (nextPage()), this, TQ_SLOT (slPaintLevel())); + connect (number, TQ_SIGNAL (prevPage()), this, TQ_SLOT (slPaintLevel())); #ifdef KGR_PORTABLE // Set the exits from this dialog box. - connect (OK, TQT_SIGNAL (clicked ()), this, TQT_SLOT (accept ())); - connect (CANCEL, TQT_SIGNAL (clicked ()), this, TQT_SLOT (reject ())); - connect (HELP, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotHelp ())); + connect (OK, TQ_SIGNAL (clicked ()), this, TQ_SLOT (accept ())); + connect (CANCEL, TQ_SIGNAL (clicked ()), this, TQ_SLOT (reject ())); + connect (HELP, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotHelp ())); #endif } @@ -557,8 +557,8 @@ KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint, // OK-> setAccel (Key_Return); // No! We need it in "mle" box. CANCEL-> setAccel (Key_Escape); - connect (OK, TQT_SIGNAL (clicked ()), dad, TQT_SLOT (accept ())); - connect (CANCEL, TQT_SIGNAL (clicked ()), dad, TQT_SLOT (reject ())); + connect (OK, TQ_SIGNAL (clicked ()), dad, TQ_SLOT (accept ())); + connect (CANCEL, TQ_SIGNAL (clicked ()), dad, TQ_SLOT (reject ())); #endif } @@ -612,7 +612,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, prefixL = new TQLabel (i18n("File name prefix:"), prefixBox); ecPrefix = new TQLineEdit (prefixBox); - ecGrp = new TQButtonGroup (1, Qt::Horizontal, 0, dad); + ecGrp = new TQButtonGroup (1, TQt::Horizontal, 0, dad); mainLayout->addWidget (ecGrp); ecTradB = new TQRadioButton (i18n("Traditional rules"), ecGrp); ecKGrB = new TQRadioButton (i18n("KGoldrunner rules"), ecGrp); @@ -709,8 +709,8 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, mle-> setText (""); } - connect (ecKGrB, TQT_SIGNAL (clicked ()), this, TQT_SLOT (ecSetKGr ())); - connect (ecTradB, TQT_SIGNAL (clicked ()), this, TQT_SLOT (ecSetTrad ())); + connect (ecKGrB, TQ_SIGNAL (clicked ()), this, TQ_SLOT (ecSetKGr ())); + connect (ecTradB, TQ_SIGNAL (clicked ()), this, TQ_SLOT (ecSetTrad ())); #ifdef KGR_PORTABLE OK-> setGeometry (10, 145 + mle->height(), 100, 25); @@ -721,8 +721,8 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, dad-> resize (300, 175 + mle->height()); - connect (OK, TQT_SIGNAL (clicked ()), this, TQT_SLOT (accept())); - connect (CANCEL, TQT_SIGNAL (clicked ()), this, TQT_SLOT (reject())); + connect (OK, TQ_SIGNAL (clicked ()), this, TQ_SLOT (accept())); + connect (CANCEL, TQ_SIGNAL (clicked ()), this, TQ_SLOT (reject())); #endif } @@ -842,10 +842,10 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames, lgList-> setSelected (0, TRUE); lgHighlight = 0; - connect (lgList, TQT_SIGNAL (highlighted (int)), this, TQT_SLOT (lgSelect (int))); + connect (lgList, TQ_SIGNAL (highlighted (int)), this, TQ_SLOT (lgSelect (int))); #ifdef KGR_PORTABLE - connect (OK, TQT_SIGNAL (clicked ()), this, TQT_SLOT (accept ())); - connect (CANCEL, TQT_SIGNAL (clicked ()), this, TQT_SLOT (reject ())); + connect (OK, TQ_SIGNAL (clicked ()), this, TQ_SLOT (accept ())); + connect (CANCEL, TQ_SIGNAL (clicked ()), this, TQ_SLOT (reject ())); #endif } @@ -963,7 +963,7 @@ void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents) #endif OK-> setAccel (Key_Return); - connect (OK, TQT_SIGNAL (clicked ()), mm, TQT_SLOT (accept ())); + connect (OK, TQ_SIGNAL (clicked ()), mm, TQ_SLOT (accept ())); mm-> exec (); diff --git a/kgoldrunner/src/kgrdialog.h b/kgoldrunner/src/kgrdialog.h index a3514a1e..9012e62d 100644 --- a/kgoldrunner/src/kgrdialog.h +++ b/kgoldrunner/src/kgrdialog.h @@ -57,7 +57,7 @@ class KGrThumbNail; class KGrSLDialog : public KGR_DIALOG // KGR_PORTABLE sets TQDialog/KDialogBase { -Q_OBJECT +TQ_OBJECT public: KGrSLDialog (int action, int requestedLevel, int collnIndex, @@ -113,7 +113,7 @@ private: class KGrNHDialog : public KGR_DIALOG // KGR_PORTABLE sets TQDialog/KDialogBase { -Q_OBJECT +TQ_OBJECT public: KGrNHDialog (const TQString & levelName, const TQString & levelHint, @@ -138,7 +138,7 @@ private: class KGrECDialog : public KGR_DIALOG // KGR_PORTABLE sets TQDialog/KDialogBase { -Q_OBJECT +TQ_OBJECT public: KGrECDialog (int action, int collnIndex, @@ -191,7 +191,7 @@ private: class KGrLGDialog : public KGR_DIALOG // KGR_PORTABLE sets TQDialog/KDialogBase { -Q_OBJECT +TQ_OBJECT public: KGrLGDialog (TQFile * savedGames, TQPtrList<KGrCollection> & collections, diff --git a/kgoldrunner/src/kgrfigure.cpp b/kgoldrunner/src/kgrfigure.cpp index 850de749..0707da67 100644 --- a/kgoldrunner/src/kgrfigure.cpp +++ b/kgoldrunner/src/kgrfigure.cpp @@ -310,8 +310,8 @@ KGrHero :: KGrHero (KGrCanvas * view, int x, int y) walkFrozen = FALSE; fallFrozen = FALSE; - connect (walkTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (walkTimeDone ())); - connect (fallTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (fallTimeDone ())); + connect (walkTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (walkTimeDone ())); + connect (fallTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (fallTimeDone ())); } int KGrHero::WALKDELAY = 0; @@ -817,9 +817,9 @@ KGrEnemy :: KGrEnemy (KGrCanvas * view, int x, int y) captiveFrozen = FALSE; captiveTimer = new TQTimer (this); - connect (captiveTimer,TQT_SIGNAL(timeout()),TQT_SLOT(captiveTimeDone())); - connect (walkTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (walkTimeDone ())); - connect (fallTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (fallTimeDone ())); + connect (captiveTimer,TQ_SIGNAL(timeout()),TQ_SLOT(captiveTimeDone())); + connect (walkTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (walkTimeDone ())); + connect (fallTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (fallTimeDone ())); } int KGrEnemy::WALKDELAY = 0; diff --git a/kgoldrunner/src/kgrfigure.h b/kgoldrunner/src/kgrfigure.h index 2494d9f1..3bbfd3fb 100644 --- a/kgoldrunner/src/kgrfigure.h +++ b/kgoldrunner/src/kgrfigure.h @@ -31,7 +31,7 @@ class KGrEnemy; class KGrFigure : public TQObject { - Q_OBJECT + TQ_OBJECT public: KGrFigure (int, int); @@ -98,7 +98,7 @@ protected: class KGrHero : public KGrFigure { - Q_OBJECT + TQ_OBJECT public: KGrHero(KGrCanvas *, int , int); @@ -158,7 +158,7 @@ signals: class KGrEnemy : public KGrFigure { - Q_OBJECT + TQ_OBJECT public: KGrEnemy (KGrCanvas *, int , int); diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index ffe0987d..080f55e6 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -63,17 +63,17 @@ KGrGame::KGrGame (KGrCanvas * theView, TQString theSystemDir, TQString theUserDi modalFreeze = FALSE; messageFreeze = FALSE; - connect (hero, TQT_SIGNAL (gotNugget(int)), TQT_SLOT (incScore(int))); - connect (hero, TQT_SIGNAL (caughtHero()), TQT_SLOT (herosDead())); - connect (hero, TQT_SIGNAL (haveAllNuggets()), TQT_SLOT (showHiddenLadders())); - connect (hero, TQT_SIGNAL (leaveLevel()), TQT_SLOT (goUpOneLevel())); + connect (hero, TQ_SIGNAL (gotNugget(int)), TQ_SLOT (incScore(int))); + connect (hero, TQ_SIGNAL (caughtHero()), TQ_SLOT (herosDead())); + connect (hero, TQ_SIGNAL (haveAllNuggets()), TQ_SLOT (showHiddenLadders())); + connect (hero, TQ_SIGNAL (leaveLevel()), TQ_SLOT (goUpOneLevel())); dyingTimer = new TQTimer (this); - connect (dyingTimer, TQT_SIGNAL (timeout()), TQT_SLOT (finalBreath())); + connect (dyingTimer, TQ_SIGNAL (timeout()), TQ_SLOT (finalBreath())); // Get the mouse position every 40 msec. It is used to steer the hero. mouseSampler = new TQTimer (this); - connect (mouseSampler, TQT_SIGNAL(timeout()), TQT_SLOT (readMousePos ())); + connect (mouseSampler, TQ_SIGNAL(timeout()), TQ_SLOT (readMousePos ())); mouseSampler->start (40, FALSE); srand(1); // initialisiere Random-Generator @@ -456,8 +456,8 @@ int KGrGame::loadLevel (int levelNo) levelHint = i18n((const char *) levelHintC.left(len-1)); // Disconnect edit-mode slots from signals from "view". - disconnect (view, TQT_SIGNAL (mouseClick(int)), 0, 0); - disconnect (view, TQT_SIGNAL (mouseLetGo(int)), 0, 0); + disconnect (view, TQ_SIGNAL (mouseClick(int)), 0, 0); + disconnect (view, TQ_SIGNAL (mouseLetGo(int)), 0, 0); if (newLevel) { hero->setEnemyList (&enemies); @@ -491,7 +491,7 @@ int KGrGame::loadLevel (int levelNo) view->setMousePos (startI, startJ); // Connect play-mode slot to signal from "view". - connect (view, TQT_SIGNAL(mouseClick(int)), TQT_SLOT(doDig(int))); + connect (view, TQ_SIGNAL(mouseClick(int)), TQ_SLOT(doDig(int))); // Re-enable player input. loading = FALSE; @@ -554,9 +554,9 @@ void KGrGame::changeObject (unsigned char kind, int i, int j) enemy->setPlayfield(&playfield); enemy->enemyId = enemyCount++; enemies.append(enemy); - connect(enemy, TQT_SIGNAL(lostNugget()), TQT_SLOT(loseNugget())); - connect(enemy, TQT_SIGNAL(trapped(int)), TQT_SLOT(incScore(int))); - connect(enemy, TQT_SIGNAL(killed(int)), TQT_SLOT(incScore(int))); + connect(enemy, TQ_SIGNAL(lostNugget()), TQ_SLOT(loseNugget())); + connect(enemy, TQ_SIGNAL(trapped(int)), TQ_SLOT(incScore(int))); + connect(enemy, TQ_SIGNAL(killed(int)), TQ_SLOT(incScore(int))); } else { // Starting a level again after losing. enemy=enemies.at(enemyCount); @@ -741,8 +741,8 @@ void KGrGame::doDig (int button) { startPlaying(); // If first player-input, start playing. } switch (button) { - case Qt::LeftButton: hero->digLeft (); break; - case Qt::RightButton: hero->digRight (); break; + case TQt::LeftButton: hero->digLeft (); break; + case TQt::RightButton: hero->digRight (); break; default: break; } } @@ -1020,8 +1020,8 @@ void KGrGame::checkHighScore() OK-> setAccel (Key_Return); hsnUser-> setFocus(); // Set the keyboard input on. - connect (hsnUser, TQT_SIGNAL (returnPressed ()), hsn, TQT_SLOT (accept ())); - connect (OK, TQT_SIGNAL (clicked ()), hsn, TQT_SLOT (accept ())); + connect (hsnUser, TQ_SIGNAL (returnPressed ()), hsn, TQ_SLOT (accept ())); + connect (OK, TQ_SIGNAL (clicked ()), hsn, TQ_SLOT (accept ())); while (TRUE) { hsn->exec(); @@ -1223,7 +1223,7 @@ void KGrGame::showHighScores() hs-> move (p.x() + 50, p.y() + 50); // Start up the dialog box. - connect (OK, TQT_SIGNAL (clicked ()), hs, TQT_SLOT (accept ())); + connect (OK, TQ_SIGNAL (clicked ()), hs, TQ_SLOT (accept ())); hs-> exec(); delete hs; @@ -2030,12 +2030,12 @@ void KGrGame::setEditableCell (int i, int j, char type) void KGrGame::showEditLevel() { // Disconnect play-mode slots from signals from "view". - disconnect (view, TQT_SIGNAL(mouseClick(int)), 0, 0); - disconnect (view, TQT_SIGNAL(mouseLetGo(int)), 0, 0); + disconnect (view, TQ_SIGNAL(mouseClick(int)), 0, 0); + disconnect (view, TQ_SIGNAL(mouseLetGo(int)), 0, 0); // Connect edit-mode slots to signals from "view". - connect (view, TQT_SIGNAL(mouseClick(int)), TQT_SLOT(doEdit(int))); - connect (view, TQT_SIGNAL(mouseLetGo(int)), TQT_SLOT(endEdit(int))); + connect (view, TQ_SIGNAL(mouseClick(int)), TQ_SLOT(doEdit(int))); + connect (view, TQ_SIGNAL(mouseLetGo(int)), TQ_SLOT(endEdit(int))); } bool KGrGame::reNumberLevels (int cIndex, int first, int last, int inc) @@ -2090,8 +2090,8 @@ void KGrGame::doEdit (int button) i = p.x(); j = p.y(); switch (button) { - case Qt::LeftButton: - case Qt::RightButton: + case TQt::LeftButton: + case TQt::RightButton: paintEditObj = TRUE; insertEditObj (i, j); view->updateCanvas(); @@ -2113,8 +2113,8 @@ void KGrGame::endEdit (int button) i = p.x(); j = p.y(); switch (button) { - case Qt::LeftButton: - case Qt::RightButton: + case TQt::LeftButton: + case TQt::RightButton: paintEditObj = FALSE; if ((i != oldI) || (j != oldJ)) { insertEditObj (i, j); diff --git a/kgoldrunner/src/kgrgame.h b/kgoldrunner/src/kgrgame.h index dfc51d3e..2d6b1a57 100644 --- a/kgoldrunner/src/kgrgame.h +++ b/kgoldrunner/src/kgrgame.h @@ -45,7 +45,7 @@ class KGrCollection; class KGrGame : public TQObject { -Q_OBJECT +TQ_OBJECT public: KGrGame (KGrCanvas * theView, TQString theSystemDir, TQString theUserDir); diff --git a/kgoldrunner/src/kgrobject.cpp b/kgoldrunner/src/kgrobject.cpp index 277dbc6a..4152770b 100644 --- a/kgoldrunner/src/kgrobject.cpp +++ b/kgoldrunner/src/kgrobject.cpp @@ -106,7 +106,7 @@ KGrBrick::KGrBrick (char objType, int i, int j, KGrCanvas * view) holeFrozen = FALSE; iamA = BRICK; timer = new TQTimer (this); - connect (timer, TQT_SIGNAL (timeout ()), TQT_SLOT (timeDone ())); + connect (timer, TQ_SIGNAL (timeout ()), TQ_SLOT (timeDone ())); } void KGrBrick::dig (void) diff --git a/kgoldrunner/src/kgrobject.h b/kgoldrunner/src/kgrobject.h index 38d0a16e..2ac41b3a 100644 --- a/kgoldrunner/src/kgrobject.h +++ b/kgoldrunner/src/kgrobject.h @@ -28,7 +28,7 @@ class KGrCanvas; class KGrObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: KGrObject (char objType); @@ -53,7 +53,7 @@ protected: class KGrEditable : public KGrObject { - Q_OBJECT + TQ_OBJECT public: KGrEditable (char editType); @@ -62,7 +62,7 @@ public: }; class KGrFree : public KGrObject -{ Q_OBJECT +{ TQ_OBJECT public: KGrFree (char objType, int i, int j, KGrCanvas * view); @@ -75,7 +75,7 @@ protected: class KGrBrick : public KGrObject { - Q_OBJECT + TQ_OBJECT public: KGrBrick (char objType, int i, int j, KGrCanvas * view); @@ -100,7 +100,7 @@ private: class KGrHladder : public KGrFree { - Q_OBJECT + TQ_OBJECT public: // BUG FIX - Ian W., 21/6/01 - must inherit "setNugget()" from "KGrFree". diff --git a/kjumpingcube/kcubeboxwidget.cpp b/kjumpingcube/kcubeboxwidget.cpp index 9b589b96..3a03ad4b 100644 --- a/kjumpingcube/kcubeboxwidget.cpp +++ b/kjumpingcube/kcubeboxwidget.cpp @@ -435,12 +435,12 @@ void KCubeBoxWidget::init() KCubeWidget::enableClicks(true); loadSettings(); - connect(moveTimer,TQT_SIGNAL(timeout()),TQT_SLOT(nextLoopStep())); - connect(this,TQT_SIGNAL(startedThinking()),TQT_SLOT(setWaitCursor())); - connect(this,TQT_SIGNAL(stoppedThinking()),TQT_SLOT(setNormalCursor())); - connect(this,TQT_SIGNAL(startedMoving()),TQT_SLOT(setWaitCursor())); - connect(this,TQT_SIGNAL(stoppedMoving()),TQT_SLOT(setNormalCursor())); - connect(this,TQT_SIGNAL(playerWon(int)),TQT_SLOT(stopActivities())); + connect(moveTimer,TQ_SIGNAL(timeout()),TQ_SLOT(nextLoopStep())); + connect(this,TQ_SIGNAL(startedThinking()),TQ_SLOT(setWaitCursor())); + connect(this,TQ_SIGNAL(stoppedThinking()),TQ_SLOT(setNormalCursor())); + connect(this,TQ_SIGNAL(startedMoving()),TQ_SLOT(setWaitCursor())); + connect(this,TQ_SIGNAL(stoppedMoving()),TQ_SLOT(setNormalCursor())); + connect(this,TQ_SIGNAL(playerWon(int)),TQ_SLOT(stopActivities())); setNormalCursor(); @@ -476,8 +476,8 @@ void KCubeBoxWidget::initCubes() cubes[i][j]->setCoordinates(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))); + connect(cubes[i][j],TQ_SIGNAL(clicked(int,int,bool)),TQ_SLOT(stopHint())); + connect(cubes[i][j],TQ_SIGNAL(clicked(int,int,bool)),TQ_SLOT(checkClick(int,int,bool))); } // initialize cubes diff --git a/kjumpingcube/kcubeboxwidget.h b/kjumpingcube/kcubeboxwidget.h index aea02ead..02060eaf 100644 --- a/kjumpingcube/kcubeboxwidget.h +++ b/kjumpingcube/kcubeboxwidget.h @@ -50,7 +50,7 @@ struct Loop class KCubeBoxWidget : public TQWidget , public CubeBoxBase<KCubeWidget> { - Q_OBJECT + TQ_OBJECT public: KCubeBoxWidget(const int dim=1,TQWidget *parent=0,const char *name=0); diff --git a/kjumpingcube/kcubewidget.cpp b/kjumpingcube/kcubewidget.cpp index b98ca82e..d832d21e 100644 --- a/kjumpingcube/kcubewidget.cpp +++ b/kjumpingcube/kcubewidget.cpp @@ -88,7 +88,7 @@ KCubeWidget::KCubeWidget(TQWidget* parent,const char* name // will be automatically destroyed by the parent hintTimer = new TQTimer(this); hintCounter=0; - connect(hintTimer,TQT_SIGNAL(timeout()),TQT_SLOT(hint())); + connect(hintTimer,TQ_SIGNAL(timeout()),TQ_SLOT(hint())); setPalette(kapp->palette()); @@ -240,7 +240,7 @@ void KCubeWidget::mouseReleaseEvent(TQMouseEvent *e) if(e->x()< 0 || e->x() > width() || e->y() < 0 || e->y() > height()) return; - if(e->button() == Qt::LeftButton && _clicksAllowed) + if(e->button() == TQt::LeftButton && _clicksAllowed) { stopHint(); emit clicked(row(),column(),true); diff --git a/kjumpingcube/kcubewidget.h b/kjumpingcube/kcubewidget.h index f0dc7146..8a6114f4 100644 --- a/kjumpingcube/kcubewidget.h +++ b/kjumpingcube/kcubewidget.h @@ -34,7 +34,7 @@ class TQTimer; */ class KCubeWidget : public TQFrame , public Cube { - Q_OBJECT + TQ_OBJECT public: diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp index 6981b449..dc5ba705 100644 --- a/kjumpingcube/kjumpingcube.cpp +++ b/kjumpingcube/kjumpingcube.cpp @@ -49,12 +49,12 @@ KJumpingCube::KJumpingCube() : view(new KCubeBoxWidget(5, this, "KCubeBoxWidget")) { - connect(view,TQT_SIGNAL(playerChanged(int)),TQT_SLOT(changePlayer(int))); - connect(view,TQT_SIGNAL(stoppedMoving()),TQT_SLOT(disableStop())); - connect(view,TQT_SIGNAL(stoppedThinking()),TQT_SLOT(disableStop())); - connect(view,TQT_SIGNAL(startedMoving()),TQT_SLOT(enableStop_Moving())); - connect(view,TQT_SIGNAL(startedThinking()),TQT_SLOT(enableStop_Thinking())); - connect(view,TQT_SIGNAL(playerWon(int)),TQT_SLOT(showWinner(int))); + connect(view,TQ_SIGNAL(playerChanged(int)),TQ_SLOT(changePlayer(int))); + connect(view,TQ_SIGNAL(stoppedMoving()),TQ_SLOT(disableStop())); + connect(view,TQ_SIGNAL(stoppedThinking()),TQ_SLOT(disableStop())); + connect(view,TQ_SIGNAL(startedMoving()),TQ_SLOT(enableStop_Moving())); + connect(view,TQ_SIGNAL(startedThinking()),TQ_SLOT(enableStop_Thinking())); + connect(view,TQ_SIGNAL(playerWon(int)),TQ_SLOT(showWinner(int))); // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(view); @@ -76,19 +76,19 @@ KJumpingCube::KJumpingCube() } void KJumpingCube::initTDEAction() { - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection()); - KStdGameAction::load(TQT_TQOBJECT(this), TQT_SLOT(openGame()), actionCollection()); - KStdGameAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); - KStdGameAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection()); + KStdGameAction::load(this, TQ_SLOT(openGame()), actionCollection()); + KStdGameAction::save(this, TQ_SLOT(save()), actionCollection()); + KStdGameAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); - hintAction = KStdGameAction::hint(TQT_TQOBJECT(view), TQT_SLOT(getHint()), actionCollection()); + hintAction = KStdGameAction::hint(view, TQ_SLOT(getHint()), actionCollection()); stopAction = new TDEAction(i18n("Stop &Thinking"), "process-stop", - TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "game_stop"); + TQt::Key_Escape, this, TQ_SLOT(stop()), actionCollection(), "game_stop"); stopAction->setEnabled(false); - undoAction = KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection()); + undoAction = KStdGameAction::undo(this, TQ_SLOT(undo()), actionCollection()); undoAction->setEnabled(false); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showOptions()), actionCollection()); setupGUI(); } @@ -270,7 +270,7 @@ void KJumpingCube::showOptions(){ TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow); dialog->addPage(new Settings(0, "General"), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), view, TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), view, TQ_SLOT(loadSettings())); dialog->show(); } diff --git a/kjumpingcube/kjumpingcube.h b/kjumpingcube/kjumpingcube.h index 09930b05..dd46daa6 100644 --- a/kjumpingcube/kjumpingcube.h +++ b/kjumpingcube/kjumpingcube.h @@ -41,7 +41,7 @@ class KCubeBoxWidget; * @version 0.7.2 */ class KJumpingCube : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/klickety/board.cpp b/klickety/board.cpp index a251687c..4adc5c59 100644 --- a/klickety/board.cpp +++ b/klickety/board.cpp @@ -8,7 +8,7 @@ using namespace KGrid2D; void KLBoard::contentsMouseReleaseEvent(TQMouseEvent *e) { - if ( e->button()!=Qt::LeftButton || blocked ) return; + if ( e->button()!=TQt::LeftButton || blocked ) return; TQCanvasItemList list = canvas()->collisions(e->pos()); if ( list.count()==0 ) return; diff --git a/klickety/board.h b/klickety/board.h index b84d95e6..6d83cb25 100644 --- a/klickety/board.h +++ b/klickety/board.h @@ -6,7 +6,7 @@ class KLBoard : public BaseBoard { - Q_OBJECT + TQ_OBJECT public: KLBoard(TQWidget *parent); diff --git a/klickety/field.cpp b/klickety/field.cpp index 84deebfd..8ac2daef 100644 --- a/klickety/field.cpp +++ b/klickety/field.cpp @@ -28,17 +28,17 @@ Field::Field(TQWidget *parent) KGameLCDList *et = new KGameLCDList(i18n("Elapsed time"), this); elapsedTime = new KGameLCDClock(et); - connect(board, TQT_SIGNAL(firstBlockClicked()), elapsedTime, TQT_SLOT(start())); + connect(board, TQ_SIGNAL(firstBlockClicked()), elapsedTime, TQ_SLOT(start())); et->append(elapsedTime); lcds->addWidget(et, 5, 0); lcds->setRowStretch(6, 1); - connect(board, TQT_SIGNAL(scoreUpdated()), TQT_SLOT(scoreUpdatedSlot())); - connect(board, TQT_SIGNAL(gameOverSignal()), TQT_SLOT(gameOver())); + connect(board, TQ_SIGNAL(scoreUpdated()), TQ_SLOT(scoreUpdatedSlot())); + connect(board, TQ_SIGNAL(gameOverSignal()), TQ_SLOT(gameOver())); settingsChanged(); - connect(parent, TQT_SIGNAL(settingsChanged()), TQT_SLOT(settingsChanged())); - TQTimer::singleShot(0, this, TQT_SLOT(start())); + connect(parent, TQ_SIGNAL(settingsChanged()), TQ_SLOT(settingsChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); } void Field::pause() diff --git a/klickety/field.h b/klickety/field.h index 1455a5ff..627e6fc2 100644 --- a/klickety/field.h +++ b/klickety/field.h @@ -10,7 +10,7 @@ class KGameLCDClock; class Field : public TQWidget, public BaseField, public BaseInterface { - Q_OBJECT + TQ_OBJECT public: Field(TQWidget *parent); diff --git a/klickety/main.h b/klickety/main.h index d3709f59..35dd3920 100644 --- a/klickety/main.h +++ b/klickety/main.h @@ -21,7 +21,7 @@ class KLFactory : public BaseFactory class KLMainWindow : public BaseMainWindow { - Q_OBJECT + TQ_OBJECT public: KLMainWindow(); diff --git a/klines/ballpainter.h b/klines/ballpainter.h index df5057ae..5c9306ba 100644 --- a/klines/ballpainter.h +++ b/klines/ballpainter.h @@ -26,7 +26,7 @@ class BallPainter : public TQObject { - Q_OBJECT + TQ_OBJECT TQPixmap* imgCash[NCOLORS][PIXTIME + FIREBALLS + BOOMBALLS + 1]; TQPixmap* backgroundPix; diff --git a/klines/field.h b/klines/field.h index 6fd8c67e..70e40105 100644 --- a/klines/field.h +++ b/klines/field.h @@ -27,7 +27,7 @@ class Field: public TQWidget { - Q_OBJECT + TQ_OBJECT public: void clearField(); diff --git a/klines/klines.cpp b/klines/klines.cpp index 1459937d..f813d0e1 100644 --- a/klines/klines.cpp +++ b/klines/klines.cpp @@ -64,10 +64,10 @@ KLines::KLines() setCentralWidget( mwidget ); lsb = mwidget->GetLsb(); - connect(lsb, TQT_SIGNAL(endTurn()), TQT_TQOBJECT(this), TQT_SLOT(makeTurn())); - connect(lsb, TQT_SIGNAL(eraseLine(int)), TQT_TQOBJECT(this), TQT_SLOT(addScore(int))); - connect(lsb, TQT_SIGNAL(endGame()), TQT_TQOBJECT(this), TQT_SLOT(endGame())); - connect(lsb, TQT_SIGNAL(userTurn()), TQT_TQOBJECT(this), TQT_SLOT(userTurn())); + connect(lsb, TQ_SIGNAL(endTurn()), this, TQ_SLOT(makeTurn())); + connect(lsb, TQ_SIGNAL(eraseLine(int)), this, TQ_SLOT(addScore(int))); + connect(lsb, TQ_SIGNAL(endGame()), this, TQ_SLOT(endGame())); + connect(lsb, TQ_SIGNAL(userTurn()), this, TQ_SLOT(userTurn())); lPrompt = mwidget->GetPrompt(); @@ -82,9 +82,9 @@ KLines::KLines() initTDEAction(); - connect(&demoTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDemo())); + connect(&demoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDemo())); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setFocus(); startGame(); @@ -104,18 +104,18 @@ KLines::~KLines() */ void KLines::initTDEAction() { - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(startGame()), actionCollection()); - act_demo = KStdGameAction::demo(TQT_TQOBJECT(this), TQT_SLOT(startDemo()), actionCollection()); + KStdGameAction::gameNew(this, TQ_SLOT(startGame()), actionCollection()); + act_demo = KStdGameAction::demo(this, TQ_SLOT(startDemo()), actionCollection()); act_demo->setText(i18n("Start &Tutorial")); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(viewHighScore()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - endTurnAction = KStdGameAction::endTurn(TQT_TQOBJECT(this), TQT_SLOT(makeTurn()), actionCollection()); + KStdGameAction::highscores(this, TQ_SLOT(viewHighScore()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + endTurnAction = KStdGameAction::endTurn(this, TQ_SLOT(makeTurn()), actionCollection()); showNextAction = new TDEToggleAction(i18n("&Show Next"), TDEShortcut(CTRL+Key_P), - TQT_TQOBJECT(this), TQT_SLOT(switchPrompt()), actionCollection(), "options_show_next"); + this, TQ_SLOT(switchPrompt()), actionCollection(), "options_show_next"); showNextAction->setCheckedState(i18n("Hide Next")); showNumberedAction = new TDEToggleAction(i18n("&Use Numbered Balls"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(switchNumbered()), actionCollection(), "options_show_numbered"); - undoAction = KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection()); + this, TQ_SLOT(switchNumbered()), actionCollection(), "options_show_numbered"); + undoAction = KStdGameAction::undo(this, TQ_SLOT(undo()), actionCollection()); levelAction = KStdGameAction::chooseGameType(0, 0, actionCollection()); TQStringList items; @@ -128,11 +128,11 @@ void KLines::initTDEAction() showNumberedAction->setChecked(Prefs::numberedBalls()); lPrompt->setPrompt(Prefs::showNext()); - (void)new TDEAction(i18n("Move Left"), Key_Left, TQT_TQOBJECT(lsb), TQT_SLOT(moveLeft()), actionCollection(), "left"); - (void)new TDEAction(i18n("Move Right"), Key_Right, TQT_TQOBJECT(lsb), TQT_SLOT(moveRight()), actionCollection(), "right"); - (void)new TDEAction(i18n("Move Up"), Key_Up, TQT_TQOBJECT(lsb), TQT_SLOT(moveUp()), actionCollection(), "up"); - (void)new TDEAction(i18n("Move Down"), Key_Down, TQT_TQOBJECT(lsb), TQT_SLOT(moveDown()), actionCollection(), "down"); - (void)new TDEAction(i18n("Move Ball"), Key_Space, TQT_TQOBJECT(lsb), TQT_SLOT(placePlayerBall()), actionCollection(), "place_ball"); + (void)new TDEAction(i18n("Move Left"), Key_Left, lsb, TQ_SLOT(moveLeft()), actionCollection(), "left"); + (void)new TDEAction(i18n("Move Right"), Key_Right, lsb, TQ_SLOT(moveRight()), actionCollection(), "right"); + (void)new TDEAction(i18n("Move Up"), Key_Up, lsb, TQ_SLOT(moveUp()), actionCollection(), "up"); + (void)new TDEAction(i18n("Move Down"), Key_Down, lsb, TQ_SLOT(moveDown()), actionCollection(), "down"); + (void)new TDEAction(i18n("Move Ball"), Key_Space, lsb, TQ_SLOT(placePlayerBall()), actionCollection(), "place_ball"); setupGUI( TDEMainWindow::Save | Keys | StatusBar | Create ); } diff --git a/klines/klines.h b/klines/klines.h index 49a9f795..91a50f93 100644 --- a/klines/klines.h +++ b/klines/klines.h @@ -28,7 +28,7 @@ class TDEToggleAction; class KLines : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: KLines(); diff --git a/klines/linesboard.cpp b/klines/linesboard.cpp index 81e7eb77..9c368a45 100644 --- a/klines/linesboard.cpp +++ b/klines/linesboard.cpp @@ -51,14 +51,14 @@ LinesBoard::LinesBoard( BallPainter * abPainter, TQWidget* parent, const char* n bPainter = abPainter; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setBackgroundColor( gray ); setMouseTracking( FALSE ); setFixedSize(wHint(), hHint()); timer = new TQTimer(this); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerSlot()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerSlot()) ); timer->start( TIMERCLOCK, FALSE ); } @@ -740,11 +740,11 @@ void LinesBoard::demoClick(int x, int y) TQPoint p = cur + i*(dest-cur) / 25; TQCursor::setPos(p); TQApplication::flushX(); - TQTimer::singleShot(80, this, TQT_SLOT(demoClickStep())); + TQTimer::singleShot(80, this, TQ_SLOT(demoClickStep())); kapp->enter_loop(); } TQCursor::setPos(dest); - TQMouseEvent ev(TQEvent::MouseButtonPress, lDest, dest, Qt::LeftButton, Qt::LeftButton); + TQMouseEvent ev(TQEvent::MouseButtonPress, lDest, dest, TQt::LeftButton, TQt::LeftButton); mousePressEvent(&ev); } diff --git a/klines/linesboard.h b/klines/linesboard.h index 859063f6..45d92a70 100644 --- a/klines/linesboard.h +++ b/klines/linesboard.h @@ -31,7 +31,7 @@ class LinesBoard : public Field { - Q_OBJECT + TQ_OBJECT public: LinesBoard( BallPainter * abPainter, TQWidget* parent=0, const char* name=0 ); diff --git a/klines/mwidget.cpp b/klines/mwidget.cpp index cfae3a1c..552a0e6f 100644 --- a/klines/mwidget.cpp +++ b/klines/mwidget.cpp @@ -36,7 +36,7 @@ MainWidget::MainWidget( TQWidget* parent, const char* name ) TQBoxLayout *right = new TQVBoxLayout(grid, 2); TQLabel *label = new TQLabel(i18n("Next balls:"), this); lPrompt = new LinesPrompt(bPainter, this); - connect(lPrompt, TQT_SIGNAL(PromptPressed()), parent, TQT_SLOT(switchPrompt())); + connect(lPrompt, TQ_SIGNAL(PromptPressed()), parent, TQ_SLOT(switchPrompt())); right->addWidget( label, 0, TQt::AlignBottom | TQt::AlignHCenter ); right->addWidget( lPrompt, 0, TQt::AlignTop | TQt::AlignHCenter ); diff --git a/klines/mwidget.h b/klines/mwidget.h index e35596d8..4577e02d 100644 --- a/klines/mwidget.h +++ b/klines/mwidget.h @@ -29,7 +29,7 @@ class BallPainter; class MainWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT LinesBoard * lsb; LinesPrompt * lPrompt; diff --git a/klines/prompt.cpp b/klines/prompt.cpp index 7424b35d..3e46f52d 100644 --- a/klines/prompt.cpp +++ b/klines/prompt.cpp @@ -25,7 +25,7 @@ LinesPrompt::LinesPrompt( BallPainter * abPainter, TQWidget* parent, const char* bPainter = abPainter; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setBackgroundColor( gray ); setMouseTracking( FALSE ); diff --git a/klines/prompt.h b/klines/prompt.h index c8a721db..cffb43c7 100644 --- a/klines/prompt.h +++ b/klines/prompt.h @@ -23,7 +23,7 @@ class LinesPrompt : public TQWidget { - Q_OBJECT + TQ_OBJECT BallPainter* bPainter; diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp index 87893bf3..ca964cc8 100644 --- a/kmahjongg/Editor.cpp +++ b/kmahjongg/Editor.cpp @@ -61,7 +61,7 @@ Editor::Editor drawFrame->setGeometry( 10, 40 ,sWidth ,sHeight); drawFrame->setMinimumSize( 0, 0 ); drawFrame->setMaximumSize( 32767, 32767 ); - drawFrame->setFocusPolicy( TQ_NoFocus ); + drawFrame->setFocusPolicy( TQWidget::NoFocus ); drawFrame->setBackgroundMode( TQWidget::PaletteBackground ); drawFrame->setFrameStyle( 49 ); drawFrame->setMouseTracking(true); @@ -85,10 +85,10 @@ Editor::Editor setCaption(kapp->makeStdCaption(i18n("Edit Board Layout"))); - connect( drawFrame, TQT_SIGNAL(mousePressed(TQMouseEvent *) ), - TQT_SLOT(drawFrameMousePressEvent(TQMouseEvent *))); - connect( drawFrame, TQT_SIGNAL(mouseMoved(TQMouseEvent *) ), - TQT_SLOT(drawFrameMouseMovedEvent(TQMouseEvent *))); + connect( drawFrame, TQ_SIGNAL(mousePressed(TQMouseEvent *) ), + TQ_SLOT(drawFrameMousePressEvent(TQMouseEvent *))); + connect( drawFrame, TQ_SIGNAL(mouseMoved(TQMouseEvent *) ), + TQ_SLOT(drawFrameMouseMovedEvent(TQMouseEvent *))); statusChanged(); @@ -176,7 +176,7 @@ void Editor::setupToolbar() topToolbar->alignItemRight( ID_TOOL_STATUS, true ); //addToolBar(topToolbar); - connect( topToolbar, TQT_SIGNAL(clicked(int) ), TQT_SLOT( topToolbarOption(int) ) ); + connect( topToolbar, TQ_SIGNAL(clicked(int) ), TQ_SLOT( topToolbarOption(int) ) ); topToolbar->updateRects(0); topToolbar->setFullSize(true); diff --git a/kmahjongg/Editor.h b/kmahjongg/Editor.h index b772f2ae..8dfd45f7 100644 --- a/kmahjongg/Editor.h +++ b/kmahjongg/Editor.h @@ -15,7 +15,7 @@ class Editor: public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmahjongg/GameTimer.h b/kmahjongg/GameTimer.h index f716ff86..eac2e928 100644 --- a/kmahjongg/GameTimer.h +++ b/kmahjongg/GameTimer.h @@ -23,7 +23,7 @@ enum TimerMode {running = -53 , stopped= -54 , paused = -55}; class GameTimer: public TQLCDNumber { - Q_OBJECT + TQ_OBJECT public: GameTimer( TQWidget *parent=0, const char *name=0 ); diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp index 3f947b51..acd1e5ba 100644 --- a/kmahjongg/HighScore.cpp +++ b/kmahjongg/HighScore.cpp @@ -112,23 +112,21 @@ HighScore::HighScore qtarch_PushButton_1->setGeometry( 110+35, 340+50, 100, 30 ); qtarch_PushButton_1->setMinimumSize( 0, 0 ); qtarch_PushButton_1->setMaximumSize( 32767, 32767 ); - qtarch_PushButton_1->setFocusPolicy( TQ_TabFocus ); + qtarch_PushButton_1->setFocusPolicy( TQWidget::TabFocus ); qtarch_PushButton_1->setAutoRepeat( false ); - qtarch_PushButton_1->setAutoResize( false ); - qtarch_PushButton_1->setDefault(true); + qtarch_PushButton_1->setDefault(true); TQPushButton* resetBtn; resetBtn= new TQPushButton( this, "resetBtn" ); resetBtn->setGeometry( 10, 5, 25, 25); resetBtn->setMinimumSize( 0, 0 ); resetBtn->setMaximumSize( 32767, 32767 ); - resetBtn->setFocusPolicy( TQ_TabFocus ); + resetBtn->setFocusPolicy( TQWidget::TabFocus ); //resetBtn->setText(i18n( "Reset" )); resetBtn->setAutoRepeat( false ); - resetBtn->setAutoResize( false ); - TDEIconLoader *loader = TDEGlobal::iconLoader(); - resetBtn->setPixmap(loader->loadIcon("edit-delete", TDEIcon::Toolbar)); + TDEIconLoader *loader = TDEGlobal::iconLoader(); + resetBtn->setPixmap(loader->loadIcon("edit-delete", TDEIcon::Toolbar)); @@ -138,21 +136,20 @@ HighScore::HighScore lineEdit = new TQLineEdit(this, ""); lineEdit->setGeometry( 50, 40+(20*30), 190, 30 ); - lineEdit->setFocusPolicy(TQ_StrongFocus); + lineEdit->setFocusPolicy(TQWidget::StrongFocus); lineEdit->setFrame(true); lineEdit->setEchoMode(TQLineEdit::Normal); lineEdit->setText(""); // the drop down for the board names - combo = new TQComboBox( false, this, "combo" ); - combo->setGeometry( 65, 5, 220, 25 ); - combo->setMinimumSize( 0, 0 ); - combo->setMaximumSize( 32767, 32767 ); - combo->setFocusPolicy( TQ_StrongFocus ); - combo->setSizeLimit( 10 ); - combo->setAutoResize( false ); - connect( combo, TQT_SIGNAL(activated(int)), TQT_SLOT(selectionChanged(int)) ); + combo = new TQComboBox( false, this, "combo" ); + combo->setGeometry( 65, 5, 220, 25 ); + combo->setMinimumSize( 0, 0 ); + combo->setMaximumSize( 32767, 32767 ); + combo->setFocusPolicy( TQWidget::StrongFocus ); + combo->setSizeLimit( 10 ); + connect( combo, TQ_SIGNAL(activated(int)), TQ_SLOT(selectionChanged(int)) ); resize( 350+70,390+45 ); @@ -166,12 +163,12 @@ HighScore::HighScore selectedLine = -1; - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString &)), - TQT_SLOT( nameChanged(const TQString &))); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString &)), + TQ_SLOT( nameChanged(const TQString &))); - connect(qtarch_PushButton_1, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); - connect(resetBtn, TQT_SIGNAL(clicked()), TQT_SLOT(reset())); + connect(qtarch_PushButton_1, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); + connect(resetBtn, TQ_SIGNAL(clicked()), TQ_SLOT(reset())); } // free up the table structures diff --git a/kmahjongg/HighScore.h b/kmahjongg/HighScore.h index 38df5454..a5409fdc 100644 --- a/kmahjongg/HighScore.h +++ b/kmahjongg/HighScore.h @@ -28,7 +28,7 @@ struct TableInstance { class HighScore : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp index 725e0a93..cfc87b5a 100644 --- a/kmahjongg/Preview.cpp +++ b/kmahjongg/Preview.cpp @@ -30,10 +30,10 @@ Preview::Preview(TQWidget* parent) : KDialogBase(parent), m_tiles(true) group = new TQHGroupBox(page); m_combo = new TQComboBox(false, group); - connect(m_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(selectionChanged(int))); + connect(m_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(selectionChanged(int))); loadButton = new KPushButton(i18n("Load..."), group); - connect( loadButton, TQT_SIGNAL(clicked()), TQT_SLOT(load()) ); + connect( loadButton, TQ_SIGNAL(clicked()), TQ_SLOT(load()) ); m_drawFrame = new FrameImage(page); m_drawFrame->setFixedSize(310, 236); @@ -448,11 +448,11 @@ void FrameImage::paintEvent( TQPaintEvent* pa ) TQPen line; - line.setStyle(Qt::DotLine); + line.setStyle(TQt::DotLine); line.setWidth(2); line.setColor(yellow); p.setPen(line); - p.setBackgroundMode(Qt::OpaqueMode); + p.setBackgroundMode(TQt::OpaqueMode); p.setBackgroundColor(black); int x = pa->rect().left(); diff --git a/kmahjongg/Preview.h b/kmahjongg/Preview.h index 2ad02205..6f8c842d 100644 --- a/kmahjongg/Preview.h +++ b/kmahjongg/Preview.h @@ -14,7 +14,7 @@ class TQPixmap; class FrameImage: public TQFrame { - Q_OBJECT + TQ_OBJECT public: FrameImage(TQWidget *parent=NULL, const char *name = NULL); @@ -43,7 +43,7 @@ private: class Preview: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp index 8bf8256a..dd75e9b0 100644 --- a/kmahjongg/boardwidget.cpp +++ b/kmahjongg/boardwidget.cpp @@ -20,8 +20,8 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name ) setBackgroundColor( TQColor( 0,0,0 ) ); timer = new TQTimer(this); - connect( timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(helpMoveTimeout()) ); + connect( timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(helpMoveTimeout()) ); TimerState = Stop; gamePaused = false; @@ -440,7 +440,7 @@ void BoardWidget::stackTiles(unsigned char t, unsigned short h, unsigned short x int ss = theTiles.shadowSize(); TQPainter p(&backBuffer); TQPen line; - p.setBackgroundMode(Qt::OpaqueMode); + p.setBackgroundMode(TQt::OpaqueMode); p.setBackgroundColor(black); @@ -633,7 +633,7 @@ void BoardWidget::demoMoveTimeout() break; } // restart timer - TQTimer::singleShot( ANIMSPEED, this, TQT_SLOT( demoMoveTimeout() ) ); + TQTimer::singleShot( ANIMSPEED, this, TQ_SLOT( demoMoveTimeout() ) ); } } @@ -667,7 +667,7 @@ void BoardWidget::matchAnimationTimeout() } } if( TimerState == Match ) - TQTimer::singleShot( ANIMSPEED, this, TQT_SLOT( matchAnimationTimeout() ) ); + TQTimer::singleShot( ANIMSPEED, this, TQ_SLOT( matchAnimationTimeout() ) ); } // --------------------------------------------------------- void BoardWidget::stopMatchAnimation() @@ -1623,7 +1623,7 @@ void BoardWidget::mousePressEvent ( TQMouseEvent* event ) if (gamePaused) return; - if( event->button() == Qt::LeftButton ) + if( event->button() == TQt::LeftButton ) { if( TimerState == Demo ) { diff --git a/kmahjongg/boardwidget.h b/kmahjongg/boardwidget.h index f6578278..4cce396a 100644 --- a/kmahjongg/boardwidget.h +++ b/kmahjongg/boardwidget.h @@ -88,7 +88,7 @@ typedef struct gamedata { */ class BoardWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp index 8edf7b6c..629794ab 100644 --- a/kmahjongg/kmahjongg.cpp +++ b/kmahjongg/kmahjongg.cpp @@ -80,37 +80,37 @@ KMahjongg::KMahjongg( TQWidget* parent, const char *name) bDemoModeActive = false; - connect( bw, TQT_SIGNAL( statusTextChanged(const TQString&, long) ), - TQT_SLOT( showStatusText(const TQString&, long) ) ); + connect( bw, TQ_SIGNAL( statusTextChanged(const TQString&, long) ), + TQ_SLOT( showStatusText(const TQString&, long) ) ); - connect( bw, TQT_SIGNAL( tileNumberChanged(int,int,int) ), - TQT_SLOT( showTileNumber(int,int,int) ) ); + connect( bw, TQ_SIGNAL( tileNumberChanged(int,int,int) ), + TQ_SLOT( showTileNumber(int,int,int) ) ); - connect( bw, TQT_SIGNAL( demoModeChanged(bool) ), - TQT_SLOT( demoModeChanged(bool) ) ); + connect( bw, TQ_SIGNAL( demoModeChanged(bool) ), + TQ_SLOT( demoModeChanged(bool) ) ); - connect( bw, TQT_SIGNAL( gameOver(unsigned short , unsigned short)), this, - TQT_SLOT( gameOver(unsigned short , unsigned short))); + connect( bw, TQ_SIGNAL( gameOver(unsigned short , unsigned short)), this, + TQ_SLOT( gameOver(unsigned short , unsigned short))); - connect(bw, TQT_SIGNAL(gameCalculated()), - this, TQT_SLOT(timerReset())); + connect(bw, TQ_SIGNAL(gameCalculated()), + this, TQ_SLOT(timerReset())); // Make connections for the preview load dialog - connect( previewLoad, TQT_SIGNAL( boardRedraw(bool) ), - bw, TQT_SLOT( drawBoard(bool) ) ); + connect( previewLoad, TQ_SIGNAL( boardRedraw(bool) ), + bw, TQ_SLOT( drawBoard(bool) ) ); - connect( previewLoad, TQT_SIGNAL( layoutChange() ), - this, TQT_SLOT( newGame() ) ); + connect( previewLoad, TQ_SIGNAL( layoutChange() ), + this, TQ_SLOT( newGame() ) ); - connect( previewLoad, TQT_SIGNAL( loadBackground(const TQString&, bool) ), - bw, TQT_SLOT(loadBackground(const TQString&, bool) ) ); + connect( previewLoad, TQ_SIGNAL( loadBackground(const TQString&, bool) ), + bw, TQ_SLOT(loadBackground(const TQString&, bool) ) ); - connect( previewLoad, TQT_SIGNAL( loadTileset(const TQString &) ), - bw, TQT_SLOT(loadTileset(const TQString&) ) ); - connect( previewLoad, TQT_SIGNAL( loadBoard(const TQString&) ), - TQT_SLOT(loadBoardLayout(const TQString&) ) ); + connect( previewLoad, TQ_SIGNAL( loadTileset(const TQString &) ), + bw, TQ_SLOT(loadTileset(const TQString&) ) ); + connect( previewLoad, TQ_SIGNAL( loadBoard(const TQString&) ), + TQ_SLOT(loadBoardLayout(const TQString&) ) ); startNewGame( ); @@ -128,41 +128,41 @@ KMahjongg::~KMahjongg() void KMahjongg::setupTDEAction() { // game - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection()); - KStdGameAction::load(TQT_TQOBJECT(this), TQT_SLOT(loadGame()), actionCollection()); - KStdGameAction::save(TQT_TQOBJECT(this), TQT_SLOT(saveGame()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdGameAction::restart(TQT_TQOBJECT(this), TQT_SLOT(restartGame()), actionCollection()); - new TDEAction(i18n("New Numbered Game..."), "newnum", 0, TQT_TQOBJECT(this), TQT_SLOT(startNewNumeric()), actionCollection(), "game_new_numeric"); - new TDEAction(i18n("Open Th&eme..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openTheme()), actionCollection(), "game_open_theme"); - new TDEAction(i18n("Open &Tileset..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openTileset()), actionCollection(), "game_open_tileset"); - new TDEAction(i18n("Open &Background..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openBackground()), actionCollection(), "game_open_background"); - new TDEAction(i18n("Open La&yout..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openLayout()), actionCollection(), "game_open_layout"); - new TDEAction(i18n("Sa&ve Theme..."), 0, TQT_TQOBJECT(this), TQT_SLOT(saveTheme()), actionCollection(), "game_save_theme"); + KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection()); + KStdGameAction::load(this, TQ_SLOT(loadGame()), actionCollection()); + KStdGameAction::save(this, TQ_SLOT(saveGame()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdGameAction::restart(this, TQ_SLOT(restartGame()), actionCollection()); + new TDEAction(i18n("New Numbered Game..."), "newnum", 0, this, TQ_SLOT(startNewNumeric()), actionCollection(), "game_new_numeric"); + new TDEAction(i18n("Open Th&eme..."), 0, this, TQ_SLOT(openTheme()), actionCollection(), "game_open_theme"); + new TDEAction(i18n("Open &Tileset..."), 0, this, TQ_SLOT(openTileset()), actionCollection(), "game_open_tileset"); + new TDEAction(i18n("Open &Background..."), 0, this, TQ_SLOT(openBackground()), actionCollection(), "game_open_background"); + new TDEAction(i18n("Open La&yout..."), 0, this, TQ_SLOT(openLayout()), actionCollection(), "game_open_layout"); + new TDEAction(i18n("Sa&ve Theme..."), 0, this, TQ_SLOT(saveTheme()), actionCollection(), "game_save_theme"); // originally "file" ends here - KStdGameAction::hint(TQT_TQOBJECT(bw), TQT_SLOT(helpMove()), actionCollection()); - new TDEAction(i18n("Shu&ffle"), "reload", 0, TQT_TQOBJECT(bw), TQT_SLOT(shuffle()), actionCollection(), "move_shuffle"); - demoAction = KStdGameAction::demo(TQT_TQOBJECT(this), TQT_SLOT(demoMode()), actionCollection()); - showMatchingTilesAction = new TDEToggleAction(i18n("Show &Matching Tiles"), 0, TQT_TQOBJECT(this), TQT_SLOT(showMatchingTiles()), actionCollection(), "options_show_matching_tiles"); + KStdGameAction::hint(bw, TQ_SLOT(helpMove()), actionCollection()); + new TDEAction(i18n("Shu&ffle"), "reload", 0, bw, TQ_SLOT(shuffle()), actionCollection(), "move_shuffle"); + demoAction = KStdGameAction::demo(this, TQ_SLOT(demoMode()), actionCollection()); + showMatchingTilesAction = new TDEToggleAction(i18n("Show &Matching Tiles"), 0, this, TQ_SLOT(showMatchingTiles()), actionCollection(), "options_show_matching_tiles"); showMatchingTilesAction->setCheckedState(i18n("Hide &Matching Tiles")); showMatchingTilesAction->setChecked(Prefs::showMatchingTiles()); bw->setShowMatch( Prefs::showMatchingTiles() ); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscores()), actionCollection()); - pauseAction = KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pause()), actionCollection()); + KStdGameAction::highscores(this, TQ_SLOT(showHighscores()), actionCollection()); + pauseAction = KStdGameAction::pause(this, TQ_SLOT(pause()), actionCollection()); // TODO: store the background ; open on startup // TODO: same about layout // TODO: same about theme // move - undoAction = KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection()); - redoAction = KStdGameAction::redo(TQT_TQOBJECT(this), TQT_SLOT(redo()), actionCollection()); + undoAction = KStdGameAction::undo(this, TQ_SLOT(undo()), actionCollection()); + redoAction = KStdGameAction::redo(this, TQ_SLOT(redo()), actionCollection()); // edit - new TDEAction(i18n("&Board Editor"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBoardEditor()), actionCollection(), "edit_board_editor"); + new TDEAction(i18n("&Board Editor"), 0, this, TQ_SLOT(slotBoardEditor()), actionCollection(), "edit_board_editor"); // settings - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); setupGUI(); } @@ -238,8 +238,8 @@ void KMahjongg::showSettings(){ TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow); dialog->addPage(new Settings(0, "General"), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), bw, TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(setDisplayedWidth())); + connect(dialog, TQ_SIGNAL(settingsChanged()), bw, TQ_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(setDisplayedWidth())); dialog->show(); } diff --git a/kmahjongg/kmahjongg.h b/kmahjongg/kmahjongg.h index a3cb237b..70a87243 100644 --- a/kmahjongg/kmahjongg.h +++ b/kmahjongg/kmahjongg.h @@ -50,7 +50,7 @@ class TQLabel; */ class KMahjongg : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmines/dialogs.cpp b/kmines/dialogs.cpp index 21120478..88656b1a 100644 --- a/kmines/dialogs.cpp +++ b/kmines/dialogs.cpp @@ -127,19 +127,19 @@ CustomConfig::CustomConfig() _width = new KIntNumInput(this, "kcfg_CustomWidth"); _width->setLabel(i18n("Width:")); _width->setRange(minWidth, maxWidth); - connect(_width, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateNbMines())); + connect(_width, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(updateNbMines())); top->addWidget(_width); _height = new KIntNumInput(this, "kcfg_CustomHeight"); _height->setLabel(i18n("Height:")); _height->setRange(minWidth, maxWidth); - connect(_height, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateNbMines())); + connect(_height, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(updateNbMines())); top->addWidget(_height); _mines = new KIntNumInput(this, "kcfg_CustomMines"); _mines->setLabel(i18n("No. of mines:")); _mines->setRange(1, Level::maxNbMines(maxWidth, maxHeight)); - connect(_mines, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateNbMines())); + connect(_mines, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(updateNbMines())); top->addWidget(_mines); top->addSpacing(2 * KDialog::spacingHint()); @@ -149,7 +149,7 @@ CustomConfig::CustomConfig() TQLabel *label = new TQLabel(i18n("Choose level:"), this); hbox->addWidget(label); _gameType = new KComboBox(false, this); - connect(_gameType, TQT_SIGNAL(activated(int)), TQT_SLOT(typeChosen(int))); + connect(_gameType, TQ_SIGNAL(activated(int)), TQ_SLOT(typeChosen(int))); for (uint i=0; i<=Level::NB_TYPES; i++) _gameType->insertItem(i18n(Level::LABELS[i])); hbox->addWidget(_gameType); @@ -224,7 +224,7 @@ GameConfig::GameConfig() cb = new TQCheckBox(i18n("\"Magic\" reveal"), this, "kcfg_MagicReveal"); TQWhatsThis::add(cb, i18n("Set flags and reveal squares where they are trivial.")); - connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(magicModified(bool))); + connect(cb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(magicModified(bool))); top->addWidget(cb); top->addSpacing(2 * KDialog::spacingHint()); diff --git a/kmines/dialogs.h b/kmines/dialogs.h index d8bd94fa..ce8bca28 100644 --- a/kmines/dialogs.h +++ b/kmines/dialogs.h @@ -33,7 +33,7 @@ class KIntNumInput; //----------------------------------------------------------------------------- class Smiley : public TQPushButton, public KMines { - Q_OBJECT + TQ_OBJECT public: Smiley(TQWidget *parent, const char *name = 0) @@ -49,7 +49,7 @@ class Smiley : public TQPushButton, public KMines //----------------------------------------------------------------------------- class DigitalClock : public KGameLCDClock { - Q_OBJECT + TQ_OBJECT public: DigitalClock(TQWidget *parent); @@ -77,7 +77,7 @@ class DigitalClock : public KGameLCDClock //----------------------------------------------------------------------------- class CustomConfig : public TQWidget, public KMines { - Q_OBJECT + TQ_OBJECT public: CustomConfig(); @@ -102,7 +102,7 @@ class CustomConfig : public TQWidget, public KMines //----------------------------------------------------------------------------- class GameConfig : public TQWidget, public KMines { - Q_OBJECT + TQ_OBJECT public: GameConfig(); @@ -121,7 +121,7 @@ class GameConfig : public TQWidget, public KMines class AppearanceConfig : public TQWidget, public KMines { - Q_OBJECT + TQ_OBJECT public: AppearanceConfig(); diff --git a/kmines/field.cpp b/kmines/field.cpp index 993e1d8f..d7a9e1c4 100644 --- a/kmines/field.cpp +++ b/kmines/field.cpp @@ -138,9 +138,9 @@ Coord Field::fromPoint(const TQPoint &qp) const int Field::mapMouseButton(TQMouseEvent *e) const { switch (e->button()) { - case Qt::LeftButton: return Settings::mouseAction(Settings::EnumButton::left); - case Qt::MidButton: return Settings::mouseAction(Settings::EnumButton::mid); - case Qt::RightButton: return Settings::mouseAction(Settings::EnumButton::right); + case TQt::LeftButton: return Settings::mouseAction(Settings::EnumButton::left); + case TQt::MidButton: return Settings::mouseAction(Settings::EnumButton::mid); + case TQt::RightButton: return Settings::mouseAction(Settings::EnumButton::right); default: return Settings::EnumMouseAction::ToggleFlag; } } @@ -233,7 +233,7 @@ void Field::keyboardAutoReveal() { _cursor_back = _cursor; pressClearFunction(_cursor_back, true); - TQTimer::singleShot(50, this, TQT_SLOT(keyboardAutoRevealSlot())); + TQTimer::singleShot(50, this, TQ_SLOT(keyboardAutoRevealSlot())); } void Field::keyboardAutoRevealSlot() diff --git a/kmines/field.h b/kmines/field.h index e61718d1..2d6ef873 100644 --- a/kmines/field.h +++ b/kmines/field.h @@ -26,7 +26,7 @@ //----------------------------------------------------------------------------- class Field : public FieldFrame, public BaseField { - Q_OBJECT + TQ_OBJECT public: enum ActionType { Reveal = 0, AutoReveal, SetFlag, UnsetFlag, SetUncertain, diff --git a/kmines/frame.cpp b/kmines/frame.cpp index 3788dee5..0698057f 100644 --- a/kmines/frame.cpp +++ b/kmines/frame.cpp @@ -127,7 +127,7 @@ void FieldFrame::drawBox(TQPainter &painter, const TQPoint &p, if (hasFocus) { painter.translate(p.x(), p.y()); TQRect fbr = style().subRect(TQStyle::SR_PushButtonFocusRect, &_button); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, fbr, + style().drawPrimitive(TQStyle::PE_FocusRect, &painter, fbr, colorGroup(), TQStyle::Style_Enabled); painter.resetXForm(); } diff --git a/kmines/kzoommainwindow.cpp b/kmines/kzoommainwindow.cpp index 758d73d6..a9bb2004 100644 --- a/kmines/kzoommainwindow.cpp +++ b/kmines/kzoommainwindow.cpp @@ -30,11 +30,11 @@ KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name { installEventFilter(this); - _zoomInAction = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(zoomIn()), actionCollection()); + _zoomInAction = KStdAction::zoomIn(this, TQ_SLOT(zoomIn()), actionCollection()); _zoomOutAction = - KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(zoomOut()), actionCollection()); + KStdAction::zoomOut(this, TQ_SLOT(zoomOut()), actionCollection()); _menu = - KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); + KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection()); } void KZoomMainWindow::init(const char *popupName) @@ -63,7 +63,7 @@ void KZoomMainWindow::addWidget(TQWidget *widget) static_cast<KZoomMainWindow *>(tlw->tqt_cast("KZoomMainWindow")); Q_ASSERT(zm); zm->_widgets.append(widget); - connect(widget, TQT_SIGNAL(destroyed()), zm, TQT_SLOT(widgetDestroyed())); + connect(widget, TQ_SIGNAL(destroyed()), zm, TQ_SLOT(widgetDestroyed())); } void KZoomMainWindow::widgetDestroyed() diff --git a/kmines/kzoommainwindow.h b/kmines/kzoommainwindow.h index 1af9bc8b..433d9d04 100644 --- a/kmines/kzoommainwindow.h +++ b/kmines/kzoommainwindow.h @@ -41,7 +41,7 @@ class TDEToggleAction; */ class KZoomMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** Constructor. */ diff --git a/kmines/main.cpp b/kmines/main.cpp index fe39f052..7c1a43e4 100644 --- a/kmines/main.cpp +++ b/kmines/main.cpp @@ -43,17 +43,17 @@ #include "dialogs.h" const MainWidget::KeyData MainWidget::KEY_DATA[NB_KEYS] = { -{I18N_NOOP("Move Up"), "keyboard_moveup", Key_Up, TQT_SLOT(moveUp())}, -{I18N_NOOP("Move Down"), "keyboard_movedown", Key_Down, TQT_SLOT(moveDown())}, -{I18N_NOOP("Move Right"), "keyboard_moveright", Key_Right, TQT_SLOT(moveRight())}, -{I18N_NOOP("Move Left"), "keyboard_moveleft", Key_Left, TQT_SLOT(moveLeft())}, -{I18N_NOOP("Move at Left Edge"), "keyboard_leftedge", Key_Home, TQT_SLOT(moveLeftEdge())}, -{I18N_NOOP("Move at Right Edge"), "keyboard_rightedge", Key_End, TQT_SLOT(moveRightEdge())}, -{I18N_NOOP("Move at Top Edge"), "keyboard_topedge", Key_PageUp, TQT_SLOT(moveTop())}, -{I18N_NOOP("Move at Bottom Edge"), "keyboard_bottomedge", Key_PageDown, TQT_SLOT(moveBottom())}, -{I18N_NOOP("Reveal Mine"), "keyboard_revealmine", Key_Space, TQT_SLOT(reveal())}, -{I18N_NOOP("Mark Mine"), "keyboard_markmine", Key_W, TQT_SLOT(mark())}, -{I18N_NOOP("Automatic Reveal"), "keyboard_autoreveal", Key_Return, TQT_SLOT(autoReveal())} +{I18N_NOOP("Move Up"), "keyboard_moveup", Key_Up, TQ_SLOT(moveUp())}, +{I18N_NOOP("Move Down"), "keyboard_movedown", Key_Down, TQ_SLOT(moveDown())}, +{I18N_NOOP("Move Right"), "keyboard_moveright", Key_Right, TQ_SLOT(moveRight())}, +{I18N_NOOP("Move Left"), "keyboard_moveleft", Key_Left, TQ_SLOT(moveLeft())}, +{I18N_NOOP("Move at Left Edge"), "keyboard_leftedge", Key_Home, TQ_SLOT(moveLeftEdge())}, +{I18N_NOOP("Move at Right Edge"), "keyboard_rightedge", Key_End, TQ_SLOT(moveRightEdge())}, +{I18N_NOOP("Move at Top Edge"), "keyboard_topedge", Key_PageUp, TQ_SLOT(moveTop())}, +{I18N_NOOP("Move at Bottom Edge"), "keyboard_bottomedge", Key_PageDown, TQ_SLOT(moveBottom())}, +{I18N_NOOP("Reveal Mine"), "keyboard_revealmine", Key_Space, TQ_SLOT(reveal())}, +{I18N_NOOP("Mark Mine"), "keyboard_markmine", Key_W, TQ_SLOT(mark())}, +{I18N_NOOP("Automatic Reveal"), "keyboard_autoreveal", Key_Return, TQ_SLOT(autoReveal())} }; @@ -63,33 +63,33 @@ MainWidget::MainWidget() KNotifyClient::startDaemon(); _status = new Status(this); - connect(_status, TQT_SIGNAL(gameStateChangedSignal(KMines::GameState)), - TQT_SLOT(gameStateChanged(KMines::GameState))); - connect(_status, TQT_SIGNAL(pause()), TQT_SLOT(pause())); + connect(_status, TQ_SIGNAL(gameStateChangedSignal(KMines::GameState)), + TQ_SLOT(gameStateChanged(KMines::GameState))); + connect(_status, TQ_SIGNAL(pause()), TQ_SLOT(pause())); // Game & Popup - KStdGameAction::gameNew(TQT_TQOBJECT(_status), TQT_SLOT(restartGame()), actionCollection()); - _pause = KStdGameAction::pause(TQT_TQOBJECT(_status), TQT_SLOT(pauseGame()), + KStdGameAction::gameNew(_status, TQ_SLOT(restartGame()), actionCollection()); + _pause = KStdGameAction::pause(_status, TQ_SLOT(pauseGame()), actionCollection()); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscores()), + KStdGameAction::highscores(this, TQ_SLOT(showHighscores()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(tqApp), TQT_SLOT(quit()), actionCollection()); + KStdGameAction::quit(tqApp, TQ_SLOT(quit()), actionCollection()); // keyboard _keybCollection = new TDEActionCollection(this); for (uint i=0; i<NB_KEYS; i++) { const KeyData &d = KEY_DATA[i]; - (void)new TDEAction(i18n(d.label), d.keycode, TQT_TQOBJECT(_status), + (void)new TDEAction(i18n(d.label), d.keycode, _status, d.slot, _keybCollection, d.name); } // Settings - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureSettings()), + KStdAction::preferences(this, TQ_SLOT(configureSettings()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), actionCollection()); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), + KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), actionCollection()); + KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()), actionCollection()); - KStdGameAction::configureHighscores(TQT_TQOBJECT(this), TQT_SLOT(configureHighscores()), + KStdGameAction::configureHighscores(this, TQ_SLOT(configureHighscores()), actionCollection()); // Levels _levels = KStdGameAction::chooseGameType(0, 0, actionCollection()); @@ -97,27 +97,27 @@ MainWidget::MainWidget() for (uint i=0; i<=Level::NB_TYPES; i++) list += i18n(Level::LABELS[i]); _levels->setItems(list); - connect(_levels, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(_status), TQT_SLOT(newGame(int))); + connect(_levels, TQ_SIGNAL(activated(int)), _status, TQ_SLOT(newGame(int))); // Adviser _advise = - KStdGameAction::hint(TQT_TQOBJECT(_status), TQT_SLOT(advise()), actionCollection()); - _solve = KStdGameAction::solve(TQT_TQOBJECT(_status), TQT_SLOT(solve()), actionCollection()); - (void)new TDEAction(i18n("Solving Rate..."), 0, TQT_TQOBJECT(_status), TQT_SLOT(solveRate()), + KStdGameAction::hint(_status, TQ_SLOT(advise()), actionCollection()); + _solve = KStdGameAction::solve(_status, TQ_SLOT(solve()), actionCollection()); + (void)new TDEAction(i18n("Solving Rate..."), 0, _status, TQ_SLOT(solveRate()), actionCollection(), "solve_rate"); // Log (void)new TDEAction(KGuiItem(i18n("View Log"), "viewmag"), 0, - TQT_TQOBJECT(_status), TQT_SLOT(viewLog()), + _status, TQ_SLOT(viewLog()), actionCollection(), "log_view"); (void)new TDEAction(KGuiItem(i18n("Replay Log"), "media-playback-start"), - 0, TQT_TQOBJECT(_status), TQT_SLOT(replayLog()), + 0, _status, TQ_SLOT(replayLog()), actionCollection(), "log_replay"); (void)new TDEAction(KGuiItem(i18n("Save Log..."), "document-save"), 0, - TQT_TQOBJECT(_status), TQT_SLOT(saveLog()), + _status, TQ_SLOT(saveLog()), actionCollection(), "log_save"); (void)new TDEAction(KGuiItem(i18n("Load Log..."), "document-open"), 0, - TQT_TQOBJECT(_status), TQT_SLOT(loadLog()), + _status, TQ_SLOT(loadLog()), actionCollection(), "log_load"); setupGUI( TDEMainWindow::Save | Create ); @@ -163,7 +163,7 @@ void MainWidget::configureSettings() dialog->addPage(new AppearanceConfig, i18n("Appearance"), "style"); CustomConfig *cc = new CustomConfig; dialog->addPage(cc, i18n("Custom Game"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), TQ_SLOT(settingsChanged())); dialog->show(); cc->init(); gc->init(); diff --git a/kmines/main.h b/kmines/main.h index 06100dc6..239663ec 100644 --- a/kmines/main.h +++ b/kmines/main.h @@ -30,7 +30,7 @@ class Status; class MainWidget : public KZoomMainWindow, public KMines { - Q_OBJECT + TQ_OBJECT public: MainWidget(); diff --git a/kmines/solver/advFastRules.cpp b/kmines/solver/advFastRules.cpp index 79c42bba..e9ad110f 100644 --- a/kmines/solver/advFastRules.cpp +++ b/kmines/solver/advFastRules.cpp @@ -81,7 +81,7 @@ bool AdviseFast::RuleSet::apply() { while(!_rules.empty()){ set<Entry>::iterator i = _rules.begin(); - std::auto_ptr<Rule> r (this->newRule(*i)); + std::unique_ptr<Rule> r (this->newRule(*i)); _rules.erase(i); if(r->apply(&this->_surePoints)) return true; diff --git a/kmines/solver/solver.cpp b/kmines/solver/solver.cpp index 99070cad..9a416d28 100644 --- a/kmines/solver/solver.cpp +++ b/kmines/solver/solver.cpp @@ -174,7 +174,7 @@ bool Solver::solveStep() } if (_inOneStep) return solveStep(); - else TQTimer::singleShot(0, this, TQT_SLOT(solveStep())); + else TQTimer::singleShot(0, this, TQ_SLOT(solveStep())); return false; } @@ -191,7 +191,7 @@ SolvingRateDialog::SolvingRateDialog(const BaseField &field, TQWidget *parent) Close, parent, "compute_solving_rate", true, true), _refField(field) { - connect(&_solver, TQT_SIGNAL(solvingDone(bool)), TQT_SLOT(solvingDone(bool))); + connect(&_solver, TQ_SIGNAL(solvingDone(bool)), TQ_SLOT(solvingDone(bool))); KGuiItem item = KStdGuiItem::ok(); item.setText(i18n("Start")); @@ -225,7 +225,7 @@ void SolvingRateDialog::slotOk() _i = 0; _success = 0; _progress->setValue(0); - TQTimer::singleShot(0, this, TQT_SLOT(step())); + TQTimer::singleShot(0, this, TQ_SLOT(step())); } void SolvingRateDialog::step() @@ -245,5 +245,5 @@ void SolvingRateDialog::solvingDone(bool success) _label->setText(i18n("Success rate: %1%") .arg(_success * 100.0 / _i, 0, 'f', 3)); _progress->advance(1); - TQTimer::singleShot(0, this, TQT_SLOT(step())); + TQTimer::singleShot(0, this, TQ_SLOT(step())); } diff --git a/kmines/solver/solver.h b/kmines/solver/solver.h index f069f0ea..7354b99c 100644 --- a/kmines/solver/solver.h +++ b/kmines/solver/solver.h @@ -31,7 +31,7 @@ class SolverPrivate; class Solver : public TQObject { - Q_OBJECT + TQ_OBJECT public: Solver(TQObject *parent = 0); @@ -62,7 +62,7 @@ class Solver : public TQObject class SolvingRateDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SolvingRateDialog(const BaseField &field, TQWidget *parent); diff --git a/kmines/status.cpp b/kmines/status.cpp index 1ed3f5d5..1e0d005b 100644 --- a/kmines/status.cpp +++ b/kmines/status.cpp @@ -49,10 +49,10 @@ Status::Status(TQWidget *parent) : TQWidget(parent, "status"), _oldLevel(Level::Easy) { _timer = new TQTimer(this); - connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(replayStep())); + connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(replayStep())); - _solver = new Solver(TQT_TQOBJECT(this)); - connect(_solver, TQT_SIGNAL(solvingDone(bool)), TQT_SLOT(solvingDone(bool))); + _solver = new Solver(this); + connect(_solver, TQ_SIGNAL(solvingDone(bool)), TQ_SLOT(solvingDone(bool))); // top layout TQGridLayout *top = new TQGridLayout(this, 2, 5, 10, 10); @@ -73,8 +73,8 @@ Status::Status(TQWidget *parent) // smiley smiley = new Smiley(this); - connect(smiley, TQT_SIGNAL(clicked()), TQT_SLOT(smileyClicked())); - smiley->setFocusPolicy(TQ_NoFocus); + connect(smiley, TQ_SIGNAL(clicked()), TQ_SLOT(smileyClicked())); + smiley->setFocusPolicy(TQWidget::NoFocus); TQWhatsThis::add(smiley, i18n("Press to start a new game")); top->addWidget(smiley, 0, 2); @@ -93,13 +93,13 @@ Status::Status(TQWidget *parent) _field = new Field(_fieldContainer); _field->readSettings(); g->addWidget(_field, 0, 0, AlignCenter); - 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))); - connect(_field, TQT_SIGNAL(setCheating()), dg, TQT_SLOT(setCheating())); - connect(_field,TQT_SIGNAL(addAction(const KGrid2D::Coord &, Field::ActionType)), - TQT_SLOT(addAction(const KGrid2D::Coord &, Field::ActionType))); + connect( _field, TQ_SIGNAL(updateStatus(bool)), TQ_SLOT(updateStatus(bool)) ); + connect(_field, TQ_SIGNAL(gameStateChanged(GameState)), + TQ_SLOT(gameStateChangedSlot(GameState)) ); + connect(_field, TQ_SIGNAL(setMood(Mood)), smiley, TQ_SLOT(setMood(Mood))); + connect(_field, TQ_SIGNAL(setCheating()), dg, TQ_SLOT(setCheating())); + connect(_field,TQ_SIGNAL(addAction(const KGrid2D::Coord &, Field::ActionType)), + TQ_SLOT(addAction(const KGrid2D::Coord &, Field::ActionType))); TQWhatsThis::add(_field, i18n("Mines field.")); // resume button @@ -110,7 +110,7 @@ Status::Status(TQWidget *parent) TQPushButton *pb = new TQPushButton(i18n("Press to Resume"), _resumeContainer); pb->setFont(f); - connect(pb, TQT_SIGNAL(clicked()), TQT_SIGNAL(pause())); + connect(pb, TQ_SIGNAL(clicked()), TQ_SIGNAL(pause())); g->addWidget(pb, 0, 0, AlignCenter); _stack = new TQWidgetStack(this); @@ -239,7 +239,7 @@ void Status::setPlaying() _logRoot = _log.createElement("kmineslog"); _logRoot.setAttribute("version", SHORT_VERSION); TQDateTime date = TQDateTime::currentDateTime(); - _logRoot.setAttribute("date", date.toString(Qt::ISODate)); + _logRoot.setAttribute("date", date.toString(TQt::ISODate)); _logRoot.setAttribute("width", level.width()); _logRoot.setAttribute("height", level.height()); _logRoot.setAttribute("mines", level.nbMines()); diff --git a/kmines/status.h b/kmines/status.h index db1ceb64..86101ab2 100644 --- a/kmines/status.h +++ b/kmines/status.h @@ -32,7 +32,7 @@ class TQTimer; class Status : public TQWidget, public KMines { - Q_OBJECT + TQ_OBJECT public : Status(TQWidget *parent); diff --git a/knetwalk/src/cell.cpp b/knetwalk/src/cell.cpp index d3ce0906..fd04932d 100644 --- a/knetwalk/src/cell.cpp +++ b/knetwalk/src/cell.cpp @@ -203,11 +203,11 @@ void Cell::paintEvent(TQPaintEvent*) void Cell::mousePressEvent(TQMouseEvent* e) { - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) emit lClicked(iindex); - else if(e->button() == Qt::RightButton) + else if(e->button() == TQt::RightButton) emit rClicked(iindex); - else if(e->button() == Qt::MidButton) + else if(e->button() == TQt::MidButton) emit mClicked(iindex); } diff --git a/knetwalk/src/cell.h b/knetwalk/src/cell.h index 2e5b9b36..d4b46456 100644 --- a/knetwalk/src/cell.h +++ b/knetwalk/src/cell.h @@ -20,7 +20,7 @@ class Cell : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum Dirs { Free = 0, U = 1, R = 2, D = 4, L = 8, None = 16 }; diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp index 13007ea6..43471aa8 100644 --- a/knetwalk/src/mainwindow.cpp +++ b/knetwalk/src/mainwindow.cpp @@ -64,11 +64,11 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) : KNotifyClient::startDaemon(); - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(slotNewGame()), actionCollection()); + KStdGameAction::gameNew(this, TQ_SLOT(slotNewGame()), actionCollection()); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscores()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdGameAction::configureHighscores(TQT_TQOBJECT(this), TQT_SLOT(configureHighscores()), actionCollection()); + KStdGameAction::highscores(this, TQ_SLOT(showHighscores()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdGameAction::configureHighscores(this, TQ_SLOT(configureHighscores()), actionCollection()); m_levels = KStdGameAction::chooseGameType(0, 0, actionCollection()); TQStringList lst; @@ -83,7 +83,7 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) : statusBar()->insertItem("abcdefghijklmnopqrst: 0 ",1); setAutoSaveSettings(); createGUI(); - connect(m_levels, TQT_SIGNAL(activated(int)), this, TQT_SLOT(newGame(int))); + connect(m_levels, TQ_SIGNAL(activated(int)), this, TQ_SLOT(newGame(int))); TQWhatsThis::add(this, i18n("<h3>Rules of the Game</h3>" @@ -108,9 +108,9 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) : { board[i] = new Cell(grid, i); board[i]->setFixedSize(cellsize, cellsize); - connect(board[i], TQT_SIGNAL(lClicked(int)), TQT_SLOT(lClicked(int))); - connect(board[i], TQT_SIGNAL(rClicked(int)), TQT_SLOT(rClicked(int))); - connect(board[i], TQT_SIGNAL(mClicked(int)), TQT_SLOT(mClicked(int))); + connect(board[i], TQ_SIGNAL(lClicked(int)), TQ_SLOT(lClicked(int))); + connect(board[i], TQ_SIGNAL(rClicked(int)), TQ_SLOT(rClicked(int))); + connect(board[i], TQ_SIGNAL(mClicked(int)), TQ_SLOT(mClicked(int))); } srand(time(0)); @@ -360,7 +360,7 @@ void MainWindow::rotate(int index, bool toleft) for(int i = 0; i < 14; i++) { kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); - TQTimer::singleShot(20, board[index], TQT_SLOT(update())); + TQTimer::singleShot(20, board[index], TQ_SLOT(update())); kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::WaitForMore); board[index]->rotate(toleft ? -6 : 6); } @@ -389,7 +389,7 @@ void MainWindow::blink(int index) for(int i = 0; i < board[index]->width() * 2; i += 2) { kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); - TQTimer::singleShot(20, board[index], TQT_SLOT(update())); + TQTimer::singleShot(20, board[index], TQ_SLOT(update())); kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::WaitForMore); board[index]->setLight(i); diff --git a/knetwalk/src/mainwindow.h b/knetwalk/src/mainwindow.h index 1962aba8..fe133719 100644 --- a/knetwalk/src/mainwindow.h +++ b/knetwalk/src/mainwindow.h @@ -26,7 +26,7 @@ class TDESelectAction; class MainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow(TQWidget *parent=0, const char* name=0, WFlags fl=0); diff --git a/kolf/config.h b/kolf/config.h index 795d6cec..a26e4b13 100644 --- a/kolf/config.h +++ b/kolf/config.h @@ -5,7 +5,7 @@ class Config : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -25,7 +25,7 @@ protected: // this is easy to use to show a message class MessageConfig : public Config { - Q_OBJECT + TQ_OBJECT public: @@ -35,7 +35,7 @@ public: // internal class DefaultConfig : public MessageConfig { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/editor.cpp b/kolf/editor.cpp index 589096f3..5dc06f63 100644 --- a/kolf/editor.cpp +++ b/kolf/editor.cpp @@ -30,7 +30,7 @@ Editor::Editor(ObjectList *list, TQWidget *parent, const char *name) listbox->insertStringList(items); - connect(listbox, TQT_SIGNAL(executed(TQListBoxItem *)), TQT_SLOT(listboxExecuted(TQListBoxItem *))); + connect(listbox, TQ_SIGNAL(executed(TQListBoxItem *)), TQ_SLOT(listboxExecuted(TQListBoxItem *))); } void Editor::listboxExecuted(TQListBoxItem * /*item*/) @@ -54,7 +54,7 @@ void Editor::setItem(CanvasItem *item) config->setFrameStyle(TQFrame::Box | TQFrame::Raised); config->setLineWidth(1); config->show(); - connect(config, TQT_SIGNAL(modified()), this, TQT_SIGNAL(changed())); + connect(config, TQ_SIGNAL(modified()), this, TQ_SIGNAL(changed())); } #include "editor.moc" diff --git a/kolf/editor.h b/kolf/editor.h index 901cb71a..4c17d651 100644 --- a/kolf/editor.h +++ b/kolf/editor.h @@ -12,7 +12,7 @@ class Config; class Editor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/floater.cpp b/kolf/floater.cpp index b2a13ce6..dc0f129a 100644 --- a/kolf/floater.cpp +++ b/kolf/floater.cpp @@ -262,10 +262,10 @@ FloaterConfig::FloaterConfig(Floater *floater, TQWidget *parent) 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); + TQSlider *slider = new TQSlider(0, 20, 2, floater->curSpeed(), TQt::Horizontal, this); hlayout->addWidget(slider); hlayout->addWidget(new TQLabel(i18n("Fast"), this)); - connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(speedChanged(int))); } void FloaterConfig::speedChanged(int news) diff --git a/kolf/floater.h b/kolf/floater.h index 07cc1842..6038cb51 100644 --- a/kolf/floater.h +++ b/kolf/floater.h @@ -6,7 +6,7 @@ class Floater; class FloaterConfig : public BridgeConfig { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/game.cpp b/kolf/game.cpp index 3c6978fd..4f6b7edb 100644 --- a/kolf/game.cpp +++ b/kolf/game.cpp @@ -202,19 +202,19 @@ BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *parent) layout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0); top = new TQCheckBox(i18n("&Top"), this); layout->addWidget(top, 0, 1); - connect(top, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(topWallChanged(bool))); + connect(top, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(topWallChanged(bool))); top->setChecked(bridge->topWallVisible()); bot = new TQCheckBox(i18n("&Bottom"), this); layout->addWidget(bot, 1, 1); - connect(bot, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(botWallChanged(bool))); + connect(bot, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(botWallChanged(bool))); bot->setChecked(bridge->botWallVisible()); left = new TQCheckBox(i18n("&Left"), this); layout->addWidget(left, 1, 0); - connect(left, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(leftWallChanged(bool))); + connect(left, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(leftWallChanged(bool))); left->setChecked(bridge->leftWallVisible()); right = new TQCheckBox(i18n("&Right"), this); layout->addWidget(right, 1, 2); - connect(right, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rightWallChanged(bool))); + connect(right, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rightWallChanged(bool))); right->setChecked(bridge->rightWallVisible()); } @@ -249,7 +249,7 @@ Bridge::Bridge(TQRect rect, TQCanvas *canvas) { TQColor color("#92772D"); setBrush(TQBrush(color)); - setPen(Qt::NoPen); + setPen(TQt::NoPen); setZ(998); topWall = new Wall(canvas); @@ -409,15 +409,15 @@ WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent) TQCheckBox *check = new TQCheckBox(i18n("Windmill on bottom"), this); check->setChecked(windmill->bottom()); - connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(endChanged(bool))); + connect(check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(endChanged(bool))); m_vlayout->addWidget(check); 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); + TQSlider *slider = new TQSlider(1, 10, 1, windmill->curSpeed(), TQt::Horizontal, this); hlayout->addWidget(slider); hlayout->addWidget(new TQLabel(i18n("Fast"), this)); - connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(speedChanged(int))); endChanged(check->isChecked()); } @@ -647,7 +647,7 @@ SignConfig::SignConfig(Sign *sign, TQWidget *parent) m_vlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this)); KLineEdit *name = new KLineEdit(sign->text(), this); m_vlayout->addWidget(name); - connect(name, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &))); + connect(name, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(textChanged(const TQString &))); } void SignConfig::textChanged(const TQString &text) @@ -667,18 +667,18 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent) TQCheckBox *check = new TQCheckBox(i18n("Enable show/hide"), this); m_vlayout->addWidget(check); - connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(check1Changed(bool))); + connect(check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(check1Changed(bool))); check->setChecked(ellipse->changeEnabled()); TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint()); slow1 = new TQLabel(i18n("Slow"), this); hlayout->addWidget(slow1); - slider1 = new TQSlider(1, 100, 5, 100 - ellipse->changeEvery(), Qt::Horizontal, this); + slider1 = new TQSlider(1, 100, 5, 100 - ellipse->changeEvery(), TQt::Horizontal, this); hlayout->addWidget(slider1); fast1 = new TQLabel(i18n("Fast"), this); hlayout->addWidget(fast1); - connect(slider1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(value1Changed(int))); + connect(slider1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(value1Changed(int))); check1Changed(ellipse->changeEnabled()); @@ -1310,8 +1310,8 @@ TQPtrList<TQCanvasItem> BlackHole::moveableItems() const BlackHoleTimer::BlackHoleTimer(Ball *ball, double speed, int msec) : m_speed(speed), m_ball(ball) { - TQTimer::singleShot(msec, this, TQT_SLOT(mySlot())); - TQTimer::singleShot(msec / 2, this, TQT_SLOT(myMidSlot())); + TQTimer::singleShot(msec, this, TQ_SLOT(mySlot())); + TQTimer::singleShot(msec / 2, this, TQ_SLOT(myMidSlot())); } void BlackHoleTimer::mySlot() @@ -1344,8 +1344,8 @@ bool BlackHole::place(Ball *ball, bool /*wasCenter*/) double magnitude = Vector(TQPoint(x(), y()), TQPoint(exitItem->x(), exitItem->y())).magnitude(); BlackHoleTimer *timer = new BlackHoleTimer(ball, speed, magnitude * 2.5 - speed * 35 + 500); - connect(timer, TQT_SIGNAL(eject(Ball *, double)), this, TQT_SLOT(eject(Ball *, double))); - connect(timer, TQT_SIGNAL(halfway()), this, TQT_SLOT(halfway())); + connect(timer, TQ_SIGNAL(eject(Ball *, double)), this, TQ_SLOT(eject(Ball *, double))); + connect(timer, TQ_SIGNAL(halfway()), this, TQ_SLOT(halfway())); playSound("blackhole"); return false; @@ -1510,7 +1510,7 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent) deg->setValue(blackHole->curExitDeg()); deg->setWrapping(true); layout->addWidget(deg); - connect(deg, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(degChanged(int))); + connect(deg, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(degChanged(int))); layout->addStretch(); @@ -1519,7 +1519,7 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent) KDoubleNumInput *min = new KDoubleNumInput(this); min->setRange(0, 8, 1, true); hlayout->addWidget(min); - connect(min, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(minChanged(double))); + connect(min, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(minChanged(double))); min->setValue(blackHole->minSpeed()); hlayout = new TQHBoxLayout(layout, spacingHint()); @@ -1527,7 +1527,7 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent) KDoubleNumInput *max = new KDoubleNumInput(this); max->setRange(1, 10, 1, true); hlayout->addWidget(max); - connect(max, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(maxChanged(double))); + connect(max, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(maxChanged(double))); max->setValue(blackHole->maxSpeed()); } @@ -1965,13 +1965,13 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent) hlayout->addWidget(new TQLabel(i18n("Course name: "), this)); KLineEdit *nameEdit = new KLineEdit(holeInfo->untranslatedName(), this); hlayout->addWidget(nameEdit); - connect(nameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &))); + connect(nameEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(nameChanged(const TQString &))); hlayout = new TQHBoxLayout(layout, spacingHint()); hlayout->addWidget(new TQLabel(i18n("Course author: "), this)); KLineEdit *authorEdit = new KLineEdit(holeInfo->author(), this); hlayout->addWidget(authorEdit); - connect(authorEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(authorChanged(const TQString &))); + connect(authorEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(authorChanged(const TQString &))); layout->addStretch(); @@ -1980,7 +1980,7 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent) TQSpinBox *par = new TQSpinBox(1, 15, 1, this); par->setValue(holeInfo->par()); hlayout->addWidget(par); - connect(par, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(parChanged(int))); + connect(par, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(parChanged(int))); hlayout->addStretch(); hlayout->addWidget(new TQLabel(i18n("Maximum:"), this)); @@ -1990,12 +1990,12 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent) maxstrokes->setSpecialValueText(i18n("Unlimited")); maxstrokes->setValue(holeInfo->maxStrokes()); hlayout->addWidget(maxstrokes); - connect(maxstrokes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxStrokesChanged(int))); + connect(maxstrokes, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(maxStrokesChanged(int))); TQCheckBox *check = new TQCheckBox(i18n("Show border walls"), this); check->setChecked(holeInfo->borderWalls()); layout->addWidget(check); - connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(borderWallsChanged(bool))); + connect(check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(borderWallsChanged(bool))); } void HoleConfig::authorChanged(const TQString &newauthor) @@ -2197,12 +2197,12 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi margin = 10; - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setFixedSize(width + 2 * margin, height + 2 * margin); setMargins(margin, margin, margin, margin); - course = new TQCanvas(TQT_TQOBJECT(this)); + course = new TQCanvas(this); course->setBackgroundColor(white); course->resize(width, height); @@ -2284,15 +2284,15 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi addBorderWall(TQPoint(width - margin - 1, margin), TQPoint(width - margin - 1, height - margin)); timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); timerMsec = 300; fastTimer = new TQTimer(this); - connect(fastTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fastTimeout())); + connect(fastTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fastTimeout())); fastTimerMsec = 11; autoSaveTimer = new TQTimer(this); - connect(autoSaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoSaveTimeout())); + connect(autoSaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoSaveTimeout())); autoSaveMsec = 5 * 1000 * 60; // 5 min autosave // setUseAdvancedPutting() sets maxStrength! @@ -2300,7 +2300,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi putting = false; putterTimer = new TQTimer(this); - connect(putterTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(putterTimeout())); + connect(putterTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(putterTimeout())); putterTimerMsec = 20; } @@ -2446,7 +2446,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e) switch (e->button()) { // select AND move now :) - case Qt::LeftButton: + case TQt::LeftButton: { selectedItem = list.first(); movingItem = selectedItem; @@ -2473,9 +2473,9 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e) { if (m_useMouse) { - if (!inPlay && e->button() == Qt::LeftButton) + if (!inPlay && e->button() == TQt::LeftButton) puttPress(); - else if (e->button() == Qt::RightButton) + else if (e->button() == TQt::RightButton) toggleShowInfo(); } } @@ -2583,9 +2583,9 @@ void KolfGame::handleMouseReleaseEvent(TQMouseEvent *e) if (!editing && m_useMouse) { - if (!inPlay && e->button() == Qt::LeftButton) + if (!inPlay && e->button() == TQt::LeftButton) puttRelease(); - else if (e->button() == Qt::RightButton) + else if (e->button() == TQt::RightButton) toggleShowInfo(); } @@ -2808,7 +2808,7 @@ void KolfGame::timeout() if (curState == Stopped && inPlay) { inPlay = false; - TQTimer::singleShot(0, this, TQT_SLOT(shotDone())); + TQTimer::singleShot(0, this, TQ_SLOT(shotDone())); } if (curState == Holed && inPlay) @@ -2842,12 +2842,12 @@ void KolfGame::timeout() (*curPlayer).addStrokeToHole(curHole); emit scoreChanged((*curPlayer).id(), curHole, (*curPlayer).score(curHole)); } - TQTimer::singleShot(600, this, TQT_SLOT(holeDone())); + TQTimer::singleShot(600, this, TQ_SLOT(holeDone())); } else { inPlay = false; - TQTimer::singleShot(0, this, TQT_SLOT(shotDone())); + TQTimer::singleShot(0, this, TQ_SLOT(shotDone())); } } } @@ -3216,11 +3216,11 @@ void KolfGame::shotDone() if (allPlayersDone()) { startNextHole(); - TQTimer::singleShot(100, this, TQT_SLOT(emitMax())); + TQTimer::singleShot(100, this, TQ_SLOT(emitMax())); return; } - TQTimer::singleShot(100, this, TQT_SLOT(emitMax())); + TQTimer::singleShot(100, this, TQ_SLOT(emitMax())); } } diff --git a/kolf/game.h b/kolf/game.h index fcbeec4e..e4d46506 100644 --- a/kolf/game.h +++ b/kolf/game.h @@ -194,7 +194,7 @@ private: }; class EllipseConfig : public Config { - Q_OBJECT + TQ_OBJECT public: @@ -317,7 +317,7 @@ public: class BlackHole; class BlackHoleConfig : public Config { - Q_OBJECT + TQ_OBJECT public: @@ -354,7 +354,7 @@ protected: }; class BlackHoleTimer : public TQObject { -Q_OBJECT +TQ_OBJECT public: @@ -374,7 +374,7 @@ protected: }; class BlackHole : public TQObject, public Hole { -Q_OBJECT +TQ_OBJECT public: @@ -544,7 +544,7 @@ private: class Bridge; class BridgeConfig : public Config { - Q_OBJECT + TQ_OBJECT public: @@ -617,7 +617,7 @@ public: class Sign; class SignConfig : public BridgeConfig { - Q_OBJECT + TQ_OBJECT public: @@ -666,7 +666,7 @@ protected: }; class WindmillConfig : public BridgeConfig { - Q_OBJECT + TQ_OBJECT public: @@ -714,7 +714,7 @@ public: class HoleInfo; class HoleConfig : public Config { - Q_OBJECT + TQ_OBJECT public: @@ -800,7 +800,7 @@ struct KDE_EXPORT CourseInfo class KDE_EXPORT KolfGame : public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/kcomboboxdialog.h b/kolf/kcomboboxdialog.h index c533a305..3c1df769 100644 --- a/kolf/kcomboboxdialog.h +++ b/kolf/kcomboboxdialog.h @@ -39,7 +39,7 @@ class KHistoryCombo; class KComboBoxDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp index a68a1c9e..856a023a 100644 --- a/kolf/kolf.cpp +++ b/kolf/kolf.cpp @@ -79,75 +79,75 @@ Kolf::~Kolf() void Kolf::initGUI() { - newAction = KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection()); + newAction = KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection()); newAction->setText(newAction->text() + TQString("...")); - endAction = KStdGameAction::end(TQT_TQOBJECT(this), TQT_SLOT(closeGame()), actionCollection()); - printAction = KStdGameAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); + endAction = KStdGameAction::end(this, TQ_SLOT(closeGame()), actionCollection()); + printAction = KStdGameAction::print(this, TQ_SLOT(print()), actionCollection()); - (void) KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - saveAction = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection(), "game_save"); + (void) KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + saveAction = KStdAction::save(this, TQ_SLOT(save()), actionCollection(), "game_save"); saveAction->setText(i18n("Save &Course")); - saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection(), "game_save_as"); + saveAsAction = KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection(), "game_save_as"); saveAsAction->setText(i18n("Save &Course As...")); - saveGameAction = new TDEAction(i18n("&Save Game"), 0, TQT_TQOBJECT(this), TQT_SLOT(saveGame()), actionCollection(), "savegame"); - saveGameAsAction = new TDEAction(i18n("&Save Game As..."), 0, TQT_TQOBJECT(this), TQT_SLOT(saveGameAs()), actionCollection(), "savegameas"); + saveGameAction = new TDEAction(i18n("&Save Game"), 0, this, TQ_SLOT(saveGame()), actionCollection(), "savegame"); + saveGameAsAction = new TDEAction(i18n("&Save Game As..."), 0, this, TQ_SLOT(saveGameAs()), actionCollection(), "savegameas"); - loadGameAction = KStdGameAction::load(TQT_TQOBJECT(this), TQT_SLOT(loadGame()), actionCollection()); + loadGameAction = KStdGameAction::load(this, TQ_SLOT(loadGame()), actionCollection()); loadGameAction->setText(i18n("Load Saved Game...")); - highScoreAction = KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighScores()), actionCollection()); + highScoreAction = KStdGameAction::highscores(this, TQ_SLOT(showHighScores()), actionCollection()); - editingAction = new TDEToggleAction(i18n("&Edit"), "pencil", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "editing"); - newHoleAction = new TDEAction(i18n("&New"), "document-new", CTRL+SHIFT+Key_N, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "newhole"); - clearHoleAction = new TDEAction(KStdGuiItem::clear().text(), "locationbar_erase", CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "clearhole"); - resetHoleAction = new TDEAction(i18n("&Reset"), CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "resethole"); - undoShotAction = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "undoshot"); + editingAction = new TDEToggleAction(i18n("&Edit"), "pencil", CTRL+Key_E, this, TQ_SLOT(emptySlot()), actionCollection(), "editing"); + newHoleAction = new TDEAction(i18n("&New"), "document-new", CTRL+SHIFT+Key_N, this, TQ_SLOT(emptySlot()), actionCollection(), "newhole"); + clearHoleAction = new TDEAction(KStdGuiItem::clear().text(), "locationbar_erase", CTRL+Key_Delete, this, TQ_SLOT(emptySlot()), actionCollection(), "clearhole"); + resetHoleAction = new TDEAction(i18n("&Reset"), CTRL+Key_R, this, TQ_SLOT(emptySlot()), actionCollection(), "resethole"); + undoShotAction = KStdAction::undo(this, TQ_SLOT(emptySlot()), actionCollection(), "undoshot"); undoShotAction->setText(i18n("&Undo Shot")); - //replayShotAction = new TDEAction(i18n("&Replay Shot"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "replay"); + //replayShotAction = new TDEAction(i18n("&Replay Shot"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "replay"); - holeAction = new TDEListAction(i18n("Switch to Hole"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "switchhole"); - nextAction = new TDEAction(i18n("&Next Hole"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "nexthole"); - prevAction = new TDEAction(i18n("&Previous Hole"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "prevhole"); - firstAction = new TDEAction(i18n("&First Hole"), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "firsthole"); - lastAction = new TDEAction(i18n("&Last Hole"), CTRL+SHIFT+Key_End, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "lasthole"); - randAction = new TDEAction(i18n("&Random Hole"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "randhole"); + holeAction = new TDEListAction(i18n("Switch to Hole"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "switchhole"); + nextAction = new TDEAction(i18n("&Next Hole"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward), this, TQ_SLOT(emptySlot()), actionCollection(), "nexthole"); + prevAction = new TDEAction(i18n("&Previous Hole"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back), this, TQ_SLOT(emptySlot()), actionCollection(), "prevhole"); + firstAction = new TDEAction(i18n("&First Hole"), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), this, TQ_SLOT(emptySlot()), actionCollection(), "firsthole"); + lastAction = new TDEAction(i18n("&Last Hole"), CTRL+SHIFT+Key_End, this, TQ_SLOT(emptySlot()), actionCollection(), "lasthole"); + randAction = new TDEAction(i18n("&Random Hole"), "goto", 0, this, TQ_SLOT(emptySlot()), actionCollection(), "randhole"); - useMouseAction = new TDEToggleAction(i18n("Enable &Mouse for Moving Putter"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "usemouse"); + useMouseAction = new TDEToggleAction(i18n("Enable &Mouse for Moving Putter"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "usemouse"); useMouseAction->setCheckedState(i18n("Disable &Mouse for Moving Putter")); - connect(useMouseAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(useMouseChanged(bool))); + connect(useMouseAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useMouseChanged(bool))); TDEConfig *config = kapp->config(); config->setGroup("Settings"); useMouseAction->setChecked(config->readBoolEntry("useMouse", true)); - useAdvancedPuttingAction = new TDEToggleAction(i18n("Enable &Advanced Putting"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "useadvancedputting"); + useAdvancedPuttingAction = new TDEToggleAction(i18n("Enable &Advanced Putting"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "useadvancedputting"); useAdvancedPuttingAction->setCheckedState(i18n("Disable &Advanced Putting")); - connect(useAdvancedPuttingAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(useAdvancedPuttingChanged(bool))); + connect(useAdvancedPuttingAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useAdvancedPuttingChanged(bool))); useAdvancedPuttingAction->setChecked(config->readBoolEntry("useAdvancedPutting", false)); - showInfoAction = new TDEToggleAction(i18n("Show &Info"), "application-vnd.tde.info", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "showinfo"); + showInfoAction = new TDEToggleAction(i18n("Show &Info"), "application-vnd.tde.info", CTRL+Key_I, this, TQ_SLOT(emptySlot()), actionCollection(), "showinfo"); showInfoAction->setCheckedState(i18n("Hide &Info")); - connect(showInfoAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(showInfoChanged(bool))); + connect(showInfoAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showInfoChanged(bool))); showInfoAction->setChecked(config->readBoolEntry("showInfo", false)); - showGuideLineAction = new TDEToggleAction(i18n("Show Putter &Guideline"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "showguideline"); + showGuideLineAction = new TDEToggleAction(i18n("Show Putter &Guideline"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "showguideline"); showGuideLineAction->setCheckedState(i18n("Hide Putter &Guideline")); - connect(showGuideLineAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(showGuideLineChanged(bool))); + connect(showGuideLineAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showGuideLineChanged(bool))); showGuideLineAction->setChecked(config->readBoolEntry("showGuideLine", true)); - TDEToggleAction *act=new TDEToggleAction(i18n("Enable All Dialog Boxes"), 0, TQT_TQOBJECT(this), TQT_SLOT(enableAllMessages()), actionCollection(), "enableAll"); + TDEToggleAction *act=new TDEToggleAction(i18n("Enable All Dialog Boxes"), 0, this, TQ_SLOT(enableAllMessages()), actionCollection(), "enableAll"); act->setCheckedState(i18n("Disable All Dialog Boxes")); - soundAction = new TDEToggleAction(i18n("Play &Sounds"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "audio-x-generic"); - connect(soundAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(soundChanged(bool))); + soundAction = new TDEToggleAction(i18n("Play &Sounds"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "audio-x-generic"); + connect(soundAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(soundChanged(bool))); soundAction->setChecked(config->readBoolEntry("sound", true)); - (void) new TDEAction(i18n("&Reload Plugins"), 0, TQT_TQOBJECT(this), TQT_SLOT(initPlugins()), actionCollection(), "reloadplugins"); - (void) new TDEAction(i18n("Show &Plugins"), 0, TQT_TQOBJECT(this), TQT_SLOT(showPlugins()), actionCollection(), "showplugins"); + (void) new TDEAction(i18n("&Reload Plugins"), 0, this, TQ_SLOT(initPlugins()), actionCollection(), "reloadplugins"); + (void) new TDEAction(i18n("Show &Plugins"), 0, this, TQ_SLOT(showPlugins()), actionCollection(), "showplugins"); - aboutAction = new TDEAction(i18n("&About Course"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "aboutcourse"); - tutorialAction = new TDEAction(i18n("&Tutorial"), 0, TQT_TQOBJECT(this), TQT_SLOT(tutorial()), actionCollection(), "tutorial"); + aboutAction = new TDEAction(i18n("&About Course"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "aboutcourse"); + tutorialAction = new TDEAction(i18n("&Tutorial"), 0, this, TQ_SLOT(tutorial()), actionCollection(), "tutorial"); statusBar(); setupGUI(); @@ -223,40 +223,40 @@ void Kolf::startNewGame() game = new KolfGame(obj, &players, filename, dummy); game->setStrict(competition); - connect(game, TQT_SIGNAL(newHole(int)), scoreboard, TQT_SLOT(newHole(int))); - connect(game, TQT_SIGNAL(scoreChanged(int, int, int)), scoreboard, TQT_SLOT(setScore(int, int, int))); - connect(game, TQT_SIGNAL(parChanged(int, int)), scoreboard, TQT_SLOT(parChanged(int, int))); - connect(game, TQT_SIGNAL(modifiedChanged(bool)), TQT_TQOBJECT(this), TQT_SLOT(updateModified(bool))); - connect(game, TQT_SIGNAL(newPlayersTurn(Player *)), TQT_TQOBJECT(this), TQT_SLOT(newPlayersTurn(Player *))); - connect(game, TQT_SIGNAL(holesDone()), TQT_TQOBJECT(this), TQT_SLOT(gameOver())); - connect(game, TQT_SIGNAL(checkEditing()), TQT_TQOBJECT(this), TQT_SLOT(checkEditing())); - connect(game, TQT_SIGNAL(editingStarted()), TQT_TQOBJECT(this), TQT_SLOT(editingStarted())); - connect(game, TQT_SIGNAL(editingEnded()), TQT_TQOBJECT(this), TQT_SLOT(editingEnded())); - connect(game, TQT_SIGNAL(inPlayStart()), TQT_TQOBJECT(this), TQT_SLOT(inPlayStart())); - connect(game, TQT_SIGNAL(inPlayEnd()), TQT_TQOBJECT(this), TQT_SLOT(inPlayEnd())); - connect(game, TQT_SIGNAL(maxStrokesReached(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(maxStrokesReached(const TQString &))); - connect(game, TQT_SIGNAL(largestHole(int)), TQT_TQOBJECT(this), TQT_SLOT(updateHoleMenu(int))); - connect(game, TQT_SIGNAL(titleChanged(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(titleChanged(const TQString &))); - connect(game, TQT_SIGNAL(newStatusText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(newStatusText(const TQString &))); - connect(game, TQT_SIGNAL(currentHole(int)), TQT_TQOBJECT(this), TQT_SLOT(setCurrentHole(int))); - connect(holeAction, TQT_SIGNAL(activated(const TQString &)), game, TQT_SLOT(switchHole(const TQString &))); - connect(nextAction, TQT_SIGNAL(activated()), game, TQT_SLOT(nextHole())); - connect(prevAction, TQT_SIGNAL(activated()), game, TQT_SLOT(prevHole())); - connect(firstAction, TQT_SIGNAL(activated()), game, TQT_SLOT(firstHole())); - connect(lastAction, TQT_SIGNAL(activated()), game, TQT_SLOT(lastHole())); - connect(randAction, TQT_SIGNAL(activated()), game, TQT_SLOT(randHole())); - connect(editingAction, TQT_SIGNAL(activated()), game, TQT_SLOT(toggleEditMode())); - connect(newHoleAction, TQT_SIGNAL(activated()), game, TQT_SLOT(addNewHole())); - connect(clearHoleAction, TQT_SIGNAL(activated()), game, TQT_SLOT(clearHole())); - connect(resetHoleAction, TQT_SIGNAL(activated()), game, TQT_SLOT(resetHole())); - connect(undoShotAction, TQT_SIGNAL(activated()), game, TQT_SLOT(undoShot())); - //connect(replayShotAction, TQT_SIGNAL(activated()), game, TQT_SLOT(replay())); - connect(aboutAction, TQT_SIGNAL(activated()), game, TQT_SLOT(showInfoDlg())); - connect(useMouseAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setUseMouse(bool))); - connect(useAdvancedPuttingAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setUseAdvancedPutting(bool))); - connect(soundAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setSound(bool))); - connect(showGuideLineAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setShowGuideLine(bool))); - connect(showInfoAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setShowInfo(bool))); + connect(game, TQ_SIGNAL(newHole(int)), scoreboard, TQ_SLOT(newHole(int))); + connect(game, TQ_SIGNAL(scoreChanged(int, int, int)), scoreboard, TQ_SLOT(setScore(int, int, int))); + connect(game, TQ_SIGNAL(parChanged(int, int)), scoreboard, TQ_SLOT(parChanged(int, int))); + connect(game, TQ_SIGNAL(modifiedChanged(bool)), this, TQ_SLOT(updateModified(bool))); + connect(game, TQ_SIGNAL(newPlayersTurn(Player *)), this, TQ_SLOT(newPlayersTurn(Player *))); + connect(game, TQ_SIGNAL(holesDone()), this, TQ_SLOT(gameOver())); + connect(game, TQ_SIGNAL(checkEditing()), this, TQ_SLOT(checkEditing())); + connect(game, TQ_SIGNAL(editingStarted()), this, TQ_SLOT(editingStarted())); + connect(game, TQ_SIGNAL(editingEnded()), this, TQ_SLOT(editingEnded())); + connect(game, TQ_SIGNAL(inPlayStart()), this, TQ_SLOT(inPlayStart())); + connect(game, TQ_SIGNAL(inPlayEnd()), this, TQ_SLOT(inPlayEnd())); + connect(game, TQ_SIGNAL(maxStrokesReached(const TQString &)), this, TQ_SLOT(maxStrokesReached(const TQString &))); + connect(game, TQ_SIGNAL(largestHole(int)), this, TQ_SLOT(updateHoleMenu(int))); + connect(game, TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(titleChanged(const TQString &))); + connect(game, TQ_SIGNAL(newStatusText(const TQString &)), this, TQ_SLOT(newStatusText(const TQString &))); + connect(game, TQ_SIGNAL(currentHole(int)), this, TQ_SLOT(setCurrentHole(int))); + connect(holeAction, TQ_SIGNAL(activated(const TQString &)), game, TQ_SLOT(switchHole(const TQString &))); + connect(nextAction, TQ_SIGNAL(activated()), game, TQ_SLOT(nextHole())); + connect(prevAction, TQ_SIGNAL(activated()), game, TQ_SLOT(prevHole())); + connect(firstAction, TQ_SIGNAL(activated()), game, TQ_SLOT(firstHole())); + connect(lastAction, TQ_SIGNAL(activated()), game, TQ_SLOT(lastHole())); + connect(randAction, TQ_SIGNAL(activated()), game, TQ_SLOT(randHole())); + connect(editingAction, TQ_SIGNAL(activated()), game, TQ_SLOT(toggleEditMode())); + connect(newHoleAction, TQ_SIGNAL(activated()), game, TQ_SLOT(addNewHole())); + connect(clearHoleAction, TQ_SIGNAL(activated()), game, TQ_SLOT(clearHole())); + connect(resetHoleAction, TQ_SIGNAL(activated()), game, TQ_SLOT(resetHole())); + connect(undoShotAction, TQ_SIGNAL(activated()), game, TQ_SLOT(undoShot())); + //connect(replayShotAction, TQ_SIGNAL(activated()), game, TQ_SLOT(replay())); + connect(aboutAction, TQ_SIGNAL(activated()), game, TQ_SLOT(showInfoDlg())); + connect(useMouseAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setUseMouse(bool))); + connect(useAdvancedPuttingAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setUseAdvancedPutting(bool))); + connect(soundAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setSound(bool))); + connect(showGuideLineAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setShowGuideLine(bool))); + connect(showInfoAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setShowInfo(bool))); game->setUseMouse(useMouseAction->isChecked()); game->setUseAdvancedPutting(useAdvancedPuttingAction->isChecked()); @@ -356,7 +356,7 @@ void Kolf::closeGame() titleChanged(TQString()); updateModified(false); - TQTimer::singleShot(100, TQT_TQOBJECT(this), TQT_SLOT(createSpacer())); + TQTimer::singleShot(100, this, TQ_SLOT(createSpacer())); } void Kolf::createSpacer() @@ -463,7 +463,7 @@ void Kolf::gameOver() scoreDialog->show(); } - TQTimer::singleShot(700, TQT_TQOBJECT(this), TQT_SLOT(closeGame())); + TQTimer::singleShot(700, this, TQ_SLOT(closeGame())); } void Kolf::showHighScores() @@ -564,7 +564,7 @@ void Kolf::openURL(KURL url) return; } - TQTimer::singleShot(10, TQT_TQOBJECT(this), TQT_SLOT(startNewGame())); + TQTimer::singleShot(10, this, TQ_SLOT(startNewGame())); } else closeGame(); @@ -594,10 +594,10 @@ void Kolf::editingStarted() { delete editor; editor = new Editor(obj, dummy, "Editor"); - connect(editor, TQT_SIGNAL(addNewItem(Object *)), game, TQT_SLOT(addNewObject(Object *))); - connect(editor, TQT_SIGNAL(changed()), game, TQT_SLOT(setModified())); - connect(editor, TQT_SIGNAL(addNewItem(Object *)), TQT_TQOBJECT(this), TQT_SLOT(setHoleFocus())); - connect(game, TQT_SIGNAL(newSelectedItem(CanvasItem *)), editor, TQT_SLOT(setItem(CanvasItem *))); + connect(editor, TQ_SIGNAL(addNewItem(Object *)), game, TQ_SLOT(addNewObject(Object *))); + connect(editor, TQ_SIGNAL(changed()), game, TQ_SLOT(setModified())); + connect(editor, TQ_SIGNAL(addNewItem(Object *)), this, TQ_SLOT(setHoleFocus())); + connect(game, TQ_SIGNAL(newSelectedItem(CanvasItem *)), editor, TQ_SLOT(setItem(CanvasItem *))); scoreboard->hide(); diff --git a/kolf/kolf.h b/kolf/kolf.h index f4295dd9..a90c4fff 100644 --- a/kolf/kolf.h +++ b/kolf/kolf.h @@ -26,7 +26,7 @@ class Editor; class KDE_EXPORT Kolf : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/kvolumecontrol.h b/kolf/kvolumecontrol.h index 45102bb0..fe64ed1d 100644 --- a/kolf/kvolumecontrol.h +++ b/kolf/kvolumecontrol.h @@ -8,7 +8,7 @@ class KVolumeControl : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp index 1754cf1b..d42da4a6 100644 --- a/kolf/newgame.cpp +++ b/kolf/newgame.cpp @@ -52,7 +52,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ addButton = new KPushButton(i18n("&New Player"), playerPage); bigLayout->addWidget(addButton); - connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addPlayer())); + connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addPlayer())); scroller = new TQScrollView(playerPage); bigLayout->addWidget(scroller); @@ -92,7 +92,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ TQVBoxLayout *coursePageLayout = new TQVBoxLayout(coursePage, marginHint(), spacingHint()); KURLLabel *coursesLink = new KURLLabel("http://web.mit.edu/~jasonkb/www/kolf/", "http://web.mit.edu/~jasonkb/www/kolf/", coursePage); - connect(coursesLink, TQT_SIGNAL(leftClickedURL(const TQString &)), kapp, TQT_SLOT(invokeBrowser(const TQString &))); + connect(coursesLink, TQ_SIGNAL(leftClickedURL(const TQString &)), kapp, TQ_SLOT(invokeBrowser(const TQString &))); coursePageLayout->addWidget(coursesLink); TQHBoxLayout *hlayout = new TQHBoxLayout(coursePageLayout, spacingHint()); @@ -131,8 +131,8 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ 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())); + connect(courseList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(courseSelected(int))); + connect(courseList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged())); TQVBoxLayout *detailLayout = new TQVBoxLayout(hlayout, spacingHint()); name = new TQLabel(coursePage); @@ -148,7 +148,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ detailLayout->addStretch(); KPushButton *scores = new KPushButton(i18n("Highscores"), coursePage); - connect(scores, TQT_SIGNAL(clicked()), this, TQT_SLOT(showHighscores())); + connect(scores, TQ_SIGNAL(clicked()), this, TQ_SLOT(showHighscores())); detailLayout->addWidget(scores); detailLayout->addStretch(); @@ -158,11 +158,11 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ KPushButton *addCourseButton = new KPushButton(i18n("Add..."), coursePage); minorLayout->addWidget(addCourseButton); - connect(addCourseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCourse())); + connect(addCourseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCourse())); remove = new KPushButton(i18n("Remove"), coursePage); minorLayout->addWidget(remove); - connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCourse())); + connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCourse())); courseSelected(curItem); selectionChanged(); @@ -289,7 +289,7 @@ void NewGameDialog::addPlayer() 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 *))); + connect(editors.last(), TQ_SIGNAL(deleteEditor(PlayerEditor *)), this, TQ_SLOT(deleteEditor(PlayerEditor *))); enableButtons(); } @@ -336,7 +336,7 @@ PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *par remove->setAutoMask(true); layout->addWidget(remove); remove->setBackgroundPixmap(grass); - connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeMe())); + connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeMe())); } void PlayerEditor::removeMe() diff --git a/kolf/newgame.h b/kolf/newgame.h index 96dfb95b..f1ccf549 100644 --- a/kolf/newgame.h +++ b/kolf/newgame.h @@ -26,7 +26,7 @@ class TQEvent; class PlayerEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -50,7 +50,7 @@ private: class NewGameDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/object.h b/kolf/object.h index 7c648865..07adb2fd 100644 --- a/kolf/object.h +++ b/kolf/object.h @@ -9,7 +9,7 @@ class Object : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp index 58e62deb..19d0f6dd 100644 --- a/kolf/objects/poolball/poolball.cpp +++ b/kolf/objects/poolball/poolball.cpp @@ -69,7 +69,7 @@ PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent) layout->addStretch(); - connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(numberChanged(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(numberChanged(int))); } void PoolBallConfig::numberChanged(int newNumber) diff --git a/kolf/objects/poolball/poolball.h b/kolf/objects/poolball/poolball.h index e6ac0e8a..722d3570 100644 --- a/kolf/objects/poolball/poolball.h +++ b/kolf/objects/poolball/poolball.h @@ -16,7 +16,7 @@ class StateDB; class TDEConfig; class PoolBallFactory : KLibFactory { - Q_OBJECT + TQ_OBJECT public: @@ -47,7 +47,7 @@ private: class PoolBallConfig : public Config { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp index 45124f9c..b7ef7a75 100644 --- a/kolf/objects/test/test.cpp +++ b/kolf/objects/test/test.cpp @@ -77,14 +77,14 @@ TestConfig::TestConfig(Test *test, TQWidget *parent) TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); TQLabel *slow = new TQLabel(i18n("Slow"), this); hlayout->addWidget(slow); - TQSlider *slider = new TQSlider(1, 100, 5, 101 - m_test->switchEvery(), Qt::Horizontal, this); + TQSlider *slider = new TQSlider(1, 100, 5, 101 - m_test->switchEvery(), TQt::Horizontal, this); hlayout->addWidget(slider); TQLabel *fast = new TQLabel(i18n("Fast"), this); hlayout->addWidget(fast); layout->addStretch(); - connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(switchEveryChanged(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(switchEveryChanged(int))); } void TestConfig::switchEveryChanged(int news) diff --git a/kolf/objects/test/test.h b/kolf/objects/test/test.h index db4a6205..fe216a53 100644 --- a/kolf/objects/test/test.h +++ b/kolf/objects/test/test.h @@ -12,7 +12,7 @@ class TDEConfig; class TestFactory : KLibFactory { - Q_OBJECT + TQ_OBJECT public: @@ -40,7 +40,7 @@ private: class TestConfig : public Config { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/printdialogpage.h b/kolf/printdialogpage.h index 0dd6cef9..350199db 100644 --- a/kolf/printdialogpage.h +++ b/kolf/printdialogpage.h @@ -10,7 +10,7 @@ class TQWidget; class PrintDialogPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/scoreboard.cpp b/kolf/scoreboard.cpp index 17c29bce..69128b00 100644 --- a/kolf/scoreboard.cpp +++ b/kolf/scoreboard.cpp @@ -17,7 +17,7 @@ ScoreBoard::ScoreBoard(TQWidget *parent, const char *name) vh->setLabel(numRows() - 1, i18n("Par")); hh->setLabel(numCols() - 1, i18n("Total")); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setRowReadOnly(0, true); setRowReadOnly(1, true); } diff --git a/kolf/scoreboard.h b/kolf/scoreboard.h index 05052ee0..dfb56ef6 100644 --- a/kolf/scoreboard.h +++ b/kolf/scoreboard.h @@ -8,7 +8,7 @@ class TQHeader; class ScoreBoard : public TQTable { - Q_OBJECT + TQ_OBJECT public: diff --git a/kolf/slope.cpp b/kolf/slope.cpp index 82708d0f..d3e3835e 100644 --- a/kolf/slope.cpp +++ b/kolf/slope.cpp @@ -534,14 +534,14 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent) gradient->insertStringList(items); gradient->setCurrentText(curText); layout->addWidget(gradient); - connect(gradient, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setGradient(const TQString &))); + connect(gradient, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setGradient(const TQString &))); layout->addStretch(); TQCheckBox *reversed = new TQCheckBox(i18n("Reverse direction"), this); reversed->setChecked(slope->isReversed()); layout->addWidget(reversed); - connect(reversed, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setReversed(bool))); + connect(reversed, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setReversed(bool))); TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint()); hlayout->addWidget(new TQLabel(i18n("Grade:"), this)); @@ -549,13 +549,13 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent) grade->setRange(0, 8, 1, true); grade->setValue(slope->curGrade()); hlayout->addWidget(grade); - connect(grade, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(gradeChanged(double))); + connect(grade, TQ_SIGNAL(valueChanged(double)), this, TQ_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()); layout->addWidget(stuck); - connect(stuck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStuckOnGround(bool))); + connect(stuck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStuckOnGround(bool))); } void SlopeConfig::setGradient(const TQString &text) diff --git a/kolf/slope.h b/kolf/slope.h index 6a967f5d..87ec03cf 100644 --- a/kolf/slope.h +++ b/kolf/slope.h @@ -8,7 +8,7 @@ class Slope; class SlopeConfig : public Config { - Q_OBJECT + TQ_OBJECT public: diff --git a/konquest/fleetdlg.cpp b/konquest/fleetdlg.cpp index 5fd71239..8d980d64 100644 --- a/konquest/fleetdlg.cpp +++ b/konquest/fleetdlg.cpp @@ -62,7 +62,7 @@ FleetDlg::FleetDlg( TQWidget *parent, AttackFleetList *fleets ) layout2->addWidget( okButton ); layout2->addStretch( 2 ); - connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( okButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); init(); diff --git a/konquest/gameboard.cpp b/konquest/gameboard.cpp index 69aec42c..48e1d531 100644 --- a/konquest/gameboard.cpp +++ b/konquest/gameboard.cpp @@ -82,7 +82,7 @@ GameBoard::GameBoard( TQWidget *parent ) setMinimumSize( 600, 600 ); setMouseTracking( true ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); //******************************************************************** @@ -119,10 +119,10 @@ GameBoard::GameBoard( TQWidget *parent ) //********************************************************************** // Set up signal/slot connections //********************************************************************** - connect( mapWidget, TQT_SIGNAL( planetSelected(Planet *) ), this, TQT_SLOT(planetSelected(Planet *)) ); - connect( shipCountEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(newShipCount()) ); - connect( endTurn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPlayer() ) ); - connect( mapWidget, TQT_SIGNAL( planetHighlighted(Planet *)), planetInfo, TQT_SLOT(showPlanet(Planet *)) ); + connect( mapWidget, TQ_SIGNAL( planetSelected(Planet *) ), this, TQ_SLOT(planetSelected(Planet *)) ); + connect( shipCountEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(newShipCount()) ); + connect( endTurn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPlayer() ) ); + connect( mapWidget, TQ_SIGNAL( planetHighlighted(Planet *)), planetInfo, TQ_SLOT(showPlanet(Planet *)) ); changeGameBoard( false ); } diff --git a/konquest/gameboard.h b/konquest/gameboard.h index 5078cfda..cf0d6a21 100644 --- a/konquest/gameboard.h +++ b/konquest/gameboard.h @@ -23,7 +23,7 @@ enum GameState { NONE, SOURCE_PLANET, DEST_PLANET, SHIP_COUNT, RULER_SOURCE, RUL //************************************************************************ class GameBoard : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/konquest/gamecore.cpp b/konquest/gamecore.cpp index 5f3e60c5..dc8c0cc3 100644 --- a/konquest/gamecore.cpp +++ b/konquest/gamecore.cpp @@ -78,7 +78,7 @@ Map::Map() for( int y = 0; y < columns; y++ ) { grid[x][y] = Sector( this, x, y ); - connect( &grid[x][y], TQT_SIGNAL( update() ), this, TQT_SLOT( childSectorUpdate() )); + connect( &grid[x][y], TQ_SIGNAL( update() ), this, TQ_SLOT( childSectorUpdate() )); } } } @@ -265,7 +265,7 @@ void Sector::setPlanet( Planet *newPlanet ) { planet = newPlanet; - connect( planet, TQT_SIGNAL( update() ), this, TQT_SLOT( childPlanetUpdate() ) ); + connect( planet, TQ_SIGNAL( update() ), this, TQ_SLOT( childPlanetUpdate() ) ); emit update(); } diff --git a/konquest/gamecore.h b/konquest/gamecore.h index 6bc3af38..9d82029f 100644 --- a/konquest/gamecore.h +++ b/konquest/gamecore.h @@ -173,7 +173,7 @@ public: class Planet : public TQObject { - Q_OBJECT + TQ_OBJECT private: @@ -228,7 +228,7 @@ private: class Sector : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -272,7 +272,7 @@ protected: class Map : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/konquest/gameenddlg.cpp b/konquest/gameenddlg.cpp index d999c375..5d049599 100644 --- a/konquest/gameenddlg.cpp +++ b/konquest/gameenddlg.cpp @@ -23,7 +23,7 @@ GameEndDlg::GameEndDlg( TQWidget *parent ) label1->setAlignment( AlignCenter ); turnCountLbl = new TQLabel( page ); - turnCount = new TQSlider( 1, 40, 1, 5, Qt::Horizontal, page ); + turnCount = new TQSlider( 1, 40, 1, 5, TQt::Horizontal, page ); KGuiItem addTurns(i18n("&Add Turns"), TQString(), TQString(), i18n("Add the specified number of turns to the game and continue playing.")); @@ -35,7 +35,7 @@ GameEndDlg::GameEndDlg( TQWidget *parent ) init(); - connect( turnCount, TQT_SIGNAL(valueChanged( int )), this, TQT_SLOT(turnCountChange( int )) ); + connect( turnCount, TQ_SIGNAL(valueChanged( int )), this, TQ_SLOT(turnCountChange( int )) ); } GameEndDlg::~GameEndDlg() diff --git a/konquest/gameenddlg.h b/konquest/gameenddlg.h index 5eccb794..b1062e8a 100644 --- a/konquest/gameenddlg.h +++ b/konquest/gameenddlg.h @@ -8,7 +8,7 @@ class TQPushButton; class GameEndDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/konquest/int_validator.cpp b/konquest/int_validator.cpp index dd96ca82..12f707c6 100644 --- a/konquest/int_validator.cpp +++ b/konquest/int_validator.cpp @@ -4,7 +4,7 @@ #include "int_validator.moc" IntValidator::IntValidator( TQWidget *parent, const char *name ) : - TQValidator( TQT_TQOBJECT(parent), name ) + TQValidator( parent, name ) { #ifdef INT_MIN v_bottom = INT_MIN; @@ -15,7 +15,7 @@ IntValidator::IntValidator( TQWidget *parent, const char *name ) : } IntValidator::IntValidator( int bottom, int top, TQWidget *parent, const char *name ) : -TQValidator( TQT_TQOBJECT(parent), name ) +TQValidator( parent, name ) { v_bottom = bottom; v_top = top; diff --git a/konquest/int_validator.h b/konquest/int_validator.h index 7af62d19..2723f43c 100644 --- a/konquest/int_validator.h +++ b/konquest/int_validator.h @@ -6,7 +6,7 @@ class IntValidator : public TQValidator { - Q_OBJECT + TQ_OBJECT public: diff --git a/konquest/mainwin.cpp b/konquest/mainwin.cpp index 8982974a..3ec192d7 100644 --- a/konquest/mainwin.cpp +++ b/konquest/mainwin.cpp @@ -37,18 +37,18 @@ MainWindow::~MainWindow() void MainWindow::setupTDEAction() { - KStdGameAction::gameNew( TQT_TQOBJECT(gameBoard), TQT_SLOT( startNewGame() ), actionCollection() ); - KStdGameAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - endAction = KStdGameAction::end( TQT_TQOBJECT(gameBoard), TQT_SLOT( shutdownGame() ), actionCollection() ); + KStdGameAction::gameNew( gameBoard, TQ_SLOT( startNewGame() ), actionCollection() ); + KStdGameAction::quit( this, TQ_SLOT( close() ), actionCollection() ); + endAction = KStdGameAction::end( gameBoard, TQ_SLOT( shutdownGame() ), actionCollection() ); endAction->setEnabled(false); //AB: there is no icon for disabled - TDEToolBar::insertButton shows the //different state - TDEAction not :-( - measureAction = new TDEAction( i18n("&Measure Distance"), "ruler", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( measureDistance() ), actionCollection(), "game_measure" ); + measureAction = new TDEAction( i18n("&Measure Distance"), "ruler", 0, gameBoard, TQ_SLOT( measureDistance() ), actionCollection(), "game_measure" ); measureAction->setEnabled(false); - standingAction = new TDEAction( i18n("&Show Standings"), "help", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( showScores() ), actionCollection(), "game_scores" ); + standingAction = new TDEAction( i18n("&Show Standings"), "help", 0, gameBoard, TQ_SLOT( showScores() ), actionCollection(), "game_scores" ); standingAction->setEnabled(false); - fleetAction = new TDEAction( i18n("&Fleet Overview"), "launch", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( showFleets() ), actionCollection(), "game_fleets" ); + fleetAction = new TDEAction( i18n("&Fleet Overview"), "launch", 0, gameBoard, TQ_SLOT( showFleets() ), actionCollection(), "game_fleets" ); fleetAction->setEnabled(false); toolBar()->setBarPos( TDEToolBar::Left ); toolBar()->setMovingEnabled( false ); @@ -60,7 +60,7 @@ MainWindow::setupGameBoard() gameBoard = new GameBoard( this ); setCentralWidget(gameBoard); - connect( gameBoard, TQT_SIGNAL( newGameState( GameState )), TQT_TQOBJECT(this), TQT_SLOT( gameStateChange( GameState ) ) ); + connect( gameBoard, TQ_SIGNAL( newGameState( GameState )), this, TQ_SLOT( gameStateChange( GameState ) ) ); } diff --git a/konquest/mainwin.h b/konquest/mainwin.h index 36c31038..81941999 100644 --- a/konquest/mainwin.h +++ b/konquest/mainwin.h @@ -10,7 +10,7 @@ class PlanetStatusTable; class MainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/konquest/map_widget.cpp b/konquest/map_widget.cpp index af39b032..912dfc97 100644 --- a/konquest/map_widget.cpp +++ b/konquest/map_widget.cpp @@ -32,10 +32,10 @@ ConquestMap::ConquestMap( Map *newMap, TQWidget *parent ) setMinimumSize( BOARD_HEIGHT, BOARD_WIDTH ); setMaximumSize( BOARD_HEIGHT, BOARD_WIDTH ); - connect( map, TQT_SIGNAL( update() ), this, TQT_SLOT( mapUpdate() ) ); + connect( map, TQ_SIGNAL( update() ), this, TQ_SLOT( mapUpdate() ) ); TQTimer *timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(squareBlink()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(squareBlink()) ); timer->start( 500, false ); viewport()->setMouseTracking( true ); diff --git a/konquest/map_widget.h b/konquest/map_widget.h index 45e67d9e..1a8eccff 100644 --- a/konquest/map_widget.h +++ b/konquest/map_widget.h @@ -15,7 +15,7 @@ class ConquestMap : public TQGridView { - Q_OBJECT + TQ_OBJECT // Constructors diff --git a/konquest/minimap.cpp b/konquest/minimap.cpp index 479e997e..4334e832 100644 --- a/konquest/minimap.cpp +++ b/konquest/minimap.cpp @@ -39,7 +39,7 @@ MiniMap::setMap(Map *newMap) setMinimumSize( BOARD_HEIGHT, BOARD_WIDTH ); setMaximumSize( BOARD_HEIGHT, BOARD_WIDTH ); - connect( map, TQT_SIGNAL( update() ), this, TQT_SLOT( mapUpdate() ) ); + connect( map, TQ_SIGNAL( update() ), this, TQ_SLOT( mapUpdate() ) ); } MiniMap::~MiniMap() diff --git a/konquest/minimap.h b/konquest/minimap.h index 417a2c54..ca65464b 100644 --- a/konquest/minimap.h +++ b/konquest/minimap.h @@ -13,7 +13,7 @@ class MiniMap : public TQGridView { - Q_OBJECT + TQ_OBJECT // Constructors diff --git a/konquest/newgamedlg.cpp b/konquest/newgamedlg.cpp index b609f1a2..f510defd 100644 --- a/konquest/newgamedlg.cpp +++ b/konquest/newgamedlg.cpp @@ -43,13 +43,13 @@ NewGameDlg::NewGameDlg( TQWidget *parent, Map *pmap, PlayerList *players, w->newPlayer->setMaxLength( 8 ); - connect(w->sliderPlayers, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotPlayerCount(int))); - connect(w->sliderPlanets, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotNewMap())); - connect(w->sliderTurns, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotTurns())); - connect(w->rejectMap, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewMap())); - connect(w->newPlayer, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotNewPlayer())); - connect(w->newPlayer, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotAddPlayer())); - connect(w->addPlayer, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddPlayer())); + connect(w->sliderPlayers, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotPlayerCount(int))); + connect(w->sliderPlanets, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotNewMap())); + connect(w->sliderTurns, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotTurns())); + connect(w->rejectMap, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewMap())); + connect(w->newPlayer, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotNewPlayer())); + connect(w->newPlayer, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotAddPlayer())); + connect(w->addPlayer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddPlayer())); init(); diff --git a/konquest/newgamedlg.h b/konquest/newgamedlg.h index ac6ac268..1843ac90 100644 --- a/konquest/newgamedlg.h +++ b/konquest/newgamedlg.h @@ -14,7 +14,7 @@ class NewGameDlgUI; class NewGameDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/konquest/planet_info.h b/konquest/planet_info.h index 3a9247df..47904b14 100644 --- a/konquest/planet_info.h +++ b/konquest/planet_info.h @@ -22,7 +22,7 @@ typedef TQPtrListIterator<planet_info_buffer> PlanetInfoListIterator; class PlanetInfo : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/konquest/scoredlg.cpp b/konquest/scoredlg.cpp index a633e3b6..0c4019ae 100644 --- a/konquest/scoredlg.cpp +++ b/konquest/scoredlg.cpp @@ -55,7 +55,7 @@ ScoreDlg::ScoreDlg( TQWidget *parent, const TQString& title, PlayerList *players layout2->addWidget( okButton ); layout2->addStretch( 2 ); - connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( okButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); init(); diff --git a/kpat/card.h b/kpat/card.h index c6518170..244f0b8d 100644 --- a/kpat/card.h +++ b/kpat/card.h @@ -43,7 +43,7 @@ typedef TQValueList<Card*> CardList; // - It is a graphic entity on a TQCanvas that can be moved around. // class Card: public TQObject, public TQCanvasRectangle { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/clock.h b/kpat/clock.h index eac9a984..09ce3a35 100644 --- a/kpat/clock.h +++ b/kpat/clock.h @@ -4,7 +4,7 @@ #include "dealer.h" class Clock : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/computation.h b/kpat/computation.h index 1a2cfbbb..48760f1a 100644 --- a/kpat/computation.h +++ b/kpat/computation.h @@ -28,7 +28,7 @@ #include "dealer.h" class Computation : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp index 43bca4c5..69853517 100644 --- a/kpat/dealer.cpp +++ b/kpat/dealer.cpp @@ -83,7 +83,7 @@ Dealer::Dealer( TDEMainWindow* _parent , const char* _name ) demotimer = new TQTimer(this); - connect(demotimer, TQT_SIGNAL(timeout()), TQT_SLOT(demo())); + connect(demotimer, TQ_SIGNAL(timeout()), TQ_SLOT(demo())); assert(!s_instance); s_instance = this; @@ -114,24 +114,24 @@ void Dealer::setupActions() { if (actions() & Dealer::Hint) { - ahint = new TDEAction( i18n("&Hint"), TQString::fromLatin1("wizard"), Key_H, TQT_TQOBJECT(this), - TQT_SLOT(hint()), + ahint = new TDEAction( i18n("&Hint"), TQString::fromLatin1("wizard"), Key_H, this, + TQ_SLOT(hint()), parent()->actionCollection(), "game_hint"); actionlist.append(ahint); } else ahint = 0; if (actions() & Dealer::Demo) { - ademo = new TDEToggleAction( i18n("&Demo"), TQString::fromLatin1("1rightarrow"), CTRL+Key_D, TQT_TQOBJECT(this), - TQT_SLOT(toggleDemo()), + ademo = new TDEToggleAction( i18n("&Demo"), TQString::fromLatin1("1rightarrow"), CTRL+Key_D, this, + TQ_SLOT(toggleDemo()), parent()->actionCollection(), "game_demo"); actionlist.append(ademo); } else ademo = 0; if (actions() & Dealer::Redeal) { - aredeal = new TDEAction (i18n("&Redeal"), TQString::fromLatin1("queue"), 0, TQT_TQOBJECT(this), - TQT_SLOT(redeal()), + aredeal = new TDEAction (i18n("&Redeal"), TQString::fromLatin1("queue"), 0, this, + TQ_SLOT(redeal()), parent()->actionCollection(), "game_redeal"); actionlist.append(aredeal); } else @@ -342,7 +342,7 @@ void Dealer::contentsMousePressEvent(TQMouseEvent* e) if (!list.count()) return; - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if (list.first()->rtti() == Card::RTTI) { Card *c = dynamic_cast<Card*>(list.first()); assert(c); @@ -355,7 +355,7 @@ void Dealer::contentsMousePressEvent(TQMouseEvent* e) return; } - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { if (list.first()->rtti() == Card::RTTI) { Card *preview = dynamic_cast<Card*>(list.first()); assert(preview); @@ -650,7 +650,7 @@ void Dealer::startNew() if (!towait) takeState(); else - connect(towait, TQT_SIGNAL(stoped(Card*)), TQT_SLOT(slotTakeState(Card *))); + connect(towait, TQ_SIGNAL(stoped(Card*)), TQ_SLOT(slotTakeState(Card *))); resizeEvent(0); } @@ -791,13 +791,13 @@ void Dealer::takeState() ademo->setEnabled( false ); if ( aredeal ) aredeal->setEnabled( false ); - TQTimer::singleShot(400, TQT_TQOBJECT(this), TQT_SIGNAL(gameLost())); + TQTimer::singleShot(400, this, TQ_SIGNAL(gameLost())); toldAboutLostGame = true; return; } } if (!demoActive() && !waiting()) - TQTimer::singleShot(TIME_BETWEEN_MOVES, TQT_TQOBJECT(this), TQT_SLOT(startAutoDrop())); + TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQ_SLOT(startAutoDrop())); emit undoPossible(undoList.count() > 1 && !waiting()); } @@ -998,7 +998,7 @@ void Dealer::setWaiting(bool w) void Dealer::setAutoDropEnabled(bool a) { _autodrop = a; - TQTimer::singleShot(TIME_BETWEEN_MOVES, TQT_TQOBJECT(this), TQT_SLOT(startAutoDrop())); + TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQ_SLOT(startAutoDrop())); } bool Dealer::startAutoDrop() @@ -1010,7 +1010,7 @@ bool Dealer::startAutoDrop() for (TQCanvasItemList::ConstIterator it = list.begin(); it != list.end(); ++it) if ((*it)->animated()) { - TQTimer::singleShot(TIME_BETWEEN_MOVES, TQT_TQOBJECT(this), TQT_SLOT(startAutoDrop())); + TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQ_SLOT(startAutoDrop())); return true; } @@ -1034,7 +1034,7 @@ bool Dealer::startAutoDrop() t->move(x, y); kdDebug(11111) << "autodrop " << t->name() << endl; t->moveTo(int(t->source()->x()), int(t->source()->y()), int(t->z()), STEPS_AUTODROP); - connect(t, TQT_SIGNAL(stoped(Card*)), TQT_SLOT(waitForAutoDrop(Card*))); + connect(t, TQ_SIGNAL(stoped(Card*)), TQ_SLOT(waitForAutoDrop(Card*))); return true; } } @@ -1269,7 +1269,7 @@ Card *Dealer::demoNewCards() void Dealer::newDemoMove(Card *m) { towait = m; - connect(m, TQT_SIGNAL(stoped(Card*)), TQT_SLOT(waitForDemo(Card*))); + connect(m, TQ_SIGNAL(stoped(Card*)), TQ_SLOT(waitForDemo(Card*))); } void Dealer::waitForDemo(Card *t) @@ -1335,7 +1335,7 @@ void Dealer::drawPile(KPixmap &pixmap, Pile *pile, bool selected) sy = -dy; dy = 0; } - bitBlt(TQT_TQPAINTDEVICE(&pixmap), dx, dy, TQT_TQPAINTDEVICE(&bg), + bitBlt(&pixmap, dx, dy, &bg, sx, sy, w, h, TQt::CopyROP, true); } } @@ -1379,9 +1379,9 @@ void Dealer::wheelEvent( TQWheelEvent *e ) e->globalPos(), e->delta(), e->state()); viewportWheelEvent(&ce); if ( !ce.isAccepted() ) { - if ( e->orientation() ==Qt::Horizontal && hScrollBarMode () == AlwaysOn ) + if ( e->orientation() ==TQt::Horizontal && hScrollBarMode () == AlwaysOn ) TQApplication::sendEvent( horizontalScrollBar(), e); - else if (e->orientation() ==Qt::Vertical && vScrollBarMode () == AlwaysOn ) + else if (e->orientation() ==TQt::Vertical && vScrollBarMode () == AlwaysOn ) TQApplication::sendEvent( verticalScrollBar(), e); } else { e->accept(); diff --git a/kpat/dealer.h b/kpat/dealer.h index 0704433b..630c2ece 100644 --- a/kpat/dealer.h +++ b/kpat/dealer.h @@ -91,7 +91,7 @@ struct State ***************************************************************/ class Dealer: public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/fortyeight.cpp b/kpat/fortyeight.cpp index 64bd8a2f..50af4e01 100644 --- a/kpat/fortyeight.cpp +++ b/kpat/fortyeight.cpp @@ -35,7 +35,7 @@ Fortyeight::Fortyeight( TDEMainWindow* parent, const char* name) const int dist_x = cardMap::CARDX() * 11 / 10 + 1; const int dist_y = cardMap::CARDY() * 11 / 10 + 1; - connect(deck, TQT_SIGNAL(clicked(Card*)), TQT_SLOT(deckClicked(Card*))); + connect(deck, TQ_SIGNAL(clicked(Card*)), TQ_SLOT(deckClicked(Card*))); deck->move(10 + cardMap::CARDX() * 82 / 10, 10 + cardMap::CARDX() * 56 / 10); deck->setZ(20); diff --git a/kpat/fortyeight.h b/kpat/fortyeight.h index 5a97e01a..ed2b1ec7 100644 --- a/kpat/fortyeight.h +++ b/kpat/fortyeight.h @@ -5,7 +5,7 @@ class HorLeftPile : public Pile { - Q_OBJECT + TQ_OBJECT public: @@ -16,7 +16,7 @@ public: class Fortyeight : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/freecell-solver/USAGE b/kpat/freecell-solver/USAGE index 16f5c93d..f78295b2 100644 --- a/kpat/freecell-solver/USAGE +++ b/kpat/freecell-solver/USAGE @@ -502,7 +502,7 @@ If you are working on a UNIX or a similar system then you can set some run-time options in "fc-solve" by sending it some signal combinations. -If you send the signal USR1, without sending any other Q_SIGNALS before +If you send the signal USR1, without sending any other signals before that, then "fc-solve" will output the present number of iterations. This method is a good way to monitor an instance that takes a long time to solve. @@ -512,7 +512,7 @@ will print the iteration number and depth on every state that it checks. It is the equivalent of specifying (or unspecifying) the option -i/--iter-output. -If you send it two USR2 Q_SIGNALS and then USR1, then "fc-solve" +If you send it two USR2 signals and then USR1, then "fc-solve" will also print the board of every state. Again, this will only be done assuming the iteration output is turned on. diff --git a/kpat/freecell-solver/cmd_line.c b/kpat/freecell-solver/cmd_line.c index 63fbf6c9..2eaf524c 100644 --- a/kpat/freecell-solver/cmd_line.c +++ b/kpat/freecell-solver/cmd_line.c @@ -518,7 +518,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( { int a; const char * start_num; - char * end_num; + const char * end_num; char * num_copy; start_num = argv[arg]; for(a=0;a<5;a++) @@ -642,7 +642,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( *last_arg = arg-1; return FCS_CMD_LINE_PARAM_WITH_NO_ARG; } - freecell_solver_user_set_soft_thread_name(instance, argv[arg]); + freecell_solver_user_set_soft_thread_name(instance, (char*)argv[arg]); } else if ((!strcmp(argv[arg], "--prelude"))) { @@ -652,7 +652,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( *last_arg = arg-1; return FCS_CMD_LINE_PARAM_WITH_NO_ARG; } - freecell_solver_user_set_hard_thread_prelude(instance, argv[arg]); + freecell_solver_user_set_hard_thread_prelude(instance, (char*)argv[arg]); } else if ((!strcmp(argv[arg], "-opt-to")) || (!strcmp(argv[arg], "--optimization-tests-order"))) { @@ -746,7 +746,8 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( else { int num_to_skip = 0; - char * s, * buffer; + const char * s; + char * buffer; FILE * f; long file_len; int ret; @@ -842,7 +843,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( ret = freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( instance, args_man->argc - num_to_skip, - args_man->argv + num_to_skip, + (const char **)(args_man->argv + num_to_skip), 0, known_parameters, callback, @@ -879,7 +880,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( args_man_t * preset_args = 0; char * dir = NULL; - status = read_preset(argv[arg], &preset_args, &dir, NULL); + status = read_preset((char*)argv[arg], &preset_args, &dir, NULL); if (status != 0) { char * err_str; @@ -896,7 +897,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( ret = freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( instance, preset_args->argc, - preset_args->argv, + (const char**)preset_args->argv, 0, known_parameters, callback, diff --git a/kpat/freecell-solver/fcs_cl.h b/kpat/freecell-solver/fcs_cl.h index e739c98e..6dafaec6 100644 --- a/kpat/freecell-solver/fcs_cl.h +++ b/kpat/freecell-solver/fcs_cl.h @@ -12,7 +12,7 @@ typedef int (*freecell_solver_user_cmd_line_known_commands_callback_t) ( void * instance, int argc, - char * argv[], + const char * argv[], int arg_index, int * num_to_skip, int * ret, diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp index 1e7b8b92..5f3ccca0 100644 --- a/kpat/freecell.cpp +++ b/kpat/freecell.cpp @@ -313,7 +313,7 @@ void FreecellBase::resumeSolution() } solver_ret = freecell_solver_user_resume_solution(solver_instance); - TQTimer::singleShot(0, this, TQT_SLOT(resumeSolution())); + TQTimer::singleShot(0, this, TQ_SLOT(resumeSolution())); } MoveHint *FreecellBase::translateMove(void *m) { @@ -602,7 +602,7 @@ void FreecellBase::moveCards(CardList &c, FreecellPile *from, Pile *to) from->moveCardsBack(c); waitfor = c.first(); - connect(waitfor, TQT_SIGNAL(stoped(Card*)), TQT_SLOT(waitForMoving(Card*))); + connect(waitfor, TQ_SIGNAL(stoped(Card*)), TQ_SLOT(waitForMoving(Card*))); PileList fcs; @@ -625,7 +625,7 @@ void FreecellBase::moveCards(CardList &c, FreecellPile *from, Pile *to) movePileToPile(c, to, fss, fcs, 0, c.count(), 0); if (!waitfor->animated()) - TQTimer::singleShot(0, this, TQT_SLOT(startMoving())); + TQTimer::singleShot(0, this, TQ_SLOT(startMoving())); } struct MoveAway { @@ -707,7 +707,7 @@ void FreecellBase::startMoving() mh->pile()->moveCardsBack(empty, true); waitfor = mh->card(); kdDebug(11111) << "wait for moving end " << mh->card()->name() << endl; - connect(mh->card(), TQT_SIGNAL(stoped(Card*)), TQT_SLOT(waitForMoving(Card*))); + connect(mh->card(), TQ_SIGNAL(stoped(Card*)), TQ_SLOT(waitForMoving(Card*))); delete mh; } diff --git a/kpat/freecell.h b/kpat/freecell.h index feca1963..bdd836c7 100644 --- a/kpat/freecell.h +++ b/kpat/freecell.h @@ -33,7 +33,7 @@ public: class FreecellBase : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/gamestats.ui b/kpat/gamestats.ui index 3efbdaa9..f5144f00 100644 --- a/kpat/gamestats.ui +++ b/kpat/gamestats.ui @@ -237,9 +237,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -265,8 +262,8 @@ <slot>setGameType(int)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>setGameType(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kpat/golf.cpp b/kpat/golf.cpp index 0e7adf9f..83e34c38 100644 --- a/kpat/golf.cpp +++ b/kpat/golf.cpp @@ -27,7 +27,7 @@ Golf::Golf( TDEMainWindow* parent, const char* _name) deck = Deck::new_deck( this); deck->move(10, pile_dist); - connect(deck, TQT_SIGNAL(clicked(Card*)), TQT_SLOT(deckClicked(Card*))); + connect(deck, TQ_SIGNAL(clicked(Card*)), TQ_SLOT(deckClicked(Card*))); for( int r = 0; r < 7; r++ ) { stack[r]=new Pile(1+r, this); diff --git a/kpat/golf.h b/kpat/golf.h index 7b6b51fe..cdf4d17f 100644 --- a/kpat/golf.h +++ b/kpat/golf.h @@ -5,7 +5,7 @@ class HorRightPile : public Pile { - Q_OBJECT + TQ_OBJECT public: @@ -15,7 +15,7 @@ public: class Golf : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/grandf.h b/kpat/grandf.h index 6a518264..59091f14 100644 --- a/kpat/grandf.h +++ b/kpat/grandf.h @@ -34,7 +34,7 @@ class Deck; class TDEMainWindow; class Grandf : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/gypsy.cpp b/kpat/gypsy.cpp index ea4727fa..77e6d55b 100644 --- a/kpat/gypsy.cpp +++ b/kpat/gypsy.cpp @@ -12,7 +12,7 @@ Gypsy::Gypsy( TDEMainWindow* parent, const char *name ) deck = Deck::new_deck(this, 2); deck->move(10 + dist_x / 2 + 8*dist_x, 10 + 45 * cardMap::CARDY() / 10); - connect(deck, TQT_SIGNAL(clicked(Card*)), TQT_SLOT(slotClicked(Card *))); + connect(deck, TQ_SIGNAL(clicked(Card*)), TQ_SLOT(slotClicked(Card *))); for (int i=0; i<8; i++) { target[i] = new Pile(i+1, this); diff --git a/kpat/gypsy.h b/kpat/gypsy.h index 96f4502e..0bcd2300 100644 --- a/kpat/gypsy.h +++ b/kpat/gypsy.h @@ -10,7 +10,7 @@ class Deck; class TDEMainWindow; class Gypsy : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/idiot.h b/kpat/idiot.h index 05ce221d..0f720056 100644 --- a/kpat/idiot.h +++ b/kpat/idiot.h @@ -27,7 +27,7 @@ class Idiot: public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/kings.h b/kpat/kings.h index 73b5795a..e908112b 100644 --- a/kpat/kings.h +++ b/kpat/kings.h @@ -8,7 +8,7 @@ class Deck; class TDEMainWindow; class Kings : public FreecellBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/klondike.h b/kpat/klondike.h index 31077d0c..3a792607 100644 --- a/kpat/klondike.h +++ b/kpat/klondike.h @@ -31,7 +31,7 @@ class KlondikePile; class Klondike : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/mod3.cpp b/kpat/mod3.cpp index a6e42a00..25488962 100644 --- a/kpat/mod3.cpp +++ b/kpat/mod3.cpp @@ -37,7 +37,7 @@ Mod3::Mod3( TDEMainWindow* parent, const char* _name) deck = Deck::new_deck( this, 2); deck->move(8 + dist_x * 8 + 20, 8 + dist_y * 3 + margin); - connect(deck, TQT_SIGNAL(clicked(Card*)), TQT_SLOT(deckClicked(Card*))); + connect(deck, TQ_SIGNAL(clicked(Card*)), TQ_SLOT(deckClicked(Card*))); aces = new Pile(50, this); aces->move(16 + dist_x * 8, 8 + dist_y / 2); diff --git a/kpat/mod3.h b/kpat/mod3.h index 396832e2..76d1f9f0 100644 --- a/kpat/mod3.h +++ b/kpat/mod3.h @@ -27,7 +27,7 @@ class Mod3 : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/napoleon.cpp b/kpat/napoleon.cpp index 053b158e..dc23bc1d 100644 --- a/kpat/napoleon.cpp +++ b/kpat/napoleon.cpp @@ -26,7 +26,7 @@ Napoleon::Napoleon( TDEMainWindow* parent, const char* _name ) : Dealer( parent, _name ) { deck = Deck::new_deck( this ); - connect(deck, TQT_SIGNAL(clicked(Card *)), TQT_SLOT(deal1(Card*))); + connect(deck, TQ_SIGNAL(clicked(Card *)), TQ_SLOT(deal1(Card*))); pile = new Pile( 1, this ); pile->setAddFlags( Pile::disallow ); diff --git a/kpat/napoleon.h b/kpat/napoleon.h index fca710f8..d4a8ba7b 100644 --- a/kpat/napoleon.h +++ b/kpat/napoleon.h @@ -24,7 +24,7 @@ #include "dealer.h" class Napoleon : public Dealer { - Q_OBJECT + TQ_OBJECT public: Napoleon (TDEMainWindow* parent=0, const char* name=0); diff --git a/kpat/pile.h b/kpat/pile.h index 0ebabe70..92d13ff4 100644 --- a/kpat/pile.h +++ b/kpat/pile.h @@ -17,7 +17,7 @@ class Dealer; class Pile : public TQObject, public TQCanvasRectangle { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp index 2eb38fc1..a726082d 100644 --- a/kpat/pwidget.cpp +++ b/kpat/pwidget.cpp @@ -59,29 +59,29 @@ pWidget::pWidget() { current_pwidget = this; // TDECrash::setEmergencySaveFunction(::saveGame); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection(), "game_exit"); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection(), "game_exit"); - undo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undoMove()), + undo = KStdAction::undo(this, TQ_SLOT(undoMove()), actionCollection(), "undo_move"); undo->setEnabled(false); - (void)KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), + (void)KStdAction::openNew(this, TQ_SLOT(newGame()), actionCollection(), "new_game"); - (void)KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openGame()), + (void)KStdAction::open(this, TQ_SLOT(openGame()), actionCollection(), "open"); - recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openGame(const KURL&)), + recent = KStdAction::openRecent(this, TQ_SLOT(openGame(const KURL&)), actionCollection(), "open_recent"); recent->loadEntries(TDEGlobal::config()); - (void)KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveGame()), + (void)KStdAction::saveAs(this, TQ_SLOT(saveGame()), actionCollection(), "save"); - (void)new TDEAction(i18n("&Choose Game..."), 0, TQT_TQOBJECT(this), TQT_SLOT(chooseGame()), + (void)new TDEAction(i18n("&Choose Game..."), 0, this, TQ_SLOT(chooseGame()), actionCollection(), "choose_game"); (void)new TDEAction(i18n("Restart &Game"), TQString::fromLatin1("reload"), 0, - TQT_TQOBJECT(this), TQT_SLOT(restart()), + this, TQ_SLOT(restart()), actionCollection(), "restart_game"); - (void)KStdAction::help(TQT_TQOBJECT(this), TQT_SLOT(helpGame()), actionCollection(), "help_game"); + (void)KStdAction::help(this, TQ_SLOT(helpGame()), actionCollection(), "help_game"); - games = new TDESelectAction(i18n("&Game Type"), 0, TQT_TQOBJECT(this), - TQT_SLOT(newGameType()), + games = new TDESelectAction(i18n("&Game Type"), 0, this, + TQ_SLOT(newGameType()), actionCollection(), "game_type"); TQStringList list; TQValueList<DealerInfo*>::ConstIterator it; @@ -104,8 +104,8 @@ pWidget::pWidget() TDEGlobal::dirs()->addResourceType("wallpaper", TDEStandardDirs::kde_default("data") + "kpat/backgrounds/"); TDEGlobal::dirs()->addResourceType("wallpaper", TDEStandardDirs::kde_default("data") + "ksnake/backgrounds/"); - wallpapers = new TDESelectAction(i18n("&Change Background"), 0, TQT_TQOBJECT(this), - TQT_SLOT(changeWallpaper()), + wallpapers = new TDESelectAction(i18n("&Change Background"), 0, this, + TQ_SLOT(changeWallpaper()), actionCollection(), "wallpaper"); list.clear(); wallpaperlist.clear(); @@ -131,17 +131,17 @@ pWidget::pWidget() (void)new cardMap(midcolor); - backs = new TDEAction(i18n("&Switch Cards..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(changeBackside()), + backs = new TDEAction(i18n("&Switch Cards..."), 0, this, + TQ_SLOT(changeBackside()), actionCollection(), "backside"); - stats = new TDEAction(i18n("&Statistics"), 0, TQT_TQOBJECT(this), TQT_SLOT(showStats()), + stats = new TDEAction(i18n("&Statistics"), 0, this, TQ_SLOT(showStats()), actionCollection(),"game_stats"); animation = new TDEToggleAction(i18n( "&Animation on Startup" ), - 0, TQT_TQOBJECT(this), TQT_SLOT(animationChanged()), + 0, this, TQ_SLOT(animationChanged()), actionCollection(), "animation"); dropaction = new TDEToggleAction(i18n("&Enable Autodrop"), - 0, TQT_TQOBJECT(this), TQT_SLOT(enableAutoDrop()), + 0, this, TQ_SLOT(enableAutoDrop()), actionCollection(), "enable_autodrop"); dropaction->setCheckedState(i18n("Disable Autodrop")); @@ -347,11 +347,11 @@ void pWidget::newGameType() name = name.replace(TQRegExp("[&']"), ""); name = name.replace(TQRegExp("[ ]"), "_").lower(); dill->setAnchorName("game_" + name); - connect(dill, TQT_SIGNAL(saveGame()), TQT_SLOT(saveGame())); - connect(dill, TQT_SIGNAL(gameInfo(const TQString&)), - TQT_SLOT(slotGameInfo(const TQString &))); - connect(dill, TQT_SIGNAL(updateMoves()), - TQT_SLOT(slotUpdateMoves())); + connect(dill, TQ_SIGNAL(saveGame()), TQ_SLOT(saveGame())); + connect(dill, TQ_SIGNAL(gameInfo(const TQString&)), + TQ_SLOT(slotGameInfo(const TQString &))); + connect(dill, TQ_SIGNAL(updateMoves()), + TQ_SLOT(slotUpdateMoves())); dill->setGameId(id); dill->setupActions(); dill->setBackgroundPixmap(background, midcolor); @@ -365,9 +365,9 @@ void pWidget::newGameType() dill = DealerInfoList::self()->games().first()->createGame(this); } - connect(dill, TQT_SIGNAL(undoPossible(bool)), TQT_SLOT(undoPossible(bool))); - connect(dill, TQT_SIGNAL(gameWon(bool)), TQT_SLOT(gameWon(bool))); - connect(dill, TQT_SIGNAL(gameLost()), TQT_SLOT(gameLost())); + connect(dill, TQ_SIGNAL(undoPossible(bool)), TQ_SLOT(undoPossible(bool))); + connect(dill, TQ_SIGNAL(gameWon(bool)), TQ_SLOT(gameWon(bool))); + connect(dill, TQ_SIGNAL(gameLost()), TQ_SLOT(gameLost())); dill->setAutoDropEnabled(dropaction->isChecked()); @@ -455,7 +455,7 @@ void pWidget::gameWon(bool withhelp) #if TEST_SOLVER == 0 KMessageBox::information(this, congrats, i18n("Congratulations!")); #endif - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(newGame())); + TQTimer::singleShot(0, this, TQ_SLOT(newGame())); #if TEST_SOLVER == 1 dill->demo(); #endif @@ -491,7 +491,7 @@ void pWidget::gameLost() KStdGuiItem::cont(), dontAskAgainName) == KMessageBox::Yes) { - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(newGame())); + TQTimer::singleShot(0, this, TQ_SLOT(newGame())); } } diff --git a/kpat/pwidget.h b/kpat/pwidget.h index aa40a917..de6fbd46 100644 --- a/kpat/pwidget.h +++ b/kpat/pwidget.h @@ -34,7 +34,7 @@ class TQWidgetStack; class TQLabel; class pWidget: public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/simon.h b/kpat/simon.h index be6733de..5ec8c3dc 100644 --- a/kpat/simon.h +++ b/kpat/simon.h @@ -4,7 +4,7 @@ #include "dealer.h" class Simon : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/spider.cpp b/kpat/spider.cpp index 383f96a2..03b9847d 100644 --- a/kpat/spider.cpp +++ b/kpat/spider.cpp @@ -68,7 +68,7 @@ Spider::Spider(int suits, TDEMainWindow* parent, const char* _name) redeals[column]->setCheckIndex(0); redeals[column]->setAddFlags(Pile::disallow); redeals[column]->setRemoveFlags(Pile::disallow); - connect(redeals[column], TQT_SIGNAL(clicked(Card*)), TQT_SLOT(deckClicked(Card*))); + connect(redeals[column], TQ_SIGNAL(clicked(Card*)), TQ_SLOT(deckClicked(Card*))); } // The 10 playing piles diff --git a/kpat/spider.h b/kpat/spider.h index 0b5d7a9f..d54db076 100644 --- a/kpat/spider.h +++ b/kpat/spider.h @@ -33,7 +33,7 @@ public: class Spider : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpat/yukon.h b/kpat/yukon.h index 8acb7195..3dc591b2 100644 --- a/kpat/yukon.h +++ b/kpat/yukon.h @@ -4,7 +4,7 @@ #include "dealer.h" class Yukon : public Dealer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/TODO b/kpoker/TODO index fb954169..34fe1f7d 100644 --- a/kpoker/TODO +++ b/kpoker/TODO @@ -18,7 +18,7 @@ - Separate the waving motion into the winner box widget. - - CardImages shouldn't inherit QWidget. + - CardImages shouldn't inherit TQWidget. - Make CardWidget::heldLabel private. diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp index 01d6fe3c..f8d80ea7 100644 --- a/kpoker/betbox.cpp +++ b/kpoker/betbox.cpp @@ -54,12 +54,12 @@ BetBox::BetBox(TQWidget* parent, const char* name) foldButton->setText(i18n("Fold")); //connects - connect(bet5Up, TQT_SIGNAL(clicked()), TQT_SLOT(bet5UpClicked())); - connect(bet10Up, TQT_SIGNAL(clicked()), TQT_SLOT(bet10UpClicked())); - connect(bet5Down, TQT_SIGNAL(clicked()), TQT_SLOT(bet5DownClicked())); - connect(bet10Down, TQT_SIGNAL(clicked()), TQT_SLOT(bet10DownClicked())); - connect(foldButton, TQT_SIGNAL(clicked()), TQT_SLOT(foldClicked())); - connect(adjustBet, TQT_SIGNAL(clicked()), TQT_SLOT(adjustBetClicked())); + connect(bet5Up, TQ_SIGNAL(clicked()), TQ_SLOT(bet5UpClicked())); + connect(bet10Up, TQ_SIGNAL(clicked()), TQ_SLOT(bet10UpClicked())); + connect(bet5Down, TQ_SIGNAL(clicked()), TQ_SLOT(bet5DownClicked())); + connect(bet10Down, TQ_SIGNAL(clicked()), TQ_SLOT(bet10DownClicked())); + connect(foldButton, TQ_SIGNAL(clicked()), TQ_SLOT(foldClicked())); + connect(adjustBet, TQ_SIGNAL(clicked()), TQ_SLOT(adjustBetClicked())); stopRaise(); } diff --git a/kpoker/betbox.h b/kpoker/betbox.h index 2fbb892c..37bee0b2 100644 --- a/kpoker/betbox.h +++ b/kpoker/betbox.h @@ -32,7 +32,7 @@ class TQPushButton; **/ class BetBox : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/kpaint.cpp b/kpoker/kpaint.cpp index 29e11608..f061bc1c 100644 --- a/kpoker/kpaint.cpp +++ b/kpoker/kpaint.cpp @@ -115,7 +115,7 @@ CardWidget::CardWidget( TQWidget *parent, const char *name ) m_held = false; setBackgroundMode( NoBackground ); // disables flickering - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(ownClick())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(ownClick())); setFixedSize(cardWidth, cardHeight); } diff --git a/kpoker/kpaint.h b/kpoker/kpaint.h index 119a2ba9..a003339d 100644 --- a/kpoker/kpaint.h +++ b/kpoker/kpaint.h @@ -35,7 +35,7 @@ class TQLabel; class CardImages : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ class CardImages : public TQWidget **/ class CardWidget : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp index 29da61d8..26330fce 100644 --- a/kpoker/kpoker.cpp +++ b/kpoker/kpoker.cpp @@ -255,7 +255,7 @@ void kpok::initWindow() // The draw button drawButton = new TQPushButton(this); drawButton->setText(i18n("&Deal")); - connect(drawButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(drawClick())); + connect(drawButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(drawClick())); inputLayout->addWidget(drawButton); inputLayout->addStretch(1); @@ -291,20 +291,20 @@ void kpok::initWindow() // Timers blinkTimer = new TQTimer(this); - connect( blinkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(bTimerEvent()) ); + connect( blinkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(bTimerEvent()) ); waveTimer = new TQTimer(this); - connect( waveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(waveTimerEvent()) ); + connect( waveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(waveTimerEvent()) ); drawTimer = new TQTimer(this); - connect (drawTimer, TQT_SIGNAL(timeout()), TQT_SLOT(drawCardsEvent()) ); + connect (drawTimer, TQ_SIGNAL(timeout()), TQ_SLOT(drawCardsEvent()) ); // and now the betUp/Down Buttons betBox = new BetBox(this, 0); betLayout->addWidget(betBox); - connect(betBox, TQT_SIGNAL(betChanged(int)), this, TQT_SLOT(betChange(int))); - connect(betBox, TQT_SIGNAL(betAdjusted()), this, TQT_SLOT(adjustBet())); - connect(betBox, TQT_SIGNAL(fold()), this, TQT_SLOT(out())); + connect(betBox, TQ_SIGNAL(betChanged(int)), this, TQ_SLOT(betChange(int))); + connect(betBox, TQ_SIGNAL(betAdjusted()), this, TQ_SLOT(adjustBet())); + connect(betBox, TQ_SIGNAL(fold()), this, TQ_SLOT(out())); // some tips TQToolTip::add(drawButton, i18n("Continue the round")); @@ -644,7 +644,7 @@ void kpok::initPoker(unsigned int numPlayers) // // FIXME: Make CardWidget::toggleHeld() work. playerBox[0]->activateToggleHeld(); - connect(playerBox[0], TQT_SIGNAL(toggleHeld()), this, TQT_SLOT(toggleHeld())); + connect(playerBox[0], TQ_SIGNAL(toggleHeld()), this, TQ_SLOT(toggleHeld())); // hide some things playerBox[0]->showHelds(false); diff --git a/kpoker/kpoker.h b/kpoker/kpoker.h index d15e7814..0d158f9a 100644 --- a/kpoker/kpoker.h +++ b/kpoker/kpoker.h @@ -169,7 +169,7 @@ public: class kpok : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp index 21023ccd..b84b7f69 100644 --- a/kpoker/newgamedlg.cpp +++ b/kpoker/newgamedlg.cpp @@ -60,8 +60,8 @@ NewGameDlg::NewGameDlg(TQWidget* parent) readFromConfigLabel->hide(); readFromConfigLabel->adjustSize(); l->addWidget(readFromConfigLabel); - connect(readFromConfig, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(changeReadFromConfig(bool))); + connect(readFromConfig, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(changeReadFromConfig(bool))); players = new KIntNumInput(playerNr, plainPage()); players->setRange(1, MAX_PLAYERS); diff --git a/kpoker/newgamedlg.h b/kpoker/newgamedlg.h index 05df1a31..46440095 100644 --- a/kpoker/newgamedlg.h +++ b/kpoker/newgamedlg.h @@ -38,7 +38,7 @@ class TQComboBox; **/ class NewGameDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/optionsdlg.h b/kpoker/optionsdlg.h index c9fcb908..3109fa9e 100644 --- a/kpoker/optionsdlg.h +++ b/kpoker/optionsdlg.h @@ -38,7 +38,7 @@ class KIntNumInput; **/ class OptionsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp index 8076554f..5bd4b939 100644 --- a/kpoker/playerbox.cpp +++ b/kpoker/playerbox.cpp @@ -176,8 +176,8 @@ void PlayerBox::paintCard(int nr) void PlayerBox::activateToggleHeld() { for (int i = 0; i < PokerHandSize; i++) { - connect(m_cardWidgets[i], TQT_SIGNAL(pClicked(CardWidget*)), - this, TQT_SLOT(cardClicked(CardWidget*))); + connect(m_cardWidgets[i], TQ_SIGNAL(pClicked(CardWidget*)), + this, TQ_SLOT(cardClicked(CardWidget*))); } } diff --git a/kpoker/playerbox.h b/kpoker/playerbox.h index 755bcb1f..652d86a3 100644 --- a/kpoker/playerbox.h +++ b/kpoker/playerbox.h @@ -31,7 +31,7 @@ class CardWidget; class PlayerBox : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/top.cpp b/kpoker/top.cpp index 76e4029e..129d450a 100644 --- a/kpoker/top.cpp +++ b/kpoker/top.cpp @@ -50,14 +50,14 @@ PokerWindow::PokerWindow() LHLabel = new TQLabel(statusBar()); LHLabel->adjustSize(); - connect(m_kpok, TQT_SIGNAL(changeLastHand(const TQString &, bool)), - this, TQT_SLOT(setHand(const TQString &, bool))); - connect(m_kpok, TQT_SIGNAL(showClickToHold(bool)), - this, TQT_SLOT(showClickToHold(bool))); - connect(m_kpok, TQT_SIGNAL(clearStatusBar()), - this, TQT_SLOT(clearStatusBar())); - connect(m_kpok, TQT_SIGNAL(statusBarMessage(TQString)), - this, TQT_SLOT(statusBarMessage(TQString))); + connect(m_kpok, TQ_SIGNAL(changeLastHand(const TQString &, bool)), + this, TQ_SLOT(setHand(const TQString &, bool))); + connect(m_kpok, TQ_SIGNAL(showClickToHold(bool)), + this, TQ_SLOT(showClickToHold(bool))); + connect(m_kpok, TQ_SIGNAL(clearStatusBar()), + this, TQ_SLOT(clearStatusBar())); + connect(m_kpok, TQ_SIGNAL(statusBarMessage(TQString)), + this, TQ_SLOT(statusBarMessage(TQString))); statusBar()->addWidget(LHLabel, 0, true); m_kpok->updateLHLabel(); @@ -79,47 +79,47 @@ PokerWindow::~PokerWindow() void PokerWindow::initTDEAction() { //Game - KStdGameAction::gameNew(TQT_TQOBJECT(m_kpok), TQT_SLOT(newGame()), actionCollection()); - KStdGameAction::save(TQT_TQOBJECT(m_kpok), TQT_SLOT(saveGame()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdGameAction::gameNew(m_kpok, TQ_SLOT(newGame()), actionCollection()); + KStdGameAction::save(m_kpok, TQ_SLOT(saveGame()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); //Settings showMenubarAction = - KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); + KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection()); - soundAction = new TDEToggleAction(i18n("Soun&d"), 0, TQT_TQOBJECT(m_kpok), - TQT_SLOT(toggleSound()), actionCollection(), "options_sound"); + soundAction = new TDEToggleAction(i18n("Soun&d"), 0, m_kpok, + TQ_SLOT(toggleSound()), actionCollection(), "options_sound"); if (m_kpok->getSound()) m_kpok->toggleSound(); - blinkingAction = new TDEToggleAction(i18n("&Blinking Cards"), 0, TQT_TQOBJECT(m_kpok), - TQT_SLOT(toggleBlinking()), actionCollection(), "options_blinking"); + blinkingAction = new TDEToggleAction(i18n("&Blinking Cards"), 0, m_kpok, + TQ_SLOT(toggleBlinking()), actionCollection(), "options_blinking"); if (m_kpok->getBlinking()) m_kpok->toggleBlinking(); adjustAction = new TDEToggleAction(i18n("&Adjust Bet is Default"), 0, - TQT_TQOBJECT(m_kpok), TQT_SLOT(toggleAdjust()), actionCollection(), "options_adjust"); + m_kpok, TQ_SLOT(toggleAdjust()), actionCollection(), "options_adjust"); if (m_kpok->getAdjust()) m_kpok->toggleAdjust(); showStatusbarAction = - KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusbar()), actionCollection()); + KStdAction::showStatusbar(this, TQ_SLOT(toggleStatusbar()), actionCollection()); - KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveOptions()), actionCollection()); - KStdGameAction::carddecks(TQT_TQOBJECT(m_kpok), TQT_SLOT(slotCardDeck()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(m_kpok), TQT_SLOT(slotPreferences()), actionCollection()); + KStdAction::saveOptions(this, TQ_SLOT(saveOptions()), actionCollection()); + KStdGameAction::carddecks(m_kpok, TQ_SLOT(slotCardDeck()), actionCollection()); + KStdAction::preferences(m_kpok, TQ_SLOT(slotPreferences()), actionCollection()); // Keyboard shortcuts. - (void)new TDEAction(i18n("Draw"), TDEShortcut(TQt::Key_Return), TQT_TQOBJECT(m_kpok), - TQT_SLOT(drawClick()), actionCollection(), "draw"); - (void)new TDEAction(i18n("Exchange Card 1"), TDEShortcut(TQt::Key_1), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard1()), actionCollection(), "exchange_card_1"); - (void)new TDEAction(i18n("Exchange Card 2"), TDEShortcut(TQt::Key_2), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard2()), actionCollection(), "exchange_card_2"); - (void)new TDEAction(i18n("Exchange Card 3"), TDEShortcut(TQt::Key_3), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard3()), actionCollection(), "exchange_card_3"); - (void)new TDEAction(i18n("Exchange Card 4"), TDEShortcut(TQt::Key_4), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard4()), actionCollection(), "exchange_card_4"); - (void)new TDEAction(i18n("Exchange Card 5"), TDEShortcut(TQt::Key_5), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard5()), actionCollection(), "exchange_card_5"); + (void)new TDEAction(i18n("Draw"), TDEShortcut(TQt::Key_Return), m_kpok, + TQ_SLOT(drawClick()), actionCollection(), "draw"); + (void)new TDEAction(i18n("Exchange Card 1"), TDEShortcut(TQt::Key_1), m_kpok, + TQ_SLOT(exchangeCard1()), actionCollection(), "exchange_card_1"); + (void)new TDEAction(i18n("Exchange Card 2"), TDEShortcut(TQt::Key_2), m_kpok, + TQ_SLOT(exchangeCard2()), actionCollection(), "exchange_card_2"); + (void)new TDEAction(i18n("Exchange Card 3"), TDEShortcut(TQt::Key_3), m_kpok, + TQ_SLOT(exchangeCard3()), actionCollection(), "exchange_card_3"); + (void)new TDEAction(i18n("Exchange Card 4"), TDEShortcut(TQt::Key_4), m_kpok, + TQ_SLOT(exchangeCard4()), actionCollection(), "exchange_card_4"); + (void)new TDEAction(i18n("Exchange Card 5"), TDEShortcut(TQt::Key_5), m_kpok, + TQ_SLOT(exchangeCard5()), actionCollection(), "exchange_card_5"); setupGUI( TDEMainWindow::Save | StatusBar | Keys | Create); } @@ -250,7 +250,7 @@ bool PokerWindow::eventFilter(TQObject*, TQEvent* e) { if (e->type() == TQEvent::MouseButtonPress) { - if (((TQMouseEvent*)e)->button() == Qt::RightButton) { + if (((TQMouseEvent*)e)->button() == TQt::RightButton) { TQPopupMenu* popup = (TQPopupMenu*) factory()->container("popup", this); if (popup) popup->popup(TQCursor::pos()); diff --git a/kpoker/top.h b/kpoker/top.h index 9653e955..750bfb97 100644 --- a/kpoker/top.h +++ b/kpoker/top.h @@ -29,7 +29,7 @@ class kpok; class PokerWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kreversi/DESIGN b/kreversi/DESIGN index 8b01b879..58758697 100644 --- a/kreversi/DESIGN +++ b/kreversi/DESIGN @@ -71,9 +71,9 @@ Engine QReversiGame The "document" for KReversi. - Handles a game being played and sends Q_SIGNALS to all its views + Handles a game being played and sends signals to all its views when something changes. Basically, the only difference between - this class and the more basic ReversiGame is that it sends Q_SIGNALS + this class and the more basic ReversiGame is that it sends signals to the views. Inherits: ReversiGame The actual game being played @@ -94,7 +94,7 @@ QReversiBoardView A view for a Reversi board. The rest of the game view is implemented in the class QReversiGameView. - Inherits: QWidget. + Inherits: TQWidget. Contains: *QReversiGame (not owner) FIXME: Enhance the view with timing information, clock, etc. diff --git a/kreversi/board.cpp b/kreversi/board.cpp index b265e8fa..7fe2ca3c 100644 --- a/kreversi/board.cpp +++ b/kreversi/board.cpp @@ -136,7 +136,7 @@ void QReversiBoardView::setAnimationSpeed(uint speed) void QReversiBoardView::mousePressEvent(TQMouseEvent *e) { // Only handle left button. No context menu. - if ( e->button() != Qt::LeftButton ) { + if ( e->button() != TQt::LeftButton ) { e->ignore(); return; } diff --git a/kreversi/board.h b/kreversi/board.h index b68c94c1..bf87bdbc 100644 --- a/kreversi/board.h +++ b/kreversi/board.h @@ -55,7 +55,7 @@ class QReversiGame; // class QReversiBoardView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp index 7e2e83ff..12668301 100644 --- a/kreversi/kreversi.cpp +++ b/kreversi/kreversi.cpp @@ -116,15 +116,15 @@ KReversi::KReversi() // The only part of the view that is left in this class is the // indicator of whose turn it is in the status bar. The rest is // in the game view. - connect(m_game, TQT_SIGNAL(sig_newGame()), TQT_TQOBJECT(this), TQT_SLOT(showTurn())); - connect(m_game, TQT_SIGNAL(sig_move(uint, Move&)), - TQT_TQOBJECT(this), TQT_SLOT(handleMove(uint, Move&))); // Calls showTurn(). - connect(m_game, TQT_SIGNAL(sig_update()), TQT_TQOBJECT(this), TQT_SLOT(showTurn())); - connect(m_game, TQT_SIGNAL(sig_gameOver()), TQT_TQOBJECT(this), TQT_SLOT(slotGameOver())); + connect(m_game, TQ_SIGNAL(sig_newGame()), this, TQ_SLOT(showTurn())); + connect(m_game, TQ_SIGNAL(sig_move(uint, Move&)), + this, TQ_SLOT(handleMove(uint, Move&))); // Calls showTurn(). + connect(m_game, TQ_SIGNAL(sig_update()), this, TQ_SLOT(showTurn())); + connect(m_game, TQ_SIGNAL(sig_gameOver()), this, TQ_SLOT(slotGameOver())); // Signal that is sent when the user clicks on the board. - connect(m_gameView, TQT_SIGNAL(signalSquareClicked(int, int)), - TQT_TQOBJECT(this), TQT_SLOT(slotSquareClicked(int, int))); + connect(m_gameView, TQ_SIGNAL(signalSquareClicked(int, int)), + this, TQ_SLOT(slotSquareClicked(int, int))); loadSettings(); @@ -150,38 +150,38 @@ KReversi::~KReversi() void KReversi::createTDEActions() { // Standard Game Actions. - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(slotNewGame()), actionCollection(), + KStdGameAction::gameNew(this, TQ_SLOT(slotNewGame()), actionCollection(), "game_new"); - KStdGameAction::load(TQT_TQOBJECT(this), TQT_SLOT(slotOpenGame()), actionCollection()); - KStdGameAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdGameAction::hint(TQT_TQOBJECT(this), TQT_SLOT(slotHint()), actionCollection(), + KStdGameAction::load(this, TQ_SLOT(slotOpenGame()), actionCollection()); + KStdGameAction::save(this, TQ_SLOT(slotSave()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdGameAction::hint(this, TQ_SLOT(slotHint()), actionCollection(), "game_hint"); - KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), + KStdGameAction::undo(this, TQ_SLOT(slotUndo()), actionCollection(), "game_undo"); // Non-standard Game Actions: Stop, Continue, Switch sides stopAction = new TDEAction(i18n("&Stop Thinking"), "game_stop", TQt::Key_Escape, - TQT_TQOBJECT(this), TQT_SLOT(slotInterrupt()), actionCollection(), + this, TQ_SLOT(slotInterrupt()), actionCollection(), "game_stop"); continueAction = new TDEAction(i18n("&Continue Thinking"), "reload", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotContinue()), actionCollection(), + this, TQ_SLOT(slotContinue()), actionCollection(), "game_continue"); new TDEAction(i18n("S&witch Sides"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSwitchSides()), actionCollection(), + this, TQ_SLOT(slotSwitchSides()), actionCollection(), "game_switch_sides"); // Some more standard game actions: Highscores, Settings. - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighScoreDialog()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotEditSettings()), actionCollection()); + KStdGameAction::highscores(this, TQ_SLOT(showHighScoreDialog()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotEditSettings()), actionCollection()); // Actions for the view(s). showLastMoveAction = new TDEToggleAction(i18n("Show Last Move"), "lastmoves", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotShowLastMove()), + this, TQ_SLOT(slotShowLastMove()), actionCollection(), "show_last_move"); showLegalMovesAction = new TDEToggleAction(i18n("Show Legal Moves"), "legalmoves", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotShowLegalMoves()), + this, TQ_SLOT(slotShowLegalMoves()), actionCollection(), "show_legal_moves"); } @@ -755,7 +755,7 @@ void KReversi::slotEditSettings() Settings *general = new Settings(0, "General"); dialog->addPage(general, i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); dialog->show(); } diff --git a/kreversi/kreversi.h b/kreversi/kreversi.h index f8fbaf9e..5d14a501 100644 --- a/kreversi/kreversi.h +++ b/kreversi/kreversi.h @@ -58,7 +58,7 @@ class TDEAction; class KReversi : public KZoomMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kreversi/kreversi.kcfg b/kreversi/kreversi.kcfg index 64fa5039..ef6707f1 100644 --- a/kreversi/kreversi.kcfg +++ b/kreversi/kreversi.kcfg @@ -55,7 +55,7 @@ </entry> <entry name="BackgroundImage" type="Path"> <label>Image to use as background.</label> - <code>#define PICDATA(x) TDEGlobal::dirs()->findResource("appdata", QString("pics/")+ x)</code> + <code>#define PICDATA(x) TDEGlobal::dirs()->findResource("appdata", TQString("pics/")+ x)</code> <default code="true">PICDATA("background/Light_Wood.png")</default> </entry> <entry name="MenubarVisible" type="Bool" key="menubar visible"> diff --git a/kreversi/kzoommainwindow.cpp b/kreversi/kzoommainwindow.cpp index f8c3c490..ca31e998 100644 --- a/kreversi/kzoommainwindow.cpp +++ b/kreversi/kzoommainwindow.cpp @@ -34,11 +34,11 @@ KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, installEventFilter(this); m_zoomInAction = - KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(zoomIn()), actionCollection()); + KStdAction::zoomIn(this, TQ_SLOT(zoomIn()), actionCollection()); m_zoomOutAction = - KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(zoomOut()), actionCollection()); + KStdAction::zoomOut(this, TQ_SLOT(zoomOut()), actionCollection()); m_menu = - KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); + KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection()); } @@ -71,7 +71,7 @@ void KZoomMainWindow::addWidget(TQWidget *widget) Q_ASSERT(zm); zm->m_widgets.append(widget); - connect(widget, TQT_SIGNAL(destroyed()), zm, TQT_SLOT(widgetDestroyed())); + connect(widget, TQ_SIGNAL(destroyed()), zm, TQ_SLOT(widgetDestroyed())); } diff --git a/kreversi/kzoommainwindow.h b/kreversi/kzoommainwindow.h index 5b79ad9a..806acf87 100644 --- a/kreversi/kzoommainwindow.h +++ b/kreversi/kzoommainwindow.h @@ -46,7 +46,7 @@ class TDEToggleAction; class KZoomMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** Constructor. */ diff --git a/kreversi/qreversigame.h b/kreversi/qreversigame.h index 050b790d..bbfb4467 100644 --- a/kreversi/qreversigame.h +++ b/kreversi/qreversigame.h @@ -63,7 +63,7 @@ class TDEConfig; // class QReversiGame : public TQObject, public Game { - Q_OBJECT + TQ_OBJECT public: diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp index 02f1ad3d..5ae999a7 100644 --- a/kreversi/qreversigameview.cpp +++ b/kreversi/qreversigameview.cpp @@ -135,15 +135,15 @@ QReversiGameView::QReversiGameView(TQWidget *parent, QReversiGame *game) m_humanColor = Nobody; // Connect the game to the view. - connect(m_game, TQT_SIGNAL(sig_newGame()), this, TQT_SLOT(newGame())); - connect(m_game, TQT_SIGNAL(sig_move(uint, Move&)), - this, TQT_SLOT(moveMade(uint, Move&))); - connect(m_game, TQT_SIGNAL(sig_update()), this, TQT_SLOT(updateView())); + connect(m_game, TQ_SIGNAL(sig_newGame()), this, TQ_SLOT(newGame())); + connect(m_game, TQ_SIGNAL(sig_move(uint, Move&)), + this, TQ_SLOT(moveMade(uint, Move&))); + connect(m_game, TQ_SIGNAL(sig_update()), this, TQ_SLOT(updateView())); // The sig_gameOver signal is not used by the view. // Reemit the signal from the board. - connect(m_boardView, TQT_SIGNAL(signalSquareClicked(int, int)), - this, TQT_SLOT(squareClicked(int, int))); + connect(m_boardView, TQ_SIGNAL(signalSquareClicked(int, int)), + this, TQ_SLOT(squareClicked(int, int))); } diff --git a/kreversi/qreversigameview.h b/kreversi/qreversigameview.h index e6ecf0fa..e7198d5c 100644 --- a/kreversi/qreversigameview.h +++ b/kreversi/qreversigameview.h @@ -57,7 +57,7 @@ class QReversiGame; class StatusWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ private: // The main game view class QReversiGameView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kreversi/settings.ui b/kreversi/settings.ui index 0be0825f..5bb20989 100644 --- a/kreversi/settings.ui +++ b/kreversi/settings.ui @@ -85,9 +85,6 @@ <property name="text"> <string>Casually</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -99,9 +96,6 @@ <property name="text"> <string>Competitively</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp index 60fabc01..b875eb40 100644 --- a/ksame/KSameWidget.cpp +++ b/ksame/KSameWidget.cpp @@ -48,17 +48,17 @@ static int default_colors=3; KSameWidget::KSameWidget(TQWidget *parent, const char* name, WFlags fl) : TDEMainWindow(parent,name,fl) { - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(m_new()), actionCollection(), "game_new"); - restart = new TDEAction(i18n("&Restart This Board"), CTRL+Key_R, TQT_TQOBJECT(this), - TQT_SLOT(m_restart()), actionCollection(), "game_restart"); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(m_showhs()), actionCollection(), "game_highscores"); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "game_quit"); - undo = KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(m_undo()), actionCollection(), "edit_undo"); + KStdGameAction::gameNew(this, TQ_SLOT(m_new()), actionCollection(), "game_new"); + restart = new TDEAction(i18n("&Restart This Board"), CTRL+Key_R, this, + TQ_SLOT(m_restart()), actionCollection(), "game_restart"); + KStdGameAction::highscores(this, TQ_SLOT(m_showhs()), actionCollection(), "game_highscores"); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection(), "game_quit"); + undo = KStdGameAction::undo(this, TQ_SLOT(m_undo()), actionCollection(), "edit_undo"); random = new TDEToggleAction(i18n("&Random Board"), 0, 0, 0, actionCollection(), "random_board"); - showNumberRemaining = new TDEToggleAction(i18n("&Show Number Remaining"), 0, TQT_TQOBJECT(this), TQT_SLOT(showNumberRemainingToggled()), actionCollection(), "showNumberRemaining"); + showNumberRemaining = new TDEToggleAction(i18n("&Show Number Remaining"), 0, this, TQ_SLOT(showNumberRemainingToggled()), actionCollection(), "showNumberRemaining"); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), + KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()), actionCollection()); status=statusBar(); @@ -69,14 +69,14 @@ KSameWidget::KSameWidget(TQWidget *parent, const char* name, WFlags fl) : stone = new StoneWidget(this,15,10); - connect( stone, TQT_SIGNAL(s_gameover()), TQT_TQOBJECT(this), TQT_SLOT(gameover())); - connect( stone, TQT_SIGNAL(s_colors(int)), TQT_TQOBJECT(this), TQT_SLOT(setColors(int))); - connect( stone, TQT_SIGNAL(s_board(int)), TQT_TQOBJECT(this), TQT_SLOT(setBoard(int))); - connect( stone, TQT_SIGNAL(s_marked(int)), TQT_TQOBJECT(this), TQT_SLOT(setMarked(int))); - connect( stone, TQT_SIGNAL(s_score(int)), TQT_TQOBJECT(this), TQT_SLOT(setScore(int))); - connect( stone, TQT_SIGNAL(s_remove(int,int)), TQT_TQOBJECT(this), TQT_SLOT(stonesRemoved(int,int))); + connect( stone, TQ_SIGNAL(s_gameover()), this, TQ_SLOT(gameover())); + connect( stone, TQ_SIGNAL(s_colors(int)), this, TQ_SLOT(setColors(int))); + connect( stone, TQ_SIGNAL(s_board(int)), this, TQ_SLOT(setBoard(int))); + connect( stone, TQ_SIGNAL(s_marked(int)), this, TQ_SLOT(setMarked(int))); + connect( stone, TQ_SIGNAL(s_score(int)), this, TQ_SLOT(setScore(int))); + connect( stone, TQ_SIGNAL(s_remove(int,int)), this, TQ_SLOT(stonesRemoved(int,int))); - connect(stone, TQT_SIGNAL(s_sizechanged()), TQT_TQOBJECT(this), TQT_SLOT(sizeChanged())); + connect(stone, TQ_SIGNAL(s_sizechanged()), this, TQ_SLOT(sizeChanged())); sizeChanged(); setCentralWidget(stone); diff --git a/ksame/KSameWidget.h b/ksame/KSameWidget.h index 8d2b2c6f..b2ecd182 100644 --- a/ksame/KSameWidget.h +++ b/ksame/KSameWidget.h @@ -27,7 +27,7 @@ class TDEToggleAction; class StoneWidget; class KSameWidget: public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp index c4fbb987..8ada4f44 100644 --- a/ksame/StoneWidget.cpp +++ b/ksame/StoneWidget.cpp @@ -72,8 +72,8 @@ StoneWidget::StoneWidget( TQWidget *parent, int x, int y ) for (int s = 0; s < maxslices; s++) { map[c][s].stone.resize(stone_width, stone_height); assert(!map[c][s].stone.isNull()); - bitBlt(TQT_TQPAINTDEVICE(&map[c][s].stone), 0, 0, - TQT_TQPAINTDEVICE(&stonemap), stone_width * s, + bitBlt(&map[c][s].stone, 0, 0, + &stonemap, stone_width * s, c*stone_height, stone_width,stone_height,CopyROP,false); TQImage im = map[c][s].stone.convertToImage(); @@ -102,7 +102,7 @@ StoneWidget::~StoneWidget() { delete [] map; setMouseTracking(false); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); } unsigned int @@ -276,8 +276,8 @@ StoneWidget::paintEvent( TQPaintEvent *e ) { if (stone->color) { int tslice = stone->marked?slice:0; - bitBlt(TQT_TQPAINTDEVICE(this),cx,cy, - TQT_TQPAINTDEVICE(&map[stone->color-1][tslice].stone), + bitBlt(this,cx,cy, + &map[stone->color-1][tslice].stone, 0, 0, stone_width,stone_height,CopyROP,FALSE); diff --git a/ksame/StoneWidget.h b/ksame/StoneWidget.h index 720474ae..5522816e 100644 --- a/ksame/StoneWidget.h +++ b/ksame/StoneWidget.h @@ -27,7 +27,7 @@ struct StoneSlice; class StoneWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT int modified; diff --git a/kshisen/app.cpp b/kshisen/app.cpp index ae3e7f94..5862f789 100644 --- a/kshisen/app.cpp +++ b/kshisen/app.cpp @@ -65,7 +65,7 @@ App::App(TQWidget *parent, const char *name) : TDEMainWindow(parent, name), hintmode(false) { - highscoreTable = new KHighscore(TQT_TQOBJECT(this)); + highscoreTable = new KHighscore(this); // TODO? // Would it make sense long term to have a tdeconfig update rather then @@ -89,13 +89,13 @@ App::App(TQWidget *parent, const char *name) : TDEMainWindow(parent, name), setupGUI(); - connect(board, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(enableItems())); + connect(board, TQ_SIGNAL(changed()), this, TQ_SLOT(enableItems())); TQTimer *t = new TQTimer(this); t->start(1000); - connect(t, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updateScore())); - connect(board, TQT_SIGNAL(endOfGame()), TQT_TQOBJECT(this), TQT_SLOT(slotEndOfGame())); - connect(board, TQT_SIGNAL(resized()), TQT_TQOBJECT(this), TQT_SLOT(boardResized())); + connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateScore())); + connect(board, TQ_SIGNAL(endOfGame()), this, TQ_SLOT(slotEndOfGame())); + connect(board, TQ_SIGNAL(resized()), this, TQ_SLOT(boardResized())); kapp->processEvents(); @@ -106,25 +106,25 @@ App::App(TQWidget *parent, const char *name) : TDEMainWindow(parent, name), void App::initTDEAction() { // Game - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection()); - KStdGameAction::restart(TQT_TQOBJECT(this), TQT_SLOT(restartGame()), actionCollection()); - KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pause()), actionCollection()); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(hallOfFame()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitGame()), actionCollection()); + KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection()); + KStdGameAction::restart(this, TQ_SLOT(restartGame()), actionCollection()); + KStdGameAction::pause(this, TQ_SLOT(pause()), actionCollection()); + KStdGameAction::highscores(this, TQ_SLOT(hallOfFame()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(quitGame()), actionCollection()); // Move - KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection()); - KStdGameAction::redo(TQT_TQOBJECT(this), TQT_SLOT(redo()), actionCollection()); - KStdGameAction::hint(TQT_TQOBJECT(this), TQT_SLOT(hint()), actionCollection()); + KStdGameAction::undo(this, TQ_SLOT(undo()), actionCollection()); + KStdGameAction::redo(this, TQ_SLOT(redo()), actionCollection()); + KStdGameAction::hint(this, TQ_SLOT(hint()), actionCollection()); //new TDEAction(i18n("Is Game Solvable?"), 0, this, - // TQT_SLOT(isSolvable()), actionCollection(), "move_solvable"); + // TQ_SLOT(isSolvable()), actionCollection(), "move_solvable"); #ifdef DEBUGGING - (void)new TDEAction(i18n("&Finish"), 0, board, TQT_SLOT(finish()), actionCollection(), "move_finish"); + (void)new TDEAction(i18n("&Finish"), 0, board, TQ_SLOT(finish()), actionCollection(), "move_finish"); #endif // Settings - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); } void App::hallOfFame() @@ -372,8 +372,8 @@ TQString App::getPlayerName() b->setDefault(true); b->setFixedSize(b->sizeHint()); - connect(b, TQT_SIGNAL(released()), dlg, TQT_SLOT(accept())); - connect(e, TQT_SIGNAL(returnPressed()), dlg, TQT_SLOT(accept())); + connect(b, TQ_SIGNAL(released()), dlg, TQ_SLOT(accept())); + connect(e, TQ_SIGNAL(returnPressed()), dlg, TQ_SLOT(accept())); // create layout TQVBoxLayout *tl = new TQVBoxLayout(dlg, 10); @@ -723,7 +723,7 @@ void App::showHighscore(int focusitem) b->setFixedSize(b->sizeHint()); // connect the "Close"-button to done - connect(b, TQT_SIGNAL(clicked()), dlg, TQT_SLOT(accept())); + connect(b, TQ_SIGNAL(clicked()), dlg, TQ_SLOT(accept())); b->setDefault(true); b->setFocus(); @@ -752,8 +752,8 @@ void App::showSettings(){ TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow); Settings *general = new Settings(0, "General"); dialog->addPage(general, i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), board, TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), board, TQ_SLOT(loadSettings())); dialog->show(); } diff --git a/kshisen/app.h b/kshisen/app.h index ec39a382..5fee0252 100644 --- a/kshisen/app.h +++ b/kshisen/app.h @@ -61,7 +61,7 @@ const unsigned HIGHSCORE_MAX = 10; class App : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kshisen/board.cpp b/kshisen/board.cpp index c868b9fc..2501f2b1 100644 --- a/kshisen/board.cpp +++ b/kshisen/board.cpp @@ -179,7 +179,7 @@ void Board::mousePressEvent(TQMouseEvent *e) } // Mark tile - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) { clearHighlight(); @@ -188,7 +188,7 @@ void Board::mousePressEvent(TQMouseEvent *e) } // Assist by highlighting all tiles of same type - if(e->button() == Qt::RightButton) + if(e->button() == TQt::RightButton) { int clicked_tile = getField(pos_x, pos_y); @@ -683,7 +683,7 @@ void Board::drawConnection(int timeout) p.flush(); p.end(); - TQTimer::singleShot(timeout, this, TQT_SLOT(undrawConnection())); + TQTimer::singleShot(timeout, this, TQ_SLOT(undrawConnection())); } void Board::undrawConnection() diff --git a/kshisen/board.h b/kshisen/board.h index 43706524..2444b420 100644 --- a/kshisen/board.h +++ b/kshisen/board.h @@ -69,7 +69,7 @@ public: class Board : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksirtet/ksirtet/ai.h b/ksirtet/ksirtet/ai.h index a24ad001..f345afc8 100644 --- a/ksirtet/ksirtet/ai.h +++ b/ksirtet/ksirtet/ai.h @@ -6,7 +6,7 @@ class KSAI : public AI { - Q_OBJECT + TQ_OBJECT public: KSAI(); diff --git a/ksirtet/ksirtet/board.h b/ksirtet/ksirtet/board.h index 72a1f816..eb77ce1c 100644 --- a/ksirtet/ksirtet/board.h +++ b/ksirtet/ksirtet/board.h @@ -6,7 +6,7 @@ class KSBoard : public Board { - Q_OBJECT + TQ_OBJECT public: KSBoard(bool graphic, TQWidget *parent); diff --git a/ksirtet/ksirtet/field.h b/ksirtet/ksirtet/field.h index b44270e3..04e3f563 100644 --- a/ksirtet/ksirtet/field.h +++ b/ksirtet/ksirtet/field.h @@ -7,7 +7,7 @@ class KSField : public Field { - Q_OBJECT + TQ_OBJECT public: KSField(TQWidget *parent); diff --git a/ksirtet/ksirtet/main.h b/ksirtet/ksirtet/main.h index 89f2c5c5..6118b66d 100644 --- a/ksirtet/ksirtet/main.h +++ b/ksirtet/ksirtet/main.h @@ -28,7 +28,7 @@ class KSFactory : public CommonFactory //----------------------------------------------------------------------------- class KSMainWindow : public MainWindow { - Q_OBJECT + TQ_OBJECT public: KSMainWindow() { init(); } diff --git a/ksirtet/ksirtet/settings.h b/ksirtet/ksirtet/settings.h index c6dd47d5..7582792f 100644 --- a/ksirtet/ksirtet/settings.h +++ b/ksirtet/ksirtet/settings.h @@ -6,7 +6,7 @@ class KSGameConfig : public GameConfig { - Q_OBJECT + TQ_OBJECT public: KSGameConfig(); diff --git a/ksmiletris/gamewidget.cpp b/ksmiletris/gamewidget.cpp index fa1ff075..b9ca5837 100644 --- a/ksmiletris/gamewidget.cpp +++ b/ksmiletris/gamewidget.cpp @@ -70,7 +70,7 @@ GameWidget::GameWidget(TQWidget *parent, const char *name) next->setNextPieceSprites(next_piece); timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); } GameWidget::~GameWidget() diff --git a/ksmiletris/gamewidget.h b/ksmiletris/gamewidget.h index 96e95b6b..f0eb335b 100644 --- a/ksmiletris/gamewidget.h +++ b/ksmiletris/gamewidget.h @@ -35,7 +35,7 @@ class NextPieceWidget; class TQTimer; class GameWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT signals: diff --git a/ksmiletris/gamewindow.cpp b/ksmiletris/gamewindow.cpp index 5337868f..e566a8bb 100644 --- a/ksmiletris/gamewindow.cpp +++ b/ksmiletris/gamewindow.cpp @@ -46,48 +46,48 @@ GameWindow::GameWindow(TQWidget *, const char *name) : TDEMainWindow(0, name) { //New Games - (void)KStdGameAction::gameNew(TQT_TQOBJECT(this), - TQT_SLOT(menu_newGame()), + (void)KStdGameAction::gameNew(this, + TQ_SLOT(menu_newGame()), actionCollection()); //Pause Game - (void)KStdGameAction::pause(TQT_TQOBJECT(this), - TQT_SLOT(menu_pause()), + (void)KStdGameAction::pause(this, + TQ_SLOT(menu_pause()), actionCollection()); //End Game - (void)KStdGameAction::end(TQT_TQOBJECT(this), - TQT_SLOT(menu_endGame()), + (void)KStdGameAction::end(this, + TQ_SLOT(menu_endGame()), actionCollection()); //Highscores - (void)KStdGameAction::highscores(TQT_TQOBJECT(this), - TQT_SLOT(menu_highScores()), + (void)KStdGameAction::highscores(this, + TQ_SLOT(menu_highScores()), actionCollection()); //Quit - (void)KStdGameAction::quit(TQT_TQOBJECT(this), - TQT_SLOT(close()), + (void)KStdGameAction::quit(this, + TQ_SLOT(close()), actionCollection()); TQStringList list; TDESelectAction* piecesAct = - new TDESelectAction(i18n("&Pieces"), 0, TQT_TQOBJECT(this), TQT_SLOT(menu_pieces()), + new TDESelectAction(i18n("&Pieces"), 0, this, TQ_SLOT(menu_pieces()), actionCollection(), "settings_pieces"); list.append(i18n("&Smiles")); list.append(i18n("S&ymbols")); list.append(i18n("&Icons")); piecesAct->setItems(list); - (void)new TDEToggleAction(i18n("&Sounds"), 0, TQT_TQOBJECT(this), - TQT_SLOT(menu_sounds()), actionCollection(), "settings_sounds"); + (void)new TDEToggleAction(i18n("&Sounds"), 0, this, + TQ_SLOT(menu_sounds()), actionCollection(), "settings_sounds"); - //connect(menu, TQT_SIGNAL(moved(menuPosition)), - // this, TQT_SLOT(movedMenu(menuPosition))); ? + //connect(menu, TQ_SIGNAL(moved(menuPosition)), + // this, TQ_SLOT(movedMenu(menuPosition))); ? status = new KStatusBar(this); status->insertItem(i18n("Level: 99"), 1); @@ -97,16 +97,16 @@ GameWindow::GameWindow(TQWidget *, const char *name) game = new GameWidget(this); setCentralWidget(game); - connect(game, TQT_SIGNAL(changedStats(int, int)), - this, TQT_SLOT(updateStats(int, int))); - connect(game, TQT_SIGNAL(gameOver()), TQT_TQOBJECT(this), TQT_SLOT(gameOver())); + connect(game, TQ_SIGNAL(changedStats(int, int)), + this, TQ_SLOT(updateStats(int, int))); + connect(game, TQ_SIGNAL(gameOver()), this, TQ_SLOT(gameOver())); //keys - (void)new TDEAction(i18n("Move Left"), Key_Left, TQT_TQOBJECT(game), TQT_SLOT(keyLeft()), actionCollection(), "left"); - (void)new TDEAction(i18n("Move Right"), Key_Right, TQT_TQOBJECT(game), TQT_SLOT(keyRight()), actionCollection(), "right"); - (void)new TDEAction(i18n("Rotate Left"), Key_Up, TQT_TQOBJECT(game), TQT_SLOT(keyUp()), actionCollection(), "up"); - (void)new TDEAction(i18n("Rotate Right"), Key_Down, TQT_TQOBJECT(game), TQT_SLOT(keyDown()), actionCollection(), "down"); - (void)new TDEAction(i18n("Drop Down"), Key_Space, TQT_TQOBJECT(game), TQT_SLOT(keySpace()), actionCollection(), "space"); + (void)new TDEAction(i18n("Move Left"), Key_Left, game, TQ_SLOT(keyLeft()), actionCollection(), "left"); + (void)new TDEAction(i18n("Move Right"), Key_Right, game, TQ_SLOT(keyRight()), actionCollection(), "right"); + (void)new TDEAction(i18n("Rotate Left"), Key_Up, game, TQ_SLOT(keyUp()), actionCollection(), "up"); + (void)new TDEAction(i18n("Rotate Right"), Key_Down, game, TQ_SLOT(keyDown()), actionCollection(), "down"); + (void)new TDEAction(i18n("Drop Down"), Key_Space, game, TQ_SLOT(keySpace()), actionCollection(), "space"); game->setFixedSize(default_width, default_height); adjustSize(); diff --git a/ksmiletris/gamewindow.h b/ksmiletris/gamewindow.h index 96b265eb..1e0c0649 100644 --- a/ksmiletris/gamewindow.h +++ b/ksmiletris/gamewindow.h @@ -34,7 +34,7 @@ class GameWidget; class KStatusBar; class GameWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksnake/basket.cpp b/ksnake/basket.cpp index 138336cd..c65695a5 100644 --- a/ksnake/basket.cpp +++ b/ksnake/basket.cpp @@ -35,7 +35,7 @@ Kaffee::Kaffee(int pos, int r1, int r2) p = pos; t = Red; r = r2; - TQTimer::singleShot( r1, this, TQT_SLOT(golden()) ); + TQTimer::singleShot( r1, this, TQ_SLOT(golden()) ); dirty = true; } @@ -43,7 +43,7 @@ void Kaffee::golden() { dirty = true; t = (t == Red ? Golden : Red); - TQTimer::singleShot( r, this, TQT_SLOT(golden()) ); + TQTimer::singleShot( r, this, TQ_SLOT(golden()) ); } Basket::Basket(Board *b, PixServer *p) diff --git a/ksnake/basket.h b/ksnake/basket.h index af8b30ea..96d253f8 100644 --- a/ksnake/basket.h +++ b/ksnake/basket.h @@ -34,7 +34,7 @@ enum Fruits { Red, Golden }; class Kaffee : public TQObject { - Q_OBJECT + TQ_OBJECT public: Kaffee(int pos, int r1, int r2); @@ -51,7 +51,7 @@ private: class Basket : public TQObject { - Q_OBJECT + TQ_OBJECT public: Basket(Board *b, PixServer *p); diff --git a/ksnake/game.cpp b/ksnake/game.cpp index 0641b7d3..54ea84f9 100644 --- a/ksnake/game.cpp +++ b/ksnake/game.cpp @@ -67,14 +67,14 @@ Game::Game(TQWidget *parent, const char *name) : TDEMainWindow(parent,name) rattler->reloadRoomPixmap(); rattler->setFocus(); - connect(rattler, TQT_SIGNAL(setPoints(int)), this, TQT_SLOT(scoreChanged(int))); - connect(rattler, TQT_SIGNAL(setTrys(int)), this, TQT_SLOT(setTrys(int))); - connect(rattler, TQT_SIGNAL(rewind()), view->progress, TQT_SLOT(rewind())); - connect(rattler, TQT_SIGNAL(advance()), view->progress, TQT_SLOT(advance())); - connect(view->progress, TQT_SIGNAL(restart()), rattler, TQT_SLOT(restartTimer())); + connect(rattler, TQ_SIGNAL(setPoints(int)), this, TQ_SLOT(scoreChanged(int))); + connect(rattler, TQ_SIGNAL(setTrys(int)), this, TQ_SLOT(setTrys(int))); + connect(rattler, TQ_SIGNAL(rewind()), view->progress, TQ_SLOT(rewind())); + connect(rattler, TQ_SIGNAL(advance()), view->progress, TQ_SLOT(advance())); + connect(view->progress, TQ_SIGNAL(restart()), rattler, TQ_SLOT(restartTimer())); - connect(rattler, TQT_SIGNAL(togglePaused()), this, TQT_SLOT(togglePaused())); - connect(rattler, TQT_SIGNAL(setScore(int)), this, TQT_SLOT(gameEnd(int))); + connect(rattler, TQ_SIGNAL(togglePaused()), this, TQ_SLOT(togglePaused())); + connect(rattler, TQ_SIGNAL(setScore(int)), this, TQ_SLOT(gameEnd(int))); setCentralWidget(view); @@ -120,16 +120,16 @@ void Game::createMenu() actionCollection()->setAutoConnectShortcuts(true); rattler->setActionCollection(actionCollection()); - KStdGameAction::gameNew(TQT_TQOBJECT(rattler), TQT_SLOT(restart()), actionCollection()); - pause = KStdGameAction::pause(TQT_TQOBJECT(rattler), TQT_SLOT(pause()), actionCollection()); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighScores()), actionCollection()); - KStdGameAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdGameAction::gameNew(rattler, TQ_SLOT(restart()), actionCollection()); + pause = KStdGameAction::pause(rattler, TQ_SLOT(pause()), actionCollection()); + KStdGameAction::highscores(this, TQ_SLOT(showHighScores()), actionCollection()); + KStdGameAction::quit( this, TQ_SLOT(close()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); // TODO change and make custom function that pauses game or // modify widget to pause when loosing focus and remove this - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); } @@ -173,7 +173,7 @@ void Game::showSettings(){ dialog->addPage(a, i18n("Appearance"), "style"); dialog->addPage(new StartRoom(0, "StartRoom"), i18n("First Level"), "folder_home"); - connect(dialog, TQT_SIGNAL(settingsChanged()), rattler, TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), rattler, TQ_SLOT(loadSettings())); dialog->show(); } diff --git a/ksnake/game.h b/ksnake/game.h index 4a5156c1..9ee61c16 100644 --- a/ksnake/game.h +++ b/ksnake/game.h @@ -35,7 +35,7 @@ class View; class Game : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: diff --git a/ksnake/pixServer.cpp b/ksnake/pixServer.cpp index b13bfa43..64299e0a 100644 --- a/ksnake/pixServer.cpp +++ b/ksnake/pixServer.cpp @@ -100,7 +100,7 @@ void PixServer::initPixmaps() pm.convertFromImage(qi,TQPixmap::AvoidDither); for (int x = 0 ; x < 18; x++){ compuSnakePix[x].resize(BRICKSIZE, BRICKSIZE); - bitBlt(TQT_TQPAINTDEVICE(&compuSnakePix[x]) ,0,0, TQT_TQPAINTDEVICE(&pm),x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); + bitBlt(&compuSnakePix[x] ,0,0, &pm,x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); compuSnakePix[x].setMask(compuSnakePix[x].createHeuristicMask()); } @@ -110,7 +110,7 @@ void PixServer::initPixmaps() pm.convertFromImage(qi,TQPixmap::AvoidDither); for (int x = 0 ; x < 18; x++){ samyPix[x].resize(BRICKSIZE, BRICKSIZE); - bitBlt(TQT_TQPAINTDEVICE(&samyPix[x]) ,0,0, TQT_TQPAINTDEVICE(&pm),x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); + bitBlt(&samyPix[x] ,0,0, &pm,x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); samyPix[x].setMask(samyPix[x].createHeuristicMask()); } @@ -120,7 +120,7 @@ void PixServer::initPixmaps() pm.convertFromImage(qi,TQPixmap::AvoidDither); for (int x = 0 ; x < 4; x++){ ballPix[x].resize(BRICKSIZE, BRICKSIZE); - bitBlt(TQT_TQPAINTDEVICE(&ballPix[x]) ,0,0, TQT_TQPAINTDEVICE(&pm),x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); + bitBlt(&ballPix[x] ,0,0, &pm,x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); ballPix[x].setMask(ballPix[x].createHeuristicMask()); } @@ -130,7 +130,7 @@ void PixServer::initPixmaps() pm.convertFromImage(qi,TQPixmap::AvoidDither); for (int x = 0 ; x < 2; x++){ applePix[x].resize(BRICKSIZE, BRICKSIZE); - bitBlt(TQT_TQPAINTDEVICE(&applePix[x]) ,0,0, TQT_TQPAINTDEVICE(&pm),x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); + bitBlt(&applePix[x] ,0,0, &pm,x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); applePix[x].setMask(applePix[x].createHeuristicMask()); } } diff --git a/ksnake/progress.cpp b/ksnake/progress.cpp index 547ddbab..f155a5ac 100644 --- a/ksnake/progress.cpp +++ b/ksnake/progress.cpp @@ -26,7 +26,7 @@ #include "progress.h" Progress::Progress(TQWidget *parent, const char *name) - : KGameProgress(0, 300, 300, Qt::Horizontal, parent, name) + : KGameProgress(0, 300, 300, TQt::Horizontal, parent, name) { setBarColor("green1"); setTextEnabled(false); diff --git a/ksnake/progress.h b/ksnake/progress.h index f4beb246..3abcf4ff 100644 --- a/ksnake/progress.h +++ b/ksnake/progress.h @@ -30,7 +30,7 @@ class Progress : public KGameProgress { - Q_OBJECT + TQ_OBJECT public: Progress( TQWidget *parent=0, const char *name=0 ); diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp index 94c467fe..d94307be 100644 --- a/ksnake/rattler.cpp +++ b/ksnake/rattler.cpp @@ -46,7 +46,7 @@ int speed[4] = { 130, 95, 55, 40 }; Rattler::Rattler( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); numBalls = Settings::balls(); ballsAI = Settings::ballsAI(); @@ -67,16 +67,16 @@ Rattler::Rattler( TQWidget *parent, const char *name ) balls = new TQPtrList<Ball>; balls->setAutoDelete( true ); - connect( samy, TQT_SIGNAL(closeGate(int)), this, TQT_SLOT(closeGate(int))); - connect( samy, TQT_SIGNAL(score(bool, int)), this, TQT_SLOT(scoring(bool,int))); - connect( samy, TQT_SIGNAL(goingOut()), this, TQT_SLOT(speedUp())); - connect( basket, TQT_SIGNAL(openGate()), this, TQT_SLOT(openGate())); + connect( samy, TQ_SIGNAL(closeGate(int)), this, TQ_SLOT(closeGate(int))); + connect( samy, TQ_SIGNAL(score(bool, int)), this, TQ_SLOT(scoring(bool,int))); + connect( samy, TQ_SIGNAL(goingOut()), this, TQ_SLOT(speedUp())); + connect( basket, TQ_SIGNAL(openGate()), this, TQ_SLOT(openGate())); gameState.fill(false); gameState.setBit(Demo); timerCount = 0; - TQTimer::singleShot( 2000, this, TQT_SLOT(demo()) ); // Why wait? + TQTimer::singleShot( 2000, this, TQ_SLOT(demo()) ); // Why wait? backgroundPixmaps = TDEGlobal::dirs()->findAllResources("appdata", "backgrounds/*.png"); @@ -196,7 +196,7 @@ void Rattler::mousePressEvent( TQMouseEvent *e ) return; uint button = e->button(); - if (button == Qt::RightButton) + if (button == TQt::RightButton) { switch (direction) { @@ -211,7 +211,7 @@ void Rattler::mousePressEvent( TQMouseEvent *e ) } e->accept(); } - else if (button == Qt::LeftButton) + else if (button == TQt::LeftButton) { switch (direction) { @@ -345,7 +345,7 @@ void Rattler::restartDemo() return; int r = 50000+ (kapp->random() % 30000); - TQTimer::singleShot( r, this, TQT_SLOT(restartDemo()) ); + TQTimer::singleShot( r, this, TQ_SLOT(restartDemo()) ); stop(); level->create(Intro); @@ -364,7 +364,7 @@ void Rattler::demo() stop(); - TQTimer::singleShot( 60000, this, TQT_SLOT(restartDemo()) ); + TQTimer::singleShot( 60000, this, TQ_SLOT(restartDemo()) ); gameState.fill(false); gameState.setBit(Init); gameState.setBit(Demo); @@ -414,7 +414,7 @@ void Rattler::restart() cleanLabel(); repaint(); - TQTimer::singleShot( 2000, this, TQT_SLOT(showRoom()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(showRoom()) ); } void Rattler::newTry() @@ -427,7 +427,7 @@ void Rattler::newTry() level->create(GameOver); pix->initRoomPixmap(); repaint(); - TQTimer::singleShot( 5000, this, TQT_SLOT(demo()) ); + TQTimer::singleShot( 5000, this, TQ_SLOT(demo()) ); emit setScore(points); return; } @@ -440,7 +440,7 @@ void Rattler::newTry() pix->initRoomPixmap(); init(true); repaint(); - TQTimer::singleShot( 1000, this, TQT_SLOT(run()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(run()) ); } void Rattler::levelUp() @@ -458,7 +458,7 @@ void Rattler::levelUp() pix->initRoomPixmap(); repaint(); - TQTimer::singleShot( 2000, this, TQT_SLOT(showRoom()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(showRoom()) ); } /* this slot is called by the progressBar when value() == 0 @@ -494,7 +494,7 @@ void Rattler::showRoom() pix->initRoomPixmap(); init(true); repaint(); - TQTimer::singleShot( 1000, this, TQT_SLOT(run()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(run()) ); } void Rattler::init(bool play) @@ -534,7 +534,7 @@ void Rattler::start(int t) void Rattler::stop() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); } void Rattler::restartComputerSnakes(bool play) @@ -557,10 +557,10 @@ void Rattler::restartComputerSnakes(bool play) as = new KillerCompuSnake(board, pix); break; } - connect( as, TQT_SIGNAL(closeGate(int)), this, TQT_SLOT(closeGate(int))); - connect( as, TQT_SIGNAL(restartTimer()), this, TQT_SLOT(restartTimer())); - connect( as, TQT_SIGNAL(score(bool, int)), this, TQT_SLOT(scoring(bool,int))); - connect( as, TQT_SIGNAL(killed()), this, TQT_SLOT(killedComputerSnake())); + connect( as, TQ_SIGNAL(closeGate(int)), this, TQ_SLOT(closeGate(int))); + connect( as, TQ_SIGNAL(restartTimer()), this, TQ_SLOT(restartTimer())); + connect( as, TQ_SIGNAL(score(bool, int)), this, TQ_SLOT(scoring(bool,int))); + connect( as, TQ_SIGNAL(killed()), this, TQ_SLOT(killedComputerSnake())); computerSnakes->append(as); } } @@ -643,10 +643,10 @@ void Rattler::setCompuSnakes(int i) as = new KillerCompuSnake(board, pix); break; } - connect( as, TQT_SIGNAL(closeGate(int)), this, TQT_SLOT(closeGate(int))); - connect( as, TQT_SIGNAL(restartTimer()), this, TQT_SLOT(restartTimer())); - connect( as, TQT_SIGNAL(score(bool, int)), this, TQT_SLOT(scoring(bool,int))); - connect( as, TQT_SIGNAL(killed()), this, TQT_SLOT(killedComputerSnake())); + connect( as, TQ_SIGNAL(closeGate(int)), this, TQ_SLOT(closeGate(int))); + connect( as, TQ_SIGNAL(restartTimer()), this, TQ_SLOT(restartTimer())); + connect( as, TQ_SIGNAL(score(bool, int)), this, TQ_SLOT(scoring(bool,int))); + connect( as, TQ_SIGNAL(killed()), this, TQ_SLOT(killedComputerSnake())); computerSnakes->append(as); i--; } diff --git a/ksnake/rattler.h b/ksnake/rattler.h index af981c36..5cc830de 100644 --- a/ksnake/rattler.h +++ b/ksnake/rattler.h @@ -42,7 +42,7 @@ enum { Init, Playing, Demo, Paused, Over }; class Rattler : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksnake/snake.h b/ksnake/snake.h index 7b0a14be..396f928a 100644 --- a/ksnake/snake.h +++ b/ksnake/snake.h @@ -33,7 +33,7 @@ class Snake : public TQObject { - Q_OBJECT + TQ_OBJECT signals: diff --git a/ksnake/startroom.cpp b/ksnake/startroom.cpp index 725fe690..b2af039e 100644 --- a/ksnake/startroom.cpp +++ b/ksnake/startroom.cpp @@ -61,7 +61,7 @@ StartRoom::StartRoom( TQWidget *parent, const char *name) textLabel->setText(i18n("First level:")); Form1Layout->addWidget( textLabel, 1, 0 ); - connect( roomRange, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(loadLevel(int))); + connect( roomRange, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(loadLevel(int))); loadLevel(1); } diff --git a/ksnake/startroom.h b/ksnake/startroom.h index e7e64e53..4a21d5dc 100644 --- a/ksnake/startroom.h +++ b/ksnake/startroom.h @@ -33,7 +33,7 @@ class TQSpinBox; class StartRoom : public TQWidget { - Q_OBJECT + TQ_OBJECT public: StartRoom( TQWidget *parent=0, const char *name=0 ); diff --git a/ksnake/view.h b/ksnake/view.h index 6fe66700..e363e488 100644 --- a/ksnake/view.h +++ b/ksnake/view.h @@ -32,7 +32,7 @@ class Rattler; class View : public TQWidget { - Q_OBJECT + TQ_OBJECT public: View ( TQWidget *parent=0, const char *name=0 ); diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp index ef8c4481..e66de3fb 100644 --- a/ksokoban/MainWindow.cpp +++ b/ksokoban/MainWindow.cpp @@ -49,8 +49,8 @@ void MainWindow::createCollectionMenu() { collection_ = new TQPopupMenu(0,"collection menu"); collection_->setCheckable(true); - //connect(collection_, TQT_SIGNAL(activated(int)), playField_, TQT_SLOT(changeCollection(int))); - connect(collection_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeCollection(int))); + //connect(collection_, TQ_SIGNAL(activated(int)), playField_, TQ_SLOT(changeCollection(int))); + connect(collection_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeCollection(int))); for (int i=0; i<internalCollections_.collections(); i++) { collection_->insertItem(internalCollections_[i]->name(), i); @@ -90,30 +90,30 @@ MainWindow::MainWindow() : TDEMainWindow(0), externalCollection_(0) { game_ = new TQPopupMenu(0,"game menu"); pixmap = SmallIcon("document-open"); - game_->insertItem(TQIconSet(pixmap), i18n("&Load Levels..."), this, TQT_SLOT(loadLevels())); + game_->insertItem(TQIconSet(pixmap), i18n("&Load Levels..."), this, TQ_SLOT(loadLevels())); pixmap = SmallIcon("forward"); - game_->insertItem(TQIconSet(pixmap), i18n("&Next Level"), playField_, TQT_SLOT(nextLevel()), Key_N); + game_->insertItem(TQIconSet(pixmap), i18n("&Next Level"), playField_, TQ_SLOT(nextLevel()), Key_N); pixmap = SmallIcon("back"); - game_->insertItem(TQIconSet(pixmap), i18n("&Previous Level"), playField_, TQT_SLOT(previousLevel()), Key_P); + game_->insertItem(TQIconSet(pixmap), i18n("&Previous Level"), playField_, TQ_SLOT(previousLevel()), Key_P); pixmap = SmallIcon("reload"); - game_->insertItem(TQIconSet(pixmap), i18n("Re&start Level"), playField_, TQT_SLOT(restartLevel()), Key_Escape); + game_->insertItem(TQIconSet(pixmap), i18n("Re&start Level"), playField_, TQ_SLOT(restartLevel()), Key_Escape); createCollectionMenu(); game_->insertItem(i18n("&Level Collection"), collection_); pixmap = SmallIcon("edit-undo"); - game_->insertItem(TQIconSet(pixmap), i18n("&Undo"), playField_, TQT_SLOT(undo()),TQKeySequence( (TDEStdAccel::undo()).toString())); + game_->insertItem(TQIconSet(pixmap), i18n("&Undo"), playField_, TQ_SLOT(undo()),TQKeySequence( (TDEStdAccel::undo()).toString())); pixmap = SmallIcon("edit-redo"); - game_->insertItem(TQIconSet(pixmap), i18n("&Redo"), playField_, TQT_SLOT(redo()), TQKeySequence( (TDEStdAccel::redo()).toString())); + game_->insertItem(TQIconSet(pixmap), i18n("&Redo"), playField_, TQ_SLOT(redo()), TQKeySequence( (TDEStdAccel::redo()).toString())); game_->insertSeparator(); pixmap = SmallIcon("system-log-out"); - game_->insertItem(TQIconSet(pixmap), i18n("&Quit"), TDEApplication::kApplication(), TQT_SLOT(closeAllWindows()), TQKeySequence( (TDEStdAccel::quit()).toString())); + game_->insertItem(TQIconSet(pixmap), i18n("&Quit"), TDEApplication::kApplication(), TQ_SLOT(closeAllWindows()), TQKeySequence( (TDEStdAccel::quit()).toString())); menu_->insertItem(i18n("&Game"), game_); animation_ = new TQPopupMenu(0,"animation menu"); animation_->setCheckable(true); - connect(animation_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateAnimMenu(int))); - connect(animation_, TQT_SIGNAL(activated(int)), playField_, TQT_SLOT(changeAnim(int))); + connect(animation_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateAnimMenu(int))); + connect(animation_, TQ_SIGNAL(activated(int)), playField_, TQ_SLOT(changeAnim(int))); animation_->insertItem(i18n("&Slow"), 3); animation_->insertItem(i18n("&Medium"), 2); animation_->insertItem(i18n("&Fast"), 1); @@ -145,7 +145,7 @@ MainWindow::MainWindow() : TDEMainWindow(0), externalCollection_(0) { setBM_->setAccel(CTRL+Key_9, 9); setBM_->insertItem(TQIconSet(pixmap), i18n("(unused)"), 10); setBM_->setAccel(CTRL+Key_0, 10); - connect(setBM_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setBookmark(int))); + connect(setBM_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setBookmark(int))); bookmarkMenu_->insertItem(i18n("&Set Bookmark"), setBM_); pixmap = SmallIcon("bookmark"); @@ -170,7 +170,7 @@ MainWindow::MainWindow() : TDEMainWindow(0), externalCollection_(0) { goToBM_->setAccel(Key_9, 9); goToBM_->insertItem(TQIconSet(pixmap), i18n("(unused)"), 10); goToBM_->setAccel(Key_0, 10); - connect(goToBM_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(goToBookmark(int))); + connect(goToBM_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(goToBookmark(int))); bookmarkMenu_->insertItem(i18n("&Go to Bookmark"), goToBM_); menu_->insertItem(i18n("&Bookmarks"), bookmarkMenu_); diff --git a/ksokoban/MainWindow.h b/ksokoban/MainWindow.h index f732d1df..add02ff5 100644 --- a/ksokoban/MainWindow.h +++ b/ksokoban/MainWindow.h @@ -34,7 +34,7 @@ class TQDropEvent; class LevelCollection; class MainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow(); diff --git a/ksokoban/ModalLabel.h b/ksokoban/ModalLabel.h index 4898f14d..379706ee 100644 --- a/ksokoban/ModalLabel.h +++ b/ksokoban/ModalLabel.h @@ -23,7 +23,7 @@ #include <tqlabel.h> class ModalLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: static void message (const TQString &text, TQWidget *parent); diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp index 1483aa44..f9ec4f79 100644 --- a/ksokoban/PlayField.cpp +++ b/ksokoban/PlayField.cpp @@ -54,7 +54,7 @@ PlayField::PlayField(TQWidget *parent, const char *name, WFlags f) pushesText_(i18n("Pushes:")), statusFont_(TDEGlobalSettings::generalFont().family(), 18, TQFont::Bold), statusMetrics_(statusFont_) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setFocus(); setBackgroundMode(TQt::NoBackground); setMouseTracking(true); @@ -421,7 +421,7 @@ PlayField::highlight() { void PlayField::stopMoving() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); delete moveSequence_; moveSequence_ = 0; moveInProgress_ = false; @@ -456,7 +456,7 @@ void PlayField::timerEvent(TQTimerEvent *) { assert(moveInProgress_); if (moveSequence_ == 0) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); moveInProgress_ = false; return; } @@ -700,7 +700,7 @@ PlayField::mousePressEvent(TQMouseEvent *e) { if (!canMoveNow()) return; if (dragInProgress_) { - if (e->button() == Qt::LeftButton) dragObject(e->x(), e->y()); + if (e->button() == TQt::LeftButton) dragObject(e->x(), e->y()); else stopDrag(); return; } @@ -711,7 +711,7 @@ PlayField::mousePressEvent(TQMouseEvent *e) { if (x < 0 || y < 0 || x >= levelMap_->width() || y >= levelMap_->height()) return; - if (e->button() == Qt::LeftButton && pathFinder_.canDrag(x, y)) { + if (e->button() == TQt::LeftButton && pathFinder_.canDrag(x, y)) { TQPainter paint(this); changeCursor(&sizeAllCursor); @@ -732,7 +732,7 @@ PlayField::mousePressEvent(TQMouseEvent *e) { Move *m; switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m = pathFinder_.search(levelMap_, x, y); if (m != 0) { history_->add(m); @@ -740,11 +740,11 @@ PlayField::mousePressEvent(TQMouseEvent *e) { startMoving(m); } break; - case Qt::MidButton: + case TQt::MidButton: undo(); return; break; - case Qt::RightButton: + case TQt::RightButton: push(x, y); break; diff --git a/ksokoban/PlayField.h b/ksokoban/PlayField.h index ec1dbadc..f025f355 100644 --- a/ksokoban/PlayField.h +++ b/ksokoban/PlayField.h @@ -42,7 +42,7 @@ class TQPainter; class TQCursor; class PlayField : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PlayField(TQWidget *parent, const char *name=0, WFlags f=0); diff --git a/ksokoban/main.cpp b/ksokoban/main.cpp index 4dd605eb..0cf04828 100644 --- a/ksokoban/main.cpp +++ b/ksokoban/main.cpp @@ -76,7 +76,7 @@ main (int argc, char **argv) } args->clear(); - TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); int rc = app.exec(); diff --git a/kspaceduel/dialogs.cpp b/kspaceduel/dialogs.cpp index bf4b7c3e..396d7dfe 100644 --- a/kspaceduel/dialogs.cpp +++ b/kspaceduel/dialogs.cpp @@ -145,14 +145,14 @@ ConfigSetup::ConfigSetup(SConfig *custom,TQWidget *parent,const char *name) slider[i]=new TQSlider(EditVal[i][0]*EditDiv[i],EditVal[i][1]*EditDiv[i], (EditVal[i][1]-EditVal[i][0])/10, EditVal[i][2]*EditDiv[i], - Qt::Horizontal,configWidgets[Parent[i]]); - connect(slider[i],TQT_SIGNAL(valueChanged(int)),TQT_SLOT(sliderChanged(int))); + TQt::Horizontal,configWidgets[Parent[i]]); + connect(slider[i],TQ_SIGNAL(valueChanged(int)),TQ_SLOT(sliderChanged(int))); value[i]=new TQLCDNumber(LCDLen,configWidgets[Parent[i]]); value[i]->setFrameStyle(TQFrame::NoFrame); } configCombo=new TQComboBox(false,this); - connect(configCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(configSelected(int))); + connect(configCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(configSelected(int))); for(i=0;i<predefinedConfigNum;i++) configCombo->insertItem(i18n(predefinedConfigName[i])); configCombo->insertItem(i18n("Custom")); @@ -396,7 +396,7 @@ SettingsDialog::SettingsDialog(SConfig *customConfig, TQWidget *parent, const ch cs = new ConfigSetup(customConfig); addPage(cs, i18n("Game"), "kspaceduel", i18n("Game Settings")); - connect(cs, TQT_SIGNAL(changed()), this, TQT_SLOT(updateButtons())); + connect(cs, TQ_SIGNAL(changed()), this, TQ_SLOT(updateButtons())); // resize(600,400); } diff --git a/kspaceduel/dialogs.h b/kspaceduel/dialogs.h index 4b1fc884..19bb353a 100644 --- a/kspaceduel/dialogs.h +++ b/kspaceduel/dialogs.h @@ -17,7 +17,7 @@ class TQCheckBox; class ConfigSetup:public TQWidget { - Q_OBJECT + TQ_OBJECT public: ConfigSetup(SConfig *custom,TQWidget *parent=0,const char* name=0); @@ -79,7 +79,7 @@ private: class SettingsDialog : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: SettingsDialog(SConfig *customConfig, TQWidget *parent=0, const char *name=0); diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index a2645087..5cbb1011 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -99,7 +99,7 @@ MyMainView::MyMainView(TQWidget *parent) MyMainView::~MyMainView() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); writeConfig(); } @@ -340,7 +340,7 @@ void MyMainView::pause() pauseAction->setChecked( true ); waitForStart=true; - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); emit setStatusText(i18n(" paused "), IDS_PAUSE); } } @@ -375,7 +375,7 @@ void MyMainView::stop() pauseAction->setEnabled( false ); pauseAction->setChecked( false ); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); waitForStart = true; } @@ -444,7 +444,7 @@ void MyMainView::newRound() timeToNextPowerup=random.getDouble() * config.powerupRefreshTime; powerups.clear(); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); mx=width()/2.0; my=height()/2.0; ship[0]->move(mx+config.startPosX,my+config.startPosY); @@ -517,7 +517,7 @@ void MyMainView::timerEvent(TQTimerEvent *event) if(event->timerId()==timerID) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); if(gameEnd>0.0) { gameEnd-=1.0; @@ -990,7 +990,7 @@ void MyMainView::gameSetup() return; SettingsDialog *settings=new SettingsDialog(&customConfig,this,"settings"); - connect(settings, TQT_SIGNAL(settingsUpdated()),this,TQT_SLOT(closeSettings())); + connect(settings, TQ_SIGNAL(settingsUpdated()),this,TQ_SLOT(closeSettings())); settings->show(); } diff --git a/kspaceduel/mainview.h b/kspaceduel/mainview.h index f39e3134..0515dfc7 100644 --- a/kspaceduel/mainview.h +++ b/kspaceduel/mainview.h @@ -18,7 +18,7 @@ class Ai; class MyMainView:public TQWidget { - Q_OBJECT + TQ_OBJECT public: MyMainView(TQWidget *parent=0); diff --git a/kspaceduel/playerinfo.h b/kspaceduel/playerinfo.h index 780a974f..5668889e 100644 --- a/kspaceduel/playerinfo.h +++ b/kspaceduel/playerinfo.h @@ -9,7 +9,7 @@ class TQPixmap; class PlayerInfo:public TQFrame { - Q_OBJECT + TQ_OBJECT public: PlayerInfo(int pnr,TQWidget *parent=0,const char *name=0); diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp index cd8fd8dc..a8a3b5ab 100644 --- a/kspaceduel/topwidget.cpp +++ b/kspaceduel/topwidget.cpp @@ -31,16 +31,16 @@ void MyTopLevelWidget::initGameWidgets( ){ toplayout->addWidget(playerinfo[1]); toplayout->activate(); - playfield->setFocusPolicy(TQ_StrongFocus); + playfield->setFocusPolicy(TQWidget::StrongFocus); playfield->setFocus(); - TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(energy(int,int)), - TQT_SLOT(energy(int,int))); - TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(hitPoints(int,int)), - TQT_SLOT(hitPoints(int,int))); - TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(wins(int,int)),TQT_SLOT(wins(int,int))); - TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(setStatusText(const TQString &,int)), - TQT_SLOT(setStatusText(const TQString &,int))); + TQObject::connect(playfield,TQ_SIGNAL(energy(int,int)), + TQ_SLOT(energy(int,int))); + TQObject::connect(playfield,TQ_SIGNAL(hitPoints(int,int)), + TQ_SLOT(hitPoints(int,int))); + TQObject::connect(playfield,TQ_SIGNAL(wins(int,int)),TQ_SLOT(wins(int,int))); + TQObject::connect(playfield,TQ_SIGNAL(setStatusText(const TQString &,int)), + TQ_SLOT(setStatusText(const TQString &,int))); setCentralWidget(w); } @@ -62,18 +62,18 @@ void MyTopLevelWidget::wins(int pn,int w) void MyTopLevelWidget::initActions( ) { - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdGameAction::gameNew(TQT_TQOBJECT(playfield), TQT_SLOT(newGame()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdGameAction::gameNew(playfield, TQ_SLOT(newGame()), actionCollection()); ( void )new TDEAction( i18n( "&New Round" ), "spnewround", - CTRL + Key_R, TQT_TQOBJECT(playfield), TQT_SLOT( newRound( ) ), + CTRL + Key_R, playfield, TQ_SLOT( newRound( ) ), actionCollection( ), "new_round" ); MyMainView::pauseAction = - KStdGameAction::pause(TQT_TQOBJECT(playfield), TQT_SLOT(togglePause()), actionCollection()); + KStdGameAction::pause(playfield, TQ_SLOT(togglePause()), actionCollection()); MyMainView::pauseAction->setChecked( false ); TDEAction* gameStart = new TDEAction( i18n( "Start" ), GAME_START_SHORTCUT, - TQT_TQOBJECT(playfield), TQT_SLOT( start( ) ), actionCollection( ), "game_start" ); + playfield, TQ_SLOT( start( ) ), actionCollection( ), "game_start" ); - KStdAction::preferences(TQT_TQOBJECT(playfield), TQT_SLOT(gameSetup()), actionCollection()); + KStdAction::preferences(playfield, TQ_SLOT(gameSetup()), actionCollection()); TDEAccel* acc = new TDEAccel(this); gameStart->plugAccel(acc); diff --git a/kspaceduel/topwidget.h b/kspaceduel/topwidget.h index 6b3c475f..0042a8de 100644 --- a/kspaceduel/topwidget.h +++ b/kspaceduel/topwidget.h @@ -8,7 +8,7 @@ class MyMainView; class MyTopLevelWidget:public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MyTopLevelWidget(); diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp index 33b6f561..85478071 100644 --- a/ktron/ktron.cpp +++ b/ktron/ktron.cpp @@ -46,7 +46,7 @@ KTron::KTron(TQWidget *parent, const char *name) : TDEMainWindow(parent, name) { playerPoints[0]=playerPoints[1]=0; tron=new Tron(this, "Tron"); - connect(tron,TQT_SIGNAL(gameEnds(Player)),TQT_SLOT(changeStatus(Player))); + connect(tron,TQ_SIGNAL(gameEnds(Player)),TQ_SLOT(changeStatus(Player))); setCentralWidget(tron); tron->setMinimumSize(200,180); @@ -81,10 +81,10 @@ KTron::KTron(TQWidget *parent, const char *name) : TDEMainWindow(parent, name) { tron->setActionCollection(actionCollection()); - KStdGameAction::pause(TQT_TQOBJECT(tron), TQT_SLOT(togglePause()), actionCollection()); - KStdGameAction::gameNew( TQT_TQOBJECT(tron), TQT_SLOT( newGame() ), actionCollection() ); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + KStdGameAction::pause(tron, TQ_SLOT(togglePause()), actionCollection()); + KStdGameAction::gameNew( tron, TQ_SLOT( newGame() ), actionCollection() ); + KStdGameAction::quit(this, TQ_SLOT( close() ), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); setupGUI( TDEMainWindow::Keys | StatusBar | Save | Create); loadSettings(); @@ -186,8 +186,8 @@ void KTron::showSettings(){ dialog->addPage(new General(0, "General"), i18n("General"), "package_settings"); dialog->addPage(new Ai(0, "Ai"), i18n("A.I."), "preferences-desktop-personal"); dialog->addPage(new Appearance(0, "Appearance"), i18n("Appearance"), "style"); - connect(dialog, TQT_SIGNAL(settingsChanged()), tron, TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), tron, TQ_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); dialog->show(); } diff --git a/ktron/ktron.h b/ktron/ktron.h index 160c6ea7..af41b9b2 100644 --- a/ktron/ktron.h +++ b/ktron/ktron.h @@ -38,7 +38,7 @@ class Tron; */ class KTron : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: diff --git a/ktron/tron.cpp b/ktron/tron.cpp index 4fb53878..c76cef5c 100644 --- a/ktron/tron.cpp +++ b/ktron/tron.cpp @@ -51,7 +51,7 @@ Tron::Tron(TQWidget *parent,const char *name) random.setSeed(0); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setBackgroundMode(NoBackground); gameBlocked=false; @@ -59,8 +59,8 @@ Tron::Tron(TQWidget *parent,const char *name) timer = new TQTimer(this,"timer"); loadSettings(); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(doMove())); - TQTimer::singleShot(15000, this,TQT_SLOT(showBeginHint())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(doMove())); + TQTimer::singleShot(15000, this,TQ_SLOT(showBeginHint())); } void Tron::loadSettings(){ @@ -150,7 +150,7 @@ void Tron::newGame() emit gameEnds(Nobody); reset(); - TQTimer::singleShot(15000,this,TQT_SLOT(showBeginHint())); + TQTimer::singleShot(15000,this,TQ_SLOT(showBeginHint())); } void Tron::reset() @@ -274,7 +274,7 @@ void Tron::showWinner(Player player) if(isComputer(Both)) { - TQTimer::singleShot(1000,this,TQT_SLOT(computerStart())); + TQTimer::singleShot(1000,this,TQ_SLOT(computerStart())); } } @@ -453,7 +453,7 @@ void Tron::setComputerplayer(Player player, bool flag) { players[1].setComputer(flag); if(isComputer(Both)) - TQTimer::singleShot(1000,this,TQT_SLOT(computerStart())); + TQTimer::singleShot(1000,this,TQ_SLOT(computerStart())); } bool Tron::isComputer(Player player) @@ -939,7 +939,7 @@ void Tron::doMove() { //this is for waiting 0,5s before starting next game gameBlocked=true; - TQTimer::singleShot(1000,this,TQT_SLOT(unblockGame())); + TQTimer::singleShot(1000,this,TQ_SLOT(unblockGame())); return; } } @@ -1056,7 +1056,7 @@ void Tron::doMove() { //this is for waiting 1s before starting next game gameBlocked=true; - TQTimer::singleShot(1000,this,TQT_SLOT(unblockGame())); + TQTimer::singleShot(1000,this,TQ_SLOT(unblockGame())); } } diff --git a/ktron/tron.h b/ktron/tron.h index eeeab068..730ca0a0 100644 --- a/ktron/tron.h +++ b/ktron/tron.h @@ -45,7 +45,7 @@ enum {BACKGROUND=0, PLAYER1=1,PLAYER2=2,TOP=4,BOTTOM=8,LEFT=16,RIGHT=32}; */ class Tron : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/ktuberling/playground.h b/ktuberling/playground.h index 4552e103..59d7533d 100644 --- a/ktuberling/playground.h +++ b/ktuberling/playground.h @@ -22,7 +22,7 @@ class TopLevel; class PlayGround : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/ktuberling/soundfactory.h b/ktuberling/soundfactory.h index bb23baca..0365fdb6 100644 --- a/ktuberling/soundfactory.h +++ b/ktuberling/soundfactory.h @@ -15,7 +15,7 @@ class TopLevel; class SoundFactory : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp index eadedb09..776cc95f 100644 --- a/ktuberling/toplevel.cpp +++ b/ktuberling/toplevel.cpp @@ -61,21 +61,21 @@ void TopLevel::registerGameboard(const TQString &menuItem, const char *actionId) switch (gameboards) { - case 0: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(gameboard0()), actionCollection(), actionId); + case 0: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(gameboard0()), actionCollection(), actionId); break; - case 1: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(gameboard1()), actionCollection(), actionId); + case 1: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(gameboard1()), actionCollection(), actionId); break; - case 2: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(gameboard2()), actionCollection(), actionId); + case 2: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(gameboard2()), actionCollection(), actionId); break; - case 3: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(gameboard3()), actionCollection(), actionId); + case 3: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(gameboard3()), actionCollection(), actionId); break; - case 4: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(gameboard4()), actionCollection(), actionId); + case 4: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(gameboard4()), actionCollection(), actionId); break; - case 5: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(gameboard5()), actionCollection(), actionId); + case 5: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(gameboard5()), actionCollection(), actionId); break; - case 6: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(gameboard6()), actionCollection(), actionId); + case 6: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(gameboard6()), actionCollection(), actionId); break; - case 7: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(gameboard7()), actionCollection(), actionId); + case 7: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(gameboard7()), actionCollection(), actionId); break; } @@ -93,37 +93,37 @@ void TopLevel::registerLanguage(const TQString &menuItem, const char *actionId, switch (languages) { - case 0: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language0()), actionCollection(), actionId); + case 0: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language0()), actionCollection(), actionId); break; - case 1: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language1()), actionCollection(), actionId); + case 1: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language1()), actionCollection(), actionId); break; - case 2: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language2()), actionCollection(), actionId); + case 2: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language2()), actionCollection(), actionId); break; - case 3: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language3()), actionCollection(), actionId); + case 3: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language3()), actionCollection(), actionId); break; - case 4: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language4()), actionCollection(), actionId); + case 4: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language4()), actionCollection(), actionId); break; - case 5: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language5()), actionCollection(), actionId); + case 5: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language5()), actionCollection(), actionId); break; - case 6: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language6()), actionCollection(), actionId); + case 6: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language6()), actionCollection(), actionId); break; - case 7: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language7()), actionCollection(), actionId); + case 7: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language7()), actionCollection(), actionId); break; - case 8: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language8()), actionCollection(), actionId); + case 8: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language8()), actionCollection(), actionId); break; - case 9: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language9()), actionCollection(), actionId); + case 9: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language9()), actionCollection(), actionId); break; - case 10: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language10()), actionCollection(), actionId); + case 10: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language10()), actionCollection(), actionId); break; - case 11: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language11()), actionCollection(), actionId); + case 11: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language11()), actionCollection(), actionId); break; - case 12: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language12()), actionCollection(), actionId); + case 12: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language12()), actionCollection(), actionId); break; - case 13: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language13()), actionCollection(), actionId); + case 13: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language13()), actionCollection(), actionId); break; - case 14: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language14()), actionCollection(), actionId); + case 14: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language14()), actionCollection(), actionId); break; - case 15: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, TQT_TQOBJECT(this), TQT_SLOT(language15()), actionCollection(), actionId); + case 15: t = new TDEToggleAction(i18n(menuItem.latin1()), 0, this, TQ_SLOT(language15()), actionCollection(), actionId); break; } @@ -254,22 +254,22 @@ void TopLevel::writeOptions() void TopLevel::setupTDEAction() { //Game - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); - KStdGameAction::load(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdGameAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); - KStdGameAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); - (void) new TDEAction(i18n("Save &as Picture..."), 0, TQT_TQOBJECT(this), TQT_SLOT(filePicture()), actionCollection(), "game_save_picture"); + KStdGameAction::gameNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdGameAction::load(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdGameAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdGameAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdGameAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + (void) new TDEAction(i18n("Save &as Picture..."), 0, this, TQ_SLOT(filePicture()), actionCollection(), "game_save_picture"); //Edit - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(editCopy()), actionCollection()); - KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(editUndo()), actionCollection()); - KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(editRedo()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection()); + KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection()); + KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection()); enableUndo(false); enableRedo(false); //Speech - TDEToggleAction* t = new TDEToggleAction(i18n("&No Sound"), 0, TQT_TQOBJECT(this), TQT_SLOT(soundOff()), actionCollection(), "speech_no_sound"); + TDEToggleAction* t = new TDEToggleAction(i18n("&No Sound"), 0, this, TQ_SLOT(soundOff()), actionCollection(), "speech_no_sound"); if (!soundEnabled) t->setChecked(true); setupGUI(); diff --git a/ktuberling/toplevel.h b/ktuberling/toplevel.h index 31cf5c18..e5aa27f6 100644 --- a/ktuberling/toplevel.h +++ b/ktuberling/toplevel.h @@ -17,7 +17,7 @@ class SoundFactory; class TopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp index f29bdb15..816d15e3 100644 --- a/libksirtet/base/board.cpp +++ b/libksirtet/base/board.cpp @@ -54,7 +54,7 @@ BaseBoard::BaseBoard(bool graphic, TQWidget *parent) _next = new BlockInfo(*sequences); setBlockInfo(main, _next); - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); Piece::info().loadColors(); KZoomMainWindow::addWidget(this); diff --git a/libksirtet/base/board.h b/libksirtet/base/board.h index 76cbf729..0f825b50 100644 --- a/libksirtet/base/board.h +++ b/libksirtet/base/board.h @@ -14,7 +14,7 @@ class BlockInfo; //----------------------------------------------------------------------------- class KDE_EXPORT FixedCanvasView : public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: FixedCanvasView(TQWidget *parent = 0, const char *name = 0); @@ -28,7 +28,7 @@ public slots: //----------------------------------------------------------------------------- class KDE_EXPORT BaseBoard : public FixedCanvasView, public GenericTetris { - Q_OBJECT + TQ_OBJECT public: enum Direction { Left = 1, Right = 2, Up = 4, Down = 8, Nb_Direction = 4 }; diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp index f443c96c..e750b67f 100644 --- a/libksirtet/base/field.cpp +++ b/libksirtet/base/field.cpp @@ -90,9 +90,9 @@ void BaseField::setMessage(const TQString &label, ButtonType type) if ( type!=NoButton ) { _button = new TQPushButton(i18n(BUTTON_TEXTS[type]), board); _button->setFocus(); - const char *slot = (type==ResumeButton ? TQT_SLOT(pause()) - : TQT_SLOT(start())); - _button->connect(_button, TQT_SIGNAL(clicked()), + const char *slot = (type==ResumeButton ? TQ_SLOT(pause()) + : TQ_SLOT(start())); + _button->connect(_button, TQ_SIGNAL(clicked()), _widget->parent(), slot); _boardLayout->addWidget(_button, 0, TQt::AlignCenter); _button->show(); diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp index 758d73d6..a9bb2004 100644 --- a/libksirtet/base/kzoommainwindow.cpp +++ b/libksirtet/base/kzoommainwindow.cpp @@ -30,11 +30,11 @@ KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name { installEventFilter(this); - _zoomInAction = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(zoomIn()), actionCollection()); + _zoomInAction = KStdAction::zoomIn(this, TQ_SLOT(zoomIn()), actionCollection()); _zoomOutAction = - KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(zoomOut()), actionCollection()); + KStdAction::zoomOut(this, TQ_SLOT(zoomOut()), actionCollection()); _menu = - KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); + KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection()); } void KZoomMainWindow::init(const char *popupName) @@ -63,7 +63,7 @@ void KZoomMainWindow::addWidget(TQWidget *widget) static_cast<KZoomMainWindow *>(tlw->tqt_cast("KZoomMainWindow")); Q_ASSERT(zm); zm->_widgets.append(widget); - connect(widget, TQT_SIGNAL(destroyed()), zm, TQT_SLOT(widgetDestroyed())); + connect(widget, TQ_SIGNAL(destroyed()), zm, TQ_SLOT(widgetDestroyed())); } void KZoomMainWindow::widgetDestroyed() diff --git a/libksirtet/base/kzoommainwindow.h b/libksirtet/base/kzoommainwindow.h index a15344c8..ad9e2ccb 100644 --- a/libksirtet/base/kzoommainwindow.h +++ b/libksirtet/base/kzoommainwindow.h @@ -43,7 +43,7 @@ class TDEToggleAction; */ class KDE_EXPORT KZoomMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** Constructor. */ diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp index e9f576f1..3916afc2 100644 --- a/libksirtet/base/main.cpp +++ b/libksirtet/base/main.cpp @@ -24,20 +24,20 @@ BaseMainWindow::BaseMainWindow() KNotifyClient::startDaemon(); // File & Popup - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(start()), actionCollection()); - _pause = KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pause()), actionCollection()); + KStdGameAction::gameNew(this, TQ_SLOT(start()), actionCollection()); + _pause = KStdGameAction::pause(this, TQ_SLOT(pause()), actionCollection()); _pause->setEnabled(false); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscores()), + KStdGameAction::highscores(this, TQ_SLOT(showHighscores()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(tqApp), TQT_SLOT(quit()), actionCollection()); + KStdGameAction::quit(tqApp, TQ_SLOT(quit()), actionCollection()); // Settings - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureSettings()), + KStdAction::preferences(this, TQ_SLOT(configureSettings()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), actionCollection()); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), + KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), actionCollection()); + KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()), actionCollection()); - KStdGameAction::configureHighscores(TQT_TQOBJECT(this), TQT_SLOT(configureHighscores()), + KStdGameAction::configureHighscores(this, TQ_SLOT(configureHighscores()), actionCollection()); _inter = bfactory->createInterface(this); @@ -89,7 +89,7 @@ void BaseMainWindow::configureSettings() if (w) dialog->addPage(w, i18n("Colors"), "colorize"); // dialog->addPage(new BackgroundConfigWidget, i18n("Background"), "background"); addConfig(dialog); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_SIGNAL(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), TQ_SIGNAL(settingsChanged())); dialog->show(); } diff --git a/libksirtet/base/main.h b/libksirtet/base/main.h index 2c48439b..3409ede5 100644 --- a/libksirtet/base/main.h +++ b/libksirtet/base/main.h @@ -12,7 +12,7 @@ class TDEConfigDialog; class KDE_EXPORT BaseMainWindow : public KZoomMainWindow { - Q_OBJECT + TQ_OBJECT public: BaseMainWindow(); diff --git a/libksirtet/base/settings.h b/libksirtet/base/settings.h index b0859e3f..c141a829 100644 --- a/libksirtet/base/settings.h +++ b/libksirtet/base/settings.h @@ -10,7 +10,7 @@ class TQGridLayout; //----------------------------------------------------------------------------- class BaseAppearanceConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: BaseAppearanceConfig(); @@ -23,7 +23,7 @@ protected: //----------------------------------------------------------------------------- class ColorConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ColorConfig(); diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp index d201d9fd..35d9d89f 100644 --- a/libksirtet/common/ai.cpp +++ b/libksirtet/common/ai.cpp @@ -89,7 +89,7 @@ AI::AI(uint tTime, uint oTime, const Data *DATA) : timer(this), thinkTime(tTime), orderTime(oTime), stopped(false), board(0) { - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); for (uint i=0; DATA[i].name; i++) { Element element; diff --git a/libksirtet/common/ai.h b/libksirtet/common/ai.h index 6cec5093..fb8575a1 100644 --- a/libksirtet/common/ai.h +++ b/libksirtet/common/ai.h @@ -40,7 +40,7 @@ class LIBKSIRTET_EXPORT AIPiece //----------------------------------------------------------------------------- class LIBKSIRTET_EXPORT AI : public TQObject { - Q_OBJECT + TQ_OBJECT public: struct Data { @@ -106,7 +106,7 @@ class LIBKSIRTET_EXPORT AI : public TQObject //----------------------------------------------------------------------------- class LIBKSIRTET_EXPORT AIConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AIConfig(const TQValueVector<AI::Element> &elements); diff --git a/libksirtet/common/board.h b/libksirtet/common/board.h index be3cf80c..ff50841f 100644 --- a/libksirtet/common/board.h +++ b/libksirtet/common/board.h @@ -10,7 +10,7 @@ class AI; class LIBKSIRTET_EXPORT Board : public BaseBoard { - Q_OBJECT + TQ_OBJECT public: Board(bool graphic, GiftPool *, TQWidget *parent); diff --git a/libksirtet/common/field.cpp b/libksirtet/common/field.cpp index f1b9cbc9..85b16fd6 100644 --- a/libksirtet/common/field.cpp +++ b/libksirtet/common/field.cpp @@ -85,9 +85,9 @@ Field::Field(TQWidget *parent) vbl->addWidget(showNext, 0); vbl->addStretch(4); - connect(board, TQT_SIGNAL(scoreUpdated()), TQT_SLOT(scoreUpdatedSlot())); - connect(board, TQT_SIGNAL(levelUpdated()), TQT_SLOT(levelUpdated())); - connect(board, TQT_SIGNAL(removedUpdated()), TQT_SLOT(removedUpdated())); + connect(board, TQ_SIGNAL(scoreUpdated()), TQ_SLOT(scoreUpdatedSlot())); + connect(board, TQ_SIGNAL(levelUpdated()), TQ_SLOT(levelUpdated())); + connect(board, TQ_SIGNAL(removedUpdated()), TQ_SLOT(removedUpdated())); initVariableGUI(); } diff --git a/libksirtet/common/field.h b/libksirtet/common/field.h index 0b754d97..6708f953 100644 --- a/libksirtet/common/field.h +++ b/libksirtet/common/field.h @@ -17,7 +17,7 @@ class KGameLCDClock; class LIBKSIRTET_EXPORT Field : public MPSimpleBoard, public BaseField { - Q_OBJECT + TQ_OBJECT public: Field(TQWidget *parent); diff --git a/libksirtet/common/inter.cpp b/libksirtet/common/inter.cpp index cc9a86ed..99c61e56 100644 --- a/libksirtet/common/inter.cpp +++ b/libksirtet/common/inter.cpp @@ -12,17 +12,17 @@ const ActionData Interface::ACTION_DATA[Nb_Actions] = { - { I18N_NOOP("Move Left"), "move left", TQT_SLOT(moveLeft()), 0 }, - { I18N_NOOP("Move Right"), "move right", TQT_SLOT(moveRight()), 0 }, - { I18N_NOOP("Drop Down"), "drop down", TQT_SLOT(dropDownStart()), - TQT_SLOT(dropDownStop()) }, - { I18N_NOOP("One Line Down"), "one line down", TQT_SLOT(oneLineDown()), 0 }, - { I18N_NOOP("Rotate Left"), "rotate left", TQT_SLOT(rotateLeft()), 0 }, - { I18N_NOOP("Rotate Right"), "rotate right", TQT_SLOT(rotateRight()), 0 }, + { I18N_NOOP("Move Left"), "move left", TQ_SLOT(moveLeft()), 0 }, + { I18N_NOOP("Move Right"), "move right", TQ_SLOT(moveRight()), 0 }, + { I18N_NOOP("Drop Down"), "drop down", TQ_SLOT(dropDownStart()), + TQ_SLOT(dropDownStop()) }, + { I18N_NOOP("One Line Down"), "one line down", TQ_SLOT(oneLineDown()), 0 }, + { I18N_NOOP("Rotate Left"), "rotate left", TQ_SLOT(rotateLeft()), 0 }, + { I18N_NOOP("Rotate Right"), "rotate right", TQ_SLOT(rotateRight()), 0 }, { I18N_NOOP("Move to Left Column"), "move left total", - TQT_SLOT(moveLeftTotal()), 0 }, + TQ_SLOT(moveLeftTotal()), 0 }, { I18N_NOOP("Move to Right Column"), "move right total", - TQT_SLOT(moveRightTotal()), 0 } + TQ_SLOT(moveRightTotal()), 0 } }; const int Interface::KEYCODE_ONE[Nb_Actions] = { @@ -45,7 +45,7 @@ MPBoard *Interface::newBoard(uint i) { Field *f = static_cast<Field *>(cfactory->createField(this)); f->settingsChanged(); - connect(this, TQT_SIGNAL(settingsChanged()), f, TQT_SLOT(settingsChanged())); + connect(this, TQ_SIGNAL(settingsChanged()), f, TQ_SLOT(settingsChanged())); if ( i==0 ) _firstField = f; return f; } diff --git a/libksirtet/common/inter.h b/libksirtet/common/inter.h index fbf78c77..cbca7e8f 100644 --- a/libksirtet/common/inter.h +++ b/libksirtet/common/inter.h @@ -14,7 +14,7 @@ class Field; class LIBKSIRTET_EXPORT Interface : public MPSimpleInterface, public BaseInterface { - Q_OBJECT + TQ_OBJECT public: Interface(const MPGameInfo &, TQWidget *parent); diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp index ec6ec658..0d0a75cb 100644 --- a/libksirtet/common/main.cpp +++ b/libksirtet/common/main.cpp @@ -20,27 +20,27 @@ void MainWindow::init() { Interface *inter = static_cast<Interface *>(_inter); inter->normalGame(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); // Modes bool ama = ( bfactory->bbi.nbArcadeStages!=0 ); TQString s = (ama ? i18n("&Single Human (Normal)") : i18n("&Single Human")); - (void)new TDEAction(s, 0, TQT_TQOBJECT(inter), TQT_SLOT(normalGame()), + (void)new TDEAction(s, 0, inter, TQ_SLOT(normalGame()), actionCollection(), "mp_single_human"); if (ama) (void)new TDEAction(i18n("&Single Human (Arcade)"), 0, - TQT_TQOBJECT(inter), TQT_SLOT(arcadeGame()), + inter, TQ_SLOT(arcadeGame()), actionCollection(), "mp_arcade"); - (void)new TDEAction(i18n("Human vs &Human"), 0, TQT_TQOBJECT(inter), TQT_SLOT(humanVsHuman()), + (void)new TDEAction(i18n("Human vs &Human"), 0, inter, TQ_SLOT(humanVsHuman()), actionCollection(), "mp_human_vs_human"); (void)new TDEAction(i18n("Human vs &Computer"), 0, - TQT_TQOBJECT(inter), TQT_SLOT(humanVsComputer()), + inter, TQ_SLOT(humanVsComputer()), actionCollection(), "mp_human_vs_computer"); - (void)new TDEAction(i18n("&More..."), 0, TQT_TQOBJECT(inter), TQT_SLOT(dialog()), + (void)new TDEAction(i18n("&More..."), 0, inter, TQ_SLOT(dialog()), actionCollection(), "mp_more"); buildGUI(inter); - connect(this, TQT_SIGNAL(settingsChanged()), - inter, TQT_SLOT(settingsChangedSlot())); + connect(this, TQ_SIGNAL(settingsChanged()), + inter, TQ_SLOT(settingsChangedSlot())); } void MainWindow::addKeys(KKeyDialog &d) diff --git a/libksirtet/common/main.h b/libksirtet/common/main.h index daafca74..e22d8f59 100644 --- a/libksirtet/common/main.h +++ b/libksirtet/common/main.h @@ -7,7 +7,7 @@ class LIBKSIRTET_EXPORT MainWindow : public BaseMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow() {} diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp index 376c0c57..f4ba7203 100644 --- a/libksirtet/common/misc_ui.cpp +++ b/libksirtet/common/misc_ui.cpp @@ -38,7 +38,7 @@ Shadow::Shadow(BaseBoard *board, TQWidget *parent) _board(board), _show(false) { KZoomMainWindow::addWidget(this); - connect(board, TQT_SIGNAL(updatePieceConfigSignal()), TQT_SLOT(update())); + connect(board, TQ_SIGNAL(updatePieceConfigSignal()), TQ_SLOT(update())); } TQSize Shadow::sizeHint() const @@ -130,7 +130,7 @@ void GiftPool::put(uint n) if ( n==0 ) return; if ( nb==0 && !ready ) TQTimer::singleShot(cfactory->cbi.giftPoolTimeout, - this, TQT_SLOT(timeout())); + this, TQ_SLOT(timeout())); uint e = TQMIN(nb+n, leds.size()); for (uint i=nb; i<e; i++) leds[i]->on(); uint f = TQMIN(nb+n-e, leds.size()); @@ -161,7 +161,7 @@ uint GiftPool::take() void GiftPool::reset() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); ready = false; nb = 0; for (uint i=0; i<leds.size(); i++) { @@ -173,7 +173,7 @@ void GiftPool::reset() //----------------------------------------------------------------------------- PlayerProgress::PlayerProgress(BaseBoard *board, TQWidget *parent, const char *name) - : KGameProgress(0, board->matrix().height(), 0, Qt::Vertical, + : KGameProgress(0, board->matrix().height(), 0, TQt::Vertical, parent, name), _board(board) { setBackgroundColor(lightGray); diff --git a/libksirtet/common/misc_ui.h b/libksirtet/common/misc_ui.h index 7ec97345..fb2fd02a 100644 --- a/libksirtet/common/misc_ui.h +++ b/libksirtet/common/misc_ui.h @@ -13,7 +13,7 @@ /*****************************************************************************/ class LIBKSIRTET_EXPORT ShowNextPiece : public FixedCanvasView { - Q_OBJECT + TQ_OBJECT public: ShowNextPiece(BaseBoard *, TQWidget *parent); @@ -22,7 +22,7 @@ class LIBKSIRTET_EXPORT ShowNextPiece : public FixedCanvasView /*****************************************************************************/ class LIBKSIRTET_EXPORT Shadow : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Shadow(BaseBoard *, TQWidget *parent); @@ -44,7 +44,7 @@ class Led; class LIBKSIRTET_EXPORT GiftPool : public TQHBox { - Q_OBJECT + TQ_OBJECT public: GiftPool(TQWidget *parent); @@ -70,7 +70,7 @@ class LIBKSIRTET_EXPORT GiftPool : public TQHBox /*****************************************************************************/ class LIBKSIRTET_EXPORT PlayerProgress : public KGameProgress { - Q_OBJECT + TQ_OBJECT public: PlayerProgress(BaseBoard *board, TQWidget *parent = 0, const char *name = 0); diff --git a/libksirtet/common/settings.h b/libksirtet/common/settings.h index eaa7b2fe..156386ac 100644 --- a/libksirtet/common/settings.h +++ b/libksirtet/common/settings.h @@ -9,7 +9,7 @@ //----------------------------------------------------------------------------- class LIBKSIRTET_EXPORT AppearanceConfig : public BaseAppearanceConfig { - Q_OBJECT + TQ_OBJECT public: AppearanceConfig(); @@ -18,7 +18,7 @@ public: //----------------------------------------------------------------------------- class LIBKSIRTET_EXPORT GameConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: GameConfig(); diff --git a/libksirtet/lib/internal.cpp b/libksirtet/lib/internal.cpp index a3f07cbb..e508e4d9 100644 --- a/libksirtet/lib/internal.cpp +++ b/libksirtet/lib/internal.cpp @@ -76,8 +76,8 @@ Network::Network(MPInterface *_interface, for (; it.current(); ++it) { rd.socket = it.current()->socket; rd.socket->notifier()->setEnabled(TRUE); - connect(rd.socket->notifier(), TQT_SIGNAL(activated(int)), - TQT_SLOT(notifier(int))); + connect(rd.socket->notifier(), TQ_SIGNAL(activated(int)), + TQ_SLOT(notifier(int))); uint nb = it.current()->bds.count(); Q_ASSERT( nb>=1 ); rd.array = new BufferArray(nb); @@ -155,8 +155,8 @@ LocalServer::LocalServer(MPInterface *_interface, uint _interval) : Local(_interface, _boards), Server(_interval) { - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutSlot())); - connect(&ctimer, TQT_SIGNAL(timeout()), TQT_SLOT(congestionTimeoutSlot())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutSlot())); + connect(&ctimer, TQ_SIGNAL(timeout()), TQ_SLOT(congestionTimeoutSlot())); serverTimeout(); } @@ -167,8 +167,8 @@ NetworkServer::NetworkServer(MPInterface *_interface, : Network(_interface, _boards, rhd), Server(_interval), nbReceived(remotes.count()) { - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutSlot())); - connect(&ctimer, TQT_SIGNAL(timeout()), TQT_SLOT(congestionTimeoutSlot())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutSlot())); + connect(&ctimer, TQ_SIGNAL(timeout()), TQ_SLOT(congestionTimeoutSlot())); // to catch unexpected data for (uint i=0; i<remotes.count(); i++) remotes[i].received = TRUE; nbReceived = remotes.count(); diff --git a/libksirtet/lib/internal.h b/libksirtet/lib/internal.h index f2e752c3..30e4c7b3 100644 --- a/libksirtet/lib/internal.h +++ b/libksirtet/lib/internal.h @@ -58,7 +58,7 @@ class Server //----------------------------------------------------------------------------- class Network : public TQObject, public Local { - Q_OBJECT + TQ_OBJECT public: @@ -93,7 +93,7 @@ class Network : public TQObject, public Local //----------------------------------------------------------------------------- class LocalServer : public TQObject, public Local, public Server { - Q_OBJECT + TQ_OBJECT public: @@ -113,7 +113,7 @@ class LocalServer : public TQObject, public Local, public Server //----------------------------------------------------------------------------- class NetworkServer : public Network, public Server { - Q_OBJECT + TQ_OBJECT public: @@ -139,7 +139,7 @@ class NetworkServer : public Network, public Server //----------------------------------------------------------------------------- class Client : public Network { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp index 5d250680..b6cc99cd 100644 --- a/libksirtet/lib/keys.cpp +++ b/libksirtet/lib/keys.cpp @@ -49,7 +49,7 @@ void KeyData::createActionCollection(uint index, TQWidget *receiver) TQString name = TQString("%2 %3").arg(index+1).arg(_data[k].name); const char *slot = (_data[k].slotRelease ? 0 : _data[k].slot); TDEAction *a = new TDEAction(label, _keycodes[_cols.size()-1][index][k], - TQT_TQOBJECT(receiver), slot, _cols[index], name.utf8()); + receiver, slot, _cols[index], name.utf8()); a->setEnabled(false); if ( slot==0 ) { SpecialData data; diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h index 9b7ecd82..9ab735bd 100644 --- a/libksirtet/lib/keys.h +++ b/libksirtet/lib/keys.h @@ -9,7 +9,7 @@ class KeyData : public TQObject { - Q_OBJECT + TQ_OBJECT public: KeyData(uint maxNb, uint nbActions, const ActionData *, diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp index 88203601..7c246356 100644 --- a/libksirtet/lib/meeting.cpp +++ b/libksirtet/lib/meeting.cpp @@ -65,13 +65,13 @@ void NetMeeting::appendLine(const MeetingLineData &pld, bool server) { MeetingLine *pl; pl = new MeetingLine(pld.own, server, false, wl); - if (pld.own) connect(pl, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(textChanged(const TQString &))); + if (pld.own) connect(pl, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(textChanged(const TQString &))); else message(i18n("A new client has just arrived (#%1)") .arg(wl->size()+1)); pl->setData(pld.ed); - connect(pl, TQT_SIGNAL(typeChanged(MeetingCheckBox::Type)), - TQT_SLOT(typeChanged(MeetingCheckBox::Type))); + connect(pl, TQ_SIGNAL(typeChanged(MeetingCheckBox::Type)), + TQ_SLOT(typeChanged(MeetingCheckBox::Type))); wl->append(pl); waiting(); } @@ -216,17 +216,17 @@ ServerNetMeeting::ServerNetMeeting(const cId &id, TQPtrList<RemoteHostData> &arhd, TQWidget *parent, const char * name) : NetMeeting(id, r.socket, option, TRUE, parent, name), rhd(arhd) { - connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), TQT_SLOT(newHost(int))); + connect(sm[0]->notifier(), TQ_SIGNAL(activated(int)), TQ_SLOT(newHost(int))); players.append(Accepted); // server // set server line ExtData ed(r.bds, "", MeetingCheckBox::Ready); spl->setData(ed); - connect(spl, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(textChanged(const TQString &))); + connect(spl, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(textChanged(const TQString &))); // options signal - if (ow) connect(ow, TQT_SIGNAL(changed()), TQT_SLOT(optionsChanged())); + if (ow) connect(ow, TQ_SIGNAL(changed()), TQ_SLOT(optionsChanged())); } void ServerNetMeeting::writeToAll(uint i) @@ -271,8 +271,8 @@ void ServerNetMeeting::newHost(int) players.append(NewPlayer); Socket *socket = new Socket(s, true); uint i = sm.append(socket, SocketManager::ReadWrite); - connect(sm[i]->notifier(), TQT_SIGNAL(activated(int)), - TQT_SLOT(readNotifier(int))); + connect(sm[i]->notifier(), TQ_SIGNAL(activated(int)), + TQ_SLOT(readNotifier(int))); sm[i]->notifier()->setEnabled(TRUE); } @@ -451,8 +451,8 @@ ClientNetMeeting::ClientNetMeeting(const cId &id, TQWidget *parent, const char * name) : NetMeeting(id, rhd.socket, option, FALSE, parent, name), bds(rhd.bds) { - connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), - TQT_SLOT(readNotifier(int))); + connect(sm[0]->notifier(), TQ_SIGNAL(activated(int)), + TQ_SLOT(readNotifier(int))); players.append(NewPlayer); // server player // Send id to server (Id flag + Id struct) diff --git a/libksirtet/lib/meeting.h b/libksirtet/lib/meeting.h index a99dd72c..779d06a4 100644 --- a/libksirtet/lib/meeting.h +++ b/libksirtet/lib/meeting.h @@ -12,7 +12,7 @@ class MPOptionWidget; /** Internal class : net meeting. */ class NetMeeting : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ class NetMeeting : public KDialogBase class ServerNetMeeting : public NetMeeting { - Q_OBJECT + TQ_OBJECT public: @@ -109,7 +109,7 @@ class ServerNetMeeting : public NetMeeting class ClientNetMeeting : public NetMeeting { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp index 97a7bfa4..7be010ee 100644 --- a/libksirtet/lib/miscui.cpp +++ b/libksirtet/lib/miscui.cpp @@ -16,12 +16,12 @@ MeetingCheckBox::MeetingCheckBox(Type type, bool owner, bool server, _ready = new TQCheckBox(i18n("Ready"), this); vbox->addWidget(_ready); _ready->setEnabled(owner); - connect(_ready, TQT_SIGNAL(clicked()), TQT_SLOT(changedSlot())); + connect(_ready, TQ_SIGNAL(clicked()), TQ_SLOT(changedSlot())); _excluded = new TQCheckBox(i18n("Excluded"), this); vbox->addWidget(_excluded); _excluded->setEnabled(server); - connect(_excluded, TQT_SIGNAL(clicked()), TQT_SLOT(changedSlot())); + connect(_excluded, TQ_SIGNAL(clicked()), TQ_SLOT(changedSlot())); setType(type); } @@ -54,5 +54,5 @@ PlayerComboBox::PlayerComboBox(Type type, bool canBeEmpty, bool acceptAI, if (canBeEmpty) insertItem(i18n("None")); setCurrentItem(type); - connect(this, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed(int))); + connect(this, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed(int))); } diff --git a/libksirtet/lib/miscui.h b/libksirtet/lib/miscui.h index f781fbea..36f6a75a 100644 --- a/libksirtet/lib/miscui.h +++ b/libksirtet/lib/miscui.h @@ -8,7 +8,7 @@ //----------------------------------------------------------------------------- class MeetingCheckBox : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum Type { Ready, NotReady, Excluded }; @@ -30,7 +30,7 @@ class MeetingCheckBox : public TQWidget //----------------------------------------------------------------------------- class PlayerComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: enum Type { Human = 0, AI, None }; diff --git a/libksirtet/lib/mp_board.h b/libksirtet/lib/mp_board.h index 9368a3ab..4d689b60 100644 --- a/libksirtet/lib/mp_board.h +++ b/libksirtet/lib/mp_board.h @@ -9,7 +9,7 @@ */ class MPBoard : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp index 1ad8a572..a18b3d0b 100644 --- a/libksirtet/lib/mp_interface.cpp +++ b/libksirtet/lib/mp_interface.cpp @@ -29,7 +29,7 @@ MPInterface::MPInterface(const MPGameInfo &_gameInfo, hbl = new TQHBoxLayout(this, 0, 5); hbl->setResizeMode( TQLayout::Fixed ); - _keyData = new KeyData(gameInfo.maxNbLocalPlayers, nbActions, data, TQT_TQOBJECT(this)); + _keyData = new KeyData(gameInfo.maxNbLocalPlayers, nbActions, data, this); } MPInterface::~MPInterface() @@ -155,7 +155,7 @@ void MPInterface::createLocalGame(const ConnectionData &cd) d.ptr = newBoard(i); hbl->addWidget(d.ptr); d.ptr->show(); - connect(d.ptr, TQT_SIGNAL(enableKeys(bool)), TQT_SLOT(enableKeys(bool))); + connect(d.ptr, TQ_SIGNAL(enableKeys(bool)), TQ_SLOT(enableKeys(bool))); boards += d; } @@ -257,7 +257,7 @@ void MPInterface::hostDisconnected(uint, const TQString &msg) if ( !disconnected ) { // to avoid multiple calls disconnected = TRUE; // the zero timer is used to be outside the "internal" class - TQTimer::singleShot(0, this, TQT_SLOT(singleHumanSlot())); + TQTimer::singleShot(0, this, TQ_SLOT(singleHumanSlot())); } } diff --git a/libksirtet/lib/mp_interface.h b/libksirtet/lib/mp_interface.h index 3ae8a0bc..968d3408 100644 --- a/libksirtet/lib/mp_interface.h +++ b/libksirtet/lib/mp_interface.h @@ -75,7 +75,7 @@ typedef struct { */ class MPInterface : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/mp_option.h b/libksirtet/lib/mp_option.h index dc4bbd15..adf78125 100644 --- a/libksirtet/lib/mp_option.h +++ b/libksirtet/lib/mp_option.h @@ -34,7 +34,7 @@ */ class MPOptionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/mp_simple_board.h b/libksirtet/lib/mp_simple_board.h index f261b30d..1a0eb8b2 100644 --- a/libksirtet/lib/mp_simple_board.h +++ b/libksirtet/lib/mp_simple_board.h @@ -8,7 +8,7 @@ class KDE_EXPORT MPSimpleBoard : public MPBoard { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp index 7058b8eb..004f1a78 100644 --- a/libksirtet/lib/mp_simple_interface.cpp +++ b/libksirtet/lib/mp_simple_interface.cpp @@ -73,7 +73,7 @@ void MPSimpleInterface::dataFromServer(TQDataStream &s) switch (scf.value()) { case SC_Flag::Stop: KMessageBox::information(this, i18n("Server has left game!")); - TQTimer::singleShot(0, this, TQT_SLOT(singleHuman())); + TQTimer::singleShot(0, this, TQ_SLOT(singleHuman())); return; case SC_Flag::GameOver: _readGameOverData(s); diff --git a/libksirtet/lib/mp_simple_interface.h b/libksirtet/lib/mp_simple_interface.h index 94f568d6..e2ab4430 100644 --- a/libksirtet/lib/mp_simple_interface.h +++ b/libksirtet/lib/mp_simple_interface.h @@ -6,7 +6,7 @@ class MPSimpleInterface : public MPInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp index f685181a..fd2d9200 100644 --- a/libksirtet/lib/pline.cpp +++ b/libksirtet/lib/pline.cpp @@ -21,7 +21,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, tcb = new MeetingCheckBox(MeetingCheckBox::Ready, isOwner, serverIsReader, this); if ( !XOR(isOwner, serverIsReader) ) tcb->setEnabled(FALSE); - else connect(tcb, TQT_SIGNAL(changed(int)), TQT_SLOT(_typeChanged(int))); + else connect(tcb, TQ_SIGNAL(changed(int)), TQ_SLOT(_typeChanged(int))); hbl->addWidget(tcb); /* Name */ @@ -52,8 +52,8 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, qle->setFont( TQFont("fixed", 12, TQFont::Bold) ); qle->setFixedSize(qle->fontMetrics().maxWidth()*TALKER_MAX_LENGTH, qle->sizeHint().height()); - connect(qle, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(_textChanged(const TQString &))); + connect(qle, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(_textChanged(const TQString &))); qle->setEnabled(isOwner); hbl->addWidget(qle); } @@ -95,7 +95,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, /* CheckBox */ pcb = new PlayerComboBox(type, canBeEmpty, acceptAI, this); - connect(pcb, TQT_SIGNAL(changed(int)), TQT_SLOT(typeChangedSlot(int))); + connect(pcb, TQ_SIGNAL(changed(int)), TQ_SLOT(typeChangedSlot(int))); hbl->addWidget(pcb); /* Name */ @@ -107,7 +107,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, /* settings button */ setting = new TQPushButton(i18n("Settings"), this); - connect(setting, TQT_SIGNAL(clicked()), TQT_SLOT(setSlot())); + connect(setting, TQ_SIGNAL(clicked()), TQ_SLOT(setSlot())); hbl->addWidget(setting); typeChangedSlot(type); diff --git a/libksirtet/lib/pline.h b/libksirtet/lib/pline.h index 4fcbf028..0a214e72 100644 --- a/libksirtet/lib/pline.h +++ b/libksirtet/lib/pline.h @@ -15,7 +15,7 @@ class TQPushButton; /** Internal class : display a "player line" in netmeeting. */ class MeetingLine : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ class MeetingLine : public TQFrame class PlayerLine : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -82,7 +82,7 @@ class PlayerLine : public TQFrame /** Internal class : scrolable list of widgets. */ class GWidgetList : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/types.cpp b/libksirtet/lib/types.cpp index ae91c4d5..e6c3e836 100644 --- a/libksirtet/lib/types.cpp +++ b/libksirtet/lib/types.cpp @@ -169,25 +169,25 @@ Stream::Stream(int _mode) { setDevice(&buf); Q_ASSERT( _mode==IO_ReadOnly || _mode==IO_WriteOnly ); - buf.open((TQIODevice_OpenModeFlag)_mode); + buf.open(_mode); } void Stream::clear() { buf.close(); - buf.open((TQIODevice_OpenModeFlag)(mode | IO_Truncate)); + buf.open(mode | IO_Truncate); } void Stream::setArray(TQByteArray a) { buf.close(); buf.setBuffer(a); - buf.open((TQIODevice_OpenModeFlag)mode); + buf.open(mode); } bool ReadingStream::readOk() { - return ( TQT_TQIODEVICE(&buf)->status()==IO_Ok ); + return ( buf.status()==IO_Ok ); } void ReadingStream::clearRead() diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp index 68537602..8618d36d 100644 --- a/libksirtet/lib/wizard.cpp +++ b/libksirtet/lib/wizard.cpp @@ -49,7 +49,7 @@ void MPWizard::setupTypePage() typePage->setMargin(KDialogBase::marginHint()); TQVButtonGroup *vbg = new TQVButtonGroup(typePage); - connect(vbg, TQT_SIGNAL(clicked(int)), TQT_SLOT(typeChanged(int))); + connect(vbg, TQ_SIGNAL(clicked(int)), TQ_SLOT(typeChanged(int))); TQRadioButton *b; b = new TQRadioButton(i18n("Create a local game"), vbg); b = new TQRadioButton(i18n("Create a network game"), vbg); @@ -81,11 +81,11 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) localPage->setMargin(KDialogBase::marginHint()); wl = new WidgetList<PlayerLine>(5, localPage); - TQSignalMapper *husm = new TQSignalMapper(TQT_TQOBJECT(this)); - if (gi.humanSettingSlot) connect(husm, TQT_SIGNAL(mapped(int)), + TQSignalMapper *husm = new TQSignalMapper(this); + if (gi.humanSettingSlot) connect(husm, TQ_SIGNAL(mapped(int)), gi.humanSettingSlot); - TQSignalMapper *aism = new TQSignalMapper(TQT_TQOBJECT(this)); - if (gi.AISettingSlot) connect(aism, TQT_SIGNAL(mapped(int)), gi.AISettingSlot); + TQSignalMapper *aism = new TQSignalMapper(this); + if (gi.AISettingSlot) connect(aism, TQ_SIGNAL(mapped(int)), gi.AISettingSlot); TDEConfigGroupSaver cg(kapp->config(), MP_GROUP); TQString n; @@ -101,18 +101,18 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) pl = new PlayerLine(type, n, gi.humanSettingSlot, gi.AISettingSlot, i!=0, gi.AIAllowed, wl); - connect(pl, TQT_SIGNAL(typeChanged(int)), TQT_SLOT(lineTypeChanged(int))); - husm->setMapping(TQT_TQOBJECT(pl), i); - connect(pl, TQT_SIGNAL(setHuman()), husm, TQT_SLOT(map())); - aism->setMapping(TQT_TQOBJECT(pl), i); - connect(pl, TQT_SIGNAL(setAI()), aism, TQT_SLOT(map())); + connect(pl, TQ_SIGNAL(typeChanged(int)), TQ_SLOT(lineTypeChanged(int))); + husm->setMapping(pl, i); + connect(pl, TQ_SIGNAL(setHuman()), husm, TQ_SLOT(map())); + aism->setMapping(pl, i); + connect(pl, TQ_SIGNAL(setAI()), aism, TQ_SLOT(map())); wl->append(pl); } ((TQVBox *)localPage)->setSpacing(KDialogBase::spacingHint()); // keys = new TQPushButton(i18n("Configure Keys..."), localPage); -// connect(keys, TQT_SIGNAL(clicked()), TQT_SLOT(configureKeysSlot())); +// connect(keys, TQ_SIGNAL(clicked()), TQ_SLOT(configureKeysSlot())); addPage(localPage, i18n("Local Player's Settings")); setHelpEnabled(localPage, FALSE); diff --git a/libksirtet/lib/wizard.h b/libksirtet/lib/wizard.h index 42a1b871..9a74ae21 100644 --- a/libksirtet/lib/wizard.h +++ b/libksirtet/lib/wizard.h @@ -18,7 +18,7 @@ class ConnectionData; class MPWizard : public KWizard { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/TODO b/libtdegames/TODO index 136c4fdd..5acd38a6 100644 --- a/libtdegames/TODO +++ b/libtdegames/TODO @@ -5,6 +5,6 @@ - 10.07.2001: global decks/carddirs need extensive testing -These pertain to the highscore widget -The Ok button when adding a name should be enabled when the lineedit is filled with a QString of length() > 0 +The Ok button when adding a name should be enabled when the lineedit is filled with a TQString of length() > 0 The lineedit by default should come up with the user name that is loged in. diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp index 5b7e08c0..286fb97a 100644 --- a/libtdegames/highscore/kexthighscore_gui.cpp +++ b/libtdegames/highscore/kexthighscore_gui.cpp @@ -130,7 +130,7 @@ HighscoresWidget::HighscoresWidget(TQWidget *parent) TQVBoxLayout *vbox = new TQVBoxLayout(this, KDialogBase::spacingHint()); _tw = new TQTabWidget(this); - connect(_tw, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(tabChanged())); + connect(_tw, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(tabChanged())); vbox->addWidget(_tw); // scores tab @@ -160,15 +160,15 @@ HighscoresWidget::HighscoresWidget(TQWidget *parent) KURL url = internal->queryURL(ManagerPrivate::Scores); _scoresUrl = new KURLLabel(url.url(), i18n("View world-wide highscores"), this); - connect(_scoresUrl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(showURL(const TQString &))); + connect(_scoresUrl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(showURL(const TQString &))); vbox->addWidget(_scoresUrl); url = internal->queryURL(ManagerPrivate::Players); _playersUrl = new KURLLabel(url.url(), i18n("View world-wide players"), this); - connect(_playersUrl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(showURL(const TQString &))); + connect(_playersUrl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(showURL(const TQString &))); vbox->addWidget(_playersUrl); } } @@ -215,8 +215,8 @@ HighscoresDialog::HighscoresDialog(int rank, TQWidget *parent) if ( i==internal->gameType() ) createPage(w); } - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), - TQT_SLOT(createPage(TQWidget *))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), + TQ_SLOT(createPage(TQWidget *))); showPage(internal->gameType()); } else { TQVBoxLayout *vbox = new TQVBoxLayout(plainPage()); @@ -234,7 +234,7 @@ void HighscoresDialog::createPage(TQWidget *page) int i = (several ? pageIndex(page) : 0); if ( _widgets[i]==0 ) { _widgets[i] = new HighscoresWidget(page); - connect(_widgets[i], TQT_SIGNAL(tabChanged(int)), TQT_SLOT(tabChanged(int))); + connect(_widgets[i], TQ_SIGNAL(tabChanged(int)), TQ_SLOT(tabChanged(int))); } uint type = internal->gameType(); if (several) internal->setGameType(i); @@ -376,10 +376,10 @@ ConfigDialog::ConfigDialog(TQWidget *parent) TQLabel *label = new TQLabel(i18n("Nickname:"), page); pageTop->addWidget(label, 0, 0); _nickname = new TQLineEdit(page); - connect(_nickname, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(modifiedSlot())); - connect(_nickname, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(nickNameChanged(const TQString &))); + connect(_nickname, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(modifiedSlot())); + connect(_nickname, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(nickNameChanged(const TQString &))); _nickname->setMaxLength(16); pageTop->addWidget(_nickname, 0, 1); @@ -387,16 +387,16 @@ ConfigDialog::ConfigDialog(TQWidget *parent) label = new TQLabel(i18n("Comment:"), page); pageTop->addWidget(label, 1, 0); _comment = new TQLineEdit(page); - connect(_comment, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(modifiedSlot())); + connect(_comment, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(modifiedSlot())); _comment->setMaxLength(50); pageTop->addWidget(_comment, 1, 1); if (tab) { _WWHEnabled = new TQCheckBox(i18n("World-wide highscores enabled"), page); - connect(_WWHEnabled, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(modifiedSlot())); + connect(_WWHEnabled, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(modifiedSlot())); pageTop->addMultiCellWidget(_WWHEnabled, 2, 2, 0, 1); // advanced tab @@ -421,7 +421,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent) KGuiItem gi = KStdGuiItem::clear(); gi.setText(i18n("Remove")); _removeButton = new KPushButton(gi, grid); - connect(_removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeSlot())); + connect(_removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeSlot())); } load(); @@ -533,7 +533,7 @@ AskNameDialog::AskNameDialog(TQWidget *parent) hbox->addWidget(label); _edit = new TQLineEdit(plainPage()); _edit->setFocus(); - connect(_edit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(nameChanged())); + connect(_edit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(nameChanged())); hbox->addWidget(_edit); top->addSpacing(spacingHint()); diff --git a/libtdegames/highscore/kexthighscore_gui.h b/libtdegames/highscore/kexthighscore_gui.h index 0749d682..d0f742f1 100644 --- a/libtdegames/highscore/kexthighscore_gui.h +++ b/libtdegames/highscore/kexthighscore_gui.h @@ -57,7 +57,7 @@ class ShowItem : public TDEListViewItem class ScoresList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ScoresList(TQWidget *parent); @@ -76,7 +76,7 @@ class ScoresList : public TDEListView //----------------------------------------------------------------------------- class HighscoresList : public ScoresList { - Q_OBJECT + TQ_OBJECT public: HighscoresList(TQWidget *parent); @@ -89,7 +89,7 @@ class HighscoresList : public ScoresList class HighscoresWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: HighscoresWidget(TQWidget *parent); @@ -115,7 +115,7 @@ class HighscoresWidget : public TQWidget class HighscoresDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: HighscoresDialog(int rank, TQWidget *parent); @@ -135,7 +135,7 @@ class HighscoresDialog : public KDialogBase //----------------------------------------------------------------------------- class LastMultipleScoresList : public ScoresList { - Q_OBJECT + TQ_OBJECT public: LastMultipleScoresList(const TQValueVector<Score> &, TQWidget *parent); @@ -150,7 +150,7 @@ private: class TotalMultipleScoresList : public ScoresList { - Q_OBJECT + TQ_OBJECT public: TotalMultipleScoresList(const TQValueVector<Score> &, TQWidget *parent); @@ -166,7 +166,7 @@ private: //----------------------------------------------------------------------------- class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(TQWidget *parent); @@ -194,7 +194,7 @@ class ConfigDialog : public KDialogBase //----------------------------------------------------------------------------- class AskNameDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AskNameDialog(TQWidget *parent); diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp index e48db436..b45a86b0 100644 --- a/libtdegames/highscore/kexthighscore_tab.cpp +++ b/libtdegames/highscore/kexthighscore_tab.cpp @@ -46,7 +46,7 @@ PlayersCombo::PlayersCombo(TQWidget *parent, const char *name) for (uint i = 0; i<p.nbEntries(); i++) insertItem(p.prettyName(i)); insertItem(TQString("<") + i18n("all") + '>'); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(activatedSlot(int))); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(activatedSlot(int))); } void PlayersCombo::activatedSlot(int i) @@ -75,9 +75,9 @@ AdditionalTab::AdditionalTab(TQWidget *parent, const char *name) TQLabel *label = new TQLabel(i18n("Select player:"), this); hbox->addWidget(label); _combo = new PlayersCombo(this); - connect(_combo, TQT_SIGNAL(playerSelected(uint)), - TQT_SLOT(playerSelected(uint))); - connect(_combo, TQT_SIGNAL(allSelected()), TQT_SLOT(allSelected())); + connect(_combo, TQ_SIGNAL(playerSelected(uint)), + TQ_SLOT(playerSelected(uint))); + connect(_combo, TQ_SIGNAL(allSelected()), TQ_SLOT(allSelected())); hbox->addWidget(_combo); hbox->addStretch(1); } diff --git a/libtdegames/highscore/kexthighscore_tab.h b/libtdegames/highscore/kexthighscore_tab.h index bb84f155..3ba1c720 100644 --- a/libtdegames/highscore/kexthighscore_tab.h +++ b/libtdegames/highscore/kexthighscore_tab.h @@ -33,7 +33,7 @@ namespace KExtHighscore //----------------------------------------------------------------------------- class PlayersCombo : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: PlayersCombo(TQWidget *parent = 0, const char *name = 0); @@ -52,7 +52,7 @@ class PlayersCombo : public TQComboBox //----------------------------------------------------------------------------- class AdditionalTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AdditionalTab(TQWidget *parent, const char *name); @@ -75,7 +75,7 @@ class AdditionalTab : public TQWidget //----------------------------------------------------------------------------- class StatisticsTab : public AdditionalTab { - Q_OBJECT + TQ_OBJECT public: StatisticsTab(TQWidget *parent); @@ -101,7 +101,7 @@ class StatisticsTab : public AdditionalTab //----------------------------------------------------------------------------- class HistogramTab : public AdditionalTab { - Q_OBJECT + TQ_OBJECT public: HistogramTab(TQWidget *parent); diff --git a/libtdegames/highscore/khighscore.h b/libtdegames/highscore/khighscore.h index 4cf5778c..ebdaebf5 100644 --- a/libtdegames/highscore/khighscore.h +++ b/libtdegames/highscore/khighscore.h @@ -83,7 +83,7 @@ class KHighscorePrivate; **/ class KDE_EXPORT KHighscore : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @obsolete diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp index 518d0084..0f35c191 100644 --- a/libtdegames/highscore/kscoredialog.cpp +++ b/libtdegames/highscore/kscoredialog.cpp @@ -90,7 +90,7 @@ KScoreDialog::KScoreDialog(int fields, TQWidget *parent, const char *oname) d->key[Score] = "Score"; d->page = makeMainWidget(); - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotGotName())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotGotName())); } KScoreDialog::~KScoreDialog() @@ -154,7 +154,7 @@ void KScoreDialog::setupDialog() } } - KSeparator *sep = new KSeparator(Qt::Horizontal, d->page); + KSeparator *sep = new KSeparator(TQt::Horizontal, d->page); d->layout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1); d->labels.resize(d->nrCols * 10); @@ -239,8 +239,8 @@ void KScoreDialog::aboutToShow() stack->addWidget(d->edit); stack->raiseWidget(d->edit); d->edit->setFocus(); - connect(d->edit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotGotReturn())); + connect(d->edit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotGotReturn())); } else { @@ -365,7 +365,7 @@ void KScoreDialog::show() void KScoreDialog::slotGotReturn() { - TQTimer::singleShot(0, this, TQT_SLOT(slotGotName())); + TQTimer::singleShot(0, this, TQ_SLOT(slotGotName())); } void KScoreDialog::slotGotName() diff --git a/libtdegames/highscore/kscoredialog.h b/libtdegames/highscore/kscoredialog.h index 51cdb479..535d4be2 100644 --- a/libtdegames/highscore/kscoredialog.h +++ b/libtdegames/highscore/kscoredialog.h @@ -38,7 +38,7 @@ class TQWidgetStack; * A simple high score dialog. */ class KDE_EXPORT KScoreDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/highscore/tdeconfigrawbackend.h b/libtdegames/highscore/tdeconfigrawbackend.h index 7e8f2790..fdaeb88a 100644 --- a/libtdegames/highscore/tdeconfigrawbackend.h +++ b/libtdegames/highscore/tdeconfigrawbackend.h @@ -47,7 +47,7 @@ private: class KRawConfig : public KSimpleConfig { - Q_OBJECT + TQ_OBJECT public: KRawConfig(int fd, bool readOnly) diff --git a/libtdegames/kcanvasrootpixmap.cpp b/libtdegames/kcanvasrootpixmap.cpp index 0976e7ef..fc75c408 100644 --- a/libtdegames/kcanvasrootpixmap.cpp +++ b/libtdegames/kcanvasrootpixmap.cpp @@ -26,8 +26,8 @@ KCanvasRootPixmap::KCanvasRootPixmap(TQCanvasView *view, const char *name) : KRootPixmap(view, name), _view(view) { setCustomPainting(true); - connect(this, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), - TQT_SLOT(backgroundUpdatedSlot(const TQPixmap &))); + connect(this, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), + TQ_SLOT(backgroundUpdatedSlot(const TQPixmap &))); } void KCanvasRootPixmap::backgroundUpdatedSlot(const TQPixmap &pixmap) diff --git a/libtdegames/kcanvasrootpixmap.h b/libtdegames/kcanvasrootpixmap.h index 566f50d2..0868f603 100644 --- a/libtdegames/kcanvasrootpixmap.h +++ b/libtdegames/kcanvasrootpixmap.h @@ -39,7 +39,7 @@ class TQCanvasView; */ class KDE_EXPORT KCanvasRootPixmap : public KRootPixmap { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp index be1c7fef..77b63205 100644 --- a/libtdegames/kcarddialog.cpp +++ b/libtdegames/kcarddialog.cpp @@ -274,7 +274,7 @@ void KCardDialog::setupDialog(bool showResizeBox) TQHBoxLayout* layout = new TQHBoxLayout(cardLayout); // Deck iconview - TQGroupBox* grp1 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Backside"), plainPage()); + TQGroupBox* grp1 = new TQGroupBox(1,TQt::Horizontal, i18n("Choose Backside"), plainPage()); layout->addWidget(grp1); d->deckIconView = new TDEIconView(grp1,"decks"); @@ -304,8 +304,8 @@ void KCardDialog::setupDialog(bool showResizeBox) d->randomDeck = new TQCheckBox(plainPage()); d->randomDeck->setChecked(false); - connect(d->randomDeck, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(slotRandomDeckToggled(bool))); + connect(d->randomDeck, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(slotRandomDeckToggled(bool))); d->randomDeck->setText(i18n("Random backside")); l->addWidget(d->randomDeck, 0, AlignTop|AlignHCenter); @@ -315,18 +315,18 @@ void KCardDialog::setupDialog(bool showResizeBox) l->addWidget(d->globalDeck, 0, AlignTop|AlignHCenter); TQPushButton* b = new TQPushButton(i18n("Make Backside Global"), plainPage()); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSetGlobalDeck())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSetGlobalDeck())); l->addWidget(b, 0, AlignTop|AlignHCenter); - connect(d->deckIconView,TQT_SIGNAL(clicked(TQIconViewItem *)), - this,TQT_SLOT(slotDeckClicked(TQIconViewItem *))); + connect(d->deckIconView,TQ_SIGNAL(clicked(TQIconViewItem *)), + this,TQ_SLOT(slotDeckClicked(TQIconViewItem *))); } if (! (flags() & NoCards)) { // Cards iconview TQHBoxLayout* layout = new TQHBoxLayout(cardLayout); - TQGroupBox* grp2 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Frontside"), plainPage()); + TQGroupBox* grp2 = new TQGroupBox(1,TQt::Horizontal, i18n("Choose Frontside"), plainPage()); layout->addWidget(grp2); d->cardIconView =new TDEIconView(grp2,"cards"); @@ -354,8 +354,8 @@ void KCardDialog::setupDialog(bool showResizeBox) d->randomCardDir = new TQCheckBox(plainPage()); d->randomCardDir->setChecked(false); - connect(d->randomCardDir, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(slotRandomCardDirToggled(bool))); + connect(d->randomCardDir, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(slotRandomCardDirToggled(bool))); d->randomCardDir->setText(i18n("Random frontside")); l->addWidget(d->randomCardDir, 0, AlignTop|AlignHCenter); @@ -365,11 +365,11 @@ void KCardDialog::setupDialog(bool showResizeBox) l->addWidget(d->globalCardDir, 0, AlignTop|AlignHCenter); TQPushButton* b = new TQPushButton(i18n("Make Frontside Global"), plainPage()); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSetGlobalCardDir())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSetGlobalCardDir())); l->addWidget(b, 0, AlignTop|AlignHCenter); - connect(d->cardIconView,TQT_SIGNAL(clicked(TQIconViewItem *)), - this,TQT_SLOT(slotCardClicked(TQIconViewItem *))); + connect(d->cardIconView,TQ_SIGNAL(clicked(TQIconViewItem *)), + this,TQ_SLOT(slotCardClicked(TQIconViewItem *))); } // Insert deck icons @@ -423,7 +423,7 @@ void KCardDialog::setupDialog(bool showResizeBox) // larger but i want the complete pixmap to be displayed. the dialog is not // resized if you make the pixmap smaller again. TQVBoxLayout* layout = new TQVBoxLayout(topLayout); - TQGroupBox* grp = new TQGroupBox(1,Qt::Horizontal, i18n("Resize Cards"), plainPage()); + TQGroupBox* grp = new TQGroupBox(1,TQt::Horizontal, i18n("Resize Cards"), plainPage()); layout->setResizeMode(TQLayout::Fixed); layout->addWidget(grp); TQWidget* box = new TQWidget(grp); @@ -431,13 +431,13 @@ void KCardDialog::setupDialog(bool showResizeBox) TQVBoxLayout* boxLayout = new TQVBoxLayout(hbox); hbox->addStretch(0); - d->scaleSlider = new TQSlider(1, SLIDER_MAX, 1, (-1000+SLIDER_MIN+SLIDER_MAX),Qt::Horizontal, box); + d->scaleSlider = new TQSlider(1, SLIDER_MAX, 1, (-1000+SLIDER_MIN+SLIDER_MAX),TQt::Horizontal, box); d->scaleSlider->setMinValue(SLIDER_MIN); - connect(d->scaleSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotCardResized(int))); + connect(d->scaleSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotCardResized(int))); boxLayout->addWidget(d->scaleSlider, 0, AlignLeft); TQPushButton* b = new TQPushButton(i18n("Default Size"), box); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotDefaultSize())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotDefaultSize())); boxLayout->addWidget(b, 0, AlignLeft); TQLabel* l = new TQLabel(i18n("Preview:"), box); diff --git a/libtdegames/kcarddialog.h b/libtdegames/kcarddialog.h index b80e87cd..3b10b3de 100644 --- a/libtdegames/kcarddialog.h +++ b/libtdegames/kcarddialog.h @@ -89,7 +89,7 @@ class KCardDialogPrivate; */ class KDE_EXPORT KCardDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kchat.h b/libtdegames/kchat.h index 59e2e55a..d60b2a0d 100644 --- a/libtdegames/kchat.h +++ b/libtdegames/kchat.h @@ -35,7 +35,7 @@ class KChatPrivate; **/ class KDE_EXPORT KChat : public KChatBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp index 17f831a0..4ebd425b 100644 --- a/libtdegames/kchatbase.cpp +++ b/libtdegames/kchatbase.cpp @@ -206,12 +206,12 @@ void KChatBase::init(bool noComboBox) TQVBoxLayout* l = new TQVBoxLayout(this); d->mBox = new TQListBox(this); - connect(d->mBox, TQT_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&)), - this, TQT_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&))); + connect(d->mBox, TQ_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&)), + this, TQ_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&))); l->addWidget(d->mBox); d->mBox->setVScrollBarMode(TQScrollView::AlwaysOn); d->mBox->setHScrollBarMode(TQScrollView::AlwaysOff); - d->mBox->setFocusPolicy(TQ_NoFocus); + d->mBox->setFocusPolicy(TQWidget::NoFocus); // d->mBox->setSelectionMode(TQListBox::NoSelection); d->mBox->setSelectionMode(TQListBox::Single); @@ -223,7 +223,7 @@ void KChatBase::init(bool noComboBox) d->mEdit->setTrapReturnKey(true); d->mEdit->completionObject(); // add the completion object d->mEdit->setCompletionMode(TDEGlobalSettings::CompletionNone); - connect(d->mEdit, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotReturnPressed(const TQString&))); + connect(d->mEdit, TQ_SIGNAL(returnPressed(const TQString&)), this, TQ_SLOT(slotReturnPressed(const TQString&))); h->addWidget(d->mEdit); if (!noComboBox) { @@ -399,7 +399,7 @@ void KChatBase::slotReturnPressed(const TQString& text) return; } d->mEdit->completionObject()->addItem(text); -// connect(d->mEdit, TQT_SIGNAL(returnPressed(const TQString&)), comp, TQT_SLOT(addItem(const TQString&))); +// connect(d->mEdit, TQ_SIGNAL(returnPressed(const TQString&)), comp, TQ_SLOT(addItem(const TQString&))); d->mEdit->clear(); returnPressed(text); } diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h index 49d41558..b5946938 100644 --- a/libtdegames/kchatbase.h +++ b/libtdegames/kchatbase.h @@ -183,7 +183,7 @@ class KChatBasePrivate; **/ class KDE_EXPORT KChatBase : public TQFrame { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kchatdialog.cpp b/libtdegames/kchatdialog.cpp index eaa6c6fc..707e9987 100644 --- a/libtdegames/kchatdialog.cpp +++ b/libtdegames/kchatdialog.cpp @@ -84,10 +84,10 @@ void KChatDialog::init() // General fonts TQPushButton* nameFont = new TQPushButton(i18n("Name Font..."), d->mTextPage); - connect(nameFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetNameFont())); + connect(nameFont, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotGetNameFont())); layout->addWidget(nameFont, 0, 0); TQPushButton* textFont = new TQPushButton(i18n("Text Font..."), d->mTextPage); - connect(textFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetTextFont())); + connect(textFont, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotGetTextFont())); layout->addWidget(textFont, 0, 1); TQFrame* messagePreview = new TQFrame(d->mTextPage); @@ -106,10 +106,10 @@ void KChatDialog::init() TQLabel* systemMessages = new TQLabel(i18n("System Messages - Messages directly sent from the game"), d->mTextPage); 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())); + connect(systemNameFont, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotGetSystemNameFont())); layout->addWidget(systemNameFont, 4, 0); TQPushButton* systemTextFont = new TQPushButton(i18n("Text Font..."), d->mTextPage); - connect(systemTextFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetSystemTextFont())); + connect(systemTextFont, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotGetSystemTextFont())); layout->addWidget(systemTextFont, 4, 1); TQFrame* systemMessagePreview = new TQFrame(d->mTextPage); diff --git a/libtdegames/kchatdialog.h b/libtdegames/kchatdialog.h index 80b63c50..bbb948b5 100644 --- a/libtdegames/kchatdialog.h +++ b/libtdegames/kchatdialog.h @@ -29,7 +29,7 @@ class KChatDialogPrivate; class KDE_EXPORT KChatDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kgame/COMPAT b/libtdegames/kgame/COMPAT index b85ec9b6..cfe81537 100644 --- a/libtdegames/kgame/COMPAT +++ b/libtdegames/kgame/COMPAT @@ -10,8 +10,8 @@ KGameIO::signalPrepareMove(..., bool*): don't know why this was necessary but it didn't work anymore... 16.09.2001: KGamePropertyHandler uses bool* for the sent parameter now. This is - because QT3 obviously doesn't honor referneces in Q_SIGNALS/Q_SLOTS. - This might even be a QT bug. Bad situation - we use references + because TQt3 obviously doesn't honor references in signals/slots. + This might even be a Qt bug. Bad situation - we use references everywhere in KGame... hope nothing else is affecterd by this problem (signalPrepareMove was fixed already by me) 18.09.2001: bool* for Key/Mouseevents and IOAdded in kgameio.h too @@ -47,7 +47,7 @@ KPlayer::sendProperty() and related functions contain a "int msgid" parameter. This is the id() of the property handler. This parameter enables us to easily add any number of property handler to a game - just by connecting it to existing send Q_SLOTS and call + just by connecting it to existing send slots and call processMessage() in slotNetworkData() 03.11.2001 KPlayer::signalNetworkData now emits msgid-KGameMessage::IdUser just like KGame::signalNetworkData does diff --git a/libtdegames/kgame/DESIGN b/libtdegames/kgame/DESIGN index b1c48146..0ad9be8b 100644 --- a/libtdegames/kgame/DESIGN +++ b/libtdegames/kgame/DESIGN @@ -256,7 +256,7 @@ class. To overload the "<<" you would e.g. do something like this: QDataStream& operator<<(QDataStream& stream, MyData& data) { int type = data.type; - QString name = data.name; + TQString name = data.name; stream << type << name; return stream; } @@ -347,7 +347,7 @@ a slot like slotDebug() { KGameDebugDialog* dialog = new KGameDebugDialog(mGame, this); - connect(dialog, SIGNAL(finished()), dialog, SLOT(slotDelayedDestruct())); + connect(dialog, TQ_SIGNAL(finished()), dialog, TQ_SLOT(slotDelayedDestruct())); dialog->show(); } that's it. @@ -374,7 +374,7 @@ the memory of the names in a release version. For as long as you use standard types for your properties (int, long, bool, ...) you should always be able to see the value of the property. If you just see "unknown" then this type has not been implemented. You can connect to the signal -KGamePropertyHandler::signalRequestValue() and supply a QString with the value +KGamePropertyHandler::signalRequestValue() and supply a TQString with the value yourself. If you do so for a standard type please also submit a bug report! Currently the dialog does *not* update automatically! So you alway have to click diff --git a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp index 2de27a0e..86d32ac2 100644 --- a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp +++ b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp @@ -63,7 +63,7 @@ KGameConnectWidget::KGameConnectWidget(TQWidget* parent) : TQWidget(parent) TQVBoxLayout* vb = new TQVBoxLayout(this, KDialog::spacingHint()); d->mButtonGroup = new TQVButtonGroup(this); vb->addWidget(d->mButtonGroup); - connect(d->mButtonGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTypeChanged(int))); + connect(d->mButtonGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotTypeChanged(int))); (void)new TQRadioButton(i18n("Create a network game"), d->mButtonGroup); (void)new TQRadioButton(i18n("Join a network game"), d->mButtonGroup); @@ -74,14 +74,14 @@ KGameConnectWidget::KGameConnectWidget(TQWidget* parent) : TQWidget(parent) d->mServerName = new TQLineEdit(g); d->mClientNameLabel = new TQLabel(i18n("Network games:"), g); d->mClientName = new TQComboBox(g); - connect(d->mClientName,TQT_SIGNAL(activated(int)),TQT_SLOT(slotGameSelected(int))); + connect(d->mClientName,TQ_SIGNAL(activated(int)),TQ_SLOT(slotGameSelected(int))); (void)new TQLabel(i18n("Port to connect to:"), g); d->mPort = new KIntNumInput(g); (void)new TQLabel(i18n("Host to connect to:"), g); d->mHost = new TQLineEdit(g); TQPushButton *button=new TQPushButton(i18n("&Start Network"), this); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalNetworkSetup())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(signalNetworkSetup())); vb->addWidget(button); // Hide until type is set d->mClientName->hide(); @@ -112,7 +112,7 @@ void KGameConnectWidget::setType(const TQString& type) d->mType = type; delete d->mBrowser; d->mBrowser = new DNSSD::ServiceBrowser(type); - connect(d->mBrowser,TQT_SIGNAL(finished()),TQT_SLOT(slotGamesFound())); + connect(d->mBrowser,TQ_SIGNAL(finished()),TQ_SLOT(slotGamesFound())); d->mBrowser->startBrowse(); showDnssdControls(); } diff --git a/libtdegames/kgame/dialogs/kgameconnectdialog.h b/libtdegames/kgame/dialogs/kgameconnectdialog.h index c6c195bf..6c0fb329 100644 --- a/libtdegames/kgame/dialogs/kgameconnectdialog.h +++ b/libtdegames/kgame/dialogs/kgameconnectdialog.h @@ -28,7 +28,7 @@ class KGameConnectWidgetPrivate; class KGameConnectWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KGameConnectWidget(TQWidget* parent); @@ -116,7 +116,7 @@ private: **/ class KGameConnectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KGameConnectDialog(TQWidget* parent = 0,int buttonmask=Ok|Cancel); diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp index 1b172cf2..7b82c909 100644 --- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp +++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp @@ -156,7 +156,7 @@ void KGameDebugDialog::initGamePage() layout->addWidget(d->mGameProperties); TQPushButton* b = new TQPushButton(i18n("Update"), d->mGamePage); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdateGameData())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotUpdateGameData())); topLayout->addWidget(b); // game data @@ -184,7 +184,7 @@ void KGameDebugDialog::initPlayerPage() TQLabel* listLabel = new TQLabel(i18n("Available Players"), d->mPlayerPage); listLayout->addWidget(listLabel); d->mPlayerList = new TDEListBox(d->mPlayerPage); - connect(d->mPlayerList, TQT_SIGNAL(executed(TQListBoxItem*)), this, TQT_SLOT(slotUpdatePlayerData(TQListBoxItem*))); + connect(d->mPlayerList, TQ_SIGNAL(executed(TQListBoxItem*)), this, TQ_SLOT(slotUpdatePlayerData(TQListBoxItem*))); listLayout->addWidget(d->mPlayerList); d->mPlayerList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); @@ -200,7 +200,7 @@ void KGameDebugDialog::initPlayerPage() layout->addWidget(d->mPlayerProperties); TQPushButton* b = new TQPushButton(i18n("Update"), d->mPlayerPage); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdatePlayerList())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotUpdatePlayerList())); topLayout->addWidget(b); d->mPlayerAddress = new TQListViewItem(v, i18n("Player Pointer")); @@ -230,11 +230,11 @@ void KGameDebugDialog::initMessagePage() d->mMessageList->addColumn(i18n("ID - Text")); TQPushButton* hide = new TQPushButton(i18n("&>>"), d->mMessagePage); - connect(hide, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotHideId())); + connect(hide, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotHideId())); layout->addWidget(hide, 4, 4); TQPushButton* show = new TQPushButton(i18n("&<<"), d->mMessagePage); - connect(show, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotShowId())); + connect(show, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotShowId())); layout->addWidget(show, 6, 4); TQLabel* l = new TQLabel(i18n("Do not show IDs:"), d->mMessagePage); @@ -243,7 +243,7 @@ void KGameDebugDialog::initMessagePage() 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())); + connect(clear, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearMessages())); layout->addMultiCellWidget(clear, 10, 10, 0, 6); //TODO: "show all but..." and "show nothing but..." } @@ -431,7 +431,7 @@ void KGameDebugDialog::setKGame(const KGame* g) d->mGame = g; if (g) { //TODO: connect to the KGame signals for joined/removed players!!! - connect(d->mGame, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotUnsetKGame())); + connect(d->mGame, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotUnsetKGame())); // connect(); TQPtrList<KPlayer> list = *d->mGame->playerList(); @@ -441,7 +441,7 @@ void KGameDebugDialog::setKGame(const KGame* g) slotUpdateGameData(); - connect(d->mGame, TQT_SIGNAL(signalMessageUpdate(int, TQ_UINT32, TQ_UINT32)), this, TQT_SLOT(slotMessageUpdate(int, TQ_UINT32, TQ_UINT32))); + connect(d->mGame, TQ_SIGNAL(signalMessageUpdate(int, TQ_UINT32, TQ_UINT32)), this, TQ_SLOT(slotMessageUpdate(int, TQ_UINT32, TQ_UINT32))); } } diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.h b/libtdegames/kgame/dialogs/kgamedebugdialog.h index 6dcea2c9..8b7a6579 100644 --- a/libtdegames/kgame/dialogs/kgamedebugdialog.h +++ b/libtdegames/kgame/dialogs/kgamedebugdialog.h @@ -33,7 +33,7 @@ class KGameDebugDialogPrivate; class KDE_EXPORT KGameDebugDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KGameDebugDialog(KGame* g, TQWidget* parent, bool modal = false); diff --git a/libtdegames/kgame/dialogs/kgamedialog.cpp b/libtdegames/kgame/dialogs/kgamedialog.cpp index a2440355..077d7f32 100644 --- a/libtdegames/kgame/dialogs/kgamedialog.cpp +++ b/libtdegames/kgame/dialogs/kgamedialog.cpp @@ -239,7 +239,7 @@ void KGameDialog::addConfigWidget(KGameDialogConfig* widget, TQWidget* parent) // kdDebug(11001) << "reparenting widget" << endl; widget->reparent(parent, TQPoint(0,0)); d->mConfigWidgets.append(widget); - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(slotRemoveConfigWidget(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(slotRemoveConfigWidget(TQObject*))); if (!d->mGame) { kdWarning(11001) << "No game has been set!" << endl; } else { @@ -306,9 +306,9 @@ void KGameDialog::setKGame(KGame* g) } if (d->mGame) { setAdmin(d->mGame->isAdmin()); - connect(d->mGame, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotUnsetKGame())); - connect(d->mGame, TQT_SIGNAL(signalAdminStatusChanged(bool)), - this, TQT_SLOT(setAdmin(bool))); + connect(d->mGame, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotUnsetKGame())); + connect(d->mGame, TQ_SIGNAL(signalAdminStatusChanged(bool)), + this, TQ_SLOT(setAdmin(bool))); } } diff --git a/libtdegames/kgame/dialogs/kgamedialog.h b/libtdegames/kgame/dialogs/kgamedialog.h index f25f0c96..6eafc732 100644 --- a/libtdegames/kgame/dialogs/kgamedialog.h +++ b/libtdegames/kgame/dialogs/kgamedialog.h @@ -73,7 +73,7 @@ class KGameDialogPrivate; **/ class KDE_EXPORT KGameDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp index a14abe73..646e8e41 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp @@ -130,16 +130,16 @@ KGameDialogNetworkConfig::KGameDialogNetworkConfig(TQWidget* parent) hb->addWidget(d->mNetworkLabel); d->mDisconnectButton=new TQPushButton(i18n("Disconnect"),this); - connect(d->mDisconnectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExitConnection())); + connect(d->mDisconnectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExitConnection())); hb->addWidget(d->mDisconnectButton); d->mInitConnection = new TQHGroupBox(i18n("Network Configuration"), this); topLayout->addWidget(d->mInitConnection); d->mConnect = new KGameConnectWidget(d->mInitConnection); - connect(d->mConnect, TQT_SIGNAL(signalNetworkSetup()), this, TQT_SLOT(slotInitConnection())); - connect(d->mConnect, TQT_SIGNAL(signalServerTypeChanged(int)), - this, TQT_SIGNAL(signalServerTypeChanged(int))); + connect(d->mConnect, TQ_SIGNAL(signalNetworkSetup()), this, TQ_SLOT(slotInitConnection())); + connect(d->mConnect, TQ_SIGNAL(signalServerTypeChanged(int)), + this, TQ_SIGNAL(signalServerTypeChanged(int))); // Needs to be AFTER the creation of the dialogs setConnected(false); @@ -180,8 +180,8 @@ void KGameDialogNetworkConfig::slotInitConnection() } // We need to learn about failed connections if (game()) { - connect(game(), TQT_SIGNAL(signalConnectionBroken()), - this, TQT_SLOT(slotConnectionBroken())); + connect(game(), TQ_SIGNAL(signalConnectionBroken()), + this, TQ_SLOT(slotConnectionBroken())); } } setConnected(connected, master); @@ -309,8 +309,8 @@ void KGameDialogGeneralConfig::setOwner(KPlayer* p) // maybe call hide() return; } - connect(owner(), TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), - this, TQT_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); + connect(owner(), TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), + this, TQ_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); setPlayerName(p->name()); //TODO: connect signalPropertyChanged and check for playername changes! } @@ -408,7 +408,7 @@ void KGameDialogMsgServerConfig::setKGame(KGame* g) { KGameDialogConfig::setKGame(g); //TODO display the ID of the admin if we aren't - // connect(g, TQT_SIGNAL(signalAdminChanged(int)), this, TQT_SLOT(slotChangeIsAdmin(int)));//TODO + // connect(g, TQ_SIGNAL(signalAdminChanged(int)), this, TQ_SLOT(slotChangeIsAdmin(int)));//TODO if (!game()) { // we cannot do anything without a KGame object! setAdmin(false); @@ -488,11 +488,11 @@ void KGameDialogMsgServerConfig::setAdmin(bool a) d->noAdmin = 0; } d->changeMaxClients = new TQPushButton(i18n("Change Maximal Number of Clients"), this); - connect(d->changeMaxClients, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChangeMaxClients())); + connect(d->changeMaxClients, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChangeMaxClients())); d->changeAdmin = new TQPushButton(i18n("Change Admin"), this); - connect(d->changeAdmin, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChangeAdmin())); + connect(d->changeAdmin, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChangeAdmin())); d->removeClient = new TQPushButton(i18n("Remove Client with All Players"), this); - connect(d->removeClient, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemoveClient())); + connect(d->removeClient, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotRemoveClient())); d->senderLayout->addWidget(d->changeMaxClients); d->senderLayout->addWidget(d->changeAdmin); d->senderLayout->addWidget(d->removeClient); @@ -627,10 +627,10 @@ void KGameDialogConnectionConfig::setKGame(KGame* g) slotClearPlayers(); if (game()) { // react to changes in KGame::playerList() - connect(game(), TQT_SIGNAL(signalPlayerJoinedGame(KPlayer*)), - this, TQT_SLOT(slotPlayerJoinedGame(KPlayer*))); - connect(game(), TQT_SIGNAL(signalPlayerLeftGame(KPlayer*)), - this, TQT_SLOT(slotPlayerLeftGame(KPlayer*))); + connect(game(), TQ_SIGNAL(signalPlayerJoinedGame(KPlayer*)), + this, TQ_SLOT(slotPlayerJoinedGame(KPlayer*))); + connect(game(), TQ_SIGNAL(signalPlayerLeftGame(KPlayer*)), + this, TQ_SLOT(slotPlayerLeftGame(KPlayer*))); KGame::KGamePlayerList l = *game()->playerList(); for (KPlayer* p = l.first(); p; p = l.next()) { @@ -650,12 +650,12 @@ void KGameDialogConnectionConfig::setAdmin(bool a) return; } if (admin()) { - disconnect(game(), TQT_SIGNAL(executed(TQListBoxItem*)), this, 0); + disconnect(game(), TQ_SIGNAL(executed(TQListBoxItem*)), this, 0); } KGameDialogConfig::setAdmin(a); if (admin()) { - connect(d->mPlayerBox, TQT_SIGNAL(executed(TQListBoxItem*)), this, - TQT_SLOT(slotKickPlayerOut(TQListBoxItem*))); + connect(d->mPlayerBox, TQ_SIGNAL(executed(TQListBoxItem*)), this, + TQ_SLOT(slotKickPlayerOut(TQListBoxItem*))); } } @@ -704,8 +704,8 @@ void KGameDialogConnectionConfig::slotPlayerJoinedGame(KPlayer* p) d->mItem2Player.insert(t, p); d->mPlayerBox->insertItem(t); - connect(p, TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), - this, TQT_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); + connect(p, TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), + this, TQ_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); } diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.h b/libtdegames/kgame/dialogs/kgamedialogconfig.h index 261500c4..ead91b47 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.h +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.h @@ -50,7 +50,7 @@ class KGameDialogConfigPrivate; **/ class KDE_EXPORT KGameDialogConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KGameDialogConfig(TQWidget* parent = 0); @@ -144,7 +144,7 @@ private: class KGameDialogGeneralConfigPrivate; class KGameDialogGeneralConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: /** @@ -212,7 +212,7 @@ private: class KGameDialogNetworkConfigPrivate; class KDE_EXPORT KGameDialogNetworkConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: KGameDialogNetworkConfig(TQWidget* parent = 0); @@ -279,7 +279,7 @@ private: class KGameDialogMsgServerConfigPrivate; class KGameDialogMsgServerConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: KGameDialogMsgServerConfig(TQWidget* parent = 0); @@ -313,7 +313,7 @@ class KGameDialogChatConfigPrivate; **/ class KGameDialogChatConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: KGameDialogChatConfig(int chatMsgId, TQWidget* parent = 0); @@ -335,7 +335,7 @@ private: class KGameDialogConnectionConfigPrivate; class KGameDialogConnectionConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: KGameDialogConnectionConfig(TQWidget* parent = 0); diff --git a/libtdegames/kgame/dialogs/kgameerrordialog.cpp b/libtdegames/kgame/dialogs/kgameerrordialog.cpp index 468ca7c8..574d4545 100644 --- a/libtdegames/kgame/dialogs/kgameerrordialog.cpp +++ b/libtdegames/kgame/dialogs/kgameerrordialog.cpp @@ -52,15 +52,15 @@ void KGameErrorDialog::setKGame(const KGame* g) slotUnsetKGame(); d->mGame = g; - connect(d->mGame, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotUnsetKGame())); + connect(d->mGame, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotUnsetKGame())); // the error signals: - connect(d->mGame, TQT_SIGNAL(signalNetworkErrorMessage(int, TQString)), - this, TQT_SLOT(slotError(int, TQString))); - connect(d->mGame, TQT_SIGNAL(signalConnectionBroken()), - this, TQT_SLOT(slotServerConnectionLost())); - connect(d->mGame, TQT_SIGNAL(signalClientDisconnected(TQ_UINT32,bool)), - this, TQT_SLOT(slotClientConnectionLost(TQ_UINT32,bool))); + connect(d->mGame, TQ_SIGNAL(signalNetworkErrorMessage(int, TQString)), + this, TQ_SLOT(slotError(int, TQString))); + connect(d->mGame, TQ_SIGNAL(signalConnectionBroken()), + this, TQ_SLOT(slotServerConnectionLost())); + connect(d->mGame, TQ_SIGNAL(signalClientDisconnected(TQ_UINT32,bool)), + this, TQ_SLOT(slotClientConnectionLost(TQ_UINT32,bool))); } void KGameErrorDialog::slotUnsetKGame() diff --git a/libtdegames/kgame/dialogs/kgameerrordialog.h b/libtdegames/kgame/dialogs/kgameerrordialog.h index fee0b73e..c9b26863 100644 --- a/libtdegames/kgame/dialogs/kgameerrordialog.h +++ b/libtdegames/kgame/dialogs/kgameerrordialog.h @@ -38,7 +38,7 @@ class KGameErrorDialogPrivate; **/ class KGameErrorDialog : public TQObject { - Q_OBJECT + TQ_OBJECT public: KGameErrorDialog(TQWidget* parent); @@ -103,7 +103,7 @@ private: **/ class KGameErrorMessageDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KGameErrorMessageDialog(TQWidget* parent); diff --git a/libtdegames/kgame/kgame.cpp b/libtdegames/kgame/kgame.cpp index 70d0644c..a3967cc3 100644 --- a/libtdegames/kgame/kgame.cpp +++ b/libtdegames/kgame/kgame.cpp @@ -89,8 +89,8 @@ KGame::KGame(int cookie,TQObject* parent) : KGameNetwork(cookie,parent) d->mProperties = new KGamePropertyHandler(this); d->mProperties->registerHandler(KGameMessage::IdGameProperty, - this,TQT_SLOT(sendProperty(int, TQDataStream&, bool* )), - TQT_SLOT(emitSignal(KGamePropertyBase *))); + this,TQ_SLOT(sendProperty(int, TQDataStream&, bool* )), + TQ_SLOT(emitSignal(KGamePropertyBase *))); d->mMaxPlayer.registerData(KGamePropertyBase::IdMaxPlayer, this, i18n("MaxPlayers")); d->mMaxPlayer.setLocal(-1); // Infinite d->mMinPlayer.registerData(KGamePropertyBase::IdMinPlayer, this, i18n("MinPlayers")); @@ -101,20 +101,20 @@ KGame::KGame(int cookie,TQObject* parent) : KGameNetwork(cookie,parent) d->mRandom = new KRandomSequence; d->mRandom->setSeed(0); - connect(this, TQT_SIGNAL(signalClientConnected(TQ_UINT32)), - this, TQT_SLOT(slotClientConnected(TQ_UINT32))); - connect(this, TQT_SIGNAL(signalClientDisconnected(TQ_UINT32,bool)), - this, TQT_SLOT(slotClientDisconnected(TQ_UINT32,bool))); - connect(this, TQT_SIGNAL(signalConnectionBroken()), - this, TQT_SLOT(slotServerDisconnected())); + connect(this, TQ_SIGNAL(signalClientConnected(TQ_UINT32)), + this, TQ_SLOT(slotClientConnected(TQ_UINT32))); + connect(this, TQ_SIGNAL(signalClientDisconnected(TQ_UINT32,bool)), + this, TQ_SLOT(slotClientDisconnected(TQ_UINT32,bool))); + connect(this, TQ_SIGNAL(signalConnectionBroken()), + this, TQ_SLOT(slotServerDisconnected())); setGameSequence(new KGameSequence()); // BL: FIXME This signal does no longer exist. When we are merging // MH: super....and how do I find out about the lost conenction now? // KGame and KGameNetwork, this could be improved! -// connect(this,TQT_SIGNAL(signalConnectionLost(KGameClient *)), -// this,TQT_SLOT(slotConnectionLost(KGameClient *))); +// connect(this,TQ_SIGNAL(signalConnectionLost(KGameClient *)), +// this,TQ_SLOT(slotConnectionLost(KGameClient *))); } KGame::~KGame() @@ -780,7 +780,7 @@ KPlayer * KGame::playerInputFinished(KPlayer *player) player->setTurn(false); // in turn based games we have to switch off input now if (gameSequence()) { - TQTimer::singleShot(0,this,TQT_SLOT(prepareNext())); + TQTimer::singleShot(0,this,TQ_SLOT(prepareNext())); } } return player; diff --git a/libtdegames/kgame/kgame.h b/libtdegames/kgame/kgame.h index 8ef56591..68179d5c 100644 --- a/libtdegames/kgame/kgame.h +++ b/libtdegames/kgame/kgame.h @@ -61,7 +61,7 @@ class KGamePrivate; */ class KDE_EXPORT KGame : public KGameNetwork { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kgamechat.cpp b/libtdegames/kgame/kgamechat.cpp index 80059e7b..650cf060 100644 --- a/libtdegames/kgame/kgamechat.cpp +++ b/libtdegames/kgame/kgamechat.cpp @@ -227,13 +227,13 @@ void KGameChat::setKGame(KGame* g) d->mGame = g; if (d->mGame) { - connect(d->mGame, TQT_SIGNAL(signalPlayerJoinedGame(KPlayer*)), - this, TQT_SLOT(slotAddPlayer(KPlayer*))); - connect(d->mGame, TQT_SIGNAL(signalPlayerLeftGame(KPlayer*)), - this, TQT_SLOT(slotRemovePlayer(KPlayer*))); - connect(d->mGame, TQT_SIGNAL(signalNetworkData(int, const TQByteArray&, TQ_UINT32, TQ_UINT32)), - this, TQT_SLOT(slotReceiveMessage(int, const TQByteArray&, TQ_UINT32, TQ_UINT32))); - connect(d->mGame, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotUnsetKGame())); + connect(d->mGame, TQ_SIGNAL(signalPlayerJoinedGame(KPlayer*)), + this, TQ_SLOT(slotAddPlayer(KPlayer*))); + connect(d->mGame, TQ_SIGNAL(signalPlayerLeftGame(KPlayer*)), + this, TQ_SLOT(slotRemovePlayer(KPlayer*))); + connect(d->mGame, TQ_SIGNAL(signalNetworkData(int, const TQByteArray&, TQ_UINT32, TQ_UINT32)), + this, TQ_SLOT(slotReceiveMessage(int, const TQByteArray&, TQ_UINT32, TQ_UINT32))); + connect(d->mGame, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotUnsetKGame())); TQPtrList<KPlayer> playerList = *d->mGame->playerList(); for (int unsigned i = 0; i < playerList.count(); i++) { @@ -281,10 +281,10 @@ void KGameChat::slotAddPlayer(KPlayer* p) int sendingId = nextId(); addSendingEntry(comboBoxItem(p->name()), sendingId); d->mSendId2PlayerId.insert(sendingId, p->id()); - connect(p, TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), - this, TQT_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); - connect(p, TQT_SIGNAL(signalNetworkData(int, const TQByteArray&, TQ_UINT32, KPlayer*)), - this, TQT_SLOT(slotReceivePrivateMessage(int, const TQByteArray&, TQ_UINT32, KPlayer*))); + connect(p, TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), + this, TQ_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); + connect(p, TQ_SIGNAL(signalNetworkData(int, const TQByteArray&, TQ_UINT32, KPlayer*)), + this, TQ_SLOT(slotReceivePrivateMessage(int, const TQByteArray&, TQ_UINT32, KPlayer*))); } void KGameChat::slotRemovePlayer(KPlayer* p) diff --git a/libtdegames/kgame/kgamechat.h b/libtdegames/kgame/kgamechat.h index 8ba51159..dea8f6fd 100644 --- a/libtdegames/kgame/kgamechat.h +++ b/libtdegames/kgame/kgamechat.h @@ -42,7 +42,7 @@ class KGameChatPrivate; **/ class KDE_EXPORT KGameChat : public KChatBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kgame/kgameio.cpp b/libtdegames/kgame/kgameio.cpp index 852e04f2..13a19a81 100644 --- a/libtdegames/kgame/kgameio.cpp +++ b/libtdegames/kgame/kgameio.cpp @@ -266,12 +266,12 @@ KGameProcessIO::KGameProcessIO(const TQString& name) //kdDebug(11001) << "================= KMEssage SetSErver ==================== " << endl; //d->mMessageClient->setServer(d->mMessageServer); kdDebug(11001) << "================= KMEssage: Connect ==================== " << endl; - //connect(d->mMessageClient, TQT_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), - // this, TQT_SLOT(clientMessage(const TQByteArray&, TQ_UINT32))); - //connect(d->mMessageClient, TQT_SIGNAL(forwardReceived(const TQByteArray&, TQ_UINT32, const TQValueList <TQ_UINT32> &)), - // this, TQT_SLOT(clientMessage(const TQByteArray&, TQ_UINT32, const TQValueList <TQ_UINT32> &))); - connect(d->mProcessIO, TQT_SIGNAL(received(const TQByteArray&)), - this, TQT_SLOT(receivedMessage(const TQByteArray&))); + //connect(d->mMessageClient, TQ_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), + // this, TQ_SLOT(clientMessage(const TQByteArray&, TQ_UINT32))); + //connect(d->mMessageClient, TQ_SIGNAL(forwardReceived(const TQByteArray&, TQ_UINT32, const TQValueList <TQ_UINT32> &)), + // this, TQ_SLOT(clientMessage(const TQByteArray&, TQ_UINT32, const TQValueList <TQ_UINT32> &))); + connect(d->mProcessIO, TQ_SIGNAL(received(const TQByteArray&)), + this, TQ_SLOT(receivedMessage(const TQByteArray&))); //kdDebug(11001) << "Our client is id="<<d->mMessageClient->id() << endl; } @@ -489,7 +489,7 @@ void KGameComputerIO::setAdvancePeriod(int ms) { stopAdvancePeriod(); d->mAdvanceTimer = new TQTimer(this); - connect(d->mAdvanceTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(advance())); + connect(d->mAdvanceTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(advance())); d->mAdvanceTimer->start(ms); } diff --git a/libtdegames/kgame/kgameio.h b/libtdegames/kgame/kgameio.h index 1478f632..9b7c34b5 100644 --- a/libtdegames/kgame/kgameio.h +++ b/libtdegames/kgame/kgameio.h @@ -54,7 +54,7 @@ class TDEProcess; */ class KDE_EXPORT KGameIO : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -177,7 +177,7 @@ private: */ class KDE_EXPORT KGameKeyIO : public KGameIO { - Q_OBJECT + TQ_OBJECT public: @@ -195,8 +195,8 @@ public: * \code * KGameKeyIO *input; * input=new KGameKeyIO(myWidget); - * connect(input,TQT_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)), - * this,TQT_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); + * connect(input,TQ_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)), + * this,TQ_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); * \endcode * * @param parent The parents widget whose keyboard events * should be grabbed @@ -249,7 +249,7 @@ protected: */ class KDE_EXPORT KGameMouseIO : public KGameIO { - Q_OBJECT + TQ_OBJECT public: @@ -261,8 +261,8 @@ public: * \code * KGameMouseIO *input; * input=new KGameMouseIO(mView); - * connect(input,TQT_SIGNAL(signalMouseEvent(KGameIO *,TQDataStream &,TQMouseEvent *,bool *)), - * this,TQT_SLOT(slotMouseInput(KGameIO *,TQDataStream &,TQMouseEvent *,bool *))); + * connect(input,TQ_SIGNAL(signalMouseEvent(KGameIO *,TQDataStream &,TQMouseEvent *,bool *)), + * this,TQ_SLOT(slotMouseInput(KGameIO *,TQDataStream &,TQMouseEvent *,bool *))); * \endcode * * @param parent The widget whose events should be captured @@ -325,7 +325,7 @@ protected: */ class KDE_EXPORT KGameProcessIO : public KGameIO { - Q_OBJECT + TQ_OBJECT public: @@ -336,10 +336,10 @@ public: * \code * KGameProcessIO *input; * input=new KGameProcessIO(executable_file); - * connect(input,TQT_SIGNAL(signalPrepareTurn(TQDataStream &,bool,KGameIO *,bool *)), - * this,TQT_SLOT(slotPrepareTurn(TQDataStream &,bool,KGameIO *,bool *))); - * connect(input,TQT_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), - * this,TQT_SLOT(slotProcessQuery(TQDataStream &,KGameProcessIO *))); + * connect(input,TQ_SIGNAL(signalPrepareTurn(TQDataStream &,bool,KGameIO *,bool *)), + * this,TQ_SLOT(slotPrepareTurn(TQDataStream &,bool,KGameIO *,bool *))); + * connect(input,TQ_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), + * this,TQ_SLOT(slotProcessQuery(TQDataStream &,KGameProcessIO *))); * \endcode * * @param name the filename of the process to start @@ -480,7 +480,7 @@ private: */ class KDE_EXPORT KGameComputerIO : public KGameIO { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kgamenetwork.cpp b/libtdegames/kgame/kgamenetwork.cpp index b51b5ae0..94badd88 100644 --- a/libtdegames/kgame/kgamenetwork.cpp +++ b/libtdegames/kgame/kgamenetwork.cpp @@ -120,25 +120,25 @@ void KGameNetwork::setMaster() } if (!d->mMessageClient) { d->mMessageClient = new KMessageClient (this); - connect (d->mMessageClient, TQT_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), - this, TQT_SLOT(receiveNetworkTransmission(const TQByteArray&, TQ_UINT32))); - connect (d->mMessageClient, TQT_SIGNAL(connectionBroken()), - this, TQT_SIGNAL(signalConnectionBroken())); - connect (d->mMessageClient, TQT_SIGNAL(aboutToDisconnect(TQ_UINT32)), - this, TQT_SLOT(aboutToLoseConnection(TQ_UINT32))); - connect (d->mMessageClient, TQT_SIGNAL(connectionBroken()), - this, TQT_SLOT(slotResetConnection())); - - connect (d->mMessageClient, TQT_SIGNAL(adminStatusChanged(bool)), - this, TQT_SLOT(slotAdminStatusChanged(bool))); - connect (d->mMessageClient, TQT_SIGNAL(eventClientConnected(TQ_UINT32)), - this, TQT_SIGNAL(signalClientConnected(TQ_UINT32))); - connect (d->mMessageClient, TQT_SIGNAL(eventClientDisconnected(TQ_UINT32, bool)), - this, TQT_SIGNAL(signalClientDisconnected(TQ_UINT32, bool))); + connect (d->mMessageClient, TQ_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), + this, TQ_SLOT(receiveNetworkTransmission(const TQByteArray&, TQ_UINT32))); + connect (d->mMessageClient, TQ_SIGNAL(connectionBroken()), + this, TQ_SIGNAL(signalConnectionBroken())); + connect (d->mMessageClient, TQ_SIGNAL(aboutToDisconnect(TQ_UINT32)), + this, TQ_SLOT(aboutToLoseConnection(TQ_UINT32))); + connect (d->mMessageClient, TQ_SIGNAL(connectionBroken()), + this, TQ_SLOT(slotResetConnection())); + + connect (d->mMessageClient, TQ_SIGNAL(adminStatusChanged(bool)), + this, TQ_SLOT(slotAdminStatusChanged(bool))); + connect (d->mMessageClient, TQ_SIGNAL(eventClientConnected(TQ_UINT32)), + this, TQ_SIGNAL(signalClientConnected(TQ_UINT32))); + connect (d->mMessageClient, TQ_SIGNAL(eventClientDisconnected(TQ_UINT32, bool)), + this, TQ_SIGNAL(signalClientDisconnected(TQ_UINT32, bool))); // broacast and direct messages are treated equally on receive. - connect (d->mMessageClient, TQT_SIGNAL(forwardReceived(const TQByteArray&, TQ_UINT32, const TQValueList<TQ_UINT32>&)), - d->mMessageClient, TQT_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32))); + connect (d->mMessageClient, TQ_SIGNAL(forwardReceived(const TQByteArray&, TQ_UINT32, const TQValueList<TQ_UINT32>&)), + d->mMessageClient, TQ_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32))); } else { // should be no problem but still has to be tested diff --git a/libtdegames/kgame/kgamenetwork.h b/libtdegames/kgame/kgamenetwork.h index 05e190c8..e7ea067c 100644 --- a/libtdegames/kgame/kgamenetwork.h +++ b/libtdegames/kgame/kgamenetwork.h @@ -45,7 +45,7 @@ class KGameNetworkPrivate; */ class KDE_EXPORT KGameNetwork : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kgameprocess.cpp b/libtdegames/kgame/kgameprocess.cpp index 8a8a2571..b0858e81 100644 --- a/libtdegames/kgame/kgameprocess.cpp +++ b/libtdegames/kgame/kgameprocess.cpp @@ -52,10 +52,10 @@ KGameProcess::KGameProcess() : TQObject(0,0) mMessageIO=new KMessageFilePipe(this,&rFile,&wFile); // mMessageClient=new KMessageClient(this); // mMessageClient->setServer(mMessageIO); -// connect (mMessageClient, TQT_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), -// this, TQT_SLOT(receivedMessage(const TQByteArray&, TQ_UINT32))); - connect (mMessageIO, TQT_SIGNAL(received(const TQByteArray&)), - this, TQT_SLOT(receivedMessage(const TQByteArray&))); +// connect (mMessageClient, TQ_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), +// this, TQ_SLOT(receivedMessage(const TQByteArray&, TQ_UINT32))); + connect (mMessageIO, TQ_SIGNAL(received(const TQByteArray&)), + this, TQ_SLOT(receivedMessage(const TQByteArray&))); fprintf(stderr,"KGameProcess::constructor %p %p\n",&rFile,&wFile); mRandom = new KRandomSequence; diff --git a/libtdegames/kgame/kgameprocess.h b/libtdegames/kgame/kgameprocess.h index 092acd0f..65b0ab74 100644 --- a/libtdegames/kgame/kgameprocess.h +++ b/libtdegames/kgame/kgameprocess.h @@ -41,7 +41,7 @@ class KMessageFilePipe; */ class KDE_EXPORT KGameProcess: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -61,12 +61,12 @@ class KDE_EXPORT KGameProcess: public TQObject * int main(int argc ,char * argv[]) * { * KGameProcess proc; - * connect(&proc,TQT_SIGNAL(signalCommand(TQDataStream &,int ,int ,int )), - * this,TQT_SLOT(slotCommand(TQDataStream & ,int ,int ,int ))); - * connect(&proc,TQT_SIGNAL(signalInit(TQDataStream &,int)), - * this,TQT_SLOT(slotInit(TQDataStream & ,int ))); - * connect(&proc,TQT_SIGNAL(signalTurn(TQDataStream &,bool )), - * this,TQT_SLOT(slotTurn(TQDataStream & ,bool ))); + * connect(&proc,TQ_SIGNAL(signalCommand(TQDataStream &,int ,int ,int )), + * this,TQ_SLOT(slotCommand(TQDataStream & ,int ,int ,int ))); + * connect(&proc,TQ_SIGNAL(signalInit(TQDataStream &,int)), + * this,TQ_SLOT(slotInit(TQDataStream & ,int ))); + * connect(&proc,TQ_SIGNAL(signalTurn(TQDataStream &,bool )), + * this,TQ_SLOT(slotTurn(TQDataStream & ,bool ))); * return proc.exec(argc,argv); * } * \endcode diff --git a/libtdegames/kgame/kgamepropertyhandler.cpp b/libtdegames/kgame/kgamepropertyhandler.cpp index 732c8bde..0cd02fbf 100644 --- a/libtdegames/kgame/kgamepropertyhandler.cpp +++ b/libtdegames/kgame/kgamepropertyhandler.cpp @@ -94,12 +94,12 @@ void KGamePropertyHandler::registerHandler(int id,const TQObject * receiver, con { setId(id); if (receiver && sendf) { - kdDebug(11001) << "Connecting TQT_SLOT " << sendf << endl; - connect(this, TQT_SIGNAL(signalSendMessage(int, TQDataStream &, bool*)), receiver, sendf); + kdDebug(11001) << "Connecting TQ_SLOT " << sendf << endl; + connect(this, TQ_SIGNAL(signalSendMessage(int, TQDataStream &, bool*)), receiver, sendf); } if (receiver && emitf) { - kdDebug(11001) << "Connecting TQT_SLOT " << emitf << endl; - connect(this, TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *)), receiver, emitf); + kdDebug(11001) << "Connecting TQ_SLOT " << emitf << endl; + connect(this, TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *)), receiver, emitf); } } diff --git a/libtdegames/kgame/kgamepropertyhandler.h b/libtdegames/kgame/kgamepropertyhandler.h index f337fe21..edda54a9 100644 --- a/libtdegames/kgame/kgamepropertyhandler.h +++ b/libtdegames/kgame/kgamepropertyhandler.h @@ -71,7 +71,7 @@ class KGamePropertyHandlerPrivate; // wow - what a name ;-) **/ class KDE_EXPORT KGamePropertyHandler : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kgamesequence.h b/libtdegames/kgame/kgamesequence.h index 0d14b32f..f4b58e21 100644 --- a/libtdegames/kgame/kgamesequence.h +++ b/libtdegames/kgame/kgamesequence.h @@ -41,7 +41,7 @@ class KGame; **/ class KGameSequence : public TQObject { - Q_OBJECT + TQ_OBJECT public: KGameSequence(); diff --git a/libtdegames/kgame/kmessageclient.cpp b/libtdegames/kgame/kmessageclient.cpp index 8c9278b6..01cc7175 100644 --- a/libtdegames/kgame/kmessageclient.cpp +++ b/libtdegames/kgame/kmessageclient.cpp @@ -86,10 +86,10 @@ void KMessageClient::setServer (KMessageIO *connection) d->connection = connection; if (connection ) { - connect (connection, TQT_SIGNAL (received(const TQByteArray &)), - this, TQT_SLOT (processIncomingMessage(const TQByteArray &))); - connect (connection, TQT_SIGNAL (connectionBroken()), - this, TQT_SLOT (removeBrokenConnection ())); + connect (connection, TQ_SIGNAL (received(const TQByteArray &)), + this, TQ_SLOT (processIncomingMessage(const TQByteArray &))); + connect (connection, TQ_SIGNAL (connectionBroken()), + this, TQ_SLOT (removeBrokenConnection ())); } } @@ -155,7 +155,7 @@ void KMessageClient::sendBroadcast (const TQByteArray &msg) TQDataStream stream (&buffer); stream << static_cast<TQ_UINT32> ( KMessageServer::REQ_BROADCAST ); - TQT_TQIODEVICE(&buffer)->writeBlock (msg); + buffer.writeBlock (msg); sendServerMessage (sendBuffer); } @@ -167,7 +167,7 @@ void KMessageClient::sendForward (const TQByteArray &msg, const TQValueList <TQ_ TQDataStream stream (&buffer); stream << static_cast<TQ_UINT32>( KMessageServer::REQ_FORWARD ) << clients; - TQT_TQIODEVICE(&buffer)->writeBlock (msg); + buffer.writeBlock (msg); sendServerMessage (sendBuffer); } @@ -322,7 +322,7 @@ void KMessageClient::removeBrokenConnection () { kdDebug (11001) << k_funcinfo << ": timer single shot for removeBrokenConnection"<<this << endl; // MH We cannot directly delete the socket. otherwise TQSocket crashes - TQTimer::singleShot( 0, this, TQT_SLOT(removeBrokenConnection2()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(removeBrokenConnection2()) ); return; } @@ -361,7 +361,7 @@ void KMessageClient::unlock () d->isLocked = false; for (unsigned int i = 0; i < d->delayedMessages.count(); i++) { - TQTimer::singleShot(0, this, TQT_SLOT(processFirstMessage())); + TQTimer::singleShot(0, this, TQ_SLOT(processFirstMessage())); } } diff --git a/libtdegames/kgame/kmessageclient.h b/libtdegames/kgame/kmessageclient.h index d66d4352..456f79cc 100644 --- a/libtdegames/kgame/kmessageclient.h +++ b/libtdegames/kgame/kmessageclient.h @@ -49,7 +49,7 @@ class KMessageClientPrivate; */ class KMessageClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -295,8 +295,8 @@ signals: \code KMessageClient *client = new KMessageClient (); - connect (client, TQT_SIGNAL (forwardReceived (const TQByteArray &, TQ_UINT32, const TQValueList <TQ_UINT32>&)), - client, TQT_SIGNAL (broadcastReceived (const TQByteArray &, TQ_UINT32))); + connect (client, TQ_SIGNAL (forwardReceived (const TQByteArray &, TQ_UINT32, const TQValueList <TQ_UINT32>&)), + client, TQ_SIGNAL (broadcastReceived (const TQByteArray &, TQ_UINT32))); \endcode Then connect the broadcast signal to your slot that analyzes the message. diff --git a/libtdegames/kgame/kmessageio.cpp b/libtdegames/kgame/kmessageio.cpp index 6067d9e5..413d1a66 100644 --- a/libtdegames/kgame/kmessageio.cpp +++ b/libtdegames/kgame/kmessageio.cpp @@ -157,9 +157,9 @@ void KMessageSocket::processNewData () void KMessageSocket::initSocket () { - connect (mSocket, TQT_SIGNAL (error(int)), TQT_SIGNAL (connectionBroken())); - connect (mSocket, TQT_SIGNAL (connectionClosed()), TQT_SIGNAL (connectionBroken())); - connect (mSocket, TQT_SIGNAL (readyRead()), TQT_SLOT (processNewData())); + connect (mSocket, TQ_SIGNAL (error(int)), TQ_SIGNAL (connectionBroken())); + connect (mSocket, TQ_SIGNAL (connectionClosed()), TQ_SIGNAL (connectionBroken())); + connect (mSocket, TQ_SIGNAL (readyRead()), TQ_SLOT (processNewData())); mAwaitingHeader = true; mNextBlockLength = 0; isRecursive = false; @@ -248,14 +248,14 @@ KMessageProcess::KMessageProcess(TQObject *parent, TQString file) : KMessageIO(p *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(TDEProcess *, char *, int )), - this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char * , int ))); - connect(mProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )), - this, TQT_SLOT(slotReceivedStderr(TDEProcess *, char * , int ))); - connect(mProcess, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(mProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotWroteStdin(TDEProcess *))); + connect(mProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(slotReceivedStdout(TDEProcess *, char * , int ))); + connect(mProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int )), + this, TQ_SLOT(slotReceivedStderr(TDEProcess *, char * , int ))); + connect(mProcess, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(mProcess, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotWroteStdin(TDEProcess *))); mProcess->start(TDEProcess::NotifyOnExit,TDEProcess::All); mSendBuffer=0; mReceiveCount=0; diff --git a/libtdegames/kgame/kmessageio.h b/libtdegames/kgame/kmessageio.h index 0a8d4172..e503da6d 100644 --- a/libtdegames/kgame/kmessageio.h +++ b/libtdegames/kgame/kmessageio.h @@ -55,7 +55,7 @@ class TDEProcess; class KMessageIO : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -169,7 +169,7 @@ protected: class KMessageSocket : public KMessageIO { - Q_OBJECT + TQ_OBJECT public: @@ -296,7 +296,7 @@ protected: class KMessageDirect : public KMessageIO { - Q_OBJECT + TQ_OBJECT public: @@ -350,7 +350,7 @@ protected: class KMessageProcess : public KMessageIO { - Q_OBJECT + TQ_OBJECT public: @@ -389,7 +389,7 @@ class KMessageProcess : public KMessageIO class KMessageFilePipe : public KMessageIO { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kmessageserver.cpp b/libtdegames/kgame/kmessageserver.cpp index 0ea66dda..e8617f57 100644 --- a/libtdegames/kgame/kmessageserver.cpp +++ b/libtdegames/kgame/kmessageserver.cpp @@ -92,8 +92,8 @@ KMessageServer::KMessageServer (TQ_UINT16 cookie,TQObject* parent) d = new KMessageServerPrivate; d->mIsRecursive=false; d->mCookie=cookie; - connect (&(d->mTimer), TQT_SIGNAL (timeout()), - this, TQT_SLOT (processOneMessage())); + connect (&(d->mTimer), TQ_SIGNAL (timeout()), + this, TQ_SLOT (processOneMessage())); kdDebug(11001) << "CREATE(KMessageServer=" << this << ") cookie=" @@ -138,8 +138,8 @@ bool KMessageServer::initNetwork (TQ_UINT16 port) kdDebug (11001) << k_funcinfo << ": Now listening to port " << d->mServerSocket->port() << endl; - connect (d->mServerSocket, TQT_SIGNAL (newClientConnected (KMessageIO*)), - this, TQT_SLOT (addClient (KMessageIO*))); + connect (d->mServerSocket, TQ_SIGNAL (newClientConnected (KMessageIO*)), + this, TQ_SLOT (addClient (KMessageIO*))); return true; } @@ -183,10 +183,10 @@ void KMessageServer::addClient (KMessageIO* client) kdDebug (11001) << k_funcinfo << ": " << client->id() << endl; // connect its signals - connect (client, TQT_SIGNAL (connectionBroken()), - this, TQT_SLOT (removeBrokenClient())); - connect (client, TQT_SIGNAL (received (const TQByteArray &)), - this, TQT_SLOT (getReceivedMessage (const TQByteArray &))); + connect (client, TQ_SIGNAL (connectionBroken()), + this, TQ_SLOT (removeBrokenClient())); + connect (client, TQ_SIGNAL (received (const TQByteArray &)), + this, TQ_SLOT (getReceivedMessage (const TQByteArray &))); // Tell everyone about the new guest // Note: The new client doesn't get this message! @@ -415,10 +415,7 @@ void KMessageServer::processOneMessage () { case REQ_BROADCAST: out_stream << TQ_UINT32 (MSG_BROADCAST) << clientID; - // FIXME, compiler bug? - // this should be okay, since TQBuffer is subclass of TQIODevice! : - // out_buffer.writeBlock (in_buffer.readAll()); - TQT_TQIODEVICE(&out_buffer)->writeBlock (in_buffer.readAll()); + out_buffer.writeBlock (in_buffer.readAll()); broadcastMessage (out_msg); break; @@ -427,8 +424,7 @@ void KMessageServer::processOneMessage () TQValueList <TQ_UINT32> clients; in_stream >> clients; out_stream << TQ_UINT32 (MSG_FORWARD) << clientID << clients; - // see above! - TQT_TQIODEVICE(&out_buffer)->writeBlock (in_buffer.readAll()); + out_buffer.writeBlock (in_buffer.readAll()); sendMessage (clients, out_msg); } break; diff --git a/libtdegames/kgame/kmessageserver.h b/libtdegames/kgame/kmessageserver.h index 36e58659..93f0e4f2 100644 --- a/libtdegames/kgame/kmessageserver.h +++ b/libtdegames/kgame/kmessageserver.h @@ -174,7 +174,7 @@ class KMessageServerPrivate; */ class KMessageServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -476,7 +476,7 @@ private: */ class KMessageServerSocket : public TQServerSocket { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kplayer.cpp b/libtdegames/kgame/kplayer.cpp index 5945f9cf..4e815b81 100644 --- a/libtdegames/kgame/kplayer.cpp +++ b/libtdegames/kgame/kplayer.cpp @@ -78,8 +78,8 @@ void KPlayer::init() d = new KPlayerPrivate; d->mProperties.registerHandler(KGameMessage::IdPlayerProperty, - this,TQT_SLOT(sendProperty(int, TQDataStream&, bool*)), - TQT_SLOT(emitSignal(KGamePropertyBase *))); + this,TQ_SLOT(sendProperty(int, TQDataStream&, bool*)), + TQ_SLOT(emitSignal(KGamePropertyBase *))); d->mVirtual=false; mActive=true; mGame=0; diff --git a/libtdegames/kgame/kplayer.h b/libtdegames/kgame/kplayer.h index 6e4ef3ae..0beb089c 100644 --- a/libtdegames/kgame/kplayer.h +++ b/libtdegames/kgame/kplayer.h @@ -68,7 +68,7 @@ class KPlayerPrivate; */ class KDE_EXPORT KPlayer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/libtdegames.html b/libtdegames/kgame/libtdegames.html index 94656f36..417ce9b2 100644 --- a/libtdegames/kgame/libtdegames.html +++ b/libtdegames/kgame/libtdegames.html @@ -59,8 +59,8 @@ The exchange of moves and other information is done using the class <em>KMessageServer</em>. An object of this class is a server that waits for connections. Someone who wants to take part - in the game has to connect to this server - usually using an internet socket connection. He does - this by creating a <em>KMessageClient</em> object. This object connects to the message server.<P> + in the game has to connect to this server - usually using an internet socket connection. This is + done by creating a <em>KMessageClient</em> object. This object connects to the message server.<P> The transfer of data is realised by subclasses of the abstract class <em>KMessageIO</em>. One object of this class is created on the client side, one on the server side. Different types of networks can @@ -84,8 +84,8 @@ The KGame objects are by default all equal. So the usual approach will be that every KGame object will store the complete status of the game, and any change or move will be broadcasted to the other KGame objects, so that they all change the status in identical ways. Sometimes it may be necessary (or just - easier to implement) that one KGame object is a <em>game server</em> (i.e. he is repsonsible for everything, - he coordinates the complete game and stores the game status), whereas the other KGame objects are + easier to implement) that one KGame object is a <em>game server</em> (i.e. repsonsible for everything, + coordinating the complete game and stores the game status), whereas the other KGame objects are only dumb stubs that are used to contact the <em>game server</em>. You can implement both approaches using the message server structure. If you need to elect the KGame object that shall be the game server, you may e.g. use the one that has the KMessageClient that is the admin of the message @@ -119,8 +119,8 @@ <b>Scenario 2: network game, started by one player</b><P> - If one user is bored of playing alone, he can open his game for connections from the outside world. - He listens to a TCP/IP socket port (i.e. a number between 0 and 65535). Other players can create + If one user is bored of playing alone, they can open their game for connections from the outside world. + The game listens to a TCP/IP socket port (i.e. a number between 0 and 65535). Other players can create KGame objects of their own and connect to this port. They need to know the IP address of that computer and the port number. This situation will have this structure: @@ -184,4 +184,4 @@ <!--------------------------------------------------------------------------------> </body> -</html>
\ No newline at end of file +</html> diff --git a/libtdegames/kgame/messages.txt b/libtdegames/kgame/messages.txt index 3a163790..5a313f72 100644 --- a/libtdegames/kgame/messages.txt +++ b/libtdegames/kgame/messages.txt @@ -80,7 +80,7 @@ IdAddPlayer rtti IdRemovePlayer Q_INT16 playerid IdError Q_INT32 errorcode - QString errortext + TQString errortext IdGameStatus Q_INT32 status diff --git a/libtdegames/kgamelcd.cpp b/libtdegames/kgamelcd.cpp index 5c9c1d85..86314cc1 100644 --- a/libtdegames/kgamelcd.cpp +++ b/libtdegames/kgamelcd.cpp @@ -36,7 +36,7 @@ KGameLCD::KGameLCD(uint nbDigits, TQWidget *parent, const char *name) _hlColor = p.color(TQPalette::Active, TQColorGroup::HighlightedText); _timer = new TQTimer(this); - connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); setFrameStyle(Panel | Plain); setSegmentStyle(Flat); @@ -114,7 +114,7 @@ KGameLCDClock::KGameLCDClock(TQWidget *parent, const char *name) : KGameLCD(5, parent, name) { _timerClock = new TQTimer(this); - connect(_timerClock, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutClock())); + connect(_timerClock, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutClock())); } KGameLCDClock::~KGameLCDClock() diff --git a/libtdegames/kgamelcd.h b/libtdegames/kgamelcd.h index ba93b91a..82def14f 100644 --- a/libtdegames/kgamelcd.h +++ b/libtdegames/kgamelcd.h @@ -41,7 +41,7 @@ class TQTimer; */ class KDE_EXPORT KGameLCD : public TQLCDNumber { - Q_OBJECT + TQ_OBJECT public: KGameLCD(uint nbDigits, TQWidget *parent = 0, const char *name = 0); @@ -126,7 +126,7 @@ private: */ class KDE_EXPORT KGameLCDClock : public KGameLCD { - Q_OBJECT + TQ_OBJECT public: KGameLCDClock(TQWidget *parent = 0, const char *name = 0); @@ -191,7 +191,7 @@ private: */ class KDE_EXPORT KGameLCDList : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp index 7327a70f..f3b48c5a 100644 --- a/libtdegames/kgameprogress.cpp +++ b/libtdegames/kgameprogress.cpp @@ -32,12 +32,12 @@ KGameProgress::KGameProgress(TQWidget *parent, const char *name) : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), - orient(Qt::Horizontal) + orient(TQt::Horizontal) { initialize(); } -KGameProgress::KGameProgress(Qt::Orientation orientation, TQWidget *parent, const char *name) +KGameProgress::KGameProgress(TQt::Orientation orientation, TQWidget *parent, const char *name) : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), orient(orientation) @@ -46,7 +46,7 @@ KGameProgress::KGameProgress(Qt::Orientation orientation, TQWidget *parent, cons } KGameProgress::KGameProgress(int minValue, int maxValue, int value, - Qt::Orientation orientation, TQWidget *parent, const char *name) + TQt::Orientation orientation, TQWidget *parent, const char *name) : TQFrame(parent, name), TQRangeControl(minValue, maxValue, 1, 10, value), orient(orientation) @@ -72,7 +72,7 @@ void KGameProgress::initialize() bar_style = Solid; text_enabled = TRUE; setBackgroundMode( PaletteBackground ); - connect(kapp, TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(paletteChange())); + connect(kapp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(paletteChange())); paletteChange(); } @@ -118,7 +118,7 @@ void KGameProgress::setBarStyle(BarStyle style) } } -void KGameProgress::setOrientation(Qt::Orientation orientation) +void KGameProgress::setOrientation(TQt::Orientation orientation) { if (orient != orientation) { orient = orientation; @@ -155,7 +155,7 @@ TQSize KGameProgress::sizeHint() const { TQSize s( size() ); - if(orientation() == Qt::Vertical) { + if(orientation() == TQt::Vertical) { s.setWidth(24); } else { s.setHeight(24); @@ -171,7 +171,7 @@ TQSize KGameProgress::minimumSizeHint() const TQSizePolicy KGameProgress::sizePolicy() const { - if ( orientation()==Qt::Vertical ) + if ( orientation()==TQt::Vertical ) return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); else return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); @@ -271,7 +271,7 @@ void KGameProgress::drawContents(TQPainter *p) switch (bar_style) { case Solid: - if (orient ==Qt::Horizontal) { + if (orient ==TQt::Horizontal) { fr.setWidth(recalcValue(cr.width())); er.setLeft(fr.right() + 1); } else { @@ -289,7 +289,7 @@ void KGameProgress::drawContents(TQPainter *p) case Blocked: const int margin = 2; int max, num, dx, dy; - if (orient ==Qt::Horizontal) { + if (orient ==TQt::Horizontal) { fr.setHeight(cr.height() - 2 * margin); fr.setWidth((int)(0.67 * fr.height())); fr.moveTopLeft(TQPoint(cr.left() + margin, cr.top() + margin)); @@ -315,7 +315,7 @@ void KGameProgress::drawContents(TQPainter *p) } if (num != max) { - if (orient ==Qt::Horizontal) + if (orient ==TQt::Horizontal) er.setLeft(fr.right() + 1); else er.setBottom(fr.bottom() + 1); diff --git a/libtdegames/kgameprogress.h b/libtdegames/kgameprogress.h index 2f5e8e57..13e0f66a 100644 --- a/libtdegames/kgameprogress.h +++ b/libtdegames/kgameprogress.h @@ -49,7 +49,7 @@ */ class KDE_EXPORT KGameProgress : public TQFrame, public TQRangeControl { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( BarStyle ) TQ_PROPERTY( int value READ value WRITE setValue) @@ -109,7 +109,7 @@ public: /** * Set the orientation of the progress bar. * - * Allowed values are @p Qt::Horizontal and @p Qt::Vertical. + * Allowed values are @p TQt::Horizontal and @p TQt::Vertical. */ void setOrientation(Orientation); @@ -1,3 +1,3 @@ - Convert BMP graphics to PNG (done) -- Checke QT QString-char * casting - (Its a bit of a QCString/QString mess right now) +- Checke QT TQString-char * casting + (Its a bit of a QCString/TQString mess right now) diff --git a/lskat/lskat/KChildConnect.h b/lskat/lskat/KChildConnect.h index a8fc4e19..0d2f002b 100644 --- a/lskat/lskat/KChildConnect.h +++ b/lskat/lskat/KChildConnect.h @@ -24,7 +24,7 @@ class KChildConnect: public TQObject { - Q_OBJECT + TQ_OBJECT protected: diff --git a/lskat/lskat/KEInput.cpp b/lskat/lskat/KEInput.cpp index 091bf4e1..91377f38 100644 --- a/lskat/lskat/KEInput.cpp +++ b/lskat/lskat/KEInput.cpp @@ -127,22 +127,22 @@ bool KEInput::SetInputDevice(int no, KG_INPUTTYPE type,KEMessage *msg) switch(QueryType(no)) { case KG_INPUTTYPE_INTERACTIVE: - connect(playerArray[no].QueryInteractiveConnect(),TQT_SIGNAL(signalReceiveMsg(KEMessage *,int )), - this,TQT_SLOT(slotSetInput(KEMessage *,int ))); - connect(playerArray[no].QueryInteractiveConnect(),TQT_SIGNAL(signalPrepareMove(KEMessage *,KG_INPUTTYPE)), - this,TQT_SLOT(slotPrepareMove(KEMessage *,KG_INPUTTYPE))); + connect(playerArray[no].QueryInteractiveConnect(),TQ_SIGNAL(signalReceiveMsg(KEMessage *,int )), + this,TQ_SLOT(slotSetInput(KEMessage *,int ))); + connect(playerArray[no].QueryInteractiveConnect(),TQ_SIGNAL(signalPrepareMove(KEMessage *,KG_INPUTTYPE)), + this,TQ_SLOT(slotPrepareMove(KEMessage *,KG_INPUTTYPE))); break; case KG_INPUTTYPE_REMOTE: - connect(playerArray[no].QueryRemoteConnect(),TQT_SIGNAL(signalReceiveMsg(KEMessage *,int )), - this,TQT_SLOT(slotSetInput(KEMessage *,int ))); - connect(playerArray[no].QueryRemoteConnect(),TQT_SIGNAL(signalPrepareMove(KEMessage *,KG_INPUTTYPE)), - this,TQT_SLOT(slotPrepareMove(KEMessage *,KG_INPUTTYPE))); + connect(playerArray[no].QueryRemoteConnect(),TQ_SIGNAL(signalReceiveMsg(KEMessage *,int )), + this,TQ_SLOT(slotSetInput(KEMessage *,int ))); + connect(playerArray[no].QueryRemoteConnect(),TQ_SIGNAL(signalPrepareMove(KEMessage *,KG_INPUTTYPE)), + this,TQ_SLOT(slotPrepareMove(KEMessage *,KG_INPUTTYPE))); break; case KG_INPUTTYPE_PROCESS: - connect(playerArray[no].QueryProcessConnect(),TQT_SIGNAL(signalReceiveMsg(KEMessage *,int )), - this,TQT_SLOT(slotSetInput(KEMessage *,int ))); - connect(playerArray[no].QueryProcessConnect(),TQT_SIGNAL(signalPrepareMove(KEMessage *,KG_INPUTTYPE)), - this,TQT_SLOT(slotPrepareMove(KEMessage *,KG_INPUTTYPE))); + connect(playerArray[no].QueryProcessConnect(),TQ_SIGNAL(signalReceiveMsg(KEMessage *,int )), + this,TQ_SLOT(slotSetInput(KEMessage *,int ))); + connect(playerArray[no].QueryProcessConnect(),TQ_SIGNAL(signalPrepareMove(KEMessage *,KG_INPUTTYPE)), + this,TQ_SLOT(slotPrepareMove(KEMessage *,KG_INPUTTYPE))); break; default: break; @@ -190,7 +190,7 @@ bool KEInput::Next(int number, bool force) // delay non interactive move to allow interactive inout if (cTimer) delete cTimer; // Ouch... cTimer=new TQTimer(this); - connect(cTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotTimerNextRemote())); + connect(cTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotTimerNextRemote())); cTimer->start(K_INPUT_DELAY,TRUE); } else @@ -204,7 +204,7 @@ bool KEInput::Next(int number, bool force) { // delay non interactive move to allow interactive inout cTimer=new TQTimer(this); - connect(cTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotTimerNextProcess())); + connect(cTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotTimerNextProcess())); cTimer->start(K_INPUT_DELAY,TRUE); } else diff --git a/lskat/lskat/KEInput.h b/lskat/lskat/KEInput.h index a2b391c8..ee84e508 100644 --- a/lskat/lskat/KEInput.h +++ b/lskat/lskat/KEInput.h @@ -31,7 +31,7 @@ class KEInput : public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/lskat/lskat/KInputChildProcess.cpp b/lskat/lskat/KInputChildProcess.cpp index bd78235c..91ff119c 100644 --- a/lskat/lskat/KInputChildProcess.cpp +++ b/lskat/lskat/KInputChildProcess.cpp @@ -36,8 +36,8 @@ bool KInputChildProcess::exec() childConnect=new KChildConnect; if (!childConnect) return false; - connect(childConnect,TQT_SIGNAL(signalReceiveMsg(KEMessage *,int)), - this,TQT_SLOT(slotReceiveMsg(KEMessage *,int))); + connect(childConnect,TQ_SIGNAL(signalReceiveMsg(KEMessage *,int)), + this,TQ_SLOT(slotReceiveMsg(KEMessage *,int))); do { // Wait for input diff --git a/lskat/lskat/KInputChildProcess.h b/lskat/lskat/KInputChildProcess.h index 60ea185b..f1876f47 100644 --- a/lskat/lskat/KInputChildProcess.h +++ b/lskat/lskat/KInputChildProcess.h @@ -24,7 +24,7 @@ class KInputChildProcess : public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/lskat/lskat/KInteractiveConnect.h b/lskat/lskat/KInteractiveConnect.h index 9ec932db..db3ab9b6 100644 --- a/lskat/lskat/KInteractiveConnect.h +++ b/lskat/lskat/KInteractiveConnect.h @@ -22,7 +22,7 @@ class KInteractiveConnect:public KChildConnect { - Q_OBJECT + TQ_OBJECT public: diff --git a/lskat/lskat/KRSocket.cpp b/lskat/lskat/KRSocket.cpp index a508989b..1b5201ad 100644 --- a/lskat/lskat/KRSocket.cpp +++ b/lskat/lskat/KRSocket.cpp @@ -114,7 +114,7 @@ KRServerSocket::KRServerSocket( const char *_path, int optname, int value, int l } notifier = new TQSocketNotifier( sock, TQSocketNotifier::Read ); - connect( notifier, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotAccept(int) ) ); + connect( notifier, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotAccept(int) ) ); } KRServerSocket::KRServerSocket( const char *_path ) : @@ -129,7 +129,7 @@ KRServerSocket::KRServerSocket( const char *_path ) : } notifier = new TQSocketNotifier( sock, TQSocketNotifier::Read ); - connect( notifier, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotAccept(int) ) ); + connect( notifier, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotAccept(int) ) ); } KRServerSocket::KRServerSocket( unsigned short int _port ) : @@ -144,7 +144,7 @@ KRServerSocket::KRServerSocket( unsigned short int _port ) : } notifier = new TQSocketNotifier( sock, TQSocketNotifier::Read ); - connect( notifier, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotAccept(int) ) ); + connect( notifier, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotAccept(int) ) ); } KRServerSocket::KRServerSocket( unsigned short int _port,int optname,int value,int level ) : @@ -159,7 +159,7 @@ KRServerSocket::KRServerSocket( unsigned short int _port,int optname,int value,i } notifier = new TQSocketNotifier( sock, TQSocketNotifier::Read ); - connect( notifier, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotAccept(int) ) ); + connect( notifier, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotAccept(int) ) ); } bool KRServerSocket::init( const char *_path ) diff --git a/lskat/lskat/KRSocket.h b/lskat/lskat/KRSocket.h index 83969a4d..eb4e47de 100644 --- a/lskat/lskat/KRSocket.h +++ b/lskat/lskat/KRSocket.h @@ -72,7 +72,7 @@ class KRServerSocketPrivate; */ class KRServerSocket : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/lskat/lskat/KRemoteConnect.cpp b/lskat/lskat/KRemoteConnect.cpp index b8f0d197..d3310324 100644 --- a/lskat/lskat/KRemoteConnect.cpp +++ b/lskat/lskat/KRemoteConnect.cpp @@ -110,13 +110,13 @@ bool tryserver; { kSocket->enableRead(TRUE); //kSocket->enableWrite(TRUE); - connect(kSocket,TQT_SIGNAL(closeEvent(TDESocket *)), - this,TQT_SLOT(socketClosed(TDESocket *))); - connect(kSocket,TQT_SIGNAL(readEvent(TDESocket *)), - this,TQT_SLOT(socketRead(TDESocket *))); + connect(kSocket,TQ_SIGNAL(closeEvent(TDESocket *)), + this,TQ_SLOT(socketClosed(TDESocket *))); + connect(kSocket,TQ_SIGNAL(readEvent(TDESocket *)), + this,TQ_SLOT(socketRead(TDESocket *))); /* - connect(kSocket,TQT_SIGNAL(writeEvent(TDESocket *)), - this,TQT_SLOT(socketWrite(TDESocket *))); + connect(kSocket,TQ_SIGNAL(writeEvent(TDESocket *)), + this,TQ_SLOT(socketWrite(TDESocket *))); */ /* printf("Socket(%d) %p connection built to a server\n", @@ -187,8 +187,8 @@ bool KRemoteConnect::OfferServerSocket() printf("Offering socket and publishing stuff\n"); service = new DNSSD::PublicService(Name,LSKAT_SERVICE,port); service->publishAsync(); - connect(kServerSocket,TQT_SIGNAL(accepted(TDESocket *)), - this,TQT_SLOT(socketRequest(TDESocket *))); + connect(kServerSocket,TQ_SIGNAL(accepted(TDESocket *)), + this,TQ_SLOT(socketRequest(TDESocket *))); return true; } @@ -206,13 +206,13 @@ void KRemoteConnect::socketRequest(TDESocket *sock) { kSocket->enableRead(TRUE); //kSocket->enableWrite(TRUE); - connect(kSocket,TQT_SIGNAL(closeEvent(TDESocket *)), - this,TQT_SLOT(socketClosed(TDESocket *))); - connect(kSocket,TQT_SIGNAL(readEvent(TDESocket *)), - this,TQT_SLOT(socketRead(TDESocket *))); + connect(kSocket,TQ_SIGNAL(closeEvent(TDESocket *)), + this,TQ_SLOT(socketClosed(TDESocket *))); + connect(kSocket,TQ_SIGNAL(readEvent(TDESocket *)), + this,TQ_SLOT(socketRead(TDESocket *))); /* - connect(kSocket,TQT_SIGNAL(writeEvent(TDESocket *)), - this,TQT_SLOT(socketWrite(TDESocket *))); + connect(kSocket,TQ_SIGNAL(writeEvent(TDESocket *)), + this,TQ_SLOT(socketWrite(TDESocket *))); */ socketStatus=KR_SERVER; delete kServerSocket; // no more connections diff --git a/lskat/lskat/KRemoteConnect.h b/lskat/lskat/KRemoteConnect.h index 99e27b12..bbc99608 100644 --- a/lskat/lskat/KRemoteConnect.h +++ b/lskat/lskat/KRemoteConnect.h @@ -28,7 +28,7 @@ class KRemoteConnect: public KChildConnect { - Q_OBJECT + TQ_OBJECT protected: diff --git a/lskat/lskat/TDEProcessConnect.cpp b/lskat/lskat/TDEProcessConnect.cpp index b2038b4f..286e6942 100644 --- a/lskat/lskat/TDEProcessConnect.cpp +++ b/lskat/lskat/TDEProcessConnect.cpp @@ -75,13 +75,13 @@ bool TDEProcessConnect::Init(int id,KEMessage *msg) // create process process=new TDEProcess; *process << processname; - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char * , int ))); - connect(process, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(slotReceivedStdout(TDEProcess *, char * , int ))); + connect(process, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); /* - connect(process, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotWroteStdin(TDEProcess *))); + connect(process, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotWroteStdin(TDEProcess *))); */ // TRUE if ok diff --git a/lskat/lskat/TDEProcessConnect.h b/lskat/lskat/TDEProcessConnect.h index 3a38e23b..e35675a5 100644 --- a/lskat/lskat/TDEProcessConnect.h +++ b/lskat/lskat/TDEProcessConnect.h @@ -26,7 +26,7 @@ class TDEProcessConnect: public KChildConnect { - Q_OBJECT + TQ_OBJECT private: diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp index 4774855b..d127b72f 100644 --- a/lskat/lskat/lskat.cpp +++ b/lskat/lskat/lskat.cpp @@ -73,16 +73,16 @@ LSkatApp::LSkatApp() : TDEMainWindow(0) // Needs to be after readOptions as we read in default paths doc->LoadGrafix(mGrafix); - mInput=new KEInput(TQT_TQOBJECT(this)); + mInput=new KEInput(this); doc->SetInputHandler(mInput); - connect(mInput,TQT_SIGNAL(signalPrepareProcessMove(KEMessage *)), - this,TQT_SLOT(slotPrepareProcessMove(KEMessage *))); - connect(mInput,TQT_SIGNAL(signalPrepareRemoteMove(KEMessage *)), - this,TQT_SLOT(slotPrepareRemoteMove(KEMessage *))); - connect(mInput,TQT_SIGNAL(signalPrepareInteractiveMove(KEMessage *)), - this,TQT_SLOT(slotPrepareInteractiveMove(KEMessage *))); - connect(mInput,TQT_SIGNAL(signalReceiveInput(KEMessage *, int)), - this,TQT_SLOT(slotReceiveInput(KEMessage *,int ))); + connect(mInput,TQ_SIGNAL(signalPrepareProcessMove(KEMessage *)), + this,TQ_SLOT(slotPrepareProcessMove(KEMessage *))); + connect(mInput,TQ_SIGNAL(signalPrepareRemoteMove(KEMessage *)), + this,TQ_SLOT(slotPrepareRemoteMove(KEMessage *))); + connect(mInput,TQ_SIGNAL(signalPrepareInteractiveMove(KEMessage *)), + this,TQ_SLOT(slotPrepareInteractiveMove(KEMessage *))); + connect(mInput,TQ_SIGNAL(signalReceiveInput(KEMessage *, int)), + this,TQ_SLOT(slotReceiveInput(KEMessage *,int ))); setMinimumSize(640,480); setMaximumSize(800,600); @@ -158,26 +158,26 @@ void LSkatApp::initGUI() { TQStringList list; - (void)KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection(), "new_game"); + (void)KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection(), "new_game"); ACTION("new_game")->setStatusText(i18n("Starting a new game...")); ACTION("new_game")->setWhatsThis(i18n("Starting a new game...")); - (void)new TDEAction(i18n("&End Game"),"process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileEnd()), + (void)new TDEAction(i18n("&End Game"),"process-stop", 0, this, TQ_SLOT(slotFileEnd()), actionCollection(), "end_game"); ACTION("end_game")->setStatusText(i18n("Ending the current game...")); ACTION("end_game")->setWhatsThis(i18n("Aborts a currently played game. No winner will be declared.")); - (void)new TDEAction(i18n("&Clear Statistics"),"flag", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileStatistics()), + (void)new TDEAction(i18n("&Clear Statistics"),"flag", 0, this, TQ_SLOT(slotFileStatistics()), actionCollection(), "clear_statistics"); ACTION("clear_statistics")->setStatusText(i18n("Delete all time statistics...")); ACTION("clear_statistics")->setWhatsThis(i18n("Clears the all time statistics which is kept in all sessions.")); - (void)new TDEAction(i18n("Send &Message..."), CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotFileMessage()), + (void)new TDEAction(i18n("Send &Message..."), CTRL+Key_M, this, TQ_SLOT(slotFileMessage()), actionCollection(), "send_message"); ACTION("send_message")->setStatusText(i18n("Sending message to remote player...")); ACTION("send_message")->setWhatsThis(i18n("Allows you to talk with a remote player.")); - (void)KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection(), "game_exit"); + (void)KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection(), "game_exit"); ACTION("game_exit")->setStatusText(i18n("Exiting...")); ACTION("game_exit")->setWhatsThis(i18n("Quits the program.")); - (void)new TDESelectAction(i18n("Starting Player"),0,TQT_TQOBJECT(this),TQT_SLOT(slotStartplayer()), + (void)new TDESelectAction(i18n("Starting Player"),0,this,TQ_SLOT(slotStartplayer()), actionCollection(), "startplayer"); ACTION("startplayer")->setStatusText(i18n("Changing starting player...")); ACTION("startplayer")->setWhatsThis(i18n("Chooses which player begins the next game.")); @@ -186,7 +186,7 @@ void LSkatApp::initGUI() list.append(i18n("Player &2")); ((TDESelectAction *)ACTION("startplayer"))->setItems(list); - (void)new TDESelectAction(i18n("Player &1 Played By"),0,TQT_TQOBJECT(this),TQT_SLOT(slotPlayer1By()), + (void)new TDESelectAction(i18n("Player &1 Played By"),0,this,TQ_SLOT(slotPlayer1By()), actionCollection(), "player1"); ACTION("player1")->setStatusText(i18n("Changing who plays player 1...")); ACTION("player1")->setWhatsThis(i18n("Changing who plays player 1...")); @@ -195,13 +195,13 @@ void LSkatApp::initGUI() list.append(i18n("&Computer")); list.append(i18n("&Remote")); ((TDESelectAction *)ACTION("player1"))->setItems(list); - (void)new TDESelectAction(i18n("Player &2 Played By"),0,TQT_TQOBJECT(this),TQT_SLOT(slotPlayer2By()), + (void)new TDESelectAction(i18n("Player &2 Played By"),0,this,TQ_SLOT(slotPlayer2By()), actionCollection(), "player2"); ACTION("player1")->setStatusText(i18n("Changing who plays player 2...")); ACTION("player1")->setWhatsThis(i18n("Changing who plays player 2...")); ((TDESelectAction *)ACTION("player2"))->setItems(list); - (void)new TDESelectAction(i18n("&Level"),0,TQT_TQOBJECT(this),TQT_SLOT(slotLevel()), + (void)new TDESelectAction(i18n("&Level"),0,this,TQ_SLOT(slotLevel()), actionCollection(), "choose_level"); ACTION("choose_level")->setStatusText(i18n("Change level...")); ACTION("choose_level")->setWhatsThis(i18n("Change the strength of the computer player.")); @@ -211,21 +211,21 @@ void LSkatApp::initGUI() list.append(i18n("&Hard")); ((TDESelectAction *)ACTION("choose_level"))->setItems(list); - (void)new TDEAction(i18n("Select &Card Deck..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionsCardDeck()), + (void)new TDEAction(i18n("Select &Card Deck..."), 0, this, TQ_SLOT(slotOptionsCardDeck()), actionCollection(), "select_carddeck"); ACTION("select_carddeck")->setStatusText(i18n("Configure card decks...")); ACTION("select_carddeck")->setWhatsThis(i18n("Choose how the cards should look.")); - (void)new TDEAction(i18n("Change &Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionsNames()), + (void)new TDEAction(i18n("Change &Names..."), 0, this, TQ_SLOT(slotOptionsNames()), actionCollection(), "change_names"); ACTION("change_names")->setStatusText(i18n("Configure player names...")); ACTION("change_names")->setWhatsThis(i18n("Configure player names...")); actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(actionCollection(), TQT_SIGNAL(clearStatusText()), TQT_SLOT(slotClearStatusMsg())); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), TQ_SLOT(slotStatusMsg(const TQString &))); + connect(actionCollection(), TQ_SIGNAL(clearStatusText()), TQ_SLOT(slotClearStatusMsg())); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); } @@ -243,7 +243,7 @@ void LSkatApp::initStatusBar() // computer move timer procTimer=new TQTimer(this); - connect(procTimer,TQT_SIGNAL(timeout()),TQT_TQOBJECT(this),TQT_SLOT(slotProcTimer())); + connect(procTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotProcTimer())); } void LSkatApp::initDocument() @@ -349,7 +349,7 @@ bool LSkatApp::queryExit() } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void LSkatApp::slotFileStatistics() diff --git a/lskat/lskat/lskat.h b/lskat/lskat/lskat.h index 6571ce5d..1caa3107 100644 --- a/lskat/lskat/lskat.h +++ b/lskat/lskat/lskat.h @@ -68,7 +68,7 @@ class LSkatView; */ class LSkatApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class LSkatView; diff --git a/lskat/lskat/lskatdoc.h b/lskat/lskat/lskatdoc.h index 52e29af2..0446f210 100644 --- a/lskat/lskat/lskatdoc.h +++ b/lskat/lskat/lskatdoc.h @@ -46,7 +46,7 @@ class LSkatView; */ class LSkatDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Constructor for the fileclass of the application */ diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp index ce1c7ec0..c206e108 100644 --- a/lskat/lskat/lskatview.cpp +++ b/lskat/lskat/lskatview.cpp @@ -119,12 +119,12 @@ LSkatView::LSkatView(TQWidget *parent, const char *name) : TQWidget(parent, name moveTimer=new TQTimer(this); moveTimer->stop(); - connect(moveTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(moveTimerReady())); + connect(moveTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(moveTimerReady())); introcnt=0; introTimer=new TQTimer(this); introTimer->stop(); - connect(introTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(introTimerReady())); + connect(introTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(introTimerReady())); introTimer->start(75,FALSE); for (int i=0;i<NO_OF_CARDS;i++) @@ -760,7 +760,7 @@ void LSkatView::paintEvent( TQPaintEvent * e) TQPixmap pm(this->rect().size()); TQPainter p; TQBrush brush; - p.begin(TQT_TQPAINTDEVICE(&pm),this); + p.begin(&pm,this); brush.setPixmap( getDocument()->mPixBackground ); p.fillRect(0,0,this->rect().width(),this->rect().height(),brush); drawIntro(&p); @@ -790,7 +790,7 @@ TQPoint LSkatView::calcCardPos(int x,int y) // mouse click event void LSkatView::mousePressEvent( TQMouseEvent *mouse ) { - if (mouse->button()!=Qt::LeftButton) return ; + if (mouse->button()!=TQt::LeftButton) return ; if (!getDocument()->IsRunning()) return ; if (getDocument()->GetMoveStatus()!=-1) return ; diff --git a/lskat/lskat/lskatview.h b/lskat/lskat/lskatview.h index 3a6b3571..112a1dca 100644 --- a/lskat/lskat/lskatview.h +++ b/lskat/lskat/lskatview.h @@ -38,7 +38,7 @@ class LSkatDoc; */ class LSkatView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** Constructor for the main view */ diff --git a/lskat/lskat/msgdlg.cpp b/lskat/lskat/msgdlg.cpp index c59109d3..4788318b 100644 --- a/lskat/lskat/msgdlg.cpp +++ b/lskat/lskat/msgdlg.cpp @@ -57,12 +57,12 @@ MsgDlg::MsgDlg( TQWidget *parent, const char *name,const char * /*sufi */ ) TQPushButton *PushButton; PushButton = new TQPushButton( i18n("Send" ), this, "PushButton_1" ); PushButton->setGeometry( 20, 120, 65, 30 ); - connect( PushButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( PushButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); PushButton->setAutoRepeat( FALSE ); PushButton = new KPushButton( KStdGuiItem::cancel(), this, "PushButton_2" ); PushButton->setGeometry( 305, 120, 65, 30 ); - connect( PushButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( PushButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); PushButton->setAutoRepeat( FALSE ); } diff --git a/lskat/lskat/msgdlg.h b/lskat/lskat/msgdlg.h index 51a57134..9c1e0440 100644 --- a/lskat/lskat/msgdlg.h +++ b/lskat/lskat/msgdlg.h @@ -22,7 +22,7 @@ class MsgDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/lskat/lskat/namedlg.cpp b/lskat/lskat/namedlg.cpp index 3bd0cca6..2cbe6ef1 100644 --- a/lskat/lskat/namedlg.cpp +++ b/lskat/lskat/namedlg.cpp @@ -44,7 +44,7 @@ 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->setColumnLayout(0, TQt::Vertical ); player_names->layout()->setSpacing( 0 ); player_names->layout()->setMargin( 0 ); vbox_2 = new TQVBoxLayout( player_names->layout() ); diff --git a/lskat/lskat/namedlg.h b/lskat/lskat/namedlg.h index c6cc18d1..16c09398 100644 --- a/lskat/lskat/namedlg.h +++ b/lskat/lskat/namedlg.h @@ -20,7 +20,7 @@ class TQPushButton; class NameDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/lskat/lskat/networkdlg.cpp b/lskat/lskat/networkdlg.cpp index e23e50fe..12b19569 100644 --- a/lskat/lskat/networkdlg.cpp +++ b/lskat/lskat/networkdlg.cpp @@ -29,7 +29,7 @@ NetworkDlg::NetworkDlg( TQWidget *parent, const char *name ) : NetworkDlgBase( parent, name, TRUE ) { browser = new DNSSD::ServiceBrowser(TQString::fromLatin1(LSKAT_SERVICE)); - connect(browser,TQT_SIGNAL(finished()),TQT_SLOT(gamesFound())); + connect(browser,TQ_SIGNAL(finished()),TQ_SLOT(gamesFound())); browser->startBrowse(); } diff --git a/lskat/lskat/networkdlg.h b/lskat/lskat/networkdlg.h index 7cd7ca9a..7fb07215 100644 --- a/lskat/lskat/networkdlg.h +++ b/lskat/lskat/networkdlg.h @@ -24,7 +24,7 @@ class NetworkDlg : public NetworkDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/lskat/lskat/networkdlgbase.ui b/lskat/lskat/networkdlgbase.ui index d064c13b..23f63a8e 100644 --- a/lskat/lskat/networkdlgbase.ui +++ b/lskat/lskat/networkdlgbase.ui @@ -298,9 +298,9 @@ <slot>toggleServerClient()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">toggleServerClient()</slot> <slot access="protected">gameSelected(int nr)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/lskat/lskatproc/KChildConnect.h b/lskat/lskatproc/KChildConnect.h index a067d9f3..0c969dad 100644 --- a/lskat/lskatproc/KChildConnect.h +++ b/lskat/lskatproc/KChildConnect.h @@ -16,7 +16,7 @@ class KChildConnect: public TQObject { - Q_OBJECT + TQ_OBJECT protected: diff --git a/lskat/lskatproc/KInputChildProcess.cpp b/lskat/lskatproc/KInputChildProcess.cpp index 13e00b93..24fca968 100644 --- a/lskat/lskatproc/KInputChildProcess.cpp +++ b/lskat/lskatproc/KInputChildProcess.cpp @@ -36,8 +36,8 @@ bool KInputChildProcess::exec() childConnect=new KChildConnect; if (!childConnect) return false; - connect(childConnect,TQT_SIGNAL(signalReceiveMsg(KEMessage *,int)), - this,TQT_SLOT(slotReceiveMsg(KEMessage *,int))); + connect(childConnect,TQ_SIGNAL(signalReceiveMsg(KEMessage *,int)), + this,TQ_SLOT(slotReceiveMsg(KEMessage *,int))); do { // Wait for input diff --git a/lskat/lskatproc/KInputChildProcess.h b/lskat/lskatproc/KInputChildProcess.h index 60ea185b..f1876f47 100644 --- a/lskat/lskatproc/KInputChildProcess.h +++ b/lskat/lskatproc/KInputChildProcess.h @@ -24,7 +24,7 @@ class KInputChildProcess : public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/tdefifteen/src/gameboard.cpp b/tdefifteen/src/gameboard.cpp index 1cca80f4..0fb2084c 100644 --- a/tdefifteen/src/gameboard.cpp +++ b/tdefifteen/src/gameboard.cpp @@ -58,7 +58,7 @@ GameBoard::GameBoard(TQWidget *parent, const char *name) dx = dy = 0; tmr = new TQTimer(this); - TQObject::connect(tmr, SIGNAL(timeout()), this, SLOT(moveItem())); + TQObject::connect(tmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(moveItem())); setEnabled(TRUE); origin = xpm; } diff --git a/tdefifteen/src/gameboard.h b/tdefifteen/src/gameboard.h index 55b25e29..5b00131c 100644 --- a/tdefifteen/src/gameboard.h +++ b/tdefifteen/src/gameboard.h @@ -32,7 +32,7 @@ protected: class GameBoard:public TQWidget { - Q_OBJECT + TQ_OBJECT public: GameBoard(TQWidget *parent = NULL, const char *name = NULL); diff --git a/tdefifteen/src/mainwindow.cpp b/tdefifteen/src/mainwindow.cpp index 258b0220..688c1743 100644 --- a/tdefifteen/src/mainwindow.cpp +++ b/tdefifteen/src/mainwindow.cpp @@ -11,11 +11,11 @@ MainWindow::MainWindow(TQWidget* parent, const char* name) : TDEMainWindow(parent, name) { - TDEAction* actionQuit = KStdAction::quit(this, SLOT(close()), 0); - TDEAction* actionNew = new TDEAction( "&New Game", "reload", TQt::CTRL + TQt::Key_N, this, SLOT(newGame()), this, "New Game"); + TDEAction* actionQuit = KStdAction::quit(this, TQ_SLOT(close()), 0); + TDEAction* actionNew = new TDEAction( "&New Game", "reload", TQt::CTRL + TQt::Key_N, this, TQ_SLOT(newGame()), this, "New Game"); mMenu = new TDEPopupMenu(this); - mMenu->insertItem(SmallIcon("images_display"), "Load an image", this, SLOT(loadImage()), TQt::CTRL + TQt::Key_L); + mMenu->insertItem(SmallIcon("images_display"), "Load an image", this, TQ_SLOT(loadImage()), TQt::CTRL + TQt::Key_L); mMenu->insertSeparator(); actionNew->plug(mMenu); diff --git a/tdefifteen/src/mainwindow.h b/tdefifteen/src/mainwindow.h index 46391c73..00fdcbee 100644 --- a/tdefifteen/src/mainwindow.h +++ b/tdefifteen/src/mainwindow.h @@ -12,7 +12,7 @@ class MainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow(TQWidget* parent = 0, const char* name = 0); diff --git a/translations/desktop_files/KGoldrunner.desktop/ru.po b/translations/desktop_files/KGoldrunner.desktop/ru.po index 9775de8d..7fa876e4 100644 --- a/translations/desktop_files/KGoldrunner.desktop/ru.po +++ b/translations/desktop_files/KGoldrunner.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 15:29+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kgoldrunner-kgoldrunnerdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KGoldrunner.desktop:2 msgid "KGoldrunner" -msgstr "" +msgstr "KGoldrunner" #. GenericName #: KGoldrunner.desktop:3 diff --git a/translations/desktop_files/atlantik-eventsrc/ru.po b/translations/desktop_files/atlantik-eventsrc/ru.po index c4727253..01f0aba2 100644 --- a/translations/desktop_files/atlantik-eventsrc/ru.po +++ b/translations/desktop_files/atlantik-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 14:47+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/atlantik-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "Atlantik" -msgstr "" +msgstr "Атлантика" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/atlantik.desktop/ru.po b/translations/desktop_files/atlantik.desktop/ru.po index 2b57b5e9..c70a392e 100644 --- a/translations/desktop_files/atlantik.desktop/ru.po +++ b/translations/desktop_files/atlantik.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 14:47+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/atlantik-atlantikdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: atlantik.desktop:3 msgid "Atlantik" -msgstr "" +msgstr "Атлантика" #. GenericName #: atlantik.desktop:4 diff --git a/translations/desktop_files/kasteroids.desktop/ru.po b/translations/desktop_files/kasteroids.desktop/ru.po index e8350a60..0d51dcbe 100644 --- a/translations/desktop_files/kasteroids.desktop/ru.po +++ b/translations/desktop_files/kasteroids.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 14:50+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kasteroids-kasteroidsdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kasteroids.desktop:2 msgid "KAsteroids" -msgstr "" +msgstr "KAsteroids" #. GenericName #: kasteroids.desktop:5 diff --git a/translations/desktop_files/kbackgammon-eventsrc/ru.po b/translations/desktop_files/kbackgammon-eventsrc/ru.po index 47fa3e9d..7d454502 100644 --- a/translations/desktop_files/kbackgammon-eventsrc/ru.po +++ b/translations/desktop_files/kbackgammon-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 15:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kbackgammon-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "KBackgammon" -msgstr "" +msgstr "KBackgammon" #. Name #: eventsrc:7 diff --git a/translations/desktop_files/kbackgammon.desktop/ru.po b/translations/desktop_files/kbackgammon.desktop/ru.po index 77862581..6ede4929 100644 --- a/translations/desktop_files/kbackgammon.desktop/ru.po +++ b/translations/desktop_files/kbackgammon.desktop/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 15:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kbackgammon-kbackgammondesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kbackgammon.desktop:3 -#, fuzzy msgid "KBackgammon" -msgstr "Нарды" +msgstr "KBackgammon" #. GenericName #: kbackgammon.desktop:6 diff --git a/translations/desktop_files/kblackbox.desktop/ru.po b/translations/desktop_files/kblackbox.desktop/ru.po index 69490fd1..0ef2c1e3 100644 --- a/translations/desktop_files/kblackbox.desktop/ru.po +++ b/translations/desktop_files/kblackbox.desktop/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 15:10+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kblackbox-kblackboxdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: kblackbox.desktop:2 @@ -24,4 +26,4 @@ msgstr "Чёрный ящик" #. Name #: kblackbox.desktop:4 msgid "KBlackBox" -msgstr "" +msgstr "KBlackBox" diff --git a/translations/desktop_files/kbounce.desktop/ru.po b/translations/desktop_files/kbounce.desktop/ru.po index b0c7f166..186c54d2 100644 --- a/translations/desktop_files/kbounce.desktop/ru.po +++ b/translations/desktop_files/kbounce.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 15:12+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kbounce-kbouncedesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kbounce.desktop:2 msgid "KBounce" -msgstr "" +msgstr "KBounce" #. GenericName #: kbounce.desktop:9 diff --git a/translations/desktop_files/kenolaba.desktop/ru.po b/translations/desktop_files/kenolaba.desktop/ru.po index 8c6b65da..f8e02c59 100644 --- a/translations/desktop_files/kenolaba.desktop/ru.po +++ b/translations/desktop_files/kenolaba.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 15:14+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kenolaba-kenolabadesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kenolaba.desktop:2 msgid "Kenolaba" -msgstr "" +msgstr "Kenolaba" #. GenericName #: kenolaba.desktop:7 diff --git a/translations/desktop_files/kjumpingcube.desktop/ru.po b/translations/desktop_files/kjumpingcube.desktop/ru.po index 9aedae3f..adeb8628 100644 --- a/translations/desktop_files/kjumpingcube.desktop/ru.po +++ b/translations/desktop_files/kjumpingcube.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 15:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kjumpingcube-kjumpingcubedesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kjumpingcube.desktop:2 msgid "KJumpingCube" -msgstr "" +msgstr "KJumpingCube" #. GenericName #: kjumpingcube.desktop:7 diff --git a/translations/desktop_files/klickety-eventsrc/ru.po b/translations/desktop_files/klickety-eventsrc/ru.po index 8d957e33..fc4c4d88 100644 --- a/translations/desktop_files/klickety-eventsrc/ru.po +++ b/translations/desktop_files/klickety-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 15:56+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/klickety-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "Klickety" -msgstr "" +msgstr "Klickety" #. Name #. Comment diff --git a/translations/desktop_files/kmahjongg.desktop/ru.po b/translations/desktop_files/kmahjongg.desktop/ru.po index 35b029ff..16c7341b 100644 --- a/translations/desktop_files/kmahjongg.desktop/ru.po +++ b/translations/desktop_files/kmahjongg.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 16:01+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kmahjongg-kmahjonggdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kmahjongg.desktop:2 msgid "KMahjongg" -msgstr "" +msgstr "KMahjongg" #. GenericName #: kmahjongg.desktop:5 diff --git a/translations/desktop_files/kmines-eventsrc/ru.po b/translations/desktop_files/kmines-eventsrc/ru.po index 58bc6a1d..8253ff14 100644 --- a/translations/desktop_files/kmines-eventsrc/ru.po +++ b/translations/desktop_files/kmines-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 16:23+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kmines-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: data/eventsrc:3 msgid "KMines" -msgstr "" +msgstr "KMines" #. Name #. Comment diff --git a/translations/desktop_files/kmines.desktop/ru.po b/translations/desktop_files/kmines.desktop/ru.po index 1ae575fd..7c6f7292 100644 --- a/translations/desktop_files/kmines.desktop/ru.po +++ b/translations/desktop_files/kmines.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 16:22+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kmines-kminesdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: data/kmines.desktop:2 msgid "KMines" -msgstr "" +msgstr "KMines" #. GenericName #: data/kmines.desktop:7 diff --git a/translations/desktop_files/knetwalk-eventsrc/ru.po b/translations/desktop_files/knetwalk-eventsrc/ru.po index ff0f9b97..4a59fce6 100644 --- a/translations/desktop_files/knetwalk-eventsrc/ru.po +++ b/translations/desktop_files/knetwalk-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 16:45+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/knetwalk-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "KNetwalk" -msgstr "" +msgstr "KNetwalk" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/knetwalk.desktop/ru.po b/translations/desktop_files/knetwalk.desktop/ru.po new file mode 100644 index 00000000..3aa7158a --- /dev/null +++ b/translations/desktop_files/knetwalk.desktop/ru.po @@ -0,0 +1,29 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Andrei Stepanov <adem4ik@gmail.com>, 2023. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-06-10 16:44+0200\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/knetwalk-knetwalkdesktop/ru/>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: knetwalk.desktop:5 +msgid "KNetwalk" +msgstr "KNetwalk" + +#. GenericName +#: knetwalk.desktop:6 +msgid "Network Contruction Game" +msgstr "Игра по строительству сети" diff --git a/translations/desktop_files/kolf-desktops/ru.po b/translations/desktop_files/kolf-desktops/ru.po index 060c598b..81bbd9ed 100644 --- a/translations/desktop_files/kolf-desktops/ru.po +++ b/translations/desktop_files/kolf-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 17:12+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kolf-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kolf.desktop:3 msgid "Kolf" -msgstr "" +msgstr "Kolf" #. GenericName #: kolf.desktop:10 diff --git a/translations/desktop_files/konquest.desktop/ru.po b/translations/desktop_files/konquest.desktop/ru.po index d3d4ba51..1d20c3cb 100644 --- a/translations/desktop_files/konquest.desktop/ru.po +++ b/translations/desktop_files/konquest.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 17:27+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/konquest-konquestdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: konquest.desktop:3 msgid "Konquest" -msgstr "" +msgstr "Konquest" #. GenericName #: konquest.desktop:6 diff --git a/translations/desktop_files/kpat.desktop/ru.po b/translations/desktop_files/kpat.desktop/ru.po index 6eac057f..f408f3c4 100644 --- a/translations/desktop_files/kpat.desktop/ru.po +++ b/translations/desktop_files/kpat.desktop/ru.po @@ -1,28 +1,29 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 17:37+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kpat-kpatdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kpat.desktop:2 -#, fuzzy msgid "Patience" msgstr "Пасьянс" #. GenericName #: kpat.desktop:7 msgid "Patience Card Game" -msgstr "Пасьянс" +msgstr "Карточный пасьянс" diff --git a/translations/desktop_files/kpoker.desktop/ru.po b/translations/desktop_files/kpoker.desktop/ru.po index a82c1eff..fe84eccf 100644 --- a/translations/desktop_files/kpoker.desktop/ru.po +++ b/translations/desktop_files/kpoker.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 17:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kpoker-kpokerdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kpoker.desktop:2 msgid "KPoker" -msgstr "" +msgstr "KPoker" #. GenericName #: kpoker.desktop:6 diff --git a/translations/desktop_files/kreversi-eventsrc/ru.po b/translations/desktop_files/kreversi-eventsrc/ru.po index e177b013..44465776 100644 --- a/translations/desktop_files/kreversi-eventsrc/ru.po +++ b/translations/desktop_files/kreversi-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 17:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kreversi-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: sounds/eventsrc:3 msgid "KReversi" -msgstr "" +msgstr "KReversi" #. Name #. Comment diff --git a/translations/desktop_files/kreversi.desktop/ru.po b/translations/desktop_files/kreversi.desktop/ru.po index 52b0cbb1..501cb3dc 100644 --- a/translations/desktop_files/kreversi.desktop/ru.po +++ b/translations/desktop_files/kreversi.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 17:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kreversi-kreversidesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kreversi.desktop:3 msgid "KReversi" -msgstr "" +msgstr "KReversi" #. GenericName #: kreversi.desktop:6 diff --git a/translations/desktop_files/ksame-eventsrc/ru.po b/translations/desktop_files/ksame-eventsrc/ru.po index 8a3b364e..4f44eca2 100644 --- a/translations/desktop_files/ksame-eventsrc/ru.po +++ b/translations/desktop_files/ksame-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 18:01+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/ksame-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "SameGame" -msgstr "" +msgstr "SameGame" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/kshisen.desktop/ru.po b/translations/desktop_files/kshisen.desktop/ru.po index 1b100a61..f92a4c1d 100644 --- a/translations/desktop_files/kshisen.desktop/ru.po +++ b/translations/desktop_files/kshisen.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 18:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kshisen-kshisendesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kshisen.desktop:5 msgid "Shisen-Sho" -msgstr "" +msgstr "Ши-сен-Сё" #. GenericName #: kshisen.desktop:6 diff --git a/translations/desktop_files/ksirtet-eventsrc/ru.po b/translations/desktop_files/ksirtet-eventsrc/ru.po index 123e6d7a..afca69ed 100644 --- a/translations/desktop_files/ksirtet-eventsrc/ru.po +++ b/translations/desktop_files/ksirtet-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 18:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/ksirtet-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "KSirtet" -msgstr "" +msgstr "KSirtet" #. Name #. Comment diff --git a/translations/desktop_files/ksirtet.desktop/ru.po b/translations/desktop_files/ksirtet.desktop/ru.po index eac09eed..5b954009 100644 --- a/translations/desktop_files/ksirtet.desktop/ru.po +++ b/translations/desktop_files/ksirtet.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 18:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/ksirtet-ksirtetdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: ksirtet.desktop:2 msgid "KSirtet" -msgstr "" +msgstr "KSirtet" #. GenericName #: ksirtet.desktop:7 diff --git a/translations/desktop_files/ksnake.desktop/ru.po b/translations/desktop_files/ksnake.desktop/ru.po index 587f4d7e..aaf42063 100644 --- a/translations/desktop_files/ksnake.desktop/ru.po +++ b/translations/desktop_files/ksnake.desktop/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 18:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/ksnake-ksnakedesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: ksnake.desktop:2 -#, fuzzy msgid "KSnakeRace" -msgstr "Змеиные гонки" +msgstr "KSnakeRace" #. GenericName #: ksnake.desktop:6 diff --git a/translations/desktop_files/ksokoban.desktop/ru.po b/translations/desktop_files/ksokoban.desktop/ru.po index 80a50115..7df5ca2c 100644 --- a/translations/desktop_files/ksokoban.desktop/ru.po +++ b/translations/desktop_files/ksokoban.desktop/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 19:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/ksokoban-ksokobandesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: data/ksokoban.desktop:2 -#, fuzzy msgid "KSokoban" -msgstr "Сокобан" +msgstr "KSokoban" #. GenericName #: data/ksokoban.desktop:3 diff --git a/translations/desktop_files/kspaceduel.desktop/ru.po b/translations/desktop_files/kspaceduel.desktop/ru.po index 1d052a5d..087542a7 100644 --- a/translations/desktop_files/kspaceduel.desktop/ru.po +++ b/translations/desktop_files/kspaceduel.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 19:17+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/kspaceduel-kspacedueldesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kspaceduel.desktop:2 msgid "KSpaceDuel" -msgstr "" +msgstr "KSpaceDuel" #. GenericName #: kspaceduel.desktop:5 diff --git a/translations/desktop_files/ktuberling-desktops/ru.po b/translations/desktop_files/ktuberling-desktops/ru.po index 940e87a5..6ab079c5 100644 --- a/translations/desktop_files/ktuberling-desktops/ru.po +++ b/translations/desktop_files/ktuberling-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 19:37+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/ktuberling-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: ktuberling.desktop:3 @@ -28,6 +30,5 @@ msgstr "Игра с картинками для детей" #. Comment #: x-tuberling.desktop:3 -#, fuzzy msgid "Potato" -msgstr "Картофельный парень" +msgstr "Клубень" diff --git a/translations/desktop_files/tdefifteen.desktop/ru.po b/translations/desktop_files/tdefifteen.desktop/ru.po new file mode 100644 index 00000000..c932a2fc --- /dev/null +++ b/translations/desktop_files/tdefifteen.desktop/ru.po @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Andrei Stepanov <adem4ik@gmail.com>, 2023. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-12-01 17:37+0100\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/tdefifteen-tdefifteendesktop/ru/>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: tdefifteen.desktop:2 +msgid "TDEFifteen" +msgstr "TDEFifteen" + +#. GenericName +#: tdefifteen.desktop:4 +msgid "Puzzle-solving game" +msgstr "Игра-головоломка" + +#. Comment +#: tdefifteen.desktop:6 +msgid "Sliding puzzle with one missing tile" +msgstr "Раздвижная головоломка с отсутствующей плиткой" diff --git a/translations/desktop_files/twin4.desktop/ru.po b/translations/desktop_files/twin4.desktop/ru.po index 0ff05a7b..fad5cffc 100644 --- a/translations/desktop_files/twin4.desktop/ru.po +++ b/translations/desktop_files/twin4.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-10 19:52+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdegames/twin4-twin4desktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: twin4.desktop:2 msgid "TWin4" -msgstr "" +msgstr "TWin4" #. GenericName #: twin4.desktop:3 diff --git a/twin4/index.html b/twin4/index.html index ea969510..1ff83bc2 100644 --- a/twin4/index.html +++ b/twin4/index.html @@ -135,7 +135,7 @@ During game only the player who is not moving can be changed. This is analogous to the yellow side. It is possible that there are two local players just as the computer can take both local players. Only one remote player is possible though. If the client does -not choose one remote player he will be asked as soon as a connection +not choose one remote player they will be asked as soon as a connection is built. It <b>does not matter</b> what colour the remote side chooses. If both remote parties choose to play the same colour the computer will handle this and transform the other players colour diff --git a/twin4/twin4/AboutDlg.kdevdlg b/twin4/twin4/AboutDlg.kdevdlg index 7755ee94..5b54c03e 100644 --- a/twin4/twin4/AboutDlg.kdevdlg +++ b/twin4/twin4/AboutDlg.kdevdlg @@ -20,7 +20,7 @@ data SessionManagement OpenedRootCount="4" } -item QWidget +item TQWidget { Name="TWin4" VarName="this" diff --git a/twin4/twin4/kspritecache.h b/twin4/twin4/kspritecache.h index 35e99af5..63a88c02 100644 --- a/twin4/twin4/kspritecache.h +++ b/twin4/twin4/kspritecache.h @@ -32,7 +32,7 @@ class KSprite; **/ class KSpriteNotify : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -151,8 +151,8 @@ class KSprite : public TQCanvasSprite * animation is finished. * Example: * <pre> - * connect(sprite->createNotify(),TQT_SIGNAL(signalNotify(TQCanvasItem *,int)), - * this,TQT_SLOT(moveDone(TQCanvasItem *,int))); + * connect(sprite->createNotify(),TQ_SIGNAL(signalNotify(TQCanvasItem *,int)), + * this,TQ_SLOT(moveDone(TQCanvasItem *,int))); * </pre> * In the move done function you best delete the notify again with * @ref deleteNotify @@ -284,7 +284,7 @@ class KSprite : public TQCanvasSprite */ class KSpriteCache : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/twin4/twin4/scorewidget.h b/twin4/twin4/scorewidget.h index 7f94a6f7..a491f521 100644 --- a/twin4/twin4/scorewidget.h +++ b/twin4/twin4/scorewidget.h @@ -10,7 +10,7 @@ class TQLabel; class ScoreWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp index d97d31f2..9db99536 100644 --- a/twin4/twin4/twin4.cpp +++ b/twin4/twin4/twin4.cpp @@ -82,7 +82,7 @@ ChatDlg::ChatDlg(KGame *game,TQWidget *parent) adjustSize(); mChatDlg=new KChatDialog(mChat,plainPage(),true); - connect(mButton,TQT_SIGNAL(clicked()),mChatDlg,TQT_SLOT(show())); + connect(mButton,TQ_SIGNAL(clicked()),mChatDlg,TQ_SLOT(show())); } /** @@ -188,50 +188,50 @@ void Kwin4App::checkMenus(CheckFlags menu) */ void Kwin4App::initGUI() { - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection(), "new_game"); + KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection(), "new_game"); ACTION("new_game")->setStatusText(i18n("Start a new game")); - KStdGameAction::load(TQT_TQOBJECT(this), TQT_SLOT(slotOpenGame()), actionCollection(), "open"); + KStdGameAction::load(this, TQ_SLOT(slotOpenGame()), actionCollection(), "open"); ACTION("open")->setStatusText(i18n("Open a saved game...")); - KStdGameAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSaveGame()), actionCollection(), "save"); + KStdGameAction::save(this, TQ_SLOT(slotSaveGame()), actionCollection(), "save"); ACTION("save")->setStatusText(i18n("Save a game...")); - KStdGameAction::end(TQT_TQOBJECT(this), TQT_SLOT(endGame()), actionCollection(), "end_game"); + KStdGameAction::end(this, TQ_SLOT(endGame()), actionCollection(), "end_game"); ACTION("end_game")->setStatusText(i18n("Ending the current game...")); ACTION("end_game")->setWhatsThis(i18n("Aborts a currently played game. No winner will be declared.")); - new TDEAction(i18n("&Network Configuration..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotInitNetwork()), + new TDEAction(i18n("&Network Configuration..."),0, this, TQ_SLOT(slotInitNetwork()), actionCollection(), "network_conf"); - new TDEAction(i18n("Network Chat..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotChat()), + new TDEAction(i18n("Network Chat..."),0, this, TQ_SLOT(slotChat()), actionCollection(), "network_chat"); if (global_debug>0) - new TDEAction(i18n("Debug KGame"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugKGame()), + new TDEAction(i18n("Debug KGame"), 0, this, TQ_SLOT(slotDebugKGame()), actionCollection(), "file_debug"); - new TDEAction(i18n("&Show Statistics"),"flag", 0, TQT_TQOBJECT(this), - TQT_SLOT(showStatistics()), actionCollection(), "statistics"); + new TDEAction(i18n("&Show Statistics"),"flag", 0, this, + TQ_SLOT(showStatistics()), actionCollection(), "statistics"); ACTION("statistics")->setStatusText(i18n("Show statistics.")); - KStdGameAction::hint(TQT_TQOBJECT(doc), TQT_SLOT(calcHint()), actionCollection(), "hint"); + KStdGameAction::hint(doc, TQ_SLOT(calcHint()), actionCollection(), "hint"); ACTION("hint")->setStatusText(i18n("Shows a hint on how to move.")); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "game_exit"); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection(), "game_exit"); ACTION("game_exit")->setStatusText(i18n("Quits the program.")); - KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), "edit_undo"); + KStdGameAction::undo(this, TQ_SLOT(slotUndo()), actionCollection(), "edit_undo"); ACTION("edit_undo")->setStatusText(i18n("Undo last move.")); - KStdGameAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection(), "edit_redo"); + KStdGameAction::redo(this, TQ_SLOT(slotRedo()), actionCollection(), "edit_redo"); ACTION("edit_redo")->setStatusText(i18n("Redo last move.")); actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(actionCollection(), TQT_SIGNAL(clearStatusText()), TQT_SLOT(slotClearStatusText())); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), TQ_SLOT(slotStatusMsg(const TQString &))); + connect(actionCollection(), TQ_SIGNAL(clearStatusText()), TQ_SLOT(slotClearStatusText())); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); } /** @@ -263,17 +263,17 @@ void Kwin4App::initDocument() { doc = new Kwin4Doc(this); // Game Over signal - connect(doc,TQT_SIGNAL(signalGameOver(int, KPlayer *,KGame *)), - this,TQT_SLOT(slotGameOver(int, KPlayer *,KGame *))); - connect(doc,TQT_SIGNAL(signalMoveDone(int, int)), - this,TQT_SLOT(slotMoveDone(int, int))); - connect(doc,TQT_SIGNAL(signalClientLeftGame(int, int,KGame *)), - this,TQT_SLOT(slotNetworkBroken(int, int, KGame *))); - connect(doc,TQT_SIGNAL(signalNextPlayer()), - this,TQT_SLOT(slotStatusNames())); + connect(doc,TQ_SIGNAL(signalGameOver(int, KPlayer *,KGame *)), + this,TQ_SLOT(slotGameOver(int, KPlayer *,KGame *))); + connect(doc,TQ_SIGNAL(signalMoveDone(int, int)), + this,TQ_SLOT(slotMoveDone(int, int))); + connect(doc,TQ_SIGNAL(signalClientLeftGame(int, int,KGame *)), + this,TQ_SLOT(slotNetworkBroken(int, int, KGame *))); + connect(doc,TQ_SIGNAL(signalNextPlayer()), + this,TQ_SLOT(slotStatusNames())); - connect(doc,TQT_SIGNAL(signalGameRun()), - this,TQT_SLOT(slotNewGame())); + connect(doc,TQ_SIGNAL(signalGameRun()), + this,TQ_SLOT(slotNewGame())); } void Kwin4App::changeAction(const char *action, bool enable){ @@ -542,8 +542,8 @@ void Kwin4App::slotInitNetwork() TQVBoxLayout *l=(TQVBoxLayout *)(box->layout()); mColorGroup=new TQVButtonGroup(box); - connect(mColorGroup, TQT_SIGNAL(clicked(int)), TQT_TQOBJECT(this), TQT_SLOT(slotRemoteChanged(int))); - connect(dlg.networkConfig(), TQT_SIGNAL(signalServerTypeChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotServerTypeChanged(int))); + connect(mColorGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotRemoteChanged(int))); + connect(dlg.networkConfig(), TQ_SIGNAL(signalServerTypeChanged(int)), this, TQ_SLOT(slotServerTypeChanged(int))); new TQRadioButton(i18n("Yellow should be played by remote"), mColorGroup); new TQRadioButton(i18n("Red should be played by remote"), mColorGroup); @@ -590,8 +590,8 @@ void Kwin4App::slotChat() mMyChatDlg->setPlayer(doc->getPlayer(Gelb)); else mMyChatDlg->setPlayer(doc->getPlayer(Rot)); - connect(doc,TQT_SIGNAL(signalChatChanged(Kwin4Player *)), - mMyChatDlg,TQT_SLOT(setPlayer(Kwin4Player *))); + connect(doc,TQ_SIGNAL(signalChatChanged(Kwin4Player *)), + mMyChatDlg,TQ_SLOT(setPlayer(Kwin4Player *))); } if (mMyChatDlg->isHidden()) @@ -619,7 +619,7 @@ void Kwin4App::showSettings(){ TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow); Settings *general = new Settings(0, "General"); dialog->addPage(general, i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), doc, TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), doc, TQ_SLOT(loadSettings())); dialog->show(); } diff --git a/twin4/twin4/twin4.h b/twin4/twin4/twin4.h index c07c1687..8c2f548f 100644 --- a/twin4/twin4/twin4.h +++ b/twin4/twin4/twin4.h @@ -37,7 +37,7 @@ class KPlayer; **/ class KDE_EXPORT ChatDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ChatDlg(KGame *game,TQWidget* parent=0); @@ -56,7 +56,7 @@ private: class Kwin4App : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: diff --git a/twin4/twin4/twin4doc.cpp b/twin4/twin4/twin4doc.cpp index 4014043a..07deb165 100644 --- a/twin4/twin4/twin4doc.cpp +++ b/twin4/twin4/twin4doc.cpp @@ -36,10 +36,10 @@ #include "prefs.h" #include "statuswidget.h" -Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,TQT_TQOBJECT(parent)), pView(0), mHintProcess(0) +Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,parent), pView(0), mHintProcess(0) { - connect(this,TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KGame *)), - this,TQT_SLOT(slotPropertyChanged(KGamePropertyBase *,KGame *))); + connect(this,TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KGame *)), + this,TQ_SLOT(slotPropertyChanged(KGamePropertyBase *,KGame *))); dataHandler()->Debug(); //kdDebug(12010) << "Property 7 policy=" << dataHandler()->find(7)->policy() << endl; @@ -93,14 +93,14 @@ Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,TQT_TQOBJECT(par setGameStatus(Intro); // Listen to network - connect(this,TQT_SIGNAL(signalMessageUpdate(int,TQ_UINT32,TQ_UINT32)), - this,TQT_SLOT(slotMessageUpdate(int, TQ_UINT32,TQ_UINT32))); - connect(this,TQT_SIGNAL(signalClientJoinedGame(TQ_UINT32,KGame *)), - this,TQT_SLOT(slotClientConnected(TQ_UINT32, KGame *))); + connect(this,TQ_SIGNAL(signalMessageUpdate(int,TQ_UINT32,TQ_UINT32)), + this,TQ_SLOT(slotMessageUpdate(int, TQ_UINT32,TQ_UINT32))); + connect(this,TQ_SIGNAL(signalClientJoinedGame(TQ_UINT32,KGame *)), + this,TQ_SLOT(slotClientConnected(TQ_UINT32, KGame *))); // Debug only - connect(this,TQT_SIGNAL(signalGameOver(int, KPlayer *,KGame *)), - this,TQT_SLOT(slotGameOver(int, KPlayer *,KGame *))); + connect(this,TQ_SIGNAL(signalGameOver(int, KPlayer *,KGame *)), + this,TQ_SLOT(slotGameOver(int, KPlayer *,KGame *))); // Change global KGame policy //dataHandler()->setPolicy(KGamePropertyBase::PolicyDirty,false); @@ -813,8 +813,8 @@ KPlayer *Kwin4Doc::createPlayer(int /*rtti*/,int io,bool isvirtual) if (!isvirtual) createIO(player,(KGameIO::IOMode)io); - connect(player,TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *, KPlayer *)), - this,TQT_SLOT(slotPlayerPropertyChanged(KGamePropertyBase *, KPlayer *))); + connect(player,TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *, KPlayer *)), + this,TQ_SLOT(slotPlayerPropertyChanged(KGamePropertyBase *, KPlayer *))); ((Kwin4Player *)player)->setWidget(pView->statusWidget()); return player; } @@ -828,7 +828,7 @@ bool Kwin4Doc::playerInput(TQDataStream &msg, KPlayer * /*player*/) int move, pl; msg >> pl >> move; if (!Move(move,pl)) - TQTimer::singleShot(0, this,TQT_SLOT(slotRepeatMove())); + TQTimer::singleShot(0, this,TQ_SLOT(slotRepeatMove())); return false; } @@ -907,8 +907,8 @@ void Kwin4Doc::createIO(KPlayer *player,KGameIO::IOMode io) input=new KGameMouseIO(pView); if (global_debug>1) kdDebug(12010) << "MOUSE IO added " << endl; // Connect mouse input to a function to process the actual input - connect(input,TQT_SIGNAL(signalMouseEvent(KGameIO *,TQDataStream &,TQMouseEvent *,bool *)), - pView,TQT_SLOT(slotMouseInput(KGameIO *,TQDataStream &,TQMouseEvent *,bool *))); + connect(input,TQ_SIGNAL(signalMouseEvent(KGameIO *,TQDataStream &,TQMouseEvent *,bool *)), + pView,TQ_SLOT(slotMouseInput(KGameIO *,TQDataStream &,TQMouseEvent *,bool *))); player->addGameIO(input); } else if (io&KGameIO::ProcessIO) @@ -920,11 +920,11 @@ void Kwin4Doc::createIO(KPlayer *player,KGameIO::IOMode io) // We want a computer player input=new KGameProcessIO(file); // Connect computer player to the setTurn - connect(input,TQT_SIGNAL(signalPrepareTurn(TQDataStream &,bool,KGameIO *,bool *)), - this,TQT_SLOT(slotPrepareTurn(TQDataStream &,bool,KGameIO *,bool *))); + connect(input,TQ_SIGNAL(signalPrepareTurn(TQDataStream &,bool,KGameIO *,bool *)), + this,TQ_SLOT(slotPrepareTurn(TQDataStream &,bool,KGameIO *,bool *))); - connect(input,TQT_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), - this,TQT_SLOT(slotProcessQuery(TQDataStream &,KGameProcessIO *))); + connect(input,TQ_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), + this,TQ_SLOT(slotProcessQuery(TQDataStream &,KGameProcessIO *))); player->addGameIO(input); } else if (io&KGameIO::KeyIO) @@ -934,8 +934,8 @@ void Kwin4Doc::createIO(KPlayer *player,KGameIO::IOMode io) KGameKeyIO *input; input=new KGameKeyIO(pView->parentWidget()); // Connect keys input to a function to process the actual input - connect((KGameKeyIO *)input,TQT_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)), - pView,TQT_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); + connect((KGameKeyIO *)input,TQ_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)), + pView,TQ_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); player->addGameIO(input); } } @@ -1104,8 +1104,8 @@ void Kwin4Doc::calcHint() // We want a computer player mHintProcess=new KGameProcessIO(file); - connect(mHintProcess,TQT_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), - this,TQT_SLOT(slotProcessHint(TQDataStream &,KGameProcessIO *))); + connect(mHintProcess,TQ_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), + this,TQ_SLOT(slotProcessHint(TQDataStream &,KGameProcessIO *))); } TQ_INT32 pl; TQByteArray buffer; diff --git a/twin4/twin4/twin4doc.h b/twin4/twin4/twin4doc.h index f78e15a6..c9aa30ab 100644 --- a/twin4/twin4/twin4doc.h +++ b/twin4/twin4/twin4doc.h @@ -47,7 +47,7 @@ typedef enum {GIllMove=-2,GNotAllowed=-1,GNormal=0,GYellowWin=1,GRedWin=2,GRemi */ class Kwin4Doc : public KGame { -Q_OBJECT +TQ_OBJECT public: diff --git a/twin4/twin4/twin4player.cpp b/twin4/twin4/twin4player.cpp index 5992c400..30b8ce26 100644 --- a/twin4/twin4/twin4player.cpp +++ b/twin4/twin4/twin4player.cpp @@ -39,8 +39,8 @@ Kwin4Player::Kwin4Player() : KPlayer(), sWidget(0) dataHandler()->setPolicy(KGamePropertyBase::PolicyDirty,false); resetStats(); - connect(this,TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KPlayer *)), - this,TQT_SLOT(slotPlayerPropertyChanged(KGamePropertyBase *,KPlayer *))); + connect(this,TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KPlayer *)), + this,TQ_SLOT(slotPlayerPropertyChanged(KGamePropertyBase *,KPlayer *))); } #include <tqlabel.h> diff --git a/twin4/twin4/twin4player.h b/twin4/twin4/twin4player.h index a7186e10..25ba061c 100644 --- a/twin4/twin4/twin4player.h +++ b/twin4/twin4/twin4player.h @@ -29,7 +29,7 @@ class TDEConfig; class Kwin4Player : public KPlayer { - Q_OBJECT + TQ_OBJECT signals: diff --git a/twin4/twin4/twin4proc.cpp b/twin4/twin4/twin4proc.cpp index b47dbe48..a17b4ad7 100644 --- a/twin4/twin4/twin4proc.cpp +++ b/twin4/twin4/twin4proc.cpp @@ -51,12 +51,12 @@ TDEComputer::TDEComputer() : TQObject(0,0) for (i=0;i<strlen(s2);i++) startofrow[i]=s2[i]-'0'; - connect(&proc,TQT_SIGNAL(signalCommand(TQDataStream &,int ,int ,int )), - this,TQT_SLOT(slotCommand(TQDataStream & ,int ,int ,int ))); - connect(&proc,TQT_SIGNAL(signalInit(TQDataStream &,int)), - this,TQT_SLOT(slotInit(TQDataStream & ,int ))); - connect(&proc,TQT_SIGNAL(signalTurn(TQDataStream &,bool )), - this,TQT_SLOT(slotTurn(TQDataStream & ,bool ))); + connect(&proc,TQ_SIGNAL(signalCommand(TQDataStream &,int ,int ,int )), + this,TQ_SLOT(slotCommand(TQDataStream & ,int ,int ,int ))); + connect(&proc,TQ_SIGNAL(signalInit(TQDataStream &,int)), + this,TQ_SLOT(slotInit(TQDataStream & ,int ))); + connect(&proc,TQ_SIGNAL(signalTurn(TQDataStream &,bool )), + this,TQ_SLOT(slotTurn(TQDataStream & ,bool ))); fprintf(stderr, "----------------->\nTDEComputer::Computer\n"); } diff --git a/twin4/twin4/twin4proc.h b/twin4/twin4/twin4proc.h index 6d6fe1a3..04f3a0fd 100644 --- a/twin4/twin4/twin4proc.h +++ b/twin4/twin4/twin4proc.h @@ -31,7 +31,7 @@ typedef char FARBE; class TDEComputer : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/twin4/twin4/twin4view.cpp b/twin4/twin4/twin4view.cpp index 71ce1eeb..5a559fe4 100644 --- a/twin4/twin4/twin4view.cpp +++ b/twin4/twin4/twin4view.cpp @@ -129,13 +129,13 @@ Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *parent, const char *name) //setBackgroundMode(PaletteBase); setBackgroundColor(TQColor(0,0,128)); - mCanvas=new TQCanvas(TQT_TQOBJECT(parent)); + mCanvas=new TQCanvas(parent); mCanvas->resize(parent->width(),parent->height()); mCanvas->setDoubleBuffering(true); mCanvas->setBackgroundColor(TQColor(0,0,128)); setCanvas(mCanvas); - mCache=new KSpriteCache(mGrafix,TQT_TQOBJECT(this)); + mCache=new KSpriteCache(mGrafix,this); mCache->setCanvas(mCanvas); TDEConfig *config=mCache->config(); @@ -371,8 +371,8 @@ void Kwin4View::drawIntro(bool /*remove*/) if (sprite) { KIntroMove *move=new KIntroMove; - connect(sprite->createNotify(),TQT_SIGNAL(signalNotify(TQCanvasItem *,int)), - this,TQT_SLOT(introMoveDone(TQCanvasItem *,int))); + connect(sprite->createNotify(),TQ_SIGNAL(signalNotify(TQCanvasItem *,int)), + this,TQ_SLOT(introMoveDone(TQCanvasItem *,int))); sprite->setMoveObject(move); if (no%2==0) { @@ -531,8 +531,8 @@ void Kwin4View::setPiece(int x,int y,int color,int no,bool animation) mBoardY-sprite->height()-mSpreadY); sprite->moveTo(sprite->x(), sprite->y()+y*(sprite->height()+mSpreadY)+mBoardY); - connect(sprite->createNotify(),TQT_SIGNAL(signalNotify(TQCanvasItem *,int)), - doc,TQT_SLOT(moveDone(TQCanvasItem *,int))); + connect(sprite->createNotify(),TQ_SIGNAL(signalNotify(TQCanvasItem *,int)), + doc,TQ_SLOT(moveDone(TQCanvasItem *,int))); } else { @@ -541,8 +541,8 @@ void Kwin4View::setPiece(int x,int y,int color,int no,bool animation) y*(sprite->height()+mSpreadY)+mBoardY); // Prevent moving (== speed =0) sprite->moveTo(sprite->x(),sprite->y()); - connect(sprite->createNotify(),TQT_SIGNAL(signalNotify(TQCanvasItem *,int)), - doc,TQT_SLOT(moveDone(TQCanvasItem *,int))); + connect(sprite->createNotify(),TQ_SIGNAL(signalNotify(TQCanvasItem *,int)), + doc,TQ_SLOT(moveDone(TQCanvasItem *,int))); sprite->emitNotify(3); } @@ -680,7 +680,7 @@ void Kwin4View::slotMouseInput(KGameIO *input,TQDataStream &stream,TQMouseEvent return; } - if (mouse->button()!=Qt::LeftButton) return ; + if (mouse->button()!=TQt::LeftButton) return ; //if (!doc->IsRunning()) return ; TQPoint point; diff --git a/twin4/twin4/twin4view.h b/twin4/twin4/twin4view.h index 25a9fda4..e15ade83 100644 --- a/twin4/twin4/twin4view.h +++ b/twin4/twin4/twin4view.h @@ -31,7 +31,7 @@ class KSpriteCache; */ class Kwin4View : public TQCanvasView { -Q_OBJECT +TQ_OBJECT public: |