From 57e0ed66347db15cb1cd66488f095107e7772ad9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 18 Nov 2023 16:44:23 +0900 Subject: Replace various strings '#define'd in tqtinterface Signed-off-by: Michele Calgaro --- tdefx/kimageeffect.cpp | 48 ++++++++++++++++++++++++------------------------ tdefx/kpixmap.cpp | 2 +- tdefx/tdestyle.cpp | 2 +- tdefx/tdestyle.h | 18 +++++++++--------- 4 files changed, 35 insertions(+), 35 deletions(-) (limited to 'tdefx') diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp index 444119a1c..8968c1b43 100644 --- a/tdefx/kimageeffect.cpp +++ b/tdefx/kimageeffect.cpp @@ -664,7 +664,7 @@ TQImage& KImageEffect::intensity(TQImage &image, float percent) int pixels = image.depth() > 8 ? image.width()*image.height() : image.numColors(); unsigned int *data = image.depth() > 8 ? (unsigned int *)image.bits() : - (unsigned int *)image.tqcolorTable(); + (unsigned int *)image.colorTable(); bool brighten = (percent >= 0); if(percent < 0) @@ -858,7 +858,7 @@ TQImage& KImageEffect::channelIntensity(TQImage &image, float percent, int pixels = image.depth() > 8 ? image.width()*image.height() : image.numColors(); unsigned int *data = image.depth() > 8 ? (unsigned int *)image.bits() : - (unsigned int *)image.tqcolorTable(); + (unsigned int *)image.colorTable(); bool brighten = (percent >= 0); if(percent < 0) percent = -percent; @@ -958,7 +958,7 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse, if (modImage.depth()<8) modImage = modImage.convertDepth(8); unsigned int *colorTable2 = (modImage.depth()==8) ? - modImage.tqcolorTable():0; + modImage.colorTable():0; unsigned int *data1, *data2; unsigned char *data2b; unsigned int color1, color2; @@ -1788,7 +1788,7 @@ TQImage& KImageEffect::blend(TQImage &image1, TQImage &image2, if (blendImage.depth()<8) blendImage = blendImage.convertDepth(8); unsigned int *colorTable3 = (blendImage.depth()==8) ? - blendImage.tqcolorTable():0; + blendImage.colorTable():0; unsigned int *data1 = (unsigned int *)image1.bits(); unsigned int *data2 = (unsigned int *)image2.bits(); @@ -2162,7 +2162,7 @@ TQImage& KImageEffect::toGray(TQImage &img, bool fast) int pixels = img.depth() > 8 ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *)img.bits() : - (unsigned int *)img.tqcolorTable(); + (unsigned int *)img.colorTable(); int val, i; for(i=0; i < pixels; ++i){ val = tqGray(data[i]); @@ -2183,7 +2183,7 @@ TQImage& KImageEffect::desaturate(TQImage &img, float desat) int pixels = img.depth() > 8 ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *)img.bits() : - (unsigned int *)img.tqcolorTable(); + (unsigned int *)img.colorTable(); int h, s, v, i; TQColor clr; // keep constructor out of loop (mosfet) for(i=0; i < pixels; ++i){ @@ -2208,7 +2208,7 @@ TQImage& KImageEffect::contrast(TQImage &img, int c) int pixels = img.depth() > 8 ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *)img.bits() : - (unsigned int *)img.tqcolorTable(); + (unsigned int *)img.colorTable(); int i, r, g, b; for(i=0; i < pixels; ++i){ r = tqRed(data[i]); @@ -2779,7 +2779,7 @@ TQImage KImageEffect::sample(TQImage &src, int w, int h) } else if(depth == 1) { int r = src.bitOrder() == TQImage::LittleEndian; - memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(TQRgb)); + memcpy(dest.colorTable(), src.colorTable(), src.numColors()*sizeof(TQRgb)); for(int y=0; y < h; ++y){ unsigned char *destData = dest.scanLine(y); unsigned char *srcData = src.scanLine(y_offset[y]); @@ -2794,7 +2794,7 @@ TQImage KImageEffect::sample(TQImage &src, int w, int h) } } else{ // PseudoClass source image - memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(TQRgb)); + memcpy(dest.colorTable(), src.colorTable(), src.numColors()*sizeof(TQRgb)); for(int y=0; y < h; ++y){ unsigned char *destData = dest.scanLine(y); unsigned char *srcData = src.scanLine(y_offset[y]); @@ -2817,7 +2817,7 @@ void KImageEffect::threshold(TQImage &img, unsigned int threshold) } else{ // PsudeoClass count = img.numColors(); - data = (unsigned int *)img.tqcolorTable(); + data = (unsigned int *)img.colorTable(); } for(i=0; i < count; ++i) data[i] = intensityValue(data[i]) < threshold ? TQColor(TQt::black).rgb() : TQColor(TQt::white).rgb(); @@ -2951,7 +2951,7 @@ TQImage KImageEffect::despeckle(TQImage &src) } else{ // PsudeoClass source image unsigned char *srcData; - unsigned int *cTable = src.tqcolorTable(); + unsigned int *cTable = src.colorTable(); unsigned int pixel; for(y=0; y < src.height(); ++y){ srcData = (unsigned char *)src.scanLine(y); @@ -3130,7 +3130,7 @@ TQImage KImageEffect::addNoise(TQImage &src, NoiseType noise_type) } else{ // PsudeoClass source image unsigned char *srcData; - unsigned int *cTable = src.tqcolorTable(); + unsigned int *cTable = src.colorTable(); unsigned int pixel; for(y=0; y < src.height(); ++y){ srcData = (unsigned char *)src.scanLine(y); @@ -3192,7 +3192,7 @@ unsigned int KImageEffect::interpolateColor(TQImage *image, double x_offset, } } else{ - unsigned int *colorTable = (unsigned int *)image->tqcolorTable(); + unsigned int *colorTable = (unsigned int *)image->colorTable(); if((x >= 0) && (y >= 0) && (x < (image->width()-1)) && (y < (image->height()-1))) { unsigned char *t; t = (unsigned char *)image->scanLine(y); @@ -3292,7 +3292,7 @@ TQImage KImageEffect::implode(TQImage &src, double factor, else{ // PsudeoClass source image unsigned char *srcData; unsigned char idx; - unsigned int *cTable = src.tqcolorTable(); + unsigned int *cTable = src.colorTable(); for(y=0; y < src.height(); ++y){ srcData = (unsigned char *)src.scanLine(y); destData = (unsigned int *)dest.scanLine(y); @@ -3368,8 +3368,8 @@ TQImage KImageEffect::rotate(TQImage &img, RotateDirection r) case Rotate90: dest.create(img.height(), img.width(), img.depth()); dest.setNumColors(img.numColors()); - srcTable = (unsigned int *)img.tqcolorTable(); - destTable = (unsigned int *)dest.tqcolorTable(); + srcTable = (unsigned int *)img.colorTable(); + destTable = (unsigned int *)dest.colorTable(); for(x=0; x < img.numColors(); ++x) destTable[x] = srcTable[x]; for(y=0; y < img.height(); ++y){ @@ -3383,8 +3383,8 @@ TQImage KImageEffect::rotate(TQImage &img, RotateDirection r) case Rotate180: dest.create(img.width(), img.height(), img.depth()); dest.setNumColors(img.numColors()); - srcTable = (unsigned int *)img.tqcolorTable(); - destTable = (unsigned int *)dest.tqcolorTable(); + srcTable = (unsigned int *)img.colorTable(); + destTable = (unsigned int *)dest.colorTable(); for(x=0; x < img.numColors(); ++x) destTable[x] = srcTable[x]; for(y=0; y < img.height(); ++y){ @@ -3397,8 +3397,8 @@ TQImage KImageEffect::rotate(TQImage &img, RotateDirection r) case Rotate270: dest.create(img.height(), img.width(), img.depth()); dest.setNumColors(img.numColors()); - srcTable = (unsigned int *)img.tqcolorTable(); - destTable = (unsigned int *)dest.tqcolorTable(); + srcTable = (unsigned int *)img.colorTable(); + destTable = (unsigned int *)dest.colorTable(); for(x=0; x < img.numColors(); ++x) destTable[x] = srcTable[x]; for(y=0; y < img.height(); ++y){ @@ -3426,7 +3426,7 @@ void KImageEffect::solarize(TQImage &img, double factor) threshold = (int)(factor*(MaxRGB+1)/100.0); if(img.depth() < 32){ - data = (unsigned int *)img.tqcolorTable(); + data = (unsigned int *)img.colorTable(); count = img.numColors(); } else{ @@ -3541,7 +3541,7 @@ TQImage KImageEffect::swirl(TQImage &src, double degrees, } else{ // PsudeoClass source image unsigned char *p; - unsigned int *cTable = (unsigned int *)src.tqcolorTable(); + unsigned int *cTable = (unsigned int *)src.colorTable(); for(y=0; y < src.height(); y++){ p = (unsigned char *)src.scanLine(y); q = (unsigned int *)dest.scanLine(y); @@ -4554,7 +4554,7 @@ TQImage KImageEffect::shade(TQImage &src, bool color_shading, double azimuth, else{ // PsudeoClass source image unsigned char *p, *s0, *s1, *s2; int scanLineIdx; - unsigned int *cTable = (unsigned int *)src.tqcolorTable(); + unsigned int *cTable = (unsigned int *)src.colorTable(); for(y=0; y < src.height(); ++y){ scanLineIdx = TQMIN(TQMAX(y-1,0),src.height()-3); p = (unsigned char *)src.scanLine(scanLineIdx); @@ -4632,7 +4632,7 @@ void KImageEffect::contrastHSV(TQImage &img, bool sharpen) } else{ count = img.numColors(); - data = (unsigned int *)img.tqcolorTable(); + data = (unsigned int *)img.colorTable(); } for(i=0; i < count; ++i){ c.setRgb(data[i]); diff --git a/tdefx/kpixmap.cpp b/tdefx/kpixmap.cpp index bbf483016..30a2de570 100644 --- a/tdefx/kpixmap.cpp +++ b/tdefx/kpixmap.cpp @@ -357,7 +357,7 @@ bool KPixmap::checkColorTable( const TQImage &image ) } - TQRgb* ctable = image.tqcolorTable(); + TQRgb* ctable = image.colorTable(); int ncols = image.numColors(); int j; diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp index f191dc751..a1d60656a 100644 --- a/tdefx/tdestyle.cpp +++ b/tdefx/tdestyle.cpp @@ -853,7 +853,7 @@ void TDEStyle::drawControl( TQ_ControlElement element, // ------------------------------------------------------------------------ case CE_ProgressBarGroove: { TQRect fr = subRect(SR_ProgressBarGroove, ceData, elementFlags, widget); - drawPrimitive(PE_Panel, p, ceData, elementFlags, fr, cg, Style_Sunken, TQStyleOption::SO_Default); + drawPrimitive(PE_Panel, p, ceData, elementFlags, fr, cg, Style_Sunken, TQStyleOption::Default); break; } diff --git a/tdefx/tdestyle.h b/tdefx/tdestyle.h index 4991eb733..613a7a1a8 100644 --- a/tdefx/tdestyle.h +++ b/tdefx/tdestyle.h @@ -245,7 +245,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default ) const; + const TQStyleOption& = TQStyleOption::Default ) const; /** * This function is identical to Qt's TQStyle::tqdrawPrimitive(), except that @@ -263,7 +263,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; @@ -294,7 +294,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default ) const; + const TQStyleOption& = TQStyleOption::Default ) const; void drawControl( TQ_ControlElement element, TQPainter* p, @@ -303,7 +303,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; void drawComplexControl( TQ_ComplexControl control, @@ -315,21 +315,21 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle SFlags flags = Style_Default, SCFlags controls = SC_All, SCFlags active = SC_None, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; SubControl querySubControl( TQ_ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; TQRect querySubControlMetrics( TQ_ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -341,12 +341,12 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle TQPixmap stylePixmap( StylePixmap stylepixmap, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; int styleHint( StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, - const TQStyleOption &opt = TQStyleOption::SO_Default, + const TQStyleOption &opt = TQStyleOption::Default, TQStyleHintReturn* shr = 0, const TQWidget* w = 0 ) const; -- cgit v1.2.1