summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kdecore/kapplication.cpp16
-rw-r--r--kdecore/kglobalsettings.cpp8
-rw-r--r--kdefx/kstyle.cpp10
-rw-r--r--kdefx/kstyle.h10
-rw-r--r--kinit/klauncher.cpp3
-rw-r--r--kio/kio/kzip.cpp2
-rw-r--r--kstyles/highcolor/highcolor.cpp52
-rw-r--r--kstyles/highcolor/highcolor.h14
-rw-r--r--kstyles/highcontrast/highcontrast.cpp44
-rw-r--r--kstyles/highcontrast/highcontrast.h16
-rw-r--r--kstyles/keramik/keramik.cpp24
-rw-r--r--kstyles/keramik/keramik.h18
-rw-r--r--kstyles/kthemestyle/kthemebase.cpp2
-rw-r--r--kstyles/kthemestyle/kthemebase.h6
-rw-r--r--kstyles/kthemestyle/kthemestyle.cpp2
-rw-r--r--kstyles/kthemestyle/kthemestyle.h4
-rw-r--r--kstyles/light/lightstyle-v2.cpp24
-rw-r--r--kstyles/light/lightstyle-v2.h14
-rw-r--r--kstyles/light/lightstyle-v3.cpp24
-rw-r--r--kstyles/light/lightstyle-v3.h14
-rw-r--r--kstyles/plastik/plastik.cpp68
-rw-r--r--kstyles/plastik/plastik.h16
22 files changed, 203 insertions, 188 deletions
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index bad196482..07260813c 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -1510,15 +1510,29 @@ void KApplication::parseCommandLine( )
if (args->isSet("style"))
{
+ TQStringList plugins = KGlobal::dirs()->resourceDirs( "qtplugins" );
+ TQStringList::Iterator itp = plugins.begin();
+ while (itp != plugins.end()) {
+ addLibraryPath( *itp );
+ ++itp;
+ }
+
TQStringList styles = TQStyleFactory::keys();
TQString reqStyle(args->getOption("style").lower());
- for (TQStringList::ConstIterator it = styles.begin(); it != styles.end(); ++it)
+ TQStringList list = libraryPaths();
+ TQStringList::Iterator it = list.begin();
+ while( it != list.end() ) {
+ ++it;
+ }
+
+ for (TQStringList::ConstIterator it = styles.begin(); it != styles.end(); ++it) {
if ((*it).lower() == reqStyle)
{
d->overrideStyle = *it;
break;
}
+ }
if (d->overrideStyle.isEmpty())
fprintf(stderr, "%s", TQString(i18n("The style %1 was not found\n").arg(reqStyle)).local8Bit().data());
diff --git a/kdecore/kglobalsettings.cpp b/kdecore/kglobalsettings.cpp
index 3595dce4c..f78377cfe 100644
--- a/kdecore/kglobalsettings.cpp
+++ b/kdecore/kglobalsettings.cpp
@@ -265,7 +265,7 @@ TQColor KGlobalSettings::buttonTextColor()
}
// IMPORTANT:
-// This function should be get in sync with
+// This function should be kept in sync with
// KApplication::kdisplaySetPalette()
TQColor KGlobalSettings::baseColor()
{
@@ -274,7 +274,7 @@ TQColor KGlobalSettings::baseColor()
}
// IMPORTANT:
-// This function should be get in sync with
+// This function should be kept in sync with
// KApplication::kdisplaySetPalette()
TQColor KGlobalSettings::textColor()
{
@@ -283,7 +283,7 @@ TQColor KGlobalSettings::textColor()
}
// IMPORTANT:
-// This function should be get in sync with
+// This function should be kept in sync with
// KApplication::kdisplaySetPalette()
TQColor KGlobalSettings::highlightedTextColor()
{
@@ -292,7 +292,7 @@ TQColor KGlobalSettings::highlightedTextColor()
}
// IMPORTANT:
-// This function should be get in sync with
+// This function should be kept in sync with
// KApplication::kdisplaySetPalette()
TQColor KGlobalSettings::highlightColor()
{
diff --git a/kdefx/kstyle.cpp b/kdefx/kstyle.cpp
index e6398add8..9e0546a87 100644
--- a/kdefx/kstyle.cpp
+++ b/kdefx/kstyle.cpp
@@ -535,7 +535,7 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) c
// #ifdef USE_QT4 // kdebindings / 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 KStyle::tqdrawPrimitive( ControlElement pe,
+//void KStyle::tqdrawPrimitive( TQ_ControlElement pe,
// TQPainter* p,
// const TQRect &r,
// const TQColorGroup &cg,
@@ -646,7 +646,7 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
-void KStyle::tqdrawControl( ControlElement element,
+void KStyle::tqdrawControl( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -1096,7 +1096,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling;
}
-void KStyle::tqdrawComplexControl( ComplexControl control,
+void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -1392,7 +1392,7 @@ void KStyle::tqdrawComplexControl( ComplexControl control,
}
-TQStyle::SubControl KStyle::querySubControl( ComplexControl control,
+TQStyle::SubControl KStyle::querySubControl( TQ_ComplexControl control,
const TQWidget* widget,
const TQPoint &pos,
const TQStyleOption &opt ) const
@@ -1408,7 +1408,7 @@ TQStyle::SubControl KStyle::querySubControl( ComplexControl control,
}
-TQRect KStyle::querySubControlMetrics( ComplexControl control,
+TQRect KStyle::querySubControlMetrics( TQ_ComplexControl control,
const TQWidget* widget,
SubControl sc,
const TQStyleOption &opt ) const
diff --git a/kdefx/kstyle.h b/kdefx/kstyle.h
index a50ab721e..c39e5e53f 100644
--- a/kdefx/kstyle.h
+++ b/kdefx/kstyle.h
@@ -284,7 +284,7 @@ class KDEFX_EXPORT KStyle: public TQCommonStyle
// #ifdef USE_QT4 // kdebindings / 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 tqdrawPrimitive( ControlElement pe,
+// void tqdrawPrimitive( TQ_ControlElement pe,
// TQPainter* p,
// const TQRect &r,
// const TQColorGroup &cg,
@@ -293,7 +293,7 @@ class KDEFX_EXPORT KStyle: public TQCommonStyle
// #endif // USE_QT4
- void tqdrawControl( ControlElement element,
+ void tqdrawControl( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -301,7 +301,7 @@ class KDEFX_EXPORT KStyle: public TQCommonStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
- void tqdrawComplexControl( ComplexControl control,
+ void tqdrawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget* widget,
const TQRect &r,
@@ -311,12 +311,12 @@ class KDEFX_EXPORT KStyle: public TQCommonStyle
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
- SubControl querySubControl( ComplexControl control,
+ SubControl querySubControl( TQ_ComplexControl control,
const TQWidget* widget,
const TQPoint &pos,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
- TQRect querySubControlMetrics( ComplexControl control,
+ TQRect querySubControlMetrics( TQ_ComplexControl control,
const TQWidget* widget,
SubControl sc,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 0a27d5125..c7ceb2895 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -163,7 +163,8 @@ IdleSlave::age(time_t now)
}
KLauncher::KLauncher(int _kdeinitSocket, bool new_startup)
- : KApplication( false, false ), // No Styles, No GUI
+// : KApplication( false, false ), // No Styles, No GUI
+ : KApplication( false, true ), // QClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
DCOPObject("klauncher"),
kdeinitSocket(_kdeinitSocket), mAutoStart( new_startup ),
dontBlockReading(false), newStartup( new_startup )
diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp
index d7b6123be..88d00c4e3 100644
--- a/kio/kio/kzip.cpp
+++ b/kio/kio/kzip.cpp
@@ -929,7 +929,7 @@ bool KZip::closeArchive()
// I do not know why memcpy is not working here
//memcpy(buffer, head, sizeof(head));
- qmemmove(buffer, head, sizeof(head));
+ tqmemmove(buffer, head, sizeof(head));
buffer[ 10 ] = char(it.current()->encoding()); // compression method
buffer[ 11 ] = char(it.current()->encoding() >> 8);
diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp
index bd3d25822..09dd48d6c 100644
--- a/kstyles/highcolor/highcolor.cpp
+++ b/kstyles/highcolor/highcolor.cpp
@@ -246,7 +246,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg
// This function draws primitive elements as well as their masks.
-void HighColorStyle::drawPrimitive( PrimitiveElement pe,
+void HighColorStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
const TQColorGroup &cg,
@@ -457,7 +457,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe,
// Small hack to ensure scrollbar gradients are drawn the right way.
flags ^= Style_Horizontal;
- drawPrimitive(PE_ButtonBevel, p, r, cg, flags | Style_Enabled | Style_Raised);
+ tqdrawPrimitive(PE_ButtonBevel, p, r, cg, flags | Style_Enabled | Style_Raised);
// Draw a scrollbar riffle (note direction after above changes)
if ( type != B3 ) {
@@ -596,20 +596,20 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe,
case PE_ScrollBarAddLine: {
- drawPrimitive( PE_ButtonBevel, p, r, cg, (flags & Style_Enabled) |
+ tqdrawPrimitive( PE_ButtonBevel, p, r, cg, (flags & Style_Enabled) |
((flags & Style_Down) ? Style_Down : Style_Raised) );
- drawPrimitive( ((flags & Style_Horizontal) ? PE_ArrowRight : PE_ArrowDown),
+ tqdrawPrimitive( ((flags & Style_Horizontal) ? PE_ArrowRight : PE_ArrowDown),
p, r, cg, flags );
break;
}
case PE_ScrollBarSubLine: {
- drawPrimitive( PE_ButtonBevel, p, r, cg, (flags & Style_Enabled) |
+ tqdrawPrimitive( PE_ButtonBevel, p, r, cg, (flags & Style_Enabled) |
((flags & Style_Down) ? Style_Down : Style_Raised) );
- drawPrimitive( ((flags & Style_Horizontal) ? PE_ArrowLeft : PE_ArrowUp),
+ tqdrawPrimitive( ((flags & Style_Horizontal) ? PE_ArrowLeft : PE_ArrowUp),
p, r, cg, flags );
break;
}
@@ -1095,7 +1095,7 @@ void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe,
}
-void HighColorStyle::tqdrawControl( ControlElement element,
+void HighColorStyle::tqdrawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1123,12 +1123,12 @@ void HighColorStyle::tqdrawControl( ControlElement element,
}
if ( btnDefault )
- drawPrimitive( PE_ButtonDefault, p, r, cg, flags );
+ tqdrawPrimitive( PE_ButtonDefault, p, r, cg, flags );
- drawPrimitive( PE_ButtonCommand, p, br, cg, flags );
+ tqdrawPrimitive( PE_ButtonCommand, p, br, cg, flags );
} else
- drawPrimitive( PE_ButtonCommand, p, r, cg, flags );
+ tqdrawPrimitive( PE_ButtonCommand, p, r, cg, flags );
break;
}
@@ -1152,7 +1152,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
// Does the button have a popup menu?
if ( button->isMenuButton() ) {
int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
- drawPrimitive( PE_ArrowDown, p, TQRect(x + w - dx - 2, y + 2, dx, h - 4),
+ tqdrawPrimitive( PE_ArrowDown, p, TQRect(x + w - dx - 2, y + 2, dx, h - 4),
cg, flags, opt );
w -= dx;
}
@@ -1209,7 +1209,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
// Draw a focus rect if the button has focus
if ( flags & Style_HasFocus )
- drawPrimitive( PE_FocusRect, p,
+ tqdrawPrimitive( PE_FocusRect, p,
TQStyle::tqvisualRect(subRect(SR_PushButtonFocusRect, widget), widget),
cg, flags );
break;
@@ -1361,7 +1361,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
SFlags cflags = Style_Default;
cflags |= active ? Style_Enabled : Style_On;
- drawPrimitive( PE_CheckMark, p, TQRect( cx + itemFrame, y + itemFrame,
+ tqdrawPrimitive( PE_CheckMark, p, TQRect( cx + itemFrame, y + itemFrame,
checkcol - itemFrame*2, h - itemFrame*2), cg, cflags );
}
@@ -1461,7 +1461,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
- PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+ TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
int dim = tqpixelMetric(PM_MenuButtonIndicator);
TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
y + h / 2 - dim / 2, dim, dim), r );
@@ -1474,9 +1474,9 @@ void HighColorStyle::tqdrawControl( ControlElement element,
TQColorGroup g2( discol, cg.highlight(), white, white,
enabled ? white : discol, discol, white );
- drawPrimitive( arrow, p, vr, g2, Style_Enabled );
+ tqdrawPrimitive( arrow, p, vr, g2, Style_Enabled );
} else
- drawPrimitive( arrow, p, vr, cg,
+ tqdrawPrimitive( arrow, p, vr, cg,
enabled ? Style_Enabled : Style_Default );
}
break;
@@ -1488,7 +1488,7 @@ void HighColorStyle::tqdrawControl( ControlElement element,
}
-void HighColorStyle::tqdrawControlMask( ControlElement element,
+void HighColorStyle::tqdrawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1514,7 +1514,7 @@ void HighColorStyle::tqdrawControlMask( ControlElement element,
}
-void HighColorStyle::tqdrawComplexControl( ComplexControl control,
+void HighColorStyle::tqdrawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1577,7 +1577,7 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
if ( active & Style_Sunken )
flags |= Style_Sunken;
- drawPrimitive(PE_ArrowDown, p, ar, cg, flags);
+ tqdrawPrimitive(PE_ArrowDown, p, ar, cg, flags);
}
// Draw an edit field if required
@@ -1611,7 +1611,7 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
TQRect re = TQStyle::tqvisualRect(
subRect(SR_ComboBoxFocusRect, cb), widget);
- drawPrimitive( PE_FocusRect, p, re, cg,
+ tqdrawPrimitive( PE_FocusRect, p, re, cg,
Style_FocusAtBorder, TQStyleOption(cg.highlight()));
}
}
@@ -1639,7 +1639,7 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
{
// If we're pressed, on, or raised...
if (bflags & (Style_Down | Style_On | Style_Raised))
- drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
+ tqdrawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
// Check whether to draw a background pixmap
else if ( toolbutton->tqparentWidget() &&
@@ -1681,14 +1681,14 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
if (controls & SC_ToolButtonMenu)
{
if (mflags & (Style_Down | Style_On | Style_Raised))
- drawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt);
- drawPrimitive(PE_ArrowDown, p, menuarea, cg, mflags, opt);
+ tqdrawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt);
+ tqdrawPrimitive(PE_ArrowDown, p, menuarea, cg, mflags, opt);
}
if (toolbutton->hasFocus() && !toolbutton->focusProxy()) {
TQRect fr = toolbutton->rect();
fr.addCoords(3, 3, -3, -3);
- drawPrimitive(PE_FocusRect, p, fr, cg);
+ tqdrawPrimitive(PE_FocusRect, p, fr, cg);
}
break;
@@ -1703,7 +1703,7 @@ void HighColorStyle::tqdrawComplexControl( ComplexControl control,
}
-void HighColorStyle::tqdrawComplexControlMask( ComplexControl control,
+void HighColorStyle::tqdrawComplexControlMask( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1822,7 +1822,7 @@ int HighColorStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
}
-TQSize HighColorStyle::sizeFromContents( ContentsType contents,
+TQSize HighColorStyle::tqsizeFromContents( ContentsType contents,
const TQWidget* widget,
const TQSize &contentSize,
const TQStyleOption& opt ) const
diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h
index 98fe2f651..14f9056e5 100644
--- a/kstyles/highcolor/highcolor.h
+++ b/kstyles/highcolor/highcolor.h
@@ -3,7 +3,7 @@
*
* KDE3 HighColor Style (version 1.0)
* Copyright (C) 2001-2002 Karol Szwed <[email protected]>
- * (C) 2001-2002 Fredrik H�glund <[email protected]>
+ * (C) 2001-2002 Fredrik H�glund <[email protected]>
*
* Drawing routines adapted from the KDE2 HCStyle,
* Copyright (C) 2000 Daniel M. Duley <[email protected]>
@@ -79,14 +79,14 @@ class HighColorStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void drawPrimitive( PrimitiveElement pe,
+ void tqdrawPrimitive( TQ_PrimitiveElement pe,
TQPainter* p,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControl( ControlElement element,
+ void tqdrawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -94,13 +94,13 @@ class HighColorStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControlMask( ControlElement element,
+ void tqdrawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControl( ComplexControl control,
+ void tqdrawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -110,7 +110,7 @@ class HighColorStyle : public KStyle
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask( ComplexControl control,
+ void tqdrawComplexControlMask( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -129,7 +129,7 @@ class HighColorStyle : public KStyle
int tqpixelMetric( PixelMetric m,
const TQWidget *widget = 0 ) const;
- TQSize sizeFromContents( ContentsType contents,
+ TQSize tqsizeFromContents( ContentsType contents,
const TQWidget *widget,
const TQSize &contentSize,
const TQStyleOption& opt ) const;
diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp
index a9b242f22..9c80914c7 100644
--- a/kstyles/highcontrast/highcontrast.cpp
+++ b/kstyles/highcontrast/highcontrast.cpp
@@ -274,7 +274,7 @@ void HighContrastStyle::drawEllipse (TQPainter* p, TQRect r, int offset, bool fi
p->drawRoundRect (r, 99, 99);
}
-void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset) const
+void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset) const
{
p->save();
addOffset (&r, offset);
@@ -325,7 +325,7 @@ void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, PrimitiveElement arro
}
// This function draws primitive elements
-void HighContrastStyle::drawPrimitive (PrimitiveElement pe,
+void HighContrastStyle::tqdrawPrimitive (TQ_PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
const TQColorGroup &cg,
@@ -573,7 +573,7 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe,
setColorsText (p, cg, flags, 0);
drawRoundRect (p, r);
if (flags & (Style_HasFocus | Style_Active))
- drawPrimitive (PE_FocusRect, p, r, cg, flags, TQStyleOption (p->backgroundColor()));
+ tqdrawPrimitive (PE_FocusRect, p, r, cg, flags, TQStyleOption (p->backgroundColor()));
break;
}
case PE_PanelTabWidget:
@@ -712,7 +712,7 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
// Probably it would be better to add a KPM_ListViewExpander metric
// to the KStyle KStylePixelMetric enum, and have the KStyle
// tqdrawComplexControl handle it.
- PrimitiveElement direction;
+ TQ_PrimitiveElement direction;
if (flags & Style_On) { // Collapsed = On
direction = PE_ArrowRight;
@@ -732,7 +732,7 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
}
-void HighContrastStyle::tqdrawControl (ControlElement element,
+void HighContrastStyle::tqdrawControl (TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -797,9 +797,9 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
}
if ( btnDefault && (button->isEnabled()))
- drawPrimitive( PE_ButtonDefault, p, r, cg, flags );
+ tqdrawPrimitive( PE_ButtonDefault, p, r, cg, flags );
- drawPrimitive( PE_ButtonCommand, p, br, cg, flags );
+ tqdrawPrimitive( PE_ButtonCommand, p, br, cg, flags );
break;
}
@@ -885,7 +885,7 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
// Draw a focus rect if the button has focus
if (flags & Style_HasFocus)
- drawPrimitive (PE_FocusRect, p, r, cg, flags, TQStyleOption (p->backgroundColor()));
+ tqdrawPrimitive (PE_FocusRect, p, r, cg, flags, TQStyleOption (p->backgroundColor()));
// Draw the label itself
TQColor color = p->pen().color();
@@ -930,7 +930,7 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
// CHECKBOX
// -------------------------------------------------------------------
case CE_CheckBox: {
- drawPrimitive (PE_Indicator, p, r, cg, flags);
+ tqdrawPrimitive (PE_Indicator, p, r, cg, flags);
break;
}
@@ -1120,7 +1120,7 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
- PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+ TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
int dim = tqpixelMetric(PM_MenuButtonIndicator);
TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
y + h / 2 - dim / 2, dim, dim), r );
@@ -1136,7 +1136,7 @@ void HighContrastStyle::tqdrawControl (ControlElement element,
}
}
-void HighContrastStyle::tqdrawControlMask (ControlElement element,
+void HighContrastStyle::tqdrawControlMask (TQ_ControlElement element,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -1179,7 +1179,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling;
}
-void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
+void HighContrastStyle::tqdrawComplexControl (TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1208,7 +1208,7 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
else
r3.setLeft (r2.right()-basicLineWidth+1);
- drawPrimitive (PE_FocusRect, p, r3, cg, flags, TQStyleOption (p->backgroundColor()));
+ tqdrawPrimitive (PE_FocusRect, p, r3, cg, flags, TQStyleOption (p->backgroundColor()));
}
setColorsButton (p, cg, flags);
@@ -1229,18 +1229,18 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
setColorsText (p, cg, flags);
drawRoundRect (p, r);
if (flags & Style_HasFocus)
- drawPrimitive(PE_FocusRect, p, r, cg, flags, TQStyleOption (p->backgroundColor()));
+ tqdrawPrimitive(PE_FocusRect, p, r, cg, flags, TQStyleOption (p->backgroundColor()));
}
setColorsButton (p, cg, flags);
// Draw arrows if required
if (controls & SC_SpinWidgetDown) {
- TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics ((QStyle::ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetDown), widget);
+ TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetDown), widget);
drawRoundRect (p, r2);
drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth);
}
if (controls & SC_SpinWidgetUp) {
- TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics ((QStyle::ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetUp), widget);
+ TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetUp), widget);
drawRoundRect (p, r2);
drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth);
}
@@ -1273,7 +1273,7 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
{
// If we're pressed, on, or raised...
if (bflags & (Style_Down | Style_On | Style_Raised))
- drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
+ tqdrawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
// Check whether to draw a background pixmap
else if ( toolbutton->tqparentWidget() &&
@@ -1289,14 +1289,14 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
if (controls & SC_ToolButtonMenu)
{
if (mflags & (Style_Down | Style_On | Style_Raised))
- drawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt);
+ tqdrawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt);
drawArrow (p, menuarea, PE_ArrowDown);
}
if (toolbutton->hasFocus() && !toolbutton->focusProxy()) {
TQRect fr = toolbutton->rect();
addOffset (&fr, 3);
- drawPrimitive(PE_FocusRect, p, fr, cg, flags, TQStyleOption (p->backgroundColor()));
+ tqdrawPrimitive(PE_FocusRect, p, fr, cg, flags, TQStyleOption (p->backgroundColor()));
}
break;
@@ -1467,7 +1467,7 @@ void HighContrastStyle::tqdrawComplexControl (ComplexControl control,
}
}
-void HighContrastStyle::tqdrawComplexControlMask(ComplexControl c,
+void HighContrastStyle::tqdrawComplexControlMask(TQ_ComplexControl c,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -1510,7 +1510,7 @@ void HighContrastStyle::drawItem( TQPainter *p,
p->restore();
}
-TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control,
+TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control,
const TQWidget* widget,
SubControl subcontrol,
const TQStyleOption& opt ) const
@@ -1662,7 +1662,7 @@ int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget *widg
}
}
-TQSize HighContrastStyle::sizeFromContents( ContentsType contents,
+TQSize HighContrastStyle::tqsizeFromContents( ContentsType contents,
const TQWidget* widget,
const TQSize &contentSize,
const TQStyleOption& opt ) const
diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h
index 39b981d29..8967a0d4d 100644
--- a/kstyles/highcontrast/highcontrast.h
+++ b/kstyles/highcontrast/highcontrast.h
@@ -67,14 +67,14 @@ class HighContrastStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void drawPrimitive( PrimitiveElement pe,
+ void tqdrawPrimitive( TQ_PrimitiveElement pe,
TQPainter* p,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControl( ControlElement element,
+ void tqdrawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -82,13 +82,13 @@ class HighContrastStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControlMask( ControlElement element,
+ void tqdrawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControl( ComplexControl control,
+ void tqdrawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -98,13 +98,13 @@ class HighContrastStyle : public KStyle
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask( ComplexControl control,
+ void tqdrawComplexControlMask( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default ) const;
- TQRect querySubControlMetrics( ComplexControl control,
+ TQRect querySubControlMetrics( TQ_ComplexControl control,
const TQWidget* widget,
SubControl subcontrol,
const TQStyleOption& opt = TQStyleOption::Default ) const;
@@ -126,7 +126,7 @@ class HighContrastStyle : public KStyle
int kPixelMetric( KStylePixelMetric m,
const TQWidget *widget = 0 ) const;
- TQSize sizeFromContents( ContentsType contents,
+ TQSize tqsizeFromContents( ContentsType contents,
const TQWidget *widget,
const TQSize &contentSize,
const TQStyleOption& opt ) const;
@@ -148,7 +148,7 @@ class HighContrastStyle : public KStyle
void drawRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const;
void drawRoundRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const;
void drawEllipse (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const;
- void drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset = 0) const;
+ void drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset = 0) const;
int basicLineWidth;
// Disable copy constructor and = operator
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index 9ba8cb6a2..8b33c3afe 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -123,7 +123,7 @@ namespace
namespace
{
- void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::PrimitiveElement pe, bool down, bool enabled)
+ void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::TQ_PrimitiveElement pe, bool down, bool enabled)
{
TQPointArray a;
@@ -533,7 +533,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQWidget* wi
}
// This function draws primitive elements as well as their masks.
-void KeramikStyle::drawPrimitive( PrimitiveElement pe,
+void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
const TQColorGroup &cg,
@@ -1324,7 +1324,7 @@ bool KeramikStyle::isFormWidget(const TQWidget* widget) const
return true;
}
-void KeramikStyle::tqdrawControl( ControlElement element,
+void KeramikStyle::tqdrawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1552,7 +1552,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
tb->orientation() == Qt::Horizontal);
}
else
- KStyle::tqdrawControl( (QStyle::ControlElement)CE_DockWindowEmptyArea, p,
+ KStyle::tqdrawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p,
widget, r, cg, flags, opt );
break;
}
@@ -1787,7 +1787,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
- PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+ TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
int dim = tqpixelMetric(PM_MenuButtonIndicator) - itemFrame;
TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
y + h / 2 - dim / 2, dim, dim), r );
@@ -1919,7 +1919,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
}
}
-void KeramikStyle::tqdrawControlMask( ControlElement element,
+void KeramikStyle::tqdrawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1943,7 +1943,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQComboBox* combo) const
return false;
}
-void KeramikStyle::tqdrawComplexControl( ComplexControl control,
+void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2114,7 +2114,7 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
case CC_SpinWidget:
{
const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget );
- TQRect br = tqvisualRect( querySubControlMetrics( (QStyle::ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget );
+ TQRect br = tqvisualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget );
if ( controls & SC_SpinWidgetButtonField )
{
Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() );
@@ -2319,7 +2319,7 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
}
}
-void KeramikStyle::tqdrawComplexControlMask( ComplexControl control,
+void KeramikStyle::tqdrawComplexControlMask( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2414,7 +2414,7 @@ int KeramikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
}
-TQSize KeramikStyle::sizeFromContents( ContentsType contents,
+TQSize KeramikStyle::tqsizeFromContents( ContentsType contents,
const TQWidget* widget,
const TQSize &contentSize,
const TQStyleOption& opt ) const
@@ -2524,7 +2524,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
}
-TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control,
+TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
const TQWidget* widget,
const TQPoint& point,
const TQStyleOption& opt ) const
@@ -2542,7 +2542,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control,
return result;
}
-TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
+TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
const TQWidget* widget,
SubControl subcontrol,
const TQStyleOption& opt ) const
diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h
index 746626b70..b0f021aee 100644
--- a/kstyles/keramik/keramik.h
+++ b/kstyles/keramik/keramik.h
@@ -4,7 +4,7 @@
based on the KDE3 HighColor Style
Copyright (C) 2001-2002 Karol Szwed <[email protected]>
- (C) 2001-2002 Fredrik H�glund <[email protected]>
+ (C) 2001-2002 Fredrik H�glund <[email protected]>
Drawing routines adapted from the KDE2 HCStyle,
Copyright (C) 2000 Daniel M. Duley <[email protected]>
@@ -63,14 +63,14 @@ public:
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void drawPrimitive( PrimitiveElement pe,
+ void tqdrawPrimitive( TQ_PrimitiveElement pe,
TQPainter* p,
const TQRect& r,
const TQColorGroup& cg,
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControl( ControlElement element,
+ void tqdrawControl( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
@@ -78,13 +78,13 @@ public:
SFlags flags = Style_Default,
const TQStyleOption& opt = TQStyleOption::Default ) const;
- void tqdrawControlMask( ControlElement element,
+ void tqdrawControlMask( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
const TQStyleOption& opt = TQStyleOption::Default ) const;
- void tqdrawComplexControl( ComplexControl control,
+ void tqdrawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
@@ -94,7 +94,7 @@ public:
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask( ComplexControl control,
+ void tqdrawComplexControlMask( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
@@ -102,17 +102,17 @@ public:
int tqpixelMetric( PixelMetric m, const TQWidget* widget = 0 ) const;
- TQSize sizeFromContents( ContentsType contents,
+ TQSize tqsizeFromContents( ContentsType contents,
const TQWidget* widget,
const TQSize& contentSize,
const TQStyleOption& opt ) const;
- SubControl querySubControl( ComplexControl control,
+ SubControl querySubControl( TQ_ComplexControl control,
const TQWidget* widget,
const TQPoint& point,
const TQStyleOption& opt = TQStyleOption::Default ) const;
- TQRect querySubControlMetrics( ComplexControl control,
+ TQRect querySubControlMetrics( TQ_ComplexControl control,
const TQWidget* widget,
SubControl subcontrol,
const TQStyleOption& opt = TQStyleOption::Default ) const;
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index 37bd51f15..db258a450 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -15,7 +15,7 @@
KDE3 HighColor Style
Copyright (C) 2001 Karol Szwed <[email protected]>
- (C) 2001 Fredrik H�glund <[email protected]>
+ (C) 2001 Fredrik H�glund <[email protected]>
Drawing routines adapted from the KDE2 HCStyle,
Copyright (C) 2000 Daniel M. Duley <[email protected]>
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index 3f0c59bab..b5f4ae8a9 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -522,7 +522,7 @@ protected:
}
- virtual void tqdrawControl( ControlElement element,
+ virtual void tqdrawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -534,7 +534,7 @@ protected:
r, cg, how, opt );
}
- virtual void tqdrawControlMask( ControlElement element,
+ virtual void tqdrawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -544,7 +544,7 @@ protected:
}
- virtual void tqdrawComplexControl( ComplexControl control,
+ virtual void tqdrawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget* widget,
const TQRect &r,
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 6b1e18e82..87a2f0d70 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -1950,7 +1950,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
-void KThemeStyle::tqdrawComplexControl ( ComplexControl control, TQPainter * p, const TQWidget * widget,
+void KThemeStyle::tqdrawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQWidget * widget,
const TQRect & r, const TQColorGroup & g, SFlags how ,
SCFlags controls, SCFlags active,
const TQStyleOption & opt ) const
diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h
index b0b9bdd97..750031156 100644
--- a/kstyles/kthemestyle/kthemestyle.h
+++ b/kstyles/kthemestyle/kthemestyle.h
@@ -15,7 +15,7 @@ dotNET Style
KDE3 HighColor Style
Copyright (C) 2001 Karol Szwed <[email protected]>
- (C) 2001 Fredrik H�glund <[email protected]>
+ (C) 2001 Fredrik H�glund <[email protected]>
Drawing routines adapted from the KDE2 HCStyle,
Copyright (C) 2000 Daniel M. Duley <[email protected]>
@@ -100,7 +100,7 @@ public:
const TQStyleOption& = TQStyleOption::Default ) const;
- virtual void tqdrawComplexControl( ComplexControl control,
+ virtual void tqdrawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget* widget,
const TQRect &r,
diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp
index 6fde9549d..94ba6c058 100644
--- a/kstyles/light/lightstyle-v2.cpp
+++ b/kstyles/light/lightstyle-v2.cpp
@@ -129,7 +129,7 @@ static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg
if (fill) p->fillRect(br, *fill);
}
-void LightStyleV2::drawPrimitive( PrimitiveElement pe,
+void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
const TQColorGroup &cg,
@@ -444,7 +444,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
case PE_ScrollBarSubLine:
{
TQRect fr = r, ar = r;
- PrimitiveElement pe;
+ TQ_PrimitiveElement pe;
p->setPen(cg.dark());
if (flags & Style_Horizontal) {
@@ -469,7 +469,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
case PE_ScrollBarAddLine:
{
TQRect fr = r, ar = r;
- PrimitiveElement pe;
+ TQ_PrimitiveElement pe;
p->setPen(cg.dark());
if (flags & Style_Horizontal) {
@@ -612,7 +612,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
}
}
-void LightStyleV2::tqdrawControl( ControlElement control,
+void LightStyleV2::tqdrawControl( TQ_ControlElement control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -970,7 +970,7 @@ void LightStyleV2::tqdrawControl( ControlElement control,
}
}
-void LightStyleV2::tqdrawControlMask( ControlElement control,
+void LightStyleV2::tqdrawControlMask( TQ_ControlElement control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1015,7 +1015,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQWidget *widget) const
return rect;
}
-void LightStyleV2::tqdrawComplexControl( ComplexControl control,
+void LightStyleV2::tqdrawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
@@ -1087,7 +1087,7 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control,
const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
TQRect frame, up, down;
- frame = querySubControlMetrics((QStyle::ComplexControl)CC_SpinWidget, widget,
+ frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, widget,
SC_SpinWidgetFrame, data);
up = spinwidget->upRect();
down = spinwidget->downRect();
@@ -1097,7 +1097,7 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control,
&cg.tqbrush(TQColorGroup::Base));
if ((controls & SC_SpinWidgetUp) && up.isValid()) {
- PrimitiveElement pe = PE_SpinWidgetUp;
+ TQ_PrimitiveElement pe = PE_SpinWidgetUp;
if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus )
pe = PE_SpinWidgetPlus;
@@ -1130,7 +1130,7 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control,
}
if ((controls & SC_SpinWidgetDown) && down.isValid()) {
- PrimitiveElement pe = PE_SpinWidgetDown;
+ TQ_PrimitiveElement pe = PE_SpinWidgetDown;
if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus )
pe = PE_SpinWidgetMinus;
@@ -1299,7 +1299,7 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control,
}
}
-TQRect LightStyleV2::querySubControlMetrics( ComplexControl control,
+TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
const TQWidget *widget,
SubControl sc,
const TQStyleOption &data ) const
@@ -1393,7 +1393,7 @@ TQRect LightStyleV2::querySubControlMetrics( ComplexControl control,
return ret;
}
-TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control,
+TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control,
const TQWidget *widget,
const TQPoint &pos,
const TQStyleOption &data ) const
@@ -1479,7 +1479,7 @@ int LightStyleV2::tqpixelMetric( PixelMetric metric,
return ret;
}
-TQSize LightStyleV2::sizeFromContents( ContentsType contents,
+TQSize LightStyleV2::tqsizeFromContents( ContentsType contents,
const TQWidget *widget,
const TQSize &contentsSize,
const TQStyleOption &data ) const
diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h
index 292984811..83a5f46f1 100644
--- a/kstyles/light/lightstyle-v2.h
+++ b/kstyles/light/lightstyle-v2.h
@@ -44,32 +44,32 @@ public:
void polishPopupMenu( TQPopupMenu * );
- void drawPrimitive(PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &,
+ void tqdrawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &,
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+ void tqdrawControl(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+ void tqdrawControlMask(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQStyleOption & = TQStyleOption::Default) const;
TQRect subRect(SubRect, const TQWidget *) const;
- void tqdrawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
+ void tqdrawComplexControl(TQ_ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
SCFlags = SC_All, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption::Default ) const;
- TQRect querySubControlMetrics(ComplexControl, const TQWidget *, SubControl,
+ TQRect querySubControlMetrics(TQ_ComplexControl, const TQWidget *, SubControl,
const TQStyleOption & = TQStyleOption::Default ) const;
- SubControl querySubControl(ComplexControl, const TQWidget *, const TQPoint &,
+ SubControl querySubControl(TQ_ComplexControl, const TQWidget *, const TQPoint &,
const TQStyleOption &data = TQStyleOption::Default ) const;
int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const;
- TQSize sizeFromContents(ContentsType, const TQWidget *, const TQSize &,
+ TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &,
const TQStyleOption & = TQStyleOption::Default ) const;
int tqstyleHint(StyleHint, const TQWidget * = 0,
diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp
index b7da954c9..b05517248 100644
--- a/kstyles/light/lightstyle-v3.cpp
+++ b/kstyles/light/lightstyle-v3.cpp
@@ -212,7 +212,7 @@ static void drawLightBevel( TQPainter *p,
p->fillRect( br, *fill );
}
-void LightStyleV3::drawPrimitive( PrimitiveElement pe,
+void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
const TQColorGroup &cg,
@@ -587,7 +587,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
case PE_ScrollBarSubLine:
{
TQRect br = r;
- PrimitiveElement pe;
+ TQ_PrimitiveElement pe;
p->setPen( cg.background() );
if (flags & Style_Horizontal) {
@@ -621,7 +621,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
case PE_ScrollBarAddLine:
{
TQRect br = r;
- PrimitiveElement pe;
+ TQ_PrimitiveElement pe;
p->setPen( cg.background() );
if (flags & Style_Horizontal) {
@@ -803,7 +803,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
}
}
-void LightStyleV3::tqdrawControl( ControlElement control,
+void LightStyleV3::tqdrawControl( TQ_ControlElement control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1088,7 +1088,7 @@ void LightStyleV3::tqdrawControl( ControlElement control,
}
}
-void LightStyleV3::tqdrawControlMask( ControlElement control,
+void LightStyleV3::tqdrawControlMask( TQ_ControlElement control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1150,7 +1150,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQWidget *widget) const
return rect;
}
-void LightStyleV3::tqdrawComplexControl( ComplexControl control,
+void LightStyleV3::tqdrawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
@@ -1218,7 +1218,7 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control,
const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
TQRect frame, up, down;
- frame = querySubControlMetrics((QStyle::ComplexControl)CC_SpinWidget, widget,
+ frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, widget,
SC_SpinWidgetFrame, data);
up = spinwidget->upRect();
down = spinwidget->downRect();
@@ -1227,7 +1227,7 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control,
tqdrawPrimitive( PE_Panel, p, frame, cg, flags | Style_Sunken );
if ((controls & SC_SpinWidgetUp) && up.isValid()) {
- PrimitiveElement pe = PE_SpinWidgetUp;
+ TQ_PrimitiveElement pe = PE_SpinWidgetUp;
if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus )
pe = PE_SpinWidgetPlus;
@@ -1245,7 +1245,7 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control,
}
if ((controls & SC_SpinWidgetDown) && down.isValid()) {
- PrimitiveElement pe = PE_SpinWidgetDown;
+ TQ_PrimitiveElement pe = PE_SpinWidgetDown;
if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus )
pe = PE_SpinWidgetMinus;
@@ -1426,7 +1426,7 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control,
}
}
-TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
+TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
const TQWidget *widget,
SubControl sc,
const TQStyleOption &data ) const
@@ -1576,7 +1576,7 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
return ret;
}
-TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control,
+TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control,
const TQWidget *widget,
const TQPoint &pos,
const TQStyleOption &data ) const
@@ -1697,7 +1697,7 @@ int LightStyleV3::tqpixelMetric( PixelMetric metric,
return ret;
}
-TQSize LightStyleV3::sizeFromContents( ContentsType contents,
+TQSize LightStyleV3::tqsizeFromContents( ContentsType contents,
const TQWidget *widget,
const TQSize &contentsSize,
const TQStyleOption &data ) const
diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h
index a97c57643..2bc7b65a5 100644
--- a/kstyles/light/lightstyle-v3.h
+++ b/kstyles/light/lightstyle-v3.h
@@ -48,32 +48,32 @@ public:
void polishPopupMenu( TQPopupMenu * );
- void drawPrimitive(PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &,
+ void tqdrawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &,
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+ void tqdrawControl(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+ void tqdrawControlMask(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQStyleOption & = TQStyleOption::Default) const;
TQRect subRect(SubRect, const TQWidget *) const;
- void tqdrawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
+ void tqdrawComplexControl(TQ_ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
SCFlags = SC_All, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption::Default ) const;
- TQRect querySubControlMetrics(ComplexControl, const TQWidget *, SubControl,
+ TQRect querySubControlMetrics(TQ_ComplexControl, const TQWidget *, SubControl,
const TQStyleOption & = TQStyleOption::Default ) const;
- SubControl querySubControl(ComplexControl, const TQWidget *, const TQPoint &,
+ SubControl querySubControl(TQ_ComplexControl, const TQWidget *, const TQPoint &,
const TQStyleOption &data = TQStyleOption::Default ) const;
int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const;
- TQSize sizeFromContents(ContentsType, const TQWidget *, const TQSize &,
+ TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &,
const TQStyleOption & = TQStyleOption::Default ) const;
int tqstyleHint(StyleHint, const TQWidget * = 0,
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index 32b8b73c8..dcc826819 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -15,7 +15,7 @@
(c) 2002,2003 Maksim Orlovich <[email protected]>
based on the KDE3 HighColor Style
Copyright (C) 2001-2002 Karol Szwed <[email protected]>
- (C) 2001-2002 Fredrik H�glund <[email protected]>
+ (C) 2001-2002 Fredrik H�glund <[email protected]>
Drawing routines adapted from the KDE2 HCStyle,
Copyright (C) 2000 Daniel M. Duley <[email protected]>
(C) 2000 Dirk Mueller <[email protected]>
@@ -1357,9 +1357,9 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
p->drawLine( centerx, centery - radius, centerx, centery + radius );
} else if(_drawTriangularExpander) {
if( flags & Style_On )
- drawPrimitive(PE_ArrowRight, p, TQRect(r.x()+1,r.y()+1,r.width(),r.height()), cg,ButtonContour, flags);
+ tqdrawPrimitive(PE_ArrowRight, p, TQRect(r.x()+1,r.y()+1,r.width(),r.height()), cg,ButtonContour, flags);
if( flags & Style_Off )
- drawPrimitive(PE_ArrowDown, p, TQRect(r.x()+1,r.y()+1,r.width(),r.height()), cg,ButtonContour, flags);
+ tqdrawPrimitive(PE_ArrowDown, p, TQRect(r.x()+1,r.y()+1,r.width(),r.height()), cg,ButtonContour, flags);
}
break;
@@ -1443,7 +1443,7 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
}
-void PlastikStyle::drawPrimitive(PrimitiveElement pe,
+void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
const TQColorGroup &cg,
@@ -1660,7 +1660,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
surfaceFlags);
p->setPen(cg.foreground());
- drawPrimitive((horiz ? PE_ArrowLeft : PE_ArrowUp), p, r, cg, flags);
+ tqdrawPrimitive((horiz ? PE_ArrowLeft : PE_ArrowUp), p, r, cg, flags);
break;
}
@@ -1686,7 +1686,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
surfaceFlags);
p->setPen(cg.foreground());
- drawPrimitive((horiz ? PE_ArrowRight : PE_ArrowDown), p, r, cg, flags);
+ tqdrawPrimitive((horiz ? PE_ArrowRight : PE_ArrowDown), p, r, cg, flags);
break;
}
@@ -1715,7 +1715,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
renderSurface(p, TQRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2),
cg.background(), contentColor, getColor(cg,MouseOverHighlight), enabled?_contrast+3:(_contrast/2), surfaceFlags);
- drawPrimitive(PE_CheckMark, p, r, cg, flags);
+ tqdrawPrimitive(PE_CheckMark, p, r, cg, flags);
break;
}
@@ -2138,7 +2138,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
}
-void PlastikStyle::tqdrawControl(ControlElement element,
+void PlastikStyle::tqdrawControl(TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2356,12 +2356,12 @@ void PlastikStyle::tqdrawControl(ControlElement element,
TQColorGroup g2 = cg;
if (isDefault)
g2.setColor(TQColorGroup::Background, cg.background().dark(120) );
- drawPrimitive(PE_ButtonBevel, p,
+ tqdrawPrimitive(PE_ButtonBevel, p,
isDefault?TQRect(r.x()+1,r.y()+1,r.width()-2,r.height()-2):r,
g2, flags, TQStyleOption(button) );
if (isDefault ) {
- drawPrimitive(PE_ButtonDefault, p, r, cg, flags);
+ tqdrawPrimitive(PE_ButtonDefault, p, r, cg, flags);
}
break;
@@ -2396,7 +2396,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
else
{
p->setPen(cg.buttonText());
- drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
+ tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
cg, flags, opt );
w -= dx;
}
@@ -2422,7 +2422,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
p->drawPixmap( x + 4, y + h / 2 - pixmap.height() / 2, pixmap );
if (cornArrow) //Draw over the icon
- drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
+ tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
cg, flags, opt );
@@ -2438,7 +2438,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
if ( flags & Style_HasFocus )
- drawPrimitive( PE_FocusRect, p,
+ tqdrawPrimitive( PE_FocusRect, p,
tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
cg, flags );
break;
@@ -2458,9 +2458,9 @@ void PlastikStyle::tqdrawControl(ControlElement element,
if (active && focused) {
if (down) {
- drawPrimitive(PE_ButtonTool, p, r, cg, flags|Style_Down, opt);
+ tqdrawPrimitive(PE_ButtonTool, p, r, cg, flags|Style_Down, opt);
} else {
- drawPrimitive(PE_ButtonTool, p, r, cg, flags, opt);
+ tqdrawPrimitive(PE_ButtonTool, p, r, cg, flags, opt);
}
}
@@ -2561,7 +2561,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
SFlags cflags = Style_On;
if (enabled)
cflags |= Style_Enabled;
- drawPrimitive( PE_CheckMark, p, cr, cg, cflags );
+ tqdrawPrimitive( PE_CheckMark, p, cr, cg, cflags );
}
// Time to draw the menu item label...
@@ -2667,7 +2667,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
- PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+ TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
int dim = tqpixelMetric(PM_MenuButtonIndicator) - 1;
TQRect vr = tqvisualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
r.y() + r.height() / 2 - dim / 2, dim, dim), r );
@@ -2680,9 +2680,9 @@ void PlastikStyle::tqdrawControl(ControlElement element,
TQColorGroup g2( discol, cg.highlight(), white, white,
enabled ? white : discol, discol, white );
- drawPrimitive( arrow, p, vr, g2, Style_Enabled );
+ tqdrawPrimitive( arrow, p, vr, g2, Style_Enabled );
} else
- drawPrimitive( arrow, p, vr, cg,
+ tqdrawPrimitive( arrow, p, vr, cg,
enabled ? Style_Enabled : Style_Default );
}
break;
@@ -2709,7 +2709,7 @@ void PlastikStyle::tqdrawControl(ControlElement element,
}
}
-void PlastikStyle::tqdrawControlMask(ControlElement element,
+void PlastikStyle::tqdrawControlMask(TQ_ControlElement element,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -2729,7 +2729,7 @@ void PlastikStyle::tqdrawControlMask(ControlElement element,
}
}
-void PlastikStyle::tqdrawComplexControlMask(ComplexControl c,
+void PlastikStyle::tqdrawComplexControlMask(TQ_ComplexControl c,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -2750,7 +2750,7 @@ void PlastikStyle::tqdrawComplexControlMask(ComplexControl c,
}
}
-void PlastikStyle::tqdrawComplexControl(ComplexControl control,
+void PlastikStyle::tqdrawComplexControl(TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2872,7 +2872,7 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
cg.background(), buttonColor, getColor(cg,MouseOverHighlight), enabled?_contrast+3:(_contrast/2),
surfaceFlags);
if (hasFocus) {
- drawPrimitive(PE_FocusRect, p,
+ tqdrawPrimitive(PE_FocusRect, p,
TQRect(RcontentSurface.x() + 2,
RcontentSurface.y() + 2,
RcontentSurface.width() - 4,
@@ -2911,7 +2911,7 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
}
p->setPen(cg.foreground());
- drawPrimitive(PE_SpinWidgetDown, p, RbuttonSurface, cg, Style_Default|Style_Enabled|Style_Raised);
+ tqdrawPrimitive(PE_SpinWidgetDown, p, RbuttonSurface, cg, Style_Default|Style_Enabled|Style_Raised);
// TQComboBox draws the text using cg.text(), we can override this
// from here
@@ -2933,7 +2933,7 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
mflags = flags;
if (kornMode) {
- drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
+ tqdrawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
break;
} else {
// don't want to have the buttoncolor as the background...
@@ -2950,7 +2950,7 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
if (controls & SC_ToolButton) {
// If we're pressed, on, or raised...
if (bflags & (Style_Down | Style_On | Style_Raised) || widget==hoverWidget ) {
- drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
+ tqdrawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt);
} else if (tb->tqparentWidget() &&
tb->tqparentWidget()->backgroundPixmap() &&
!tb->tqparentWidget()->backgroundPixmap()->isNull()) {
@@ -2962,15 +2962,15 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
// Draw a toolbutton menu indicator if required
if (controls & SC_ToolButtonMenu) {
if (mflags & (Style_Down | Style_On | Style_Raised)) {
- drawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt);
+ tqdrawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt);
}
- drawPrimitive(PE_ArrowDown, p, menuarea, cg, mflags, opt);
+ tqdrawPrimitive(PE_ArrowDown, p, menuarea, cg, mflags, opt);
}
if (tb->hasFocus() && !tb->focusProxy()) {
TQRect fr = tb->rect();
fr.addCoords(2, 2, -2, -2);
- drawPrimitive(PE_FocusRect, p, fr, cg);
+ tqdrawPrimitive(PE_FocusRect, p, fr, cg);
}
// Set the color for the ToolButton menu indicator
@@ -2986,7 +2986,7 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
const TQSpinWidget *sw = dynamic_cast<const TQSpinWidget *>(widget);
SFlags sflags = flags;
- PrimitiveElement pe;
+ TQ_PrimitiveElement pe;
bool hasFocus = false;
if (sw)
@@ -3094,7 +3094,7 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
else
pe = PE_SpinWidgetUp;
p->setPen(cg.foreground());
- drawPrimitive(pe, p, upRect, cg, sflags);
+ tqdrawPrimitive(pe, p, upRect, cg, sflags);
sflags = Style_Default | Style_Enabled;
if (active == SC_SpinWidgetDown) {
@@ -3107,7 +3107,7 @@ void PlastikStyle::tqdrawComplexControl(ComplexControl control,
else
pe = PE_SpinWidgetDown;
p->setPen(cg.foreground());
- drawPrimitive(pe, p, downRect, cg, sflags);
+ tqdrawPrimitive(pe, p, downRect, cg, sflags);
// thin frame around the input area
const TQRect Rcontent = TQRect(reverseLayout?r.left()+1+handleWidth+1:r.left()+1, r.top()+1,
@@ -3172,7 +3172,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQWidget *widget) const
}
}
-TQRect PlastikStyle::querySubControlMetrics(ComplexControl control,
+TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
const TQWidget *widget,
SubControl subcontrol,
const TQStyleOption &opt) const
@@ -3347,7 +3347,7 @@ int PlastikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
}
-TQSize PlastikStyle::sizeFromContents(ContentsType t,
+TQSize PlastikStyle::tqsizeFromContents(ContentsType t,
const TQWidget *widget,
const TQSize &s,
const TQStyleOption &opt) const
diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h
index 64c3c3a65..45e734aef 100644
--- a/kstyles/plastik/plastik.h
+++ b/kstyles/plastik/plastik.h
@@ -13,7 +13,7 @@
(c) 2002,2003 Maksim Orlovich <[email protected]>
based on the KDE3 HighColor Style
Copyright (C) 2001-2002 Karol Szwed <[email protected]>
- (C) 2001-2002 Fredrik H�glund <[email protected]>
+ (C) 2001-2002 Fredrik H�glund <[email protected]>
Drawing routines adapted from the KDE2 HCStyle,
Copyright (C) 2000 Daniel M. Duley <[email protected]>
(C) 2000 Dirk Mueller <[email protected]>
@@ -74,14 +74,14 @@ public:
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void drawPrimitive(PrimitiveElement pe,
+ void tqdrawPrimitive(TQ_PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags = Style_Default,
const TQStyleOption &opt = TQStyleOption::Default ) const;
- void tqdrawControl(ControlElement element,
+ void tqdrawControl(TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -89,9 +89,9 @@ public:
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
+ void tqdrawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
- void tqdrawComplexControl(ComplexControl control,
+ void tqdrawComplexControl(TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -107,18 +107,18 @@ public:
TQRect subRect(SubRect r,
const TQWidget *widget ) const;
- TQRect querySubControlMetrics(ComplexControl control,
+ TQRect querySubControlMetrics(TQ_ComplexControl control,
const TQWidget *widget,
SubControl subcontrol,
const TQStyleOption &opt = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask(TQStyle::ComplexControl c,
+ void tqdrawComplexControlMask(TQStyle::TQ_ComplexControl c,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
const TQStyleOption &o=TQStyleOption::Default) const;
- TQSize sizeFromContents(TQStyle::ContentsType t,
+ TQSize tqsizeFromContents(TQStyle::ContentsType t,
const TQWidget *w,
const TQSize &s,
const TQStyleOption &o) const;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 23:30:51 +0000