TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 3

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8d79c40791)
pull/271/head
Michele Calgaro 12 months ago
parent cf7f8e74af
commit 4c9f3f02c0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
44 changed files with 126 additions and 126 deletions
Show Stats Download Patch File Download Diff File

4
kate/part/kateviewinternal.cpp
Unescape View File

@ -420,7 +420,7 @@ void KateViewInternal::scrollPos(KateTextCursor& c, bool force, bool calledExter
Q_ASSERT(lines >= 0); Q_ASSERT(lines >= 0);
if (!calledExternally && QABS(viewLinesScrolled) < lines) if (!calledExternally && TQABS(viewLinesScrolled) < lines)
{ {
updateView(false, viewLinesScrolled); updateView(false, viewLinesScrolled);
@ -456,7 +456,7 @@ void KateViewInternal::scrollColumns ( int x )
int dx = m_startX - x; int dx = m_startX - x;
m_startX = x; m_startX = x;
if (QABS(dx) < width()) if (TQABS(dx) < width())
scroll(dx, 0); scroll(dx, 0);
else else
update(); update();

2
kimgio/ico.cpp
Unescape View File

@ -233,7 +233,7 @@ namespace
TQRgb* p = reinterpret_cast< TQRgb* >( lines[ y ] ); TQRgb* p = reinterpret_cast< TQRgb* >( lines[ y ] );
for ( unsigned x = 0; x < rec.width; ++x, ++p ) for ( unsigned x = 0; x < rec.width; ++x, ++p )
if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) ) if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) )
*p &= TQRGB_MASK; *p &= TQT_RGB_MASK;
} }
delete[] buf; delete[] buf;
} }

2
kimgio/xcf.cpp
Unescape View File

