From 881122ce627bb012d1330d2cba895347714967bc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:36:40 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- libkdcraw/libkdcraw/dcrawbinary.cpp | 6 ++-- libkdcraw/libkdcraw/dcrawsettingswidget.cpp | 6 ++-- libkdcraw/libkdcraw/kdcraw.cpp | 44 ++++++++++++++--------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/libkdcraw/libkdcraw/dcrawbinary.cpp b/libkdcraw/libkdcraw/dcrawbinary.cpp index ac79763..8efafb6 100644 --- a/libkdcraw/libkdcraw/dcrawbinary.cpp +++ b/libkdcraw/libkdcraw/dcrawbinary.cpp @@ -162,7 +162,7 @@ void DcrawBinary::checkReport() "You can continue, but you will not be able " "to handle any Raw images. " "Please check the installation of libkdcraw package on your computer.") - .tqarg(path()), + .arg(path()), TQString(), i18n("Do not show this message again"), KMessageBox::Notify | KMessageBox::AllowLink); @@ -179,8 +179,8 @@ void DcrawBinary::checkReport() "You can continue, but you will not be able " "to handle any Raw images. " "Please check the installation of libkdcraw package on your computer.") - .tqarg(path()) - .tqarg(version()), + .arg(path()) + .arg(version()), TQString(), i18n("Do not show this message again"), KMessageBox::Notify | KMessageBox::AllowLink); diff --git a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp index 5d288c0..c8b89f2 100644 --- a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp +++ b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -215,8 +215,8 @@ void DcrawSettingsWidget::setup(int advSettings) line++; KURLLabel *dcrawVersion = new KURLLabel("http://www.libraw.org", i18n("libraw %1") - .tqarg(KDcraw::librawVersion()), d->demosaicingSettings); - dcrawVersion->tqsetAlignment(TQt::AlignRight); + .arg(KDcraw::librawVersion()), d->demosaicingSettings); + dcrawVersion->setAlignment(TQt::AlignRight); TQToolTip::add(dcrawVersion, i18n("Visit dcraw project website")); demosaicingLayout->addMultiCellWidget(dcrawVersion, 0, 0, 2, 2); diff --git a/libkdcraw/libkdcraw/kdcraw.cpp b/libkdcraw/libkdcraw/kdcraw.cpp index 13cfd40..39948cd 100644 --- a/libkdcraw/libkdcraw/kdcraw.cpp +++ b/libkdcraw/libkdcraw/kdcraw.cpp @@ -424,35 +424,35 @@ bool KDcraw::loadFromDcraw(const TQString& filePath, TQByteArray &imageData, } // (-H) Unclip highlight color. - args.append(TQString("-H %1").tqarg(m_rawDecodingSettings.unclipColors)); + args.append(TQString("-H %1").arg(m_rawDecodingSettings.unclipColors)); raw.imgdata.params.highlight = m_rawDecodingSettings.unclipColors; if (m_rawDecodingSettings.brightness != 1.0) { // (-b) Set Brightness value. - args.append(TQString("-b %1").tqarg(m_rawDecodingSettings.brightness)); + args.append(TQString("-b %1").arg(m_rawDecodingSettings.brightness)); raw.imgdata.params.bright = m_rawDecodingSettings.brightness; } if (m_rawDecodingSettings.enableBlackPoint) { // (-k) Set Black Point value. - args.append(TQString("-k %1").tqarg(m_rawDecodingSettings.blackPoint)); + args.append(TQString("-k %1").arg(m_rawDecodingSettings.blackPoint)); raw.imgdata.params.user_black = m_rawDecodingSettings.blackPoint; } if (m_rawDecodingSettings.enableWhitePoint) { // (-S) Set White Point value (saturation). - args.append(TQString("-S %1").tqarg(m_rawDecodingSettings.whitePoint)); + args.append(TQString("-S %1").arg(m_rawDecodingSettings.whitePoint)); raw.imgdata.params.user_sat = m_rawDecodingSettings.whitePoint; } if (m_rawDecodingSettings.medianFilterPasses > 0) { // (-m) After interpolation, clean up color artifacts by repeatedly applying a 3x3 median filter to the R-G and B-G channels. - args.append(TQString("-m %1").tqarg(m_rawDecodingSettings.medianFilterPasses)); + args.append(TQString("-m %1").arg(m_rawDecodingSettings.medianFilterPasses)); raw.imgdata.params.med_passes = m_rawDecodingSettings.medianFilterPasses; } @@ -460,7 +460,7 @@ bool KDcraw::loadFromDcraw(const TQString& filePath, TQByteArray &imageData, { // (-P) Read the dead pixel list from this file. raw.imgdata.params.bad_pixels = deadpixelPath.data(); - args.append(TQString("-P %1").tqarg(raw.imgdata.params.bad_pixels)); + args.append(TQString("-P %1").arg(raw.imgdata.params.bad_pixels)); } switch (m_rawDecodingSettings.whiteBalance) @@ -556,10 +556,10 @@ bool KDcraw::loadFromDcraw(const TQString& filePath, TQByteArray &imageData, raw.imgdata.params.user_mul[1] = RGB[1]; raw.imgdata.params.user_mul[2] = RGB[2]; raw.imgdata.params.user_mul[3] = RGB[1]; - args.append(TQString("-r %1 %2 %3 %4").tqarg(raw.imgdata.params.user_mul[0]) - .tqarg(raw.imgdata.params.user_mul[1]) - .tqarg(raw.imgdata.params.user_mul[2]) - .tqarg(raw.imgdata.params.user_mul[3])); + args.append(TQString("-r %1 %2 %3 %4").arg(raw.imgdata.params.user_mul[0]) + .arg(raw.imgdata.params.user_mul[1]) + .arg(raw.imgdata.params.user_mul[2]) + .arg(raw.imgdata.params.user_mul[3])); break; } case RawDecodingSettings::AERA: @@ -569,23 +569,23 @@ bool KDcraw::loadFromDcraw(const TQString& filePath, TQByteArray &imageData, raw.imgdata.params.greybox[1] = m_rawDecodingSettings.whiteBalanceArea.top(); raw.imgdata.params.greybox[2] = m_rawDecodingSettings.whiteBalanceArea.width(); raw.imgdata.params.greybox[3] = m_rawDecodingSettings.whiteBalanceArea.height(); - args.append(TQString("-A %1 %2 %3 %4").tqarg(raw.imgdata.params.greybox[0]) - .tqarg(raw.imgdata.params.greybox[1]) - .tqarg(raw.imgdata.params.greybox[2]) - .tqarg(raw.imgdata.params.greybox[3])); + args.append(TQString("-A %1 %2 %3 %4").arg(raw.imgdata.params.greybox[0]) + .arg(raw.imgdata.params.greybox[1]) + .arg(raw.imgdata.params.greybox[2]) + .arg(raw.imgdata.params.greybox[3])); break; } } // (-q) Use an interpolation method. raw.imgdata.params.user_qual = m_rawDecodingSettings.RAWQuality; - args.append(TQString("-q %1").tqarg(m_rawDecodingSettings.RAWQuality)); + args.append(TQString("-q %1").arg(m_rawDecodingSettings.RAWQuality)); if (m_rawDecodingSettings.enableNoiseReduction) { // (-n) Use wavelets to erase noise while preserving real detail. raw.imgdata.params.threshold = m_rawDecodingSettings.NRThreshold; - args.append(TQString("-n %1").tqarg(raw.imgdata.params.threshold)); + args.append(TQString("-n %1").arg(raw.imgdata.params.threshold)); } if (m_rawDecodingSettings.enableCACorrection) @@ -593,8 +593,8 @@ bool KDcraw::loadFromDcraw(const TQString& filePath, TQByteArray &imageData, // (-C) Set Correct chromatic aberration correction. raw.imgdata.params.aber[0] = m_rawDecodingSettings.caMultiplier[0]; raw.imgdata.params.aber[2] = m_rawDecodingSettings.caMultiplier[1]; - args.append(TQString("-C %1 %2").tqarg(raw.imgdata.params.aber[0]) - .tqarg(raw.imgdata.params.aber[2])); + args.append(TQString("-C %1 %2").arg(raw.imgdata.params.aber[0]) + .arg(raw.imgdata.params.aber[2])); } switch (m_rawDecodingSettings.inputColorSpace) @@ -612,7 +612,7 @@ bool KDcraw::loadFromDcraw(const TQString& filePath, TQByteArray &imageData, { // (-p) Use input profile file to define the camera's raw colorspace. raw.imgdata.params.camera_profile = cameraProfile.data(); - args.append(TQString("-p %1").tqarg(raw.imgdata.params.camera_profile)); + args.append(TQString("-p %1").arg(raw.imgdata.params.camera_profile)); } break; } @@ -628,7 +628,7 @@ bool KDcraw::loadFromDcraw(const TQString& filePath, TQByteArray &imageData, { // (-o) Use ICC profile file to define the output colorspace. raw.imgdata.params.output_profile = outputProfile.data(); - args.append(TQString("-o %1").tqarg(raw.imgdata.params.output_profile)); + args.append(TQString("-o %1").arg(raw.imgdata.params.output_profile)); } break; } @@ -636,7 +636,7 @@ bool KDcraw::loadFromDcraw(const TQString& filePath, TQByteArray &imageData, { // (-o) Define the output colorspace. raw.imgdata.params.output_color = m_rawDecodingSettings.outputColorSpace; - args.append(TQString("-o %1").tqarg(raw.imgdata.params.output_color)); + args.append(TQString("-o %1").arg(raw.imgdata.params.output_color)); break; } } @@ -732,7 +732,7 @@ const char *KDcraw::rawFiles() TQStringList KDcraw::rawFilesList() { - TQString string = TQString::tqfromLatin1(rawFiles()).remove("*."); + TQString string = TQString::fromLatin1(rawFiles()).remove("*."); return TQStringList::split(' ', string); } -- cgit v1.2.3