From 82e857b822ab15a2762a8ca2cf16c1a0c2ffe020 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 02:04:59 -0500 Subject: [PATCH] Fix inadvertent "TQ" changes. --- .../imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h | 8 ++++---- .../coreplugin/sharpnesseditor/clapack/fmtlib.c | 2 +- .../coreplugin/sharpnesseditor/clapack/wrtfmt.c | 4 ++-- digikam/imageplugins/hotpixels/hotpixelfixer.cpp | 6 +++--- digikam/imageplugins/hotpixels/hotpixelfixer.h | 2 +- digikam/imageplugins/hotpixels/hotpixelstool.cpp | 2 +- digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp | 4 ++-- digikam/libs/lprof/cmslnr.cpp | 4 ++-- digikam/libs/widgets/common/squeezedcombobox.h | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h index d24eb0c..19065a2 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h @@ -51,7 +51,7 @@ typedef union #endif char ic; integer il; -#ifdef Allow_TYTQUAD +#ifdef Allow_TYQUAD longint ili; #endif } Uint; @@ -85,12 +85,12 @@ extern int f__scale; #define PUT(x) (*f__putn)(x) extern int f__cursor; -#undef TYTQUAD -#ifndef Allow_TYTQUAD +#undef TYQUAD +#ifndef Allow_TYQUAD #undef longint #define longint long #else -#define TYTQUAD 14 +#define TYQUAD 14 #endif #ifdef KR_headers diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c index 9221dae..91483fc 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c @@ -2,7 +2,7 @@ #define MAXINTLENGTH 23 #include "f2c.h" -#ifndef Allow_TYTQUAD +#ifndef Allow_TYQUAD #undef longint #define longint long #undef ulongint diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c index 56ba693..477c40f 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c @@ -130,7 +130,7 @@ wrt_I(Uint *n, int w, ftnlen len, register int base) char *ans; if(len==sizeof(integer)) x=n->il; else if(len == sizeof(char)) x = n->ic; -#ifdef Allow_TYTQUAD +#ifdef Allow_TYQUAD else if (len == sizeof(longint)) x = n->ili; #endif else x=n->is; @@ -158,7 +158,7 @@ wrt_IM(Uint *n, int w, int m, ftnlen len, int base) char *ans; if(sizeof(integer)==len) x=n->il; else if(len == sizeof(char)) x = n->ic; -#ifdef Allow_TYTQUAD +#ifdef Allow_TYQUAD else if (len == sizeof(longint)) x = n->ili; #endif else x=n->is; diff --git a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp b/digikam/imageplugins/hotpixels/hotpixelfixer.cpp index b89c12f..d29b852 100644 --- a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelfixer.cpp @@ -169,9 +169,9 @@ void HotPixelFixer::interpolate (Digikam::DImg &img, HotPixel &hp, int method) weightPixels (img,hp,LINEAR_INTERPOLATION,TWODIM_DIRECTION,sixtBits ? 65535: 255); break; - case TQUADRATIC_INTERPOLATION: + case QUADRATIC_INTERPOLATION: // (Bi)quadratic interpolation. - weightPixels (img,hp,TQUADRATIC_INTERPOLATION,TWODIM_DIRECTION,sixtBits ? 65535 : 255); + weightPixels (img,hp,QUADRATIC_INTERPOLATION,TWODIM_DIRECTION,sixtBits ? 65535 : 255); break; case CUBIC_INTERPOLATION: @@ -199,7 +199,7 @@ void HotPixelFixer::weightPixels (Digikam::DImg &img, HotPixel &px, int method, case LINEAR_INTERPOLATION: polynomeOrder=1; break; - case TQUADRATIC_INTERPOLATION: + case QUADRATIC_INTERPOLATION: polynomeOrder=2; break; case CUBIC_INTERPOLATION: diff --git a/digikam/imageplugins/hotpixels/hotpixelfixer.h b/digikam/imageplugins/hotpixels/hotpixelfixer.h index b02d7e0..2bf8131 100644 --- a/digikam/imageplugins/hotpixels/hotpixelfixer.h +++ b/digikam/imageplugins/hotpixels/hotpixelfixer.h @@ -55,7 +55,7 @@ public: { AVERAGE_INTERPOLATION = 0, LINEAR_INTERPOLATION = 1, - TQUADRATIC_INTERPOLATION = 2, + QUADRATIC_INTERPOLATION = 2, CUBIC_INTERPOLATION = 3 }; diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp index 1aece33..84b5ce7 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp @@ -91,7 +91,7 @@ HotPixelsTool::HotPixelsTool(TQObject* parent) m_filterMethodCombo->insertItem(i18n("Linear")); m_filterMethodCombo->insertItem(i18n("Quadratic")); m_filterMethodCombo->insertItem(i18n("Cubic")); - m_filterMethodCombo->setDefaultItem(HotPixelFixer::TQUADRATIC_INTERPOLATION); + m_filterMethodCombo->setDefaultItem(HotPixelFixer::QUADRATIC_INTERPOLATION); m_blackFrameButton = new TQPushButton(i18n("Black Frame..."), m_gboxSettings->plainPage()); TQWhatsThis::add(m_blackFrameButton, i18n("