@ -80,7 +80,7 @@ const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = {
//! Change a TQRgb value's alpha only. //! Change a TQRgb value's alpha only.
inline TQRgb tqRgba ( TQRgb rgb, int a ) inline TQRgb tqRgba ( TQRgb rgb, int a )
{ {
return ((a & 0xff) << 24 | (rgb & TQRGB_MASK)); return ((a & 0xff) << 24 | (rgb & TQT_RGB_MASK));
} }

2
tdecore/kdemacros.h.cmake
Unescape View File

@ -54,7 +54,7 @@
* cope with symbol visibility. * cope with symbol visibility.
*/ */
#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \ #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \ TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
TQ_EXPORT_PLUGIN(PLUGIN) TQ_EXPORT_PLUGIN(PLUGIN)

2
tdecore/kdemacros.h.in
Unescape View File

@ -53,7 +53,7 @@
* cope with symbol visibility. * cope with symbol visibility.
*/ */
#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \ #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \ TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
TQ_EXPORT_PLUGIN(PLUGIN) TQ_EXPORT_PLUGIN(PLUGIN)

2
tdecore/ktimezones.cpp
Unescape View File

@ -605,7 +605,7 @@ const KTimezone *KTimezones::local()
for (ZoneMap::Iterator it = m_zones->begin(); it != m_zones->end(); ++it) for (ZoneMap::Iterator it = m_zones->begin(); it != m_zones->end(); ++it)
{ {
KTimezone *zone = it.data(); KTimezone *zone = it.data();
int candidateOffset = QABS(zone->offset(TQt::LocalTime)); int candidateOffset = TQABS(zone->offset(TQt::LocalTime));
if (zone->parse(matcher) && matcher.test() && (candidateOffset < bestOffset)) if (zone->parse(matcher) && matcher.test() && (candidateOffset < bestOffset))
{ {
// kdError() << "local=" << zone->name() << endl; // kdError() << "local=" << zone->name() << endl;

8
tdefx/tdestyle.cpp
Unescape View File

@ -664,7 +664,7 @@ void TDEStyle::drawPrimitive( PrimitiveElement pe,
void TDEStyle::drawControl( TQ_ControlElement element, void TDEStyle::drawControl( ControlElement element,
TQPainter* p, TQPainter* p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1109,7 +1109,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling; return sibling;
} }
void TDEStyle::drawComplexControl( TQ_ComplexControl control, void TDEStyle::drawComplexControl( ComplexControl control,
TQPainter* p, TQPainter* p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1415,7 +1415,7 @@ void TDEStyle::drawComplexControl( TQ_ComplexControl control,
} }
TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control, TQStyle::SubControl TDEStyle::querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQPoint &pos, const TQPoint &pos,
@ -1433,7 +1433,7 @@ TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control,
} }
TQRect TDEStyle::querySubControlMetrics( TQ_ComplexControl control, TQRect TDEStyle::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,

12
tdefx/tdestyle.h
Unescape View File

@ -248,12 +248,12 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default ) const;
/** /**
* This function is identical to Qt's TQStyle::tqdrawPrimitive(), except that * This function is identical to Qt's TQStyle::drawPrimitive(), except that
* it adds one further parameter, 'widget', that can be used to determine * it adds one further parameter, 'widget', that can be used to determine
* the widget state of the TDEStylePrimitive in question. * the widget state of the TDEStylePrimitive in question.
* *
* @see TDEStyle::TDEStylePrimitive * @see TDEStyle::TDEStylePrimitive
* @see TQStyle::tqdrawPrimitive * @see TQStyle::drawPrimitive
* @see TQStyle::drawComplexControl * @see TQStyle::drawComplexControl
*/ */
virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe, virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe,
@ -296,7 +296,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
SFlags flags = Style_Default, SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default ) const;
void drawControl( TQ_ControlElement element, void drawControl( ControlElement element,
TQPainter* p, TQPainter* p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -306,7 +306,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* widget = 0 ) const; const TQWidget* widget = 0 ) const;
void drawComplexControl( TQ_ComplexControl control, void drawComplexControl( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -318,14 +318,14 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* widget = 0 ) const; const TQWidget* widget = 0 ) const;
SubControl querySubControl( TQ_ComplexControl control, SubControl querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQPoint &pos, const TQPoint &pos,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* widget = 0 ) const; const TQWidget* widget = 0 ) const;
TQRect querySubControlMetrics( TQ_ComplexControl control, TQRect querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,

4
tdehtml/rendering/render_form.cpp
Unescape View File

@ -263,7 +263,7 @@ void RenderSubmitButton::calcMinMaxWidth()
raw = TQString::fromLatin1("X"); raw = TQString::fromLatin1("X");
TQFontMetrics fm = pb->fontMetrics(); TQFontMetrics fm = pb->fontMetrics();
TQSize ts = fm.size( ShowPrefix, raw); TQSize ts = fm.size( ShowPrefix, raw);
TQSize s(pb->style().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts ) TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts )
.expandedTo(TQApplication::globalStrut())); .expandedTo(TQApplication::globalStrut()));
int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) + int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) +
pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
@ -805,7 +805,7 @@ void RenderFileButton::calcMinMaxWidth()
int h = fm.lineSpacing(); int h = fm.lineSpacing();
int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some" int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some"
KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit(); KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit();
TQSize s = edit->style().tqsizeFromContents(TQStyle::CT_LineEdit, TQSize s = edit->style().sizeFromContents(TQStyle::CT_LineEdit,
edit, edit,
TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth()))
.expandedTo(TQApplication::globalStrut()); .expandedTo(TQApplication::globalStrut());

2
tdehtml/tdehtml_settings.cpp
Unescape View File

@ -442,7 +442,7 @@ void TDEHTMLSettings::init( TDEConfig * config, bool reset )
d->m_fallbackAccessKeysAssignments.clear(); d->m_fallbackAccessKeysAssignments.clear();
for( TQStringList::ConstIterator it = accesskeys.begin(); it != accesskeys.end(); ++it ) for( TQStringList::ConstIterator it = accesskeys.begin(); it != accesskeys.end(); ++it )
if( (*it).length() > 2 && (*it)[ 1 ] == ':' ) if( (*it).length() > 2 && (*it)[ 1 ] == ':' )
d->m_fallbackAccessKeysAssignments.append( tqMakePair( (*it).mid( 2 ), (*it)[ 0 ] )); d->m_fallbackAccessKeysAssignments.append( qMakePair( (*it).mid( 2 ), (*it)[ 0 ] ));
} }
// Colors // Colors

2
tdehtml/xml/dom_nodeimpl.cpp
Unescape View File

