summaryrefslogtreecommitdiffstats
path: root/lskat/lskat
diff options
context:
space:
mode:
Diffstat (limited to 'lskat/lskat')
-rw-r--r--lskat/lskat/KChildConnect.h2
-rw-r--r--lskat/lskat/KEInput.cpp28
-rw-r--r--lskat/lskat/KEInput.h2
-rw-r--r--lskat/lskat/KInputChildProcess.cpp4
-rw-r--r--lskat/lskat/KInputChildProcess.h2
-rw-r--r--lskat/lskat/KInteractiveConnect.h2
-rw-r--r--lskat/lskat/KRSocket.cpp8
-rw-r--r--lskat/lskat/KRSocket.h2
-rw-r--r--lskat/lskat/KRemoteConnect.cpp28
-rw-r--r--lskat/lskat/KRemoteConnect.h2
-rw-r--r--lskat/lskat/TDEProcessConnect.cpp12
-rw-r--r--lskat/lskat/TDEProcessConnect.h2
-rw-r--r--lskat/lskat/lskat.cpp50
-rw-r--r--lskat/lskat/lskat.h2
-rw-r--r--lskat/lskat/lskatdoc.h2
-rw-r--r--lskat/lskat/lskatview.cpp8
-rw-r--r--lskat/lskat/lskatview.h2
-rw-r--r--lskat/lskat/msgdlg.cpp4
-rw-r--r--lskat/lskat/msgdlg.h2
-rw-r--r--lskat/lskat/namedlg.cpp2
-rw-r--r--lskat/lskat/namedlg.h2
-rw-r--r--lskat/lskat/networkdlg.cpp2
-rw-r--r--lskat/lskat/networkdlg.h2
-rw-r--r--lskat/lskat/networkdlgbase.ui4
24 files changed, 88 insertions, 88 deletions
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 21:56:40 +0000