summaryrefslogtreecommitdiffstats
path: root/libksirtet/common
diff options
context:
space:
mode:
Diffstat (limited to 'libksirtet/common')
-rw-r--r--libksirtet/common/ai.cpp2
-rw-r--r--libksirtet/common/ai.h4
-rw-r--r--libksirtet/common/board.h2
-rw-r--r--libksirtet/common/field.cpp6
-rw-r--r--libksirtet/common/field.h2
-rw-r--r--libksirtet/common/inter.cpp20
-rw-r--r--libksirtet/common/inter.h2
-rw-r--r--libksirtet/common/libksirtet2.kcfg2
-rw-r--r--libksirtet/common/main.cpp16
-rw-r--r--libksirtet/common/main.h2
-rw-r--r--libksirtet/common/misc_ui.cpp8
-rw-r--r--libksirtet/common/misc_ui.h8
-rw-r--r--libksirtet/common/settings.h4
13 files changed, 39 insertions, 39 deletions
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/libksirtet2.kcfg b/libksirtet/common/libksirtet2.kcfg
index 27ee72e3..88498ced 100644
--- a/libksirtet/common/libksirtet2.kcfg
+++ b/libksirtet/common/libksirtet2.kcfg
@@ -17,7 +17,7 @@
<default>false</default>
</entry>
<entry name="InitialGameLevel" type="Int" key="init level" min="1" max="20">
- <label>The inital level of new games.</label>
+ <label>The initial level of new games.</label>
<default>1</default>
<min>1</min>
<max>20</max>
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();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 12:47:34 +0000