@ -1659,7 +1659,7 @@ NodeImpl *NodeListImpl::item( unsigned long index ) const
bool usedCache = false; bool usedCache = false;
if (m_cache->current.node) { if (m_cache->current.node) {
//Compute distance from the requested index to the cache node //Compute distance from the requested index to the cache node
long cacheDist = QABS(long(index) - long(m_cache->position)); long cacheDist = TQABS(long(index) - long(m_cache->position));
if (cacheDist < (long)index) { //Closer to the cached position if (cacheDist < (long)index) { //Closer to the cached position
usedCache = true; usedCache = true;

4
tdeio/tdefile/tdefiledialog.cpp
Unescape View File

@ -834,10 +834,10 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
d->autoSelectExtChecked = false; d->autoSelectExtChecked = false;
d->urlBar = 0; // delayed loading d->urlBar = 0; // delayed loading
TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); TQtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true); toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true);
toolbar->setFlat(true); toolbar->setFlat(true);
tqInstallMsgHandler( oldHandler ); qInstallMsgHandler( oldHandler );
d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true, d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true,
toolbar, "path combo" ); toolbar, "path combo" );

10
tdestyles/asteroid/asteroid.cpp
Unescape View File

@ -969,7 +969,7 @@ void AsteroidStyle::drawPrimitive(PrimitiveElement pe,
} }
} }
void AsteroidStyle::drawControl(TQ_ControlElement ce, void AsteroidStyle::drawControl(ControlElement ce,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1710,7 +1710,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
} }
} }
void AsteroidStyle::drawControlMask(TQ_ControlElement ce, void AsteroidStyle::drawControlMask(ControlElement ce,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1757,7 +1757,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
} }
} }
void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, void AsteroidStyle::drawComplexControl(ComplexControl cc,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -2173,7 +2173,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
} }
} }
void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc, void AsteroidStyle::drawComplexControlMask(ComplexControl cc,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
@ -2373,7 +2373,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat
} }
} }
TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc, TQRect AsteroidStyle::querySubControlMetrics(ComplexControl cc,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,

10
tdestyles/asteroid/asteroid.h
Unescape View File

@ -58,7 +58,7 @@ public:
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default) const; const TQStyleOption & = TQStyleOption::Default) const;
void drawControl(TQ_ControlElement, void drawControl(ControlElement,
TQPainter *, TQPainter *,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -68,7 +68,7 @@ public:
const TQStyleOption & = TQStyleOption::Default, const TQStyleOption & = TQStyleOption::Default,
const TQWidget * = 0) const; const TQWidget * = 0) const;
void drawControlMask(TQ_ControlElement, void drawControlMask(ControlElement,
TQPainter *, TQPainter *,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -76,7 +76,7 @@ public:
const TQStyleOption &, const TQStyleOption &,
const TQWidget * = 0) const; const TQWidget * = 0) const;
void drawComplexControl(TQ_ComplexControl, void drawComplexControl(ComplexControl,
TQPainter *, TQPainter *,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -88,7 +88,7 @@ public:
const TQStyleOption & = TQStyleOption::Default, const TQStyleOption & = TQStyleOption::Default,
const TQWidget * = 0) const; const TQWidget * = 0) const;
void drawComplexControlMask(TQ_ComplexControl, void drawComplexControlMask(ComplexControl,
TQPainter *, TQPainter *,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
@ -102,7 +102,7 @@ public:
TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
TQRect querySubControlMetrics(TQ_ComplexControl, TQRect querySubControlMetrics(ComplexControl,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl, SubControl,

8
tdestyles/highcolor/highcolor.cpp
Unescape View File

@ -1144,7 +1144,7 @@ void HighColorStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
} }
void HighColorStyle::drawControl( TQ_ControlElement element, void HighColorStyle::drawControl( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1520,7 +1520,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element,
} }
void HighColorStyle::drawControlMask( TQ_ControlElement element, void HighColorStyle::drawControlMask( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1548,7 +1548,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element,
} }
void HighColorStyle::drawComplexControl( TQ_ComplexControl control, void HighColorStyle::drawComplexControl( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1735,7 +1735,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
} }
void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control, void HighColorStyle::drawComplexControlMask( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,

8
tdestyles/highcolor/highcolor.h
Unescape View File

@ -90,7 +90,7 @@ class HighColorStyle : public TDEStyle
SFlags flags = Style_Default, SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default ) const;
void drawControl( TQ_ControlElement element, void drawControl( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -100,7 +100,7 @@ class HighColorStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawControlMask( TQ_ControlElement element, void drawControlMask( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -108,7 +108,7 @@ class HighColorStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawComplexControl( TQ_ComplexControl control, void drawComplexControl( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -120,7 +120,7 @@ class HighColorStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawComplexControlMask( TQ_ComplexControl control, void drawComplexControlMask( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,

14
tdestyles/highcontrast/highcontrast.cpp
Unescape View File

@ -784,7 +784,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
} }
void HighContrastStyle::drawControl (TQ_ControlElement element, void HighContrastStyle::drawControl (ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1162,7 +1162,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element,
} }
} }
void HighContrastStyle::drawControlMask (TQ_ControlElement element, void HighContrastStyle::drawControlMask (ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1207,7 +1207,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling; return sibling;
} }
void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, void HighContrastStyle::drawComplexControl (ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1262,12 +1262,12 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
setColorsButton (p, cg, flags); setColorsButton (p, cg, flags);
// Draw arrows if required // Draw arrows if required
if (controls & SC_SpinWidgetDown) { if (controls & SC_SpinWidgetDown) {
TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags); TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags);
drawRoundRect (p, r2); drawRoundRect (p, r2);
drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth); drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth);
} }
if (controls & SC_SpinWidgetUp) { if (controls & SC_SpinWidgetUp) {
TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags); TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags);
drawRoundRect (p, r2); drawRoundRect (p, r2);
drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth); drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth);
} }
@ -1490,7 +1490,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
} }
} }
void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c, void HighContrastStyle::drawComplexControlMask(ComplexControl c,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
@ -1535,7 +1535,7 @@ void HighContrastStyle::drawItem( TQPainter *p,
p->restore(); p->restore();
} }
TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control, TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,

