From d82c9bd8b659143ef1c13dfff0f0a1a6da99e11f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:50:23 +0900 Subject: [PATCH] Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro --- src/barcode/barcode.cpp | 2 +- src/entryiconfactory.cpp | 2 +- src/entryiconview.cpp | 2 +- src/newstuff/dialog.cpp | 2 +- src/translators/alexandriaexporter.cpp | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/barcode/barcode.cpp b/src/barcode/barcode.cpp index 5eb229c..a56915a 100644 --- a/src/barcode/barcode.cpp +++ b/src/barcode/barcode.cpp @@ -69,7 +69,7 @@ void barcodeRecognitionThread::run() // //DEBUG if (!img.isNull()) { - TQImage preview = img.scale( 320, 240, TQ_ScaleMin ); + TQImage preview = img.scale( 320, 240, TQImage::ScaleMin ); emit gotImage( preview ); Barcode_EAN13 barcode = recognize( img ); if (barcode.isValid() && (old != barcode)) { diff --git a/src/entryiconfactory.cpp b/src/entryiconfactory.cpp index a01d982..d852d09 100644 --- a/src/entryiconfactory.cpp +++ b/src/entryiconfactory.cpp @@ -30,7 +30,7 @@ TQPixmap* EntryIconFactory::createPixmap(const TQIconSet&, TQIconSet::Size, TQIc // if we're 22x22 or smaller, just use entry icon if(m_size < 23) { TQImage entryImg = entryPix.convertToImage(); - entryPix.convertFromImage(entryImg.smoothScale(m_size, m_size, TQ_ScaleMin), 0); + entryPix.convertFromImage(entryImg.smoothScale(m_size, m_size, TQImage::ScaleMin), 0); return new TQPixmap(entryPix); } diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp index c932573..1364680 100644 --- a/src/entryiconview.cpp +++ b/src/entryiconview.cpp @@ -105,7 +105,7 @@ const TQPixmap& EntryIconView::defaultPixmap() { tmp = UserIcon(TQString::fromLatin1("tellico")); } if(TQMAX(tmp.width(), tmp.height()) > static_cast(MIN_ENTRY_ICON_SIZE)) { - tmp.convertFromImage(tmp.convertToImage().smoothScale(m_maxIconWidth, m_maxIconHeight, TQ_ScaleMin)); + tmp.convertFromImage(tmp.convertToImage().smoothScale(m_maxIconWidth, m_maxIconHeight, TQImage::ScaleMin)); } pix = new TQPixmap(tmp); m_defaultPixmaps.insert(m_coll->type(), pix); diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index 56f1954..52a1922 100644 --- a/src/newstuff/dialog.cpp +++ b/src/newstuff/dialog.cpp @@ -540,7 +540,7 @@ void Dialog::slotPreviewResult(TDEIO::Job* job_) { if(!pix.isNull()) { if(pix.width() > 64 || pix.height() > 64) { - pix.convertFromImage(pix.convertToImage().smoothScale(64, 64, TQ_ScaleMin)); + pix.convertFromImage(pix.convertToImage().smoothScale(64, 64, TQImage::ScaleMin)); } // only set label if it's still current if(m_listView->selectedItem() == m_lastPreviewItem) { diff --git a/src/translators/alexandriaexporter.cpp b/src/translators/alexandriaexporter.cpp index 633864f..7d067e4 100644 --- a/src/translators/alexandriaexporter.cpp +++ b/src/translators/alexandriaexporter.cpp @@ -167,11 +167,11 @@ bool AlexandriaExporter::writeFile(const TQDir& dir_, Data::ConstEntryPtr entry_ TQString filename = dir_.absPath() + TQDir::separator() + isbn; if(img1.height() > ALEXANDRIA_MAX_SIZE_SMALL) { if(img1.height() > ALEXANDRIA_MAX_SIZE_MEDIUM) { // limit maximum size - img1 = img1.scale(ALEXANDRIA_MAX_SIZE_MEDIUM, ALEXANDRIA_MAX_SIZE_MEDIUM, TQ_ScaleMin); + img1 = img1.scale(ALEXANDRIA_MAX_SIZE_MEDIUM, ALEXANDRIA_MAX_SIZE_MEDIUM, TQImage::ScaleMin); } - img2 = img1.scale(ALEXANDRIA_MAX_SIZE_SMALL, ALEXANDRIA_MAX_SIZE_SMALL, TQ_ScaleMin); + img2 = img1.scale(ALEXANDRIA_MAX_SIZE_SMALL, ALEXANDRIA_MAX_SIZE_SMALL, TQImage::ScaleMin); } else { - img2 = img1.smoothScale(ALEXANDRIA_MAX_SIZE_MEDIUM, ALEXANDRIA_MAX_SIZE_MEDIUM, TQ_ScaleMin); // scale up + img2 = img1.smoothScale(ALEXANDRIA_MAX_SIZE_MEDIUM, ALEXANDRIA_MAX_SIZE_MEDIUM, TQImage::ScaleMin); // scale up } if(!img1.save(filename + TQString::fromLatin1("_medium.jpg"), "JPEG") || !img2.save(filename + TQString::fromLatin1("_small.jpg"), "JPEG")) {