From 46c271a0c91e3bd1b018b1ff43be34a52f5c2cc8 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:54:29 +0900 Subject: [PATCH] Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro --- charselectapplet/charselectapplet.cpp | 2 +- kcalc/kcalcdisplay.cpp | 2 +- kgpg/keyinfowidget.cpp | 2 +- kgpg/listkeys.cpp | 6 +++--- khexedit/bitswapwidget.cpp | 2 +- khexedit/dialog.cpp | 2 +- khexedit/hexviewwidget.cpp | 2 +- khexedit/lib/khexedit.cpp | 2 +- kjots/KJotsMain.cpp | 2 +- kmilo/kmilod/defaultskin.cpp | 2 +- superkaramba/src/karamba.cpp | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index 9730560..cd2e0f5 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -157,7 +157,7 @@ CharTable::CharTable(TQWidget* parent, const char* name) _cWidth(cell_width), _cHeight(cell_height) { setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(TQWidget::NoBackground); } diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp index 8ad1350..a335458 100644 --- a/kcalc/kcalcdisplay.cpp +++ b/kcalc/kcalcdisplay.cpp @@ -48,7 +48,7 @@ KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name) setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAlignment(AlignRight | AlignVCenter); setFocus(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisplaySelected())); diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index 1b833ac..578bd0c 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -374,7 +374,7 @@ void KgpgKeyInfo::slotSetPhoto(const TQPixmap &pix) // kdDebug(2100) << k_funcinfo << endl; TQImage dup=pix.convertToImage(); TQPixmap dup2; - dup2.convertFromImage(dup.scale(prop->pLPhoto->width(),prop->pLPhoto->height(),TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(prop->pLPhoto->width(),prop->pLPhoto->height(),TQImage::ScaleMin)); prop->pLPhoto->setPixmap(dup2); } diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index ed1d7dc..c0f53a3 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -2641,9 +2641,9 @@ TQPixmap KeyView::slotGetPhoto(TQString photoId,bool mini) TQImage dup=pixmap.convertToImage(); TQPixmap dup2; if (!mini) - dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQImage::ScaleMin)); else - dup2.convertFromImage(dup.scale(22,22,TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(22,22,TQImage::ScaleMin)); phototmp->unlink(); delete phototmp; return dup2; @@ -2721,7 +2721,7 @@ void KeyView::expandKey(TQListViewItem *item) pixmap.load(kgpgphototmp->name()); TQImage dup=pixmap.convertToImage(); TQPixmap dup2; - dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQImage::ScaleMin)); itemuid->setPixmap(0,dup2); delete kgpgphototmp; //itemuid->setPixmap(0,keyPhotoId); diff --git a/khexedit/bitswapwidget.cpp b/khexedit/bitswapwidget.cpp index bbea65a..bc6da80 100644 --- a/khexedit/bitswapwidget.cpp +++ b/khexedit/bitswapwidget.cpp @@ -27,7 +27,7 @@ CDigitLabel::CDigitLabel( TQWidget *parent, uint digit, const char *name ) :TQLabel(parent, name), mDigit( digit ), mDotPosition( 0 ) { - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); initialize(); } diff --git a/khexedit/dialog.cpp b/khexedit/dialog.cpp index c2f2d80..588a715 100644 --- a/khexedit/dialog.cpp +++ b/khexedit/dialog.cpp @@ -365,7 +365,7 @@ CFindNavigatorDialog::CFindNavigatorDialog( TQWidget *parent, const char *name, mKey = new TQLineEdit( plainPage() ); mKey->setMinimumWidth( fontMetrics().width("M") * 20 ); - mKey->setFocusPolicy( TQ_NoFocus ); + mKey->setFocusPolicy( TQWidget::NoFocus ); hbox->addWidget( mKey ); topLayout->addSpacing( spacingHint() ); // A little bit extra space diff --git a/khexedit/hexviewwidget.cpp b/khexedit/hexviewwidget.cpp index 6c15ae3..28335af 100644 --- a/khexedit/hexviewwidget.cpp +++ b/khexedit/hexviewwidget.cpp @@ -217,7 +217,7 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, setFrameStyle( TQFrame::WinPanel|TQFrame::Sunken ); setWFlags( WResizeNoErase ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); mHexBuffer = hexBuffer; mHexBuffer->cursorReset(); diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index dd34e1e..eaedc9d 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -133,7 +133,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl // get the full control viewport()->setFocusProxy( this ); - viewport()->setFocusPolicy( TQ_WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); viewport()->installEventFilter( this ); installEventFilter( this ); diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 5146536..ef0bb6e 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -90,7 +90,7 @@ KJotsMain::KJotsMain(const char* name) textStack = new TQWidgetStack(splitter); me_text = new KJotsEdit(textStack, "me_text"); - me_text->setFocusPolicy(TQ_StrongFocus); + me_text->setFocusPolicy(TQWidget::StrongFocus); me_text->setEnabled(false); textStack->addWidget(me_text); connect(me_text, TQT_SIGNAL(findSuccessful()), this, TQT_SLOT(slotFindSuccessful())); diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index ac983fd..bcf6a9f 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -41,7 +41,7 @@ DefaultSkin::DefaultSkin() { connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); _widget = new DefaultWidget(0, "Screen Indicator", TQt::WX11BypassWM); - _widget->setFocusPolicy(TQ_NoFocus); + _widget->setFocusPolicy(TQWidget::NoFocus); KWin::setOnAllDesktops(_widget->winId(), true); KWin::setState( _widget->winId(), NET::StaysOnTop | NET::Sticky diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index f9e3e76..749805b 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -314,7 +314,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, this->setMouseTracking(true); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } karamba::~karamba()