10
tdestyles/highcontrast/highcontrast.h
Unescape View File

@ -78,7 +78,7 @@ class HighContrastStyle : public TDEStyle
SFlags flags = Style_Default, SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default ) const;
void drawControl( TQ_ControlElement element, void drawControl( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -88,7 +88,7 @@ class HighContrastStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawControlMask( TQ_ControlElement element, void drawControlMask( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -96,7 +96,7 @@ class HighContrastStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawComplexControl( TQ_ComplexControl control, void drawComplexControl( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -108,7 +108,7 @@ class HighContrastStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawComplexControlMask( TQ_ComplexControl control, void drawComplexControlMask( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
@ -116,7 +116,7 @@ class HighContrastStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
TQRect querySubControlMetrics( TQ_ComplexControl control, TQRect querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,

16
tdestyles/keramik/keramik.cpp
Unescape View File

@ -1380,7 +1380,7 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C
return false; return false;
} }
void KeramikStyle::drawControl( TQ_ControlElement element, void KeramikStyle::drawControl( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1603,7 +1603,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
tb->orientation() == TQt::Horizontal); tb->orientation() == TQt::Horizontal);
} }
else else
TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, TDEStyle::drawControl( (ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
r, cg, flags, opt, widget ); r, cg, flags, opt, widget );
break; break;
} }
@ -1963,7 +1963,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
} }
} }
void KeramikStyle::drawControlMask( TQ_ControlElement element, void KeramikStyle::drawControlMask( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1995,7 +1995,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData &ceDat
} }
} }
void KeramikStyle::drawComplexControl( TQ_ComplexControl control, void KeramikStyle::drawComplexControl( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -2164,7 +2164,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
case CC_SpinWidget: case CC_SpinWidget:
{ {
const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget ); const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget );
TQRect br = visualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags ); TQRect br = visualRect( querySubControlMetrics( (ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags );
if ( controls & SC_SpinWidgetButtonField ) if ( controls & SC_SpinWidgetButtonField )
{ {
Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() ); Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() );
@ -2361,7 +2361,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
} }
} }
void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control, void KeramikStyle::drawComplexControlMask( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
@ -2574,7 +2574,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
} }
TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQPoint& point, const TQPoint& point,
@ -2594,7 +2594,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
return result; return result;
} }
TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,

