From 838baf3f99ec5ab81b063eb5449a3381d860f377 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 04:58:26 +0000 Subject: TQt4 port kdegames This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- klines/ballpainter.cpp | 8 +++---- klines/ballpainter.h | 3 ++- klines/field.cpp | 14 ++++++------ klines/field.h | 5 +++-- klines/klines.cpp | 56 +++++++++++++++++++++++----------------------- klines/klines.h | 1 + klines/linesboard.cpp | 32 +++++++++++++------------- klines/linesboard.h | 3 ++- klines/mwidget.cpp | 12 +++++----- klines/mwidget.h | 5 +++-- klines/povray/balls.sh | 2 +- klines/povray/fire.sh | 2 +- klines/povray/makeballs.sh | 2 +- klines/povray/povray.ini | 2 +- klines/prompt.cpp | 6 ++--- klines/prompt.h | 5 +++-- 16 files changed, 82 insertions(+), 76 deletions(-) (limited to 'klines') diff --git a/klines/ballpainter.cpp b/klines/ballpainter.cpp index 76156f11..131b81f8 100644 --- a/klines/ballpainter.cpp +++ b/klines/ballpainter.cpp @@ -67,7 +67,7 @@ void BallPainter::createPix() locate( "appdata", "fire.jpg" )); if (balls->isNull() ||backgroundPix->isNull() || fire->isNull() ) { KMessageBox::error(0, i18n("Unable to find graphics. Check your installation."), i18n("Error")); - qApp->exit(1); + tqApp->exit(1); return; // Error } @@ -82,12 +82,12 @@ void BallPainter::createPix() if (Prefs::numberedBalls() && (t == NORMALBALL)) { if ((c == 2) || (c == 3) || (c == 6)) - p.setPen(Qt::black); + p.setPen(TQt::black); else - p.setPen(Qt::white); + p.setPen(TQt::white); TQString tmp; tmp.setNum(c+1); - p.drawText(TQRect(0,0,CELLSIZE,CELLSIZE), Qt::AlignCenter, tmp); + p.drawText(TQRect(0,0,CELLSIZE,CELLSIZE), TQt::AlignCenter, tmp); } } diff --git a/klines/ballpainter.h b/klines/ballpainter.h index 522a3928..55754117 100644 --- a/klines/ballpainter.h +++ b/klines/ballpainter.h @@ -24,9 +24,10 @@ #define CELLSIZE 32 -class BallPainter : public QObject +class BallPainter : public TQObject { Q_OBJECT + TQ_OBJECT TQPixmap* imgCash[NCOLORS][PIXTIME + FIREBALLS + BOOMBALLS + 1]; TQPixmap* backgroundPix; TQPixmap* firePix[FIREPIX]; diff --git a/klines/field.cpp b/klines/field.cpp index d8da8ec7..22211b76 100644 --- a/klines/field.cpp +++ b/klines/field.cpp @@ -19,8 +19,8 @@ #include "cfg.h" #include "field.moc" -Field::Field(TQWidget* parent, const char* name) - : TQWidget( parent, name ) +Field::Field(TQWidget* tqparent, const char* name) + : TQWidget( tqparent, name ) { clearField(); } @@ -73,7 +73,7 @@ void Field::putBall(int x, int y, char color) if( checkBounds(x,y) ){ field[y][x].setColor(color); erase5Balls(); - repaint(FALSE); + tqrepaint(FALSE); } }*/ void Field::moveBall(int xa, int ya, int xb, int yb) @@ -184,10 +184,10 @@ int Field::calcPosScore(int x, int y, int whatIf) int score = -10; int color = field[y][x].getColor(); field[y][x].setColor(whatIf); - score = QMAX(score, calcRun(x, y-4, 0, 1)); - score = QMAX(score, calcRun(x-4, y-4, 1, 1)); - score = QMAX(score, calcRun(x-4, y, 1, 0)); - score = QMAX(score, calcRun(x-4, y+4, 1, -1)); + score = TQMAX(score, calcRun(x, y-4, 0, 1)); + score = TQMAX(score, calcRun(x-4, y-4, 1, 1)); + score = TQMAX(score, calcRun(x-4, y, 1, 0)); + score = TQMAX(score, calcRun(x-4, y+4, 1, -1)); field[y][x].setColor(color); return score; } diff --git a/klines/field.h b/klines/field.h index 6fb08932..c93bac4b 100644 --- a/klines/field.h +++ b/klines/field.h @@ -25,9 +25,10 @@ #define NUMCELLSW 9 #define NUMCELLSH 9 -class Field: public QWidget +class Field: public TQWidget { Q_OBJECT + TQ_OBJECT public: void clearField(); @@ -35,7 +36,7 @@ public: void saveUndo(); protected: - Field(TQWidget* parent, const char* name); + Field(TQWidget* tqparent, const char* name); ~Field(); void putBall(int x, int y, int color); diff --git a/klines/klines.cpp b/klines/klines.cpp index 50d96163..848f6ffa 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()), this, TQT_SLOT(makeTurn())); - connect(lsb, TQT_SIGNAL(eraseLine(int)), this, TQT_SLOT(addScore(int))); - connect(lsb, TQT_SIGNAL(endGame()), this, TQT_SLOT(endGame())); - connect(lsb, TQT_SIGNAL(userTurn()), this, TQT_SLOT(userTurn())); + 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())); lPrompt = mwidget->GetPrompt(); @@ -82,9 +82,9 @@ KLines::KLines() initKAction(); - connect(&demoTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDemo())); + connect(&demoTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDemo())); - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); setFocus(); startGame(); @@ -104,18 +104,18 @@ KLines::~KLines() */ void KLines::initKAction() { - KStdGameAction::gameNew(this, TQT_SLOT(startGame()), actionCollection()); - act_demo = KStdGameAction::demo(this, TQT_SLOT(startDemo()), actionCollection()); + KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(startGame()), actionCollection()); + act_demo = KStdGameAction::demo(TQT_TQOBJECT(this), TQT_SLOT(startDemo()), actionCollection()); act_demo->setText(i18n("Start &Tutorial")); - KStdGameAction::highscores(this, TQT_SLOT(viewHighScore()), actionCollection()); - KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection()); - endTurnAction = KStdGameAction::endTurn(this, TQT_SLOT(makeTurn()), actionCollection()); + 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()); showNextAction = new KToggleAction(i18n("&Show Next"), KShortcut(CTRL+Key_P), - this, TQT_SLOT(switchPrompt()), actionCollection(), "options_show_next"); + TQT_TQOBJECT(this), TQT_SLOT(switchPrompt()), actionCollection(), "options_show_next"); showNextAction->setCheckedState(i18n("Hide Next")); showNumberedAction = new KToggleAction(i18n("&Use Numbered Balls"), KShortcut(), - this, TQT_SLOT(switchNumbered()), actionCollection(), "options_show_numbered"); - undoAction = KStdGameAction::undo(this, TQT_SLOT(undo()), actionCollection()); + TQT_TQOBJECT(this), TQT_SLOT(switchNumbered()), actionCollection(), "options_show_numbered"); + undoAction = KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection()); levelAction = KStdGameAction::chooseGameType(0, 0, actionCollection()); TQStringList items; @@ -128,11 +128,11 @@ void KLines::initKAction() showNumberedAction->setChecked(Prefs::numberedBalls()); lPrompt->setPrompt(Prefs::showNext()); - (void)new KAction(i18n("Move Left"), Key_Left, lsb, TQT_SLOT(moveLeft()), actionCollection(), "left"); - (void)new KAction(i18n("Move Right"), Key_Right, lsb, TQT_SLOT(moveRight()), actionCollection(), "right"); - (void)new KAction(i18n("Move Up"), Key_Up, lsb, TQT_SLOT(moveUp()), actionCollection(), "up"); - (void)new KAction(i18n("Move Down"), Key_Down, lsb, TQT_SLOT(moveDown()), actionCollection(), "down"); - (void)new KAction(i18n("Move Ball"), Key_Space, lsb, TQT_SLOT(placePlayerBall()), actionCollection(), "place_ball"); + (void)new KAction(i18n("Move Left"), Key_Left, TQT_TQOBJECT(lsb), TQT_SLOT(moveLeft()), actionCollection(), "left"); + (void)new KAction(i18n("Move Right"), Key_Right, TQT_TQOBJECT(lsb), TQT_SLOT(moveRight()), actionCollection(), "right"); + (void)new KAction(i18n("Move Up"), Key_Up, TQT_TQOBJECT(lsb), TQT_SLOT(moveUp()), actionCollection(), "up"); + (void)new KAction(i18n("Move Down"), Key_Down, TQT_TQOBJECT(lsb), TQT_SLOT(moveDown()), actionCollection(), "down"); + (void)new KAction(i18n("Move Ball"), Key_Space, TQT_TQOBJECT(lsb), TQT_SLOT(placePlayerBall()), actionCollection(), "place_ball"); setupGUI( KMainWindow::Save | Keys | StatusBar | Create ); } @@ -164,7 +164,7 @@ void KLines::startGame() void KLines::setLevel(int level) { levelStr = i18n(LEVEL[level+2]); - statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0); + statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0); } void KLines::startDemo() @@ -183,7 +183,7 @@ void KLines::startDemo() bFirst = true; levelStr = i18n("Tutorial"); - statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0); + statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0); lsb->startDemoMode(); lsb->setGameOver(false); @@ -202,7 +202,7 @@ void KLines::stopDemo() bDemo = false; lsb->hideDemoText(); demoTimer.stop(); - statusBar()->changeItem(i18n(" Level: %1").arg(i18n("Tutorial - Stopped")), 0); + statusBar()->changeItem(i18n(" Level: %1").tqarg(i18n("Tutorial - Stopped")), 0); act_demo->setText(i18n("Start &Tutorial")); } @@ -380,7 +380,7 @@ void KLines::slotDemo() if (!msg.isEmpty()) { lsb->showDemoText(msg); - demoTimer.start(3500 + msg.contains("\n")*1500, true); + demoTimer.start(3500 + msg.tqcontains("\n")*1500, true); return; } if (newBalls) @@ -419,7 +419,7 @@ void KLines::focusOutEvent(TQFocusEvent *ev) { lsb->hideDemoText(); demoTimer.stop(); - statusBar()->changeItem(i18n(" Level: %1").arg(i18n("Tutorial - Paused")), 0); + statusBar()->changeItem(i18n(" Level: %1").tqarg(i18n("Tutorial - Paused")), 0); } KMainWindow::focusOutEvent(ev); } @@ -428,7 +428,7 @@ void KLines::focusInEvent(TQFocusEvent *ev) { if (bDemo) { - statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0); + statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0); slotDemo(); } KMainWindow::focusInEvent(ev); @@ -528,7 +528,7 @@ void KLines::addScore(int ballsErased) void KLines::updateStat() { - statusBar()->changeItem(i18n(" Score: %1").arg(score), 1); + statusBar()->changeItem(i18n(" Score: %1").tqarg(score), 1); } void KLines::viewHighScore() @@ -540,7 +540,7 @@ void KLines::viewHighScore() void KLines::endGame() { lsb->setGameOver(true); - lsb->repaint(false); + lsb->tqrepaint(false); if (bDemo) return; @@ -575,7 +575,7 @@ void KLines::switchUndo(bool bu) void KLines::keyPressEvent(TQKeyEvent *e) { - if (lsb->gameOver() && (e->key() == Qt::Key_Space)) + if (lsb->gameOver() && (e->key() == TQt::Key_Space)) { e->accept(); startGame(); diff --git a/klines/klines.h b/klines/klines.h index 39352b33..ba78c7fe 100644 --- a/klines/klines.h +++ b/klines/klines.h @@ -29,6 +29,7 @@ class KToggleAction; class KLines : public KMainWindow { Q_OBJECT + TQ_OBJECT public: KLines(); ~KLines(); diff --git a/klines/linesboard.cpp b/klines/linesboard.cpp index aefa1a65..fe7faee1 100644 --- a/klines/linesboard.cpp +++ b/klines/linesboard.cpp @@ -34,8 +34,8 @@ Constructs a LinesBoard widget. */ -LinesBoard::LinesBoard( BallPainter * abPainter, TQWidget* parent, const char* name ) - : Field( parent, name ) +LinesBoard::LinesBoard( BallPainter * abPainter, TQWidget* tqparent, const char* name ) + : Field( tqparent, name ) { demoLabel = 0; bGameOver = false; @@ -51,7 +51,7 @@ LinesBoard::LinesBoard( BallPainter * abPainter, TQWidget* parent, const char* n bPainter = abPainter; - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); setBackgroundColor( gray ); setMouseTracking( FALSE ); @@ -163,7 +163,7 @@ void LinesBoard::placeBall( ) /*id LinesBoard::doAfterBalls() { erase5Balls(); - repaint(FALSE); + tqrepaint(FALSE); } */ /* @@ -215,7 +215,7 @@ void LinesBoard::paintEvent( TQPaintEvent* ) { paint->end(); - KPixmapEffect::fade(*pixmap, 0.5, Qt::black); + KPixmapEffect::fade(*pixmap, 0.5, TQt::black); TQPainter p(this); p.drawPixmap(0,0, *pixmap); @@ -225,9 +225,9 @@ void LinesBoard::paintEvent( TQPaintEvent* ) gameover_font.setPointSize(48); gameover_font.setBold(true); p.setFont(gameover_font); - p.setPen(Qt::white); + p.setPen(TQt::white); TQString gameover_text = i18n("Game Over"); - p.drawText(0, 0, width(), height(), AlignCenter|Qt::WordBreak, gameover_text); + p.drawText(0, 0, width(), height(), AlignCenter|TQt::WordBreak, gameover_text); } else { @@ -239,7 +239,7 @@ void LinesBoard::paintEvent( TQPaintEvent* ) r.setY(focusY*CELLSIZE+2); r.setWidth(CELLSIZE-4); r.setHeight(CELLSIZE-4); - paint->setPen(TQPen(Qt::DotLine)); + paint->setPen(TQPen(TQt::DotLine)); paint->drawRect(r); } } @@ -306,7 +306,7 @@ void LinesBoard::moveFocus(int dx, int dy) focusX = (focusX + dx + NUMCELLSW) % NUMCELLSW; focusY = (focusY + dy + NUMCELLSH) % NUMCELLSH; } - repaint(FALSE); + tqrepaint(FALSE); } void LinesBoard::moveLeft() @@ -401,7 +401,7 @@ int LinesBoard::AnimEnd( ) else if ( oldanim == ANIM_BURN ) { emit eraseLine( deleteAnimatedBalls() ); - repaint(FALSE); + tqrepaint(FALSE); if ( nextBallToPlace < BALLSDROP ) { placeBall(); @@ -455,7 +455,7 @@ void LinesBoard::AnimNext() { if ( (direction > 0 && animstep == animmax) || ( direction < 0 && animstep == 0)) direction = -direction; animstep += direction; - repaint(FALSE); + tqrepaint(FALSE); } else { if ( animstep >= animmax ) AnimEnd(); @@ -466,7 +466,7 @@ void LinesBoard::AnimNext() { moveBall(way[animstep].x,way[animstep].y,way[animstep+1].x,way[animstep+1].y); animstep++; animdelaycount = animdelaystart; - repaint( FALSE ); + tqrepaint( FALSE ); } } } @@ -698,7 +698,7 @@ void LinesBoard::undo() AnimEnd(); restoreUndo(); restoreRandomState(); - repaint( FALSE ); + tqrepaint( FALSE ); } void LinesBoard::showDemoText(const TQString &text) @@ -711,13 +711,13 @@ void LinesBoard::showDemoText(const TQString &text) demoLabel->setAutoMask( FALSE ); demoLabel->setFrameStyle( TQFrame::Plain | TQFrame::Box ); demoLabel->setLineWidth( 1 ); - demoLabel->setAlignment( AlignHCenter | AlignTop ); + demoLabel->tqsetAlignment( AlignHCenter | AlignTop ); demoLabel->setPalette(TQToolTip::palette()); demoLabel->polish(); } demoLabel->setText(text); demoLabel->adjustSize(); - TQSize s = demoLabel->sizeHint(); + TQSize s = demoLabel->tqsizeHint(); TQPoint p = TQPoint(x() + (width()-s.width())/2, y() + (height()-s.height())/2); demoLabel->move(mapToGlobal(p)); demoLabel->show(); @@ -744,7 +744,7 @@ void LinesBoard::demoClick(int x, int y) kapp->enter_loop(); } TQCursor::setPos(dest); - TQMouseEvent ev(TQEvent::MouseButtonPress, lDest, dest, LeftButton, LeftButton); + TQMouseEvent ev(TQEvent::MouseButtonPress, lDest, dest, Qt::LeftButton, Qt::LeftButton); mousePressEvent(&ev); } diff --git a/klines/linesboard.h b/klines/linesboard.h index f5e3ac37..4a6b3979 100644 --- a/klines/linesboard.h +++ b/klines/linesboard.h @@ -32,8 +32,9 @@ class LinesBoard : public Field { Q_OBJECT + TQ_OBJECT public: - LinesBoard( BallPainter * abPainter, TQWidget* parent=0, const char* name=0 ); + LinesBoard( BallPainter * abPainter, TQWidget* tqparent=0, const char* name=0 ); ~LinesBoard(); int width(); diff --git a/klines/mwidget.cpp b/klines/mwidget.cpp index c883b9ba..9f66345d 100644 --- a/klines/mwidget.cpp +++ b/klines/mwidget.cpp @@ -24,8 +24,8 @@ #include "ballpainter.h" -MainWidget::MainWidget( TQWidget* parent, const char* name ) - : TQFrame( parent, name ) +MainWidget::MainWidget( TQWidget* tqparent, const char* name ) + : TQFrame( tqparent, name ) { TQBoxLayout *grid = new TQHBoxLayout( this, 5 ); //(rows,col) bPainter = new BallPainter(); @@ -36,17 +36,17 @@ 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, TQT_SIGNAL(PromptPressed()), tqparent, TQT_SLOT(switchPrompt())); - right->addWidget( label, 0, Qt::AlignBottom | Qt::AlignHCenter ); - right->addWidget( lPrompt, 0, Qt::AlignTop | Qt::AlignHCenter ); + right->addWidget( label, 0, TQt::AlignBottom | TQt::AlignHCenter ); + right->addWidget( lPrompt, 0, TQt::AlignTop | TQt::AlignHCenter ); grid->activate(); grid->freeze(0,0); // warning("width: %i height: %i", width(), height() ); -// warning("wh: %i hh: %i", sizeHint().width(), sizeHint().height() ); +// warning("wh: %i hh: %i", tqsizeHint().width(), tqsizeHint().height() ); } diff --git a/klines/mwidget.h b/klines/mwidget.h index 18f48720..11133a2f 100644 --- a/klines/mwidget.h +++ b/klines/mwidget.h @@ -27,15 +27,16 @@ class BallPainter; -class MainWidget : public QFrame +class MainWidget : public TQFrame { Q_OBJECT + TQ_OBJECT LinesBoard * lsb; LinesPrompt * lPrompt; BallPainter *bPainter; public: - MainWidget( TQWidget* parent=0, const char* name=0 ); + MainWidget( TQWidget* tqparent=0, const char* name=0 ); ~MainWidget(); LinesBoard * GetLsb(); LinesPrompt * GetPrompt(); diff --git a/klines/povray/balls.sh b/klines/povray/balls.sh index 1897afaa..66b6ddc2 100755 --- a/klines/povray/balls.sh +++ b/klines/povray/balls.sh @@ -7,7 +7,7 @@ povray -w30 -h30 -V1 -P +A +KI5 +KF6 +KFF6 +SF2 +EF5 -Iball.pov +Ob$1.tga #### burning balls balls povray -w30 -h30 -V1 -P +A +KI0 +KF1 +KFF11 +SF1 +EF5 -Iball.pov +Oe$1.tga -montage -geometry 30x30 -tile 100x1 -page 570x30 a$1??.tga b$1?.tga e$1??.tga bl_$1.tga +montage -tqgeometry 30x30 -tile 100x1 -page 570x30 a$1??.tga b$1?.tga e$1??.tga bl_$1.tga mogrify -crop 570x30+0+0 bl_$1.tga diff --git a/klines/povray/fire.sh b/klines/povray/fire.sh index 2b6b5f9a..c3eaa319 100755 --- a/klines/povray/fire.sh +++ b/klines/povray/fire.sh @@ -3,7 +3,7 @@ echo "#declare BallColor = White" >clr.inc if (povray -w30 -h30 -V1 -P +A +KI0 +KF1 +KFF11 +SF6 +EF10 -Iball.pov \ +Ofire.tga) then # mogrify -raise 1x1 e$1??.tga - montage -geometry 30x30 -tile 100x1 -page 150x30 fire*.tga fire.tga + montage -tqgeometry 30x30 -tile 100x1 -page 150x30 fire*.tga fire.tga mogrify -crop 150x30+0+0 fire.tga # animate -delay 7 $1??.tga fi diff --git a/klines/povray/makeballs.sh b/klines/povray/makeballs.sh index 62769605..0d937415 100755 --- a/klines/povray/makeballs.sh +++ b/klines/povray/makeballs.sh @@ -17,7 +17,7 @@ balls.sh Brown "rgb<1/2,1/3,0>" #### montage balls ( 20x7 cells each 30x30) -montage -geometry 570x30 -tile 1x10 bl_*.tga balls.tga +montage -tqgeometry 570x30 -tile 1x10 bl_*.tga balls.tga mogrify -crop 570x210+0+0 balls.tga #### convert to jpeg diff --git a/klines/povray/povray.ini b/klines/povray/povray.ini index 22ddf8ec..6c01d50a 100644 --- a/klines/povray/povray.ini +++ b/klines/povray/povray.ini @@ -10,7 +10,7 @@ ; ; The general form of the options is "Variable=value". Everything ; between the equals sign and the end of the line is considered part -; of the value. The spacing and layout is free-form but only one option +; of the value. The spacing and tqlayout is free-form but only one option ; per line is allowed. Variables and values are not case-sensitive. ; ; Note: characters after a semi-colon are treated as a comment diff --git a/klines/prompt.cpp b/klines/prompt.cpp index 7a9ec36a..1233abf5 100644 --- a/klines/prompt.cpp +++ b/klines/prompt.cpp @@ -19,13 +19,13 @@ #include "prompt.h" #include "prompt.moc" -LinesPrompt::LinesPrompt( BallPainter * abPainter, TQWidget* parent, const char* name ) - : TQWidget( parent, name ) +LinesPrompt::LinesPrompt( BallPainter * abPainter, TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { bPainter = abPainter; - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); setBackgroundColor( gray ); setMouseTracking( FALSE ); diff --git a/klines/prompt.h b/klines/prompt.h index 3ddf6335..e1decfd5 100644 --- a/klines/prompt.h +++ b/klines/prompt.h @@ -21,9 +21,10 @@ #include #include "ballpainter.h" -class LinesPrompt : public QWidget +class LinesPrompt : public TQWidget { Q_OBJECT + TQ_OBJECT BallPainter* bPainter; bool PromptEnabled; @@ -33,7 +34,7 @@ class LinesPrompt : public QWidget void mousePressEvent( TQMouseEvent* ); public: - LinesPrompt( BallPainter * abPainter, TQWidget * parent=0, const char * name=0 ); + LinesPrompt( BallPainter * abPainter, TQWidget * tqparent=0, const char * name=0 ); ~LinesPrompt(); void setPrompt(bool enabled); -- cgit v1.2.3