summaryrefslogtreecommitdiffstats
path: root/tdefx
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-26 14:53:30 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-31 10:10:06 +0900
commite8f6750e65767709575720eb6da1402e6ef20bad (patch)
treed1d2db5eff55dc1f66155b8f4ef2ba260a1b1b3c /tdefx
parent97fea74e68727e260cb1901763ad4d43f7f96342 (diff)
downloadtdelibs-e8f6750e65767709575720eb6da1402e6ef20bad.tar.gz
tdelibs-e8f6750e65767709575720eb6da1402e6ef20bad.zip
Drop USE_TQT4 code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 57af4f9d87ac88216a3bbcebaeed55db07a8948d)
Diffstat (limited to 'tdefx')
-rw-r--r--tdefx/kimageeffect.cpp12
-rw-r--r--tdefx/tdestyle.cpp22
-rw-r--r--tdefx/tdestyle.h13
3 files changed, 0 insertions, 47 deletions
diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp
index 277e1cc7f..bba2e4952 100644
--- a/tdefx/kimageeffect.cpp
+++ b/tdefx/kimageeffect.cpp
@@ -1079,11 +1079,6 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity)
if (dst.depth() != 32)
dst = dst.convertDepth(32);
-#ifdef USE_QT4
- if (dst.format() != QImage::Format_ARGB32)
- dst = dst.convertToFormat(QImage::Format_ARGB32); // This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB)
-#endif
-
int pixels = dst.width() * dst.height();
#ifdef USE_SSE2_INLINE_ASM
@@ -1334,13 +1329,6 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity)
if (src.depth() != 32) src = src.convertDepth(32);
if (dst.depth() != 32) dst = dst.convertDepth(32);
-#ifdef USE_QT4
- if (src.format() != QImage::Format_ARGB32)
- src = dst.convertToFormat(QImage::Format_ARGB32); // This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB)
- if (dst.format() != QImage::Format_ARGB32)
- dst = dst.convertToFormat(QImage::Format_ARGB32); // This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB)
-#endif
-
int pixels = src.width() * src.height();
#ifdef USE_SSE2_INLINE_ASM
diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp
index 43cb4329a..ce17cc24c 100644
--- a/tdefx/tdestyle.cpp
+++ b/tdefx/tdestyle.cpp
@@ -569,28 +569,6 @@ int TDEStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElement
// -----------------------------------------------------------------------------
-// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
-
-//void TDEStyle::drawPrimitive( TQ_ControlElement pe,
-// TQPainter* p,
-// const TQStyleControlElementData &ceData,
-// ControlElementFlags elementFlags,
-// const TQRect &r,
-// const TQColorGroup &cg,
-// SFlags flags,
-// const TQStyleOption& opt ) const
-//{
-// // FIXME:
-// // What should "widget" be in actuality? How should I get it? From where?
-// // Almost certainly it should not be null!
-// TQWidget *widget = 0;
-// drawControl(pe, p, ceData, elementFlags, r, cg, flags, opt, widget);
-//}
-
-// #endif // USE_QT4
-
-// -----------------------------------------------------------------------------
-
void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
TQPainter* p,
const TQStyleControlElementData &ceData,
diff --git a/tdefx/tdestyle.h b/tdefx/tdestyle.h
index 013dab1ea..7cf4e0858 100644
--- a/tdefx/tdestyle.h
+++ b/tdefx/tdestyle.h
@@ -296,19 +296,6 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
-// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
-
-// void drawPrimitive( TQ_ControlElement pe,
-// TQPainter* p,
-// const TQStyleControlElementData &ceData,
-// ControlElementFlags elementFlags,
-// const TQRect &r,
-// const TQColorGroup &cg,
-// SFlags flags = Style_Default,
-// const TQStyleOption& = TQStyleOption::SO_Default ) const;
-
-// #endif // USE_QT4
-
void drawControl( TQ_ControlElement element,
TQPainter* p,
const TQStyleControlElementData &ceData,