12
tdestyles/keramik/keramik.h
Unescape View File

@ -74,7 +74,7 @@ public:
SFlags flags = Style_Default, SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default ) const;
void drawControl( TQ_ControlElement element, void drawControl( ControlElement element,
TQPainter* p, TQPainter* p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -84,7 +84,7 @@ public:
const TQStyleOption& opt = TQStyleOption::Default, const TQStyleOption& opt = TQStyleOption::Default,
const TQWidget* widget = 0 ) const; const TQWidget* widget = 0 ) const;
void drawControlMask( TQ_ControlElement element, void drawControlMask( ControlElement element,
TQPainter* p, TQPainter* p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -92,7 +92,7 @@ public:
const TQStyleOption& opt = TQStyleOption::Default, const TQStyleOption& opt = TQStyleOption::Default,
const TQWidget* widget = 0 ) const; const TQWidget* widget = 0 ) const;
void drawComplexControl( TQ_ComplexControl control, void drawComplexControl( ComplexControl control,
TQPainter* p, TQPainter* p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -104,7 +104,7 @@ public:
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* widget = 0 ) const; const TQWidget* widget = 0 ) const;
void drawComplexControlMask( TQ_ComplexControl control, void drawComplexControlMask( ComplexControl control,
TQPainter* p, TQPainter* p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
@ -121,14 +121,14 @@ public:
const TQStyleOption& opt, const TQStyleOption& opt,
const TQWidget* widget = 0 ) const; const TQWidget* widget = 0 ) const;
SubControl querySubControl( TQ_ComplexControl control, SubControl querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQPoint& point, const TQPoint& point,
const TQStyleOption& opt = TQStyleOption::Default, const TQStyleOption& opt = TQStyleOption::Default,
const TQWidget* widget = 0 ) const; const TQWidget* widget = 0 ) const;
TQRect querySubControlMetrics( TQ_ComplexControl control, TQRect querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,

8
tdestyles/kthemestyle/kthemebase.h
Unescape View File

@ -517,12 +517,12 @@ protected:
SFlags flags = Style_Default, SFlags flags = Style_Default,
const TQStyleOption& option = TQStyleOption::Default ) const const TQStyleOption& option = TQStyleOption::Default ) const
{ {
TDEStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg, TDEStyle::drawPrimitive ( pe, p, ceData, elementFlags, r, cg,
flags, option ); flags, option );
} }
virtual void drawControl( TQ_ControlElement element, virtual void drawControl( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -536,7 +536,7 @@ protected:
r, cg, how, opt, widget ); r, cg, how, opt, widget );
} }
virtual void drawControlMask( TQ_ControlElement element, virtual void drawControlMask( ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -548,7 +548,7 @@ protected:
} }
virtual void drawComplexControl( TQ_ComplexControl control, virtual void drawComplexControl( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,

2
tdestyles/kthemestyle/kthemestyle.cpp
Unescape View File

@ -2013,7 +2013,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQRect & r, const TQColorGroup & g, SFlags how , const TQRect & r, const TQColorGroup & g, SFlags how ,
SCFlags controls, SCFlags active, SCFlags controls, SCFlags active,
const TQStyleOption & opt, const TQWidget * widget ) const const TQStyleOption & opt, const TQWidget * widget ) const

2
tdestyles/kthemestyle/kthemestyle.h
Unescape View File

@ -104,7 +104,7 @@ public:
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
virtual void drawComplexControl( TQ_ComplexControl control, virtual void drawComplexControl( ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,

12
tdestyles/light/lightstyle-v2.cpp
Unescape View File

@ -642,7 +642,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
} }
} }
void LightStyleV2::drawControl( TQ_ControlElement control, void LightStyleV2::drawControl( ControlElement control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -999,7 +999,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control,
} }
} }
void LightStyleV2::drawControlMask( TQ_ControlElement control, void LightStyleV2::drawControlMask( ControlElement control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1045,7 +1045,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQStyleControlElementData &c
return rect; return rect;
} }
void LightStyleV2::drawComplexControl( TQ_ComplexControl control, void LightStyleV2::drawComplexControl( ComplexControl control,
TQPainter* p, TQPainter* p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1119,7 +1119,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
TQRect frame, up, down; TQRect frame, up, down;
frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags,
SC_SpinWidgetFrame, data, widget); SC_SpinWidgetFrame, data, widget);
up = ceData.spinWidgetData.upRect; up = ceData.spinWidgetData.upRect;
down = ceData.spinWidgetData.downRect; down = ceData.spinWidgetData.downRect;
@ -1329,7 +1329,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
} }
} }
TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control, TQRect LightStyleV2::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
@ -1424,7 +1424,7 @@ TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
return ret; return ret;
} }
TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control, TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQPoint &pos, const TQPoint &pos,

