summaryrefslogtreecommitdiffstats
path: root/klines
diff options
context:
space:
mode:
Diffstat (limited to 'klines')
-rw-r--r--klines/ballpainter.h2
-rw-r--r--klines/field.h2
-rw-r--r--klines/klines.cpp38
-rw-r--r--klines/klines.h2
-rw-r--r--klines/linesboard.cpp8
-rw-r--r--klines/linesboard.h2
-rw-r--r--klines/mwidget.cpp2
-rw-r--r--klines/mwidget.h2
-rw-r--r--klines/prompt.cpp2
-rw-r--r--klines/prompt.h2
10 files changed, 31 insertions, 31 deletions
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;