Use this button to " diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp index 468a9d3..29544db 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp @@ -137,7 +137,7 @@ void ImageEffect_HotPixels::readUserSettings() config->setGroup("hotpixels Tool Dialog"); m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", TQString())); m_filterMethodCombo->setCurrentItem(config->readNumEntry("Filter Method", - HotPixelFixer::TQUADRATIC_INTERPOLATION)); + HotPixelFixer::QUADRATIC_INTERPOLATION)); if (m_blackFrameURL.isValid()) { @@ -163,7 +163,7 @@ void ImageEffect_HotPixels::writeUserSettings() void ImageEffect_HotPixels::resetValues() { m_filterMethodCombo->blockSignals(true); - m_filterMethodCombo->setCurrentItem(HotPixelFixer::TQUADRATIC_INTERPOLATION); + m_filterMethodCombo->setCurrentItem(HotPixelFixer::QUADRATIC_INTERPOLATION); m_filterMethodCombo->blockSignals(false); } diff --git a/digikam/libs/lprof/cmslnr.cpp b/digikam/libs/lprof/cmslnr.cpp index 17d8fca..f151f68 100644 --- a/digikam/libs/lprof/cmslnr.cpp +++ b/digikam/libs/lprof/cmslnr.cpp @@ -60,7 +60,7 @@ void cdecl cmsxApplyLinearizationGamma(WORD In[3], LPGAMMATABLE Gamma[3], WORD O #define EPSILON 0.00005 -#define LEVENBERG_MARTQUARDT_ITERATE_MAX 150 +#define LEVENBERG_MARQUARDT_ITERATE_MAX 150 /* In order to track linearization tables, we use following procedure */ /* */ @@ -210,7 +210,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[]) OldChiSq = cmsxLevenbergMarquardtChiSq(h); - for(i = 0; i < LEVENBERG_MARTQUARDT_ITERATE_MAX; i++) { + for(i = 0; i < LEVENBERG_MARQUARDT_ITERATE_MAX; i++) { if (!cmsxLevenbergMarquardtIterate(h)) { Status = false; diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/digikam/libs/widgets/common/squeezedcombobox.h index 1fd131e..f6b0a4f 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.h +++ b/digikam/libs/widgets/common/squeezedcombobox.h @@ -25,8 +25,8 @@ /** @file squeezedcombobox.h */ -#ifndef STQUEEZEDCOMBOBOX_H -#define STQUEEZEDCOMBOBOX_H +#ifndef SQUEEZEDCOMBOBOX_H +#define SQUEEZEDCOMBOBOX_H // TQt includes. @@ -161,4 +161,4 @@ private: } // namespace Digikam -#endif // STQUEEZEDCOMBOBOX_H +#endif // SQUEEZEDCOMBOBOX_H