10
tdestyles/light/lightstyle-v2.h
Unescape View File

@ -48,23 +48,23 @@ public:
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const; const TQStyleOption & = TQStyleOption::Default ) const;
void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQColorGroup &, SFlags = Style_Default, const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQColorGroup &, SFlags = Style_Default, const TQColorGroup &, SFlags = Style_Default,
SCFlags = SC_All, SCFlags = SC_None, SCFlags = SC_All, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const; const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const;
int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;

12
tdestyles/light/lightstyle-v3.cpp
Unescape View File

@ -830,7 +830,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
} }
} }
void LightStyleV3::drawControl( TQ_ControlElement control, void LightStyleV3::drawControl( ControlElement control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1114,7 +1114,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control,
} }
} }
void LightStyleV3::drawControlMask( TQ_ControlElement control, void LightStyleV3::drawControlMask( ControlElement control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1178,7 +1178,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQStyleControlElementData &c
return rect; return rect;
} }
void LightStyleV3::drawComplexControl( TQ_ComplexControl control, void LightStyleV3::drawComplexControl( ComplexControl control,
TQPainter* p, TQPainter* p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1248,7 +1248,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
TQRect frame, up, down; TQRect frame, up, down;
frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags,
SC_SpinWidgetFrame, data, widget); SC_SpinWidgetFrame, data, widget);
up = ceData.spinWidgetData.upRect; up = ceData.spinWidgetData.upRect;
down = ceData.spinWidgetData.downRect; down = ceData.spinWidgetData.downRect;
@ -1455,7 +1455,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
} }
} }
TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control, TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
@ -1606,7 +1606,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
return ret; return ret;
} }
TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control, TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQPoint &pos, const TQPoint &pos,

10
tdestyles/light/lightstyle-v3.h
Unescape View File

@ -52,23 +52,23 @@ public:
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const; const TQStyleOption & = TQStyleOption::Default ) const;
void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQColorGroup &, SFlags = Style_Default, const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQColorGroup &, SFlags = Style_Default, const TQColorGroup &, SFlags = Style_Default,
SCFlags = SC_All, SCFlags = SC_None, SCFlags = SC_All, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const; const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const;
int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;

10
tdestyles/plastik/plastik.cpp
Unescape View File

@ -2181,7 +2181,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
} }
void PlastikStyle::drawControl(TQ_ControlElement element, void PlastikStyle::drawControl(ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -2737,7 +2737,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
} }
} }
void PlastikStyle::drawControlMask(TQ_ControlElement element, void PlastikStyle::drawControlMask(ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -2759,7 +2759,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element,
} }
} }
void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, void PlastikStyle::drawComplexControlMask(ComplexControl c,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
@ -2782,7 +2782,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
} }
} }
void PlastikStyle::drawComplexControl(TQ_ComplexControl control, void PlastikStyle::drawComplexControl(ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -3199,7 +3199,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
} }
} }
TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control, TQRect PlastikStyle::querySubControlMetrics(ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,

10
tdestyles/plastik/plastik.h
Unescape View File

@ -85,7 +85,7 @@ public:
SFlags flags = Style_Default, SFlags flags = Style_Default,
const TQStyleOption &opt = TQStyleOption::Default ) const; const TQStyleOption &opt = TQStyleOption::Default ) const;
void drawControl(TQ_ControlElement element, void drawControl(ControlElement element,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -95,9 +95,9 @@ public:
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawControlMask( TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const;
void drawComplexControl(TQ_ComplexControl control, void drawComplexControl(ComplexControl control,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -115,14 +115,14 @@ public:
TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags,
const TQWidget *widget ) const; const TQWidget *widget ) const;
TQRect querySubControlMetrics(TQ_ComplexControl control, TQRect querySubControlMetrics(ComplexControl control,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,
const TQStyleOption &opt = TQStyleOption::Default, const TQStyleOption &opt = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawComplexControlMask(TQStyle::TQ_ComplexControl c, void drawComplexControlMask(TQStyle::ComplexControl c,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,

4
tdeui/karrowbutton.cpp
Unescape View File

@ -63,7 +63,7 @@ void KArrowButton::drawButton(TQPainter *p)
const unsigned int margin = 2; const unsigned int margin = 2;
p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
style().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ), style().drawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
colorGroup(), colorGroup(),
isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default, isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default,
TQStyleOption( 2, 0 ) ); TQStyleOption( 2, 0 ) );
@ -103,7 +103,7 @@ void KArrowButton::drawButton(TQPainter *p)
int flags = TQStyle::Style_Enabled; int flags = TQStyle::Style_Enabled;
if ( isDown() ) if ( isDown() )
flags |= TQStyle::Style_Down; flags |= TQStyle::Style_Down;
style().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ), style().drawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
colorGroup(), flags ); colorGroup(), flags );
} }

