From 7415013cd766b039e6adcbaac04e62a1c5b9e4fe Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:48:31 +0900 Subject: Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro (cherry picked from commit e1209cdbda0933b9a18486c11fc2c2cec9c04e7b) --- bibletime/bibletime_init.cpp | 2 +- bibletime/frontend/displaywindow/cdisplaywindow.cpp | 4 ++-- bibletime/frontend/keychooser/ckeychooserwidget.cpp | 6 +++--- bibletime/frontend/keychooser/ckeyreferencewidget.cpp | 2 +- bibletime/frontend/keychooser/cscrollbutton.cpp | 2 +- bibletime/frontend/keychooser/cscrollerwidgetset.cpp | 6 +++--- bibletime/frontend/mainindex/cmainindex.cpp | 2 +- bibletime/frontend/searchdialog/csearchanalysis.cpp | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp index f8fb318..f293ba0 100644 --- a/bibletime/bibletime_init.cpp +++ b/bibletime/bibletime_init.cpp @@ -94,7 +94,7 @@ void BibleTime::initView() { m_mdi = new CMDIArea(m_mainSplitter, "mdiarea" ); m_mdi->setMinimumSize(100, 100); - m_mdi->setFocusPolicy(TQ_ClickFocus); + m_mdi->setFocusPolicy(TQWidget::ClickFocus); m_helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), true, actionCollection()); } diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp index 8082380..93b93ff 100644 --- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp +++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp @@ -351,8 +351,8 @@ const bool CDisplayWindow::init() { setCaption(windowCaption()); //setup focus stuff. - setFocusPolicy(TQ_ClickFocus); - parentWidget()->setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); + parentWidget()->setFocusPolicy(TQWidget::ClickFocus); initActions(); initToolbars(); diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.cpp b/bibletime/frontend/keychooser/ckeychooserwidget.cpp index a099506..be41cec 100644 --- a/bibletime/frontend/keychooser/ckeychooserwidget.cpp +++ b/bibletime/frontend/keychooser/ckeychooserwidget.cpp @@ -32,7 +32,7 @@ CKCComboBox::CKCComboBox(bool rw,TQWidget* parent,const char* name) : TQComboBox(rw,parent,name) { - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); if (lineEdit()) { installEventFilter( lineEdit() ); } @@ -183,12 +183,12 @@ void CKeyChooserWidget::reset(TQStringList *list, int index, bool do_emit) { void CKeyChooserWidget::init() { oldKey = TQString(); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); m_comboBox = new CKCComboBox( true, this ); m_comboBox->setAutoCompletion( true ); m_comboBox->setInsertionPolicy(TQComboBox::NoInsertion); - m_comboBox->setFocusPolicy(TQ_WheelFocus); + m_comboBox->setFocusPolicy(TQWidget::WheelFocus); m_mainLayout = new TQHBoxLayout( this ); m_mainLayout->addWidget(m_comboBox,5); diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp index 2cae363..fbc6d31 100644 --- a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp +++ b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp @@ -85,7 +85,7 @@ CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVers updatelock = false; m_module = mod; - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); // Erase button KGuiItem erase_picture; diff --git a/bibletime/frontend/keychooser/cscrollbutton.cpp b/bibletime/frontend/keychooser/cscrollbutton.cpp index 221f35b..a174471 100644 --- a/bibletime/frontend/keychooser/cscrollbutton.cpp +++ b/bibletime/frontend/keychooser/cscrollbutton.cpp @@ -22,7 +22,7 @@ #include CScrollButton::CScrollButton(TQWidget *parent, const char *name ) : TQToolButton(parent,name) { - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); setCursor( splitVCursor ); m_isLocked = false; diff --git a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp b/bibletime/frontend/keychooser/cscrollerwidgetset.cpp index 1fbb6bc..1b75462 100644 --- a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp +++ b/bibletime/frontend/keychooser/cscrollerwidgetset.cpp @@ -43,15 +43,15 @@ CScrollerWidgetSet::CScrollerWidgetSet(TQWidget *parent, const char *name) : TQW btn_up = new TQToolButton( UpArrow, this, "btn_up" ); btn_up->setFixedSize(WIDTH, ARROW_HEIGHT); - btn_up->setFocusPolicy(TQ_NoFocus); + btn_up->setFocusPolicy(TQWidget::NoFocus); btn_fx = new CScrollButton( this, "btn_fx" ); btn_fx->setFixedSize(WIDTH, MOVER_HEIGHT); - btn_fx->setFocusPolicy(TQ_NoFocus); + btn_fx->setFocusPolicy(TQWidget::NoFocus); btn_down = new TQToolButton( DownArrow, this, "btn_down" ); btn_down->setFixedSize(WIDTH, ARROW_HEIGHT); - btn_down->setFocusPolicy(TQ_NoFocus); + btn_down->setFocusPolicy(TQWidget::NoFocus); m_layout->addWidget( btn_up,0 ); m_layout->addWidget( btn_fx,0 ); m_layout->addWidget( btn_down,0 ); diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp index 5ac6d02..66e1ce5 100644 --- a/bibletime/frontend/mainindex/cmainindex.cpp +++ b/bibletime/frontend/mainindex/cmainindex.cpp @@ -129,7 +129,7 @@ void CMainIndex::initView() { setBackgroundMode(PaletteBase); setFullWidth(true); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); setAcceptDrops( true ); setDragEnabled( true ); diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp index d86d951..77efa5a 100644 --- a/bibletime/frontend/searchdialog/csearchanalysis.cpp +++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp @@ -413,7 +413,7 @@ const TQString CSearchAnalysisItem::getToolTip() { CSearchAnalysisView::CSearchAnalysisView(TQCanvas* canvas, TQWidget* parent) : TQCanvasView(canvas, parent) { - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); m_toolTip = new ToolTip(this); resize(sizeHint()); } -- cgit v1.2.1