From 1ece3ab54a7c973756eeb539fb24df4f5563e117 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:53:09 +0900 Subject: Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro (cherry picked from commit 8b08e8d5f6d410854393049d96157eded0f9b26c) --- kasteroids/toplevel.cpp | 2 +- katomic/feld.cpp | 2 +- kblackbox/kbbgfx.cpp | 6 +++--- kbounce/kbounce.cpp | 2 +- klines/klines.cpp | 2 +- klines/linesboard.cpp | 2 +- klines/prompt.cpp | 2 +- kmahjongg/Editor.cpp | 2 +- kmahjongg/HighScore.cpp | 8 ++++---- kmines/status.cpp | 2 +- kolf/game.cpp | 2 +- kolf/scoreboard.cpp | 2 +- konquest/gameboard.cpp | 2 +- ksnake/rattler.cpp | 2 +- ksokoban/PlayField.cpp | 2 +- kspaceduel/topwidget.cpp | 2 +- ktron/tron.cpp | 2 +- libksirtet/common/main.cpp | 2 +- libtdegames/kchatbase.cpp | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp index 303219d7..64a0c79d 100644 --- a/kasteroids/toplevel.cpp +++ b/kasteroids/toplevel.cpp @@ -252,7 +252,7 @@ KAstTopLevel::KAstTopLevel() setupGUI( TDEMainWindow::Save | Create ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); #ifdef KA_ENABLE_SOUND diff --git a/katomic/feld.cpp b/katomic/feld.cpp index 3411b7fb..6e422d04 100644 --- a/katomic/feld.cpp +++ b/katomic/feld.cpp @@ -45,7 +45,7 @@ Feld::Feld( TQWidget *parent, const char *name ) : setMouseTracking(true); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setBackgroundColor( TQColor( 0, 0, 0) ); setFixedSize(15 * 30, 15 * 30); diff --git a/kblackbox/kbbgfx.cpp b/kblackbox/kbbgfx.cpp index 0becd126..c3af718e 100644 --- a/kblackbox/kbbgfx.cpp +++ b/kblackbox/kbbgfx.cpp @@ -28,7 +28,7 @@ KBBGraphic::KBBGraphic( TQPixmap **p, TQWidget* parent, const char* name ) int i; curRow = curCol = 0; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setBackgroundColor( gray ); setCellWidth( CELLW ); // set width of cell in pixels setCellHeight( CELLH ); // set height of cell in pixels @@ -454,8 +454,8 @@ void KBBGraphic::focusOutEvent( TQFocusEvent* ) void KBBGraphic::setInputAccepted( bool b ) { inputAccepted = b; - if (b) setFocusPolicy( TQ_StrongFocus ); - else setFocusPolicy( TQ_NoFocus ); + if (b) setFocusPolicy( TQWidget::StrongFocus ); + else setFocusPolicy( TQWidget::NoFocus ); } /* diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp index 9fcb3c63..d3450bf9 100644 --- a/kbounce/kbounce.cpp +++ b/kbounce/kbounce.cpp @@ -103,7 +103,7 @@ KJezzball::KJezzball() .arg(m_newAction->shortcut().toString()) ); //m_gameWidget->display( i18n("Press to start a game!") ); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setFocus(); setupGUI(); } diff --git a/klines/klines.cpp b/klines/klines.cpp index 1459937d..b874679f 100644 --- a/klines/klines.cpp +++ b/klines/klines.cpp @@ -84,7 +84,7 @@ KLines::KLines() connect(&demoTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDemo())); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setFocus(); startGame(); diff --git a/klines/linesboard.cpp b/klines/linesboard.cpp index 81e7eb77..e5fd16a8 100644 --- a/klines/linesboard.cpp +++ b/klines/linesboard.cpp @@ -51,7 +51,7 @@ LinesBoard::LinesBoard( BallPainter * abPainter, TQWidget* parent, const char* n bPainter = abPainter; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setBackgroundColor( gray ); setMouseTracking( FALSE ); 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/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp index 87893bf3..1271a760 100644 --- a/kmahjongg/Editor.cpp +++ b/kmahjongg/Editor.cpp @@ -61,7 +61,7 @@ Editor::Editor drawFrame->setGeometry( 10, 40 ,sWidth ,sHeight); drawFrame->setMinimumSize( 0, 0 ); drawFrame->setMaximumSize( 32767, 32767 ); - drawFrame->setFocusPolicy( TQ_NoFocus ); + drawFrame->setFocusPolicy( TQWidget::NoFocus ); drawFrame->setBackgroundMode( TQWidget::PaletteBackground ); drawFrame->setFrameStyle( 49 ); drawFrame->setMouseTracking(true); diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp index 416fae2c..e926a4e7 100644 --- a/kmahjongg/HighScore.cpp +++ b/kmahjongg/HighScore.cpp @@ -112,7 +112,7 @@ HighScore::HighScore qtarch_PushButton_1->setGeometry( 110+35, 340+50, 100, 30 ); qtarch_PushButton_1->setMinimumSize( 0, 0 ); qtarch_PushButton_1->setMaximumSize( 32767, 32767 ); - qtarch_PushButton_1->setFocusPolicy( TQ_TabFocus ); + qtarch_PushButton_1->setFocusPolicy( TQWidget::TabFocus ); qtarch_PushButton_1->setAutoRepeat( false ); qtarch_PushButton_1->setDefault(true); @@ -121,7 +121,7 @@ HighScore::HighScore resetBtn->setGeometry( 10, 5, 25, 25); resetBtn->setMinimumSize( 0, 0 ); resetBtn->setMaximumSize( 32767, 32767 ); - resetBtn->setFocusPolicy( TQ_TabFocus ); + resetBtn->setFocusPolicy( TQWidget::TabFocus ); //resetBtn->setText(i18n( "Reset" )); resetBtn->setAutoRepeat( false ); @@ -136,7 +136,7 @@ HighScore::HighScore lineEdit = new TQLineEdit(this, ""); lineEdit->setGeometry( 50, 40+(20*30), 190, 30 ); - lineEdit->setFocusPolicy(TQ_StrongFocus); + lineEdit->setFocusPolicy(TQWidget::StrongFocus); lineEdit->setFrame(true); lineEdit->setEchoMode(TQLineEdit::Normal); lineEdit->setText(""); @@ -147,7 +147,7 @@ HighScore::HighScore combo->setGeometry( 65, 5, 220, 25 ); combo->setMinimumSize( 0, 0 ); combo->setMaximumSize( 32767, 32767 ); - combo->setFocusPolicy( TQ_StrongFocus ); + combo->setFocusPolicy( TQWidget::StrongFocus ); combo->setSizeLimit( 10 ); connect( combo, TQT_SIGNAL(activated(int)), TQT_SLOT(selectionChanged(int)) ); diff --git a/kmines/status.cpp b/kmines/status.cpp index 1ed3f5d5..ad5f6ef3 100644 --- a/kmines/status.cpp +++ b/kmines/status.cpp @@ -74,7 +74,7 @@ Status::Status(TQWidget *parent) // smiley smiley = new Smiley(this); connect(smiley, TQT_SIGNAL(clicked()), TQT_SLOT(smileyClicked())); - smiley->setFocusPolicy(TQ_NoFocus); + smiley->setFocusPolicy(TQWidget::NoFocus); TQWhatsThis::add(smiley, i18n("Press to start a new game")); top->addWidget(smiley, 0, 2); diff --git a/kolf/game.cpp b/kolf/game.cpp index 3c6978fd..e4c298fe 100644 --- a/kolf/game.cpp +++ b/kolf/game.cpp @@ -2197,7 +2197,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi margin = 10; - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setFixedSize(width + 2 * margin, height + 2 * margin); setMargins(margin, margin, margin, margin); diff --git a/kolf/scoreboard.cpp b/kolf/scoreboard.cpp index 17c29bce..69128b00 100644 --- a/kolf/scoreboard.cpp +++ b/kolf/scoreboard.cpp @@ -17,7 +17,7 @@ ScoreBoard::ScoreBoard(TQWidget *parent, const char *name) vh->setLabel(numRows() - 1, i18n("Par")); hh->setLabel(numCols() - 1, i18n("Total")); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setRowReadOnly(0, true); setRowReadOnly(1, true); } diff --git a/konquest/gameboard.cpp b/konquest/gameboard.cpp index 69aec42c..b02ce64e 100644 --- a/konquest/gameboard.cpp +++ b/konquest/gameboard.cpp @@ -82,7 +82,7 @@ GameBoard::GameBoard( TQWidget *parent ) setMinimumSize( 600, 600 ); setMouseTracking( true ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); //******************************************************************** diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp index 94c467fe..400e9794 100644 --- a/ksnake/rattler.cpp +++ b/ksnake/rattler.cpp @@ -46,7 +46,7 @@ int speed[4] = { 130, 95, 55, 40 }; Rattler::Rattler( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); numBalls = Settings::balls(); ballsAI = Settings::ballsAI(); diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp index 1483aa44..c781e366 100644 --- a/ksokoban/PlayField.cpp +++ b/ksokoban/PlayField.cpp @@ -54,7 +54,7 @@ PlayField::PlayField(TQWidget *parent, const char *name, WFlags f) pushesText_(i18n("Pushes:")), statusFont_(TDEGlobalSettings::generalFont().family(), 18, TQFont::Bold), statusMetrics_(statusFont_) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setFocus(); setBackgroundMode(TQt::NoBackground); setMouseTracking(true); diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp index b8bef2e1..fb385b0c 100644 --- a/kspaceduel/topwidget.cpp +++ b/kspaceduel/topwidget.cpp @@ -31,7 +31,7 @@ void MyTopLevelWidget::initGameWidgets( ){ toplayout->addWidget(playerinfo[1]); toplayout->activate(); - playfield->setFocusPolicy(TQ_StrongFocus); + playfield->setFocusPolicy(TQWidget::StrongFocus); playfield->setFocus(); TQObject::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(energy(int,int)), diff --git a/ktron/tron.cpp b/ktron/tron.cpp index 4fb53878..5e83a874 100644 --- a/ktron/tron.cpp +++ b/ktron/tron.cpp @@ -51,7 +51,7 @@ Tron::Tron(TQWidget *parent,const char *name) random.setSeed(0); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setBackgroundMode(NoBackground); gameBlocked=false; diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp index ec6ec658..f869cb1c 100644 --- a/libksirtet/common/main.cpp +++ b/libksirtet/common/main.cpp @@ -20,7 +20,7 @@ void MainWindow::init() { Interface *inter = static_cast(_inter); inter->normalGame(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); // Modes bool ama = ( bfactory->bbi.nbArcadeStages!=0 ); diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp index 17f831a0..091d7cfa 100644 --- a/libtdegames/kchatbase.cpp +++ b/libtdegames/kchatbase.cpp @@ -211,7 +211,7 @@ void KChatBase::init(bool noComboBox) l->addWidget(d->mBox); d->mBox->setVScrollBarMode(TQScrollView::AlwaysOn); d->mBox->setHScrollBarMode(TQScrollView::AlwaysOff); - d->mBox->setFocusPolicy(TQ_NoFocus); + d->mBox->setFocusPolicy(TQWidget::NoFocus); // d->mBox->setSelectionMode(TQListBox::NoSelection); d->mBox->setSelectionMode(TQListBox::Single); -- cgit v1.2.1