From 5665df9602807d84c8de673a2b4101f2e3a9fd89 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:49:34 +0900 Subject: [PATCH] Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro --- src/archive.cpp | 2 +- src/basket.cpp | 6 +++--- src/basket_part.cpp | 2 +- src/basketlistview.cpp | 2 +- src/bnpview.cpp | 2 +- src/note.cpp | 4 ++-- src/notecontent.cpp | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/archive.cpp b/src/archive.cpp index aec789f..bf40a59 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -136,7 +136,7 @@ void Archive::save(Basket *basket, bool withSubBaskets, const TQString &destinat painter.end(); TQImage previewImage = previewPixmap.convertToImage(); const int PREVIEW_SIZE = 256; - previewImage = previewImage.scale(PREVIEW_SIZE, PREVIEW_SIZE, TQ_ScaleMin); + previewImage = previewImage.scale(PREVIEW_SIZE, PREVIEW_SIZE, TQImage::ScaleMin); previewImage.save(tempFolder + "preview.png", "PNG"); // Finaly Save to the Real Destination file: diff --git a/src/basket.cpp b/src/basket.cpp index a767275..62b859e 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -257,7 +257,7 @@ void DecoratedBasket::resetFilter() TransparentWidget::TransparentWidget(Basket *basket) : TQWidget(basket->viewport(), "", TQt::WNoAutoErase), m_basket(basket) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setWFlags(TQt::WNoAutoErase); setMouseTracking(true); // To receive mouseMoveEvents @@ -1076,7 +1076,7 @@ void Basket::equalizeColumnSizes() void Basket::enableActions() { Global::bnpView->enableActions(); - setFocusPolicy(isLocked() ? TQ_NoFocus : TQ_StrongFocus); + setFocusPolicy(isLocked() ? TQWidget::NoFocus : TQWidget::StrongFocus); if (isLocked()) viewport()->setCursor(TQt::ArrowCursor); // When locking, the cursor stays the last form it was } @@ -1363,7 +1363,7 @@ Basket::Basket(TQWidget *parent, const TQString &folderName) if (!m_folderName.endsWith("/")) m_folderName += "/"; - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setWFlags(TQt::WNoAutoErase); setDragAutoScroll(true); diff --git a/src/basket_part.cpp b/src/basket_part.cpp index df5541c..2059ab0 100644 --- a/src/basket_part.cpp +++ b/src/basket_part.cpp @@ -51,7 +51,7 @@ BasketPart::BasketPart( TQWidget *parentWidget, const char *, m_view = new BNPView(parentWidget, "BNPViewPart", this, actionCollection(), bar); connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(setCaption(const TQString &))); connect(m_view, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart())); - m_view->setFocusPolicy(TQ_ClickFocus); + m_view->setFocusPolicy(TQWidget::ClickFocus); // notify the part that this is our internal widget setWidget(m_view); diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp index 380b361..1cbe8c9 100644 --- a/src/basketlistview.cpp +++ b/src/basketlistview.cpp @@ -796,7 +796,7 @@ void BasketTreeListView::paintEmptyArea(TQPainter *painter, const TQRect &rect) } } -/** We should NEVER get focus (because of TQ_NoFocus focusPolicy()) +/** We should NEVER get focus (because of TQWidget::NoFocus focusPolicy()) * but TDEListView can programatically give us the focus. * So we give it to the basket. */ diff --git a/src/bnpview.cpp b/src/bnpview.cpp index 15b8388..af71d4b 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -348,7 +348,7 @@ void BNPView::initialize() m_tree->setTreeStepSize(16); m_tree->setLineWidth(1); m_tree->setMidLineWidth(0); - m_tree->setFocusPolicy(TQ_NoFocus); + m_tree->setFocusPolicy(TQWidget::NoFocus); /// Configure the List View Drag and Drop: m_tree->setDragEnabled(true); diff --git a/src/note.cpp b/src/note.cpp index 09eb274..2d2e448 100644 --- a/src/note.cpp +++ b/src/note.cpp @@ -2839,7 +2839,7 @@ TQString Note::toHtml(const TQString &imageName) image = pixmap()->convertToImage(); else image = movie()->framePixmap().convertToImage(); - image = image.smoothScale(200, 150, TQ_ScaleMin); + image = image.smoothScale(200, 150, TQImage::ScaleMin); TQPixmap pixmap = TQPixmap(image); TQMimeSourceFactory::defaultFactory()->setPixmap(imageName, pixmap); return ""; /// @@ -2852,7 +2852,7 @@ TQString Note::toHtml(const TQString &imageName) image = pixmap()->convertToImage(); else image = movie()->framePixmap().convertToImage(); - image = image.smoothScale(200, 150, TQ_ScaleMin); + image = image.smoothScale(200, 150, TQImage::ScaleMin); TQPixmap pixmap = TQPixmap(image); TQMimeSourceFactory::defaultFactory()->setPixmap(imageName, pixmap); return ""; /// diff --git a/src/notecontent.cpp b/src/notecontent.cpp index 00b5795..ef01cb9 100644 --- a/src/notecontent.cpp +++ b/src/notecontent.cpp @@ -408,7 +408,7 @@ TQPixmap ImageContent::feedbackPixmap(int width, int height) } else { // Scalled down TQImage imageToScale = m_pixmap.convertToImage(); TQPixmap pmScaled; - pmScaled.convertFromImage(imageToScale./*smoothScale*/scale(width, height, TQ_ScaleMin)); + pmScaled.convertFromImage(imageToScale./*smoothScale*/scale(width, height, TQImage::ScaleMin)); if (pmScaled.hasAlpha()) { TQPixmap opaque(pmScaled.width(), pmScaled.height()); opaque.fill(note()->backgroundColor().dark(FEEDBACK_DARKING)); @@ -429,7 +429,7 @@ TQPixmap AnimationContent::feedbackPixmap(int width, int height) else { // Scalled down TQImage imageToScale = pixmap.convertToImage(); TQPixmap pmScaled; - pmScaled.convertFromImage(imageToScale./*smoothScale*/scale(width, height, TQ_ScaleMin)); + pmScaled.convertFromImage(imageToScale./*smoothScale*/scale(width, height, TQImage::ScaleMin)); return pmScaled; } }