2
tdeui/kcharselect.cpp
Unescape View File

@ -173,7 +173,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
} }
if ( c == focusItem.unicode() && hasFocus() ) { if ( c == focusItem.unicode() && hasFocus() ) {
style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ),
colorGroup() ); colorGroup() );
focusPos = TQPoint( col, row ); focusPos = TQPoint( col, row );
} }

4
tdeui/kcolorbutton.cpp
Unescape View File

@ -126,13 +126,13 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
if ( hasFocus() ) { if ( hasFocus() ) {
TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this ); TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
} }
} }
TQSize KColorButton::sizeHint() const TQSize KColorButton::sizeHint() const
{ {
return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
expandedTo(TQApplication::globalStrut()); expandedTo(TQApplication::globalStrut());
} }

2
tdeui/kdatepicker.cpp
Unescape View File

@ -507,7 +507,7 @@ KDatePicker::setFontSize(int s)
maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height()));
} }
TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton,
selectMonth, selectMonth,
maxMonthRect); maxMonthRect);
selectMonth->setMinimumSize(metricBound); selectMonth->setMinimumSize(metricBound);

4
tdeui/kdockwidget.cpp
Unescape View File

@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this ); paint.begin( this );
style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end(); paint.end();
} }
@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
TQWidget::paintEvent(pe); TQWidget::paintEvent(pe);
TQPainter paint; TQPainter paint;
paint.begin( this ); paint.begin( this );
style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end(); paint.end();
} }

2
tdeui/kseparator.cpp
Unescape View File

@ -95,7 +95,7 @@ void KSeparator::drawFrame(TQPainter *p)
} }
TQStyleOption opt( lineWidth(), midLineWidth() ); TQStyleOption opt( lineWidth(), midLineWidth() );
style().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g, style().drawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g,
TQStyle::Style_Sunken, opt ); TQStyle::Style_Sunken, opt );
} }

2
tdeui/kstdguiitem.cpp
Unescape View File

@ -199,7 +199,7 @@ KGuiItem KStdGuiItem::forward( BidiMode useBidi )
TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward() TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward()
{ {
return tqMakePair( back( UseRTL ), forward( UseRTL ) ); return qMakePair( back( UseRTL ), forward( UseRTL ) );
} }
KGuiItem KStdGuiItem::print() KGuiItem KStdGuiItem::print()

2
tdeui/ktabwidget.cpp
Unescape View File

@ -190,7 +190,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
int iw = 0; int iw = 0;
if ( tab->iconSet() ) if ( tab->iconSet() )
iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,
TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
TQStyleOption( tab ) ) ).width(); TQStyleOption( tab ) ) ).width();
} }

2
tdeui/kurllabel.cpp
Unescape View File

@ -367,7 +367,7 @@ bool KURLLabel::event (TQEvent *e)
if (result && hasFocus()) { if (result && hasFocus()) {
TQPainter p(this); TQPainter p(this);
TQRect r( activeRect() ); TQRect r( activeRect() );
style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() ); style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
} }
return result; return result;
} }

