diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-13 12:28:49 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-19 10:10:52 +0900 |
commit | 6374e2e62eef25945347ce2c9ae9f88e61765d11 (patch) | |
tree | 707d84dbca20d20dee68626dda0d35568d7dcb34 /libksirtet/lib | |
parent | c26a225408c4759743b754453b07d0dca97aa749 (diff) | |
download | tdegames-6374e2e62eef25945347ce2c9ae9f88e61765d11.tar.gz tdegames-6374e2e62eef25945347ce2c9ae9f88e61765d11.zip |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit c20f4d8f2cf03c69fcecc80d63fe3cbb80f51610)
Diffstat (limited to 'libksirtet/lib')
-rw-r--r-- | libksirtet/lib/internal.cpp | 12 | ||||
-rw-r--r-- | libksirtet/lib/meeting.cpp | 24 | ||||
-rw-r--r-- | libksirtet/lib/miscui.cpp | 6 | ||||
-rw-r--r-- | libksirtet/lib/mp_interface.cpp | 4 | ||||
-rw-r--r-- | libksirtet/lib/mp_simple_interface.cpp | 2 | ||||
-rw-r--r-- | libksirtet/lib/pline.cpp | 10 | ||||
-rw-r--r-- | libksirtet/lib/wizard.cpp | 14 |
7 files changed, 36 insertions, 36 deletions
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/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/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/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp index 559f0d7e..a18b3d0b 100644 --- a/libksirtet/lib/mp_interface.cpp +++ b/libksirtet/lib/mp_interface.cpp @@ -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_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/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/wizard.cpp b/libksirtet/lib/wizard.cpp index 891a0c6d..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); @@ -82,10 +82,10 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) wl = new WidgetList<PlayerLine>(5, localPage); TQSignalMapper *husm = new TQSignalMapper(this); - if (gi.humanSettingSlot) connect(husm, TQT_SIGNAL(mapped(int)), + if (gi.humanSettingSlot) connect(husm, TQ_SIGNAL(mapped(int)), gi.humanSettingSlot); TQSignalMapper *aism = new TQSignalMapper(this); - if (gi.AISettingSlot) connect(aism, TQT_SIGNAL(mapped(int)), gi.AISettingSlot); + 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))); + connect(pl, TQ_SIGNAL(typeChanged(int)), TQ_SLOT(lineTypeChanged(int))); husm->setMapping(pl, i); - connect(pl, TQT_SIGNAL(setHuman()), husm, TQT_SLOT(map())); + connect(pl, TQ_SIGNAL(setHuman()), husm, TQ_SLOT(map())); aism->setMapping(pl, i); - connect(pl, TQT_SIGNAL(setAI()), aism, TQT_SLOT(map())); + 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); |