From 84057ea26e8662283fd441a21067bdf1f599e82e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:48:23 +0900 Subject: Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro (cherry picked from commit ee077affc0b8b1df873d13d00e66e8044e5d505b) --- src/kvirc/kernel/kvi_theme.cpp | 2 +- src/kvirc/ui/kvi_colorwin.cpp | 2 +- src/kvirc/ui/kvi_cryptcontroller.cpp | 2 +- src/kvirc/ui/kvi_frame.cpp | 2 +- src/kvirc/ui/kvi_imagedialog.cpp | 2 +- src/kvirc/ui/kvi_input.cpp | 2 +- src/kvirc/ui/kvi_maskeditor.cpp | 8 ++++---- src/kvirc/ui/kvi_mdimanager.cpp | 4 ++-- src/kvirc/ui/kvi_modeeditor.cpp | 2 +- src/kvirc/ui/kvi_taskbar.cpp | 2 +- src/kvirc/ui/kvi_window.cpp | 10 +++++----- src/modules/actioneditor/actioneditor.cpp | 2 +- src/modules/help/helpwidget.cpp | 2 +- src/modules/logview/logviewmdiwindow.cpp | 2 +- src/modules/notifier/notifierwindow.cpp | 2 +- src/modules/objects/class_widget.cpp | 8 ++++---- src/modules/theme/packthemedialog.cpp | 4 ++-- src/modules/theme/savethemedialog.cpp | 2 +- src/modules/url/libkviurl.cpp | 2 +- 19 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/kvi_theme.cpp index 30b1932e..4431b8b0 100644 --- a/src/kvirc/kernel/kvi_theme.cpp +++ b/src/kvirc/kernel/kvi_theme.cpp @@ -36,7 +36,7 @@ #define KVI_THEME_MEDIUM_SCREENSHOT_NAME "screenshot_medium.png" #define KVI_THEME_LARGE_SCREENSHOT_NAME "screenshot.png" - #define TQIMAGE_SCALE_MIN TQ_ScaleMin + #define TQIMAGE_SCALE_MIN TQImage::ScaleMin KviThemeInfo::KviThemeInfo() : KviHeapObject() diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp index af190b53..23f5136c 100644 --- a/src/kvirc/ui/kvi_colorwin.cpp +++ b/src/kvirc/ui/kvi_colorwin.cpp @@ -38,7 +38,7 @@ KviColorWindow::KviColorWindow() :TQWidget(0,"toplevel_color_window",TQt::WType_Popup) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(TQt::NoBackground); setFixedSize(146,38); m_pOwner = 0; diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 6b768587..5af9b913 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -78,7 +78,7 @@ m_pWindow = wnd; - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); TQGridLayout *g = new TQGridLayout(this,10,4,2,2); diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index d5c08b09..4288263d 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -1137,7 +1137,7 @@ bool KviFrame::focusNextPrevChild(bool next) TQWidget * w = focusWidget(); if(w) { - if(w->focusPolicy() == TQ_StrongFocus)return false; + if(w->focusPolicy() == TQWidget::StrongFocus)return false; //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index bb5d9416..652be479 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -281,7 +281,7 @@ void KviImageDialog::heartbeat() TQImage i(szPath); if(i.isNull())continue; TQPixmap pix; - if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,TQ_ScaleMin); + if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,TQImage::ScaleMin); else pix = i; TQString tip = szFile; diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 095b5812..46ffcf52 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -195,7 +195,7 @@ KviInputEditor::KviInputEditor(TQWidget * par,KviWindow *wnd,KviUserListView * v setInputMethodEnabled(true); setBackgroundMode(TQt::NoBackground); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setAcceptDrops(true); setFrameStyle( LineEditPanel ); setFrameShadow( Plain ); diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index bb804eae..cb6b446c 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -136,7 +136,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP w = w->parent(); } - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); TQGridLayout *g = new TQGridLayout(this,4,2,2,2); @@ -182,7 +182,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP g->addMultiCellWidget(l,2,2,0,1); m_pMaskBox = new KviTalListView(this); - m_pMaskBox->setFocusPolicy(TQ_ClickFocus); + m_pMaskBox->setFocusPolicy(TQWidget::ClickFocus); m_pMaskBox->setFocusProxy(this); m_pMaskBox->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken); m_pMaskBox->addColumn(__tr2qs("Mask")); @@ -197,7 +197,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP m_pRemoveMask = new TQPushButton(__tr2qs("Re&move"),this); m_pRemoveMask->setEnabled(isEnabled); - m_pRemoveMask->setFocusPolicy(TQ_ClickFocus); + m_pRemoveMask->setFocusPolicy(TQWidget::ClickFocus); m_pRemoveMask->setFocusProxy(this); g->addWidget(m_pRemoveMask,4,1); connect(m_pRemoveMask,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); @@ -205,7 +205,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP m_pAddButton = new TQPushButton(__tr2qs("Add"),this); m_pAddButton->setEnabled(isEnabled); - m_pAddButton->setFocusPolicy(TQ_ClickFocus); + m_pAddButton->setFocusPolicy(TQWidget::ClickFocus); m_pAddButton->setFocusProxy(this); g->addWidget(m_pAddButton,4,0); connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index a2485c1a..d1e25dc6 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -82,8 +82,8 @@ KviMdiManager::KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name setStaticBackground(true); resizeContents(width(),height()); - setFocusPolicy(TQ_NoFocus); - viewport()->setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); + viewport()->setFocusPolicy(TQWidget::NoFocus); connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); } diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 746bd57b..0c998975 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -68,7 +68,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons TQGridLayout *pMasterLayout = new TQGridLayout(this,2,1,2,2); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); KviTalScrollView *pScrollView = new KviTalScrollView(this); pScrollView->viewport()->setBackgroundMode(TQWidget::PaletteBackground); diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 9396cc9e..d2bac667 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -1159,7 +1159,7 @@ KviTreeTaskBar::KviTreeTaskBar() //setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth)); //m_pListView->setMinimumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth)); //m_pListView->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth)); - m_pListView->setFocusPolicy(TQ_NoFocus); + m_pListView->setFocusPolicy(TQWidget::NoFocus); m_pListView->setStaticBackground(true); m_pListView->viewport()->setBackgroundMode(TQWidget::NoBackground); if(!KVI_OPTION_BOOL(KviOption_boolShowTreeTaskbarHeader)) diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 8f64ab84..12291913 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -140,7 +140,7 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole * setMinimumSize(KVI_WINDOW_MIN_WIDTH,KVI_WINDOW_MIN_HEIGHT); setBackgroundMode(NoBackground); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); } @@ -278,7 +278,7 @@ bool KviWindow::focusNextPrevChild(bool next) TQWidget * w = focusWidget(); if(w) { - if(w->focusPolicy() == TQ_StrongFocus)return false; + if(w->focusPolicy() == TQWidget::StrongFocus)return false; //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! @@ -1023,8 +1023,8 @@ bool KviWindow::eventFilter(TQObject *o,TQEvent *e) TQApplication::restoreOverrideCursor(); break; case TQEvent::MouseButtonPress: - if( (((TQWidget *)o)->focusPolicy() == TQ_NoFocus) || - (((TQWidget *)o)->focusPolicy() == TQ_TabFocus)) + if( (((TQWidget *)o)->focusPolicy() == TQWidget::NoFocus) || + (((TQWidget *)o)->focusPolicy() == TQWidget::TabFocus)) { // this will not focus our window // set the focus to the focus handler @@ -1066,7 +1066,7 @@ void KviWindow::childInserted(TQWidget * o) m_pFocusHandler = o; else { - if(!m_pFocusHandler && (o->focusPolicy() == TQ_StrongFocus)) + if(!m_pFocusHandler && (o->focusPolicy() == TQWidget::StrongFocus)) { m_pFocusHandler = o; } diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 8fdd1bd0..705233f3 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -659,7 +659,7 @@ KviActionEditor::KviActionEditor(TQWidget * par) m_pListView = new KviActionEditorListView(box); //m_pListView->setMultiSelection(false); m_pListView->setShowSortIndicator(true); - m_pListView->setFocusPolicy(TQ_StrongFocus); + m_pListView->setFocusPolicy(TQWidget::StrongFocus); connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentChanged(KviTalListViewItem *))); diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index 67c0793d..1de90892 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -52,7 +52,7 @@ KviHelpWidget::KviHelpWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone) //#warning "Re enable this when using TQt 3.0 : TQProcess " m_pTextBrowser = new TQTextBrowser(this,"text_browser"); m_pTextBrowser->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken); - m_pTextBrowser->setFocusPolicy(TQ_NoFocus); + m_pTextBrowser->setFocusPolicy(TQWidget::NoFocus); m_pToolBar = new KviTalHBox(this); m_pBtnIndex = new KviStyledToolButton(m_pToolBar); diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 1faa6146..ea92cfc7 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -145,7 +145,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra layout->addWidget(w,11,1); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); - m_pIrcView->setFocusPolicy(TQ_ClickFocus); + m_pIrcView->setFocusPolicy(TQWidget::ClickFocus); KviValueList li; li.append(110); li.append(width()-110); diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 25afa711..fa55316e 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -119,7 +119,7 @@ KviNotifierWindow::KviNotifierWindow() if(m_iInputHeight < 10)m_iInputHeight = 10; setBackgroundMode(TQt::NoBackground); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setMouseTracking(true); //setCursor(m_cursor); diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index de92fc98..74e5dc1d 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -78,10 +78,10 @@ const int widgettypes_cod[] = { }; - #define TQT_WIDGET_TABFOCUS TQ_TabFocus - #define TQT_WIDGET_CLICKFOCUS TQ_ClickFocus - #define TQT_WIDGET_STRONGFOCUS TQ_StrongFocus - #define TQT_WIDGET_NOFOCUS TQ_NoFocus + #define TQT_WIDGET_TABFOCUS TQWidget::TabFocus + #define TQT_WIDGET_CLICKFOCUS TQWidget::ClickFocus + #define TQT_WIDGET_STRONGFOCUS TQWidget::StrongFocus + #define TQT_WIDGET_NOFOCUS TQWidget::NoFocus #define widgettypes_num (sizeof(widgettypes_tbl) / sizeof(widgettypes_tbl[0])) diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index 7ae09b77..8afd2b3b 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -328,7 +328,7 @@ void KviPackThemeDialog::imageSelectionChanged(const TQString &szImagePath) { TQPixmap out; if(pix.width() > 300 || pix.height() > 225) - out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin)); + out.convertFromImage(pix.smoothScale(300,225,TQImage::ScaleMin)); else out.convertFromImage(pix); m_pImageLabel->setPixmap(out); @@ -365,7 +365,7 @@ bool KviPackThemeDialog::packTheme() if(!pix.isNull()) { if(pix.width() > 300 || pix.height() > 225) - out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin)); + out.convertFromImage(pix.smoothScale(300,225,TQImage::ScaleMin)); else out.convertFromImage(pix); } else { diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp index 8e015309..e7b78334 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -187,7 +187,7 @@ void KviSaveThemeDialog::imageSelectionChanged(const TQString &szImagePath) { TQPixmap out; if(pix.width() > 300 || pix.height() > 225) - out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin)); + out.convertFromImage(pix.smoothScale(300,225,TQImage::ScaleMin)); else out.convertFromImage(pix); m_pImageLabel->setPixmap(out); diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 3556fd3b..dfd884e8 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -144,7 +144,7 @@ UrlDialog::UrlDialog(KviPointerList *g_pList) connect(m_pUrlList,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *, const TQPoint &, int)),TQT_SLOT(popup(KviTalListViewItem *, const TQPoint &, int))); // setFocusHandlerNoChildren(m_pUrlList); - m_pUrlList->setFocusPolicy(TQ_StrongFocus); + m_pUrlList->setFocusPolicy(TQWidget::StrongFocus); m_pUrlList->setFocus(); } -- cgit v1.2.1