4
tdeui/tdelistview.cpp
Unescape View File

@ -1399,7 +1399,7 @@ TQRect TDEListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item
r = itemRect(item); r = itemRect(item);
r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize()); r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
if (painter) if (painter)
style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(), style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
TQStyle::Style_FocusAtBorder, colorGroup().highlight()); TQStyle::Style_FocusAtBorder, colorGroup().highlight());
} }
@ -2152,7 +2152,7 @@ void TDEListView::viewportPaintEvent(TQPaintEvent *e)
TQPainter painter(viewport()); TQPainter painter(viewport());
// This is where we actually draw the drop-highlighter // This is where we actually draw the drop-highlighter
style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(), style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
TQStyle::Style_FocusAtBorder); TQStyle::Style_FocusAtBorder);
} }
d->painting = false; d->painting = false;

2
tdeui/tdepopupmenu.cpp
Unescape View File

@ -86,7 +86,7 @@ void TDEPopupTitle::paintEvent(TQPaintEvent *)
{ {
TQRect r(rect()); TQRect r(rect());
TQPainter p(this); TQPainter p(this);
kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active()); kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
if (!miniicon.isNull()) if (!miniicon.isNull())
p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon); p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon);

4
tdeui/tdeselect.cpp
Unescape View File

@ -122,7 +122,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
TQPainter painter; TQPainter painter;
painter.begin( this ); painter.begin( this );
style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, style().drawPrimitive(TQStyle::PE_Panel, &painter,
borderRect, colorGroup(), borderRect, colorGroup(),
TQStyle::Style_Sunken); TQStyle::Style_Sunken);
@ -281,7 +281,7 @@ void TDESelector::paintEvent( TQPaintEvent * )
r.addCoords(0, iw - w, -iw, w - iw); r.addCoords(0, iw - w, -iw, w - iw);
else else
r.addCoords(iw - w, 0, w - iw, -iw); r.addCoords(iw - w, 0, w - iw, -iw);
style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, style().drawPrimitive(TQStyle::PE_Panel, &painter,
r, colorGroup(), r, colorGroup(),
TQStyle::Style_Sunken); TQStyle::Style_Sunken);
} }

2
tdeui/tdetoolbar.cpp
Unescape View File

@ -170,7 +170,7 @@ void TDEToolBarSeparator::drawContents( TQPainter* p )
if ( orientation() == TQt::Horizontal ) if ( orientation() == TQt::Horizontal )
flags = flags | TQStyle::Style_Horizontal; flags = flags | TQStyle::Style_Horizontal;
style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p, style().drawPrimitive(TQStyle::PE_DockWindowSeparator, p,
contentsRect(), colorGroup(), flags); contentsRect(), colorGroup(), flags);
} else { } else {
TQFrame::drawContents(p); TQFrame::drawContents(p);

4
tdeui/tdetoolbarbutton.cpp
Unescape View File

@ -251,7 +251,7 @@ void TDEToolBarButton::modeChange()
break; break;
} }
mysize = style().tqsizeFromContents(TQStyle::CT_ToolButton, this, mysize). mysize = style().sizeFromContents(TQStyle::CT_ToolButton, this, mysize).
expandedTo(TQApplication::globalStrut()); expandedTo(TQApplication::globalStrut());
// make sure that this isn't taller then it is wide // make sure that this isn't taller then it is wide
@ -628,7 +628,7 @@ void TDEToolBarButton::drawButton( TQPainter *_painter )
if (isDown()) arrowFlags |= TQStyle::Style_Down; if (isDown()) arrowFlags |= TQStyle::Style_Down;
if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled;
style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter, style().drawPrimitive(TQStyle::PE_ArrowDown, _painter,
TQRect(width()-7, height()-7, 7, 7), colorGroup(), TQRect(width()-7, height()-7, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() ); arrowFlags, TQStyleOption() );
} }

2
tdeutils/tdemultitabbar.cpp
Unescape View File

@ -491,7 +491,7 @@ TQSize KMultiTabBarButton::sizeHint() const
h = TQMAX(h, sz.height()); h = TQMAX(h, sz.height());
} }
return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
} }

Write Preview
Loading…
Cancel
Save