summaryrefslogtreecommitdiffstats
path: root/src/styles
diff options
context:
space:
mode:
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/ntqcdestyle.h4
-rw-r--r--src/styles/ntqcommonstyle.h4
-rw-r--r--src/styles/ntqcompactstyle.h4
-rw-r--r--src/styles/ntqinterlacestyle.h4
-rw-r--r--src/styles/ntqmotifplusstyle.h4
-rw-r--r--src/styles/ntqmotifstyle.h4
-rw-r--r--src/styles/ntqplatinumstyle.h4
-rw-r--r--src/styles/ntqsgistyle.h4
-rw-r--r--src/styles/ntqstylefactory.h6
-rw-r--r--src/styles/ntqstyleplugin.h8
-rw-r--r--src/styles/ntqwindowsstyle.h4
-rw-r--r--src/styles/qcdestyle.cpp4
-rw-r--r--src/styles/qcommonstyle.cpp144
-rw-r--r--src/styles/qcompactstyle.cpp2
-rw-r--r--src/styles/qinterlacestyle.cpp4
-rw-r--r--src/styles/qmotifplusstyle.cpp42
-rw-r--r--src/styles/qmotifstyle.cpp54
-rw-r--r--src/styles/qplatinumstyle.cpp18
-rw-r--r--src/styles/qsgistyle.cpp44
-rw-r--r--src/styles/qstylefactory.cpp66
-rw-r--r--src/styles/qstyleinterface_p.h8
-rw-r--r--src/styles/qstyleplugin.cpp8
-rw-r--r--src/styles/qt_styles.pri24
-rw-r--r--src/styles/qwindowsstyle.cpp42
24 files changed, 255 insertions, 255 deletions
diff --git a/src/styles/ntqcdestyle.h b/src/styles/ntqcdestyle.h
index 5f169118c..90857223d 100644
--- a/src/styles/ntqcdestyle.h
+++ b/src/styles/ntqcdestyle.h
@@ -46,7 +46,7 @@
#include "ntqmotifstyle.h"
#endif // QT_H
-#if !defined(QT_NO_STYLE_CDE) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN)
#if defined(QT_PLUGIN)
#define Q_EXPORT_STYLE_CDE
@@ -85,6 +85,6 @@ public:
};
-#endif // QT_NO_STYLE_CDE
+#endif // TQT_NO_STYLE_CDE
#endif // TQCDESTYLE_H
diff --git a/src/styles/ntqcommonstyle.h b/src/styles/ntqcommonstyle.h
index cb04fa717..d77f72801 100644
--- a/src/styles/ntqcommonstyle.h
+++ b/src/styles/ntqcommonstyle.h
@@ -45,7 +45,7 @@
#include "ntqstyle.h"
#endif // QT_H
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
class Q_EXPORT TQCommonStyle: public TQStyle
{
@@ -159,6 +159,6 @@ private:
#endif
};
-#endif // QT_NO_STYLE
+#endif // TQT_NO_STYLE
#endif // TQCOMMONSTYLE_H
diff --git a/src/styles/ntqcompactstyle.h b/src/styles/ntqcompactstyle.h
index 13a442021..a7d28c84e 100644
--- a/src/styles/ntqcompactstyle.h
+++ b/src/styles/ntqcompactstyle.h
@@ -45,7 +45,7 @@
#include "ntqwindowsstyle.h"
#endif // QT_H
-#if !defined(QT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
#if defined(QT_PLUGIN)
#define Q_EXPORT_STYLE_COMPACT
@@ -81,6 +81,6 @@ private: // Disabled copy constructor and operator=
#endif
};
-#endif // QT_NO_STYLE_WINDOWS
+#endif // TQT_NO_STYLE_WINDOWS
#endif // TQCOMPACTSTYLE_H
diff --git a/src/styles/ntqinterlacestyle.h b/src/styles/ntqinterlacestyle.h
index 7c00675d9..a3487b651 100644
--- a/src/styles/ntqinterlacestyle.h
+++ b/src/styles/ntqinterlacestyle.h
@@ -46,7 +46,7 @@
#include "ntqmotifstyle.h"
#endif // QT_H
-#if !defined(QT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
#include "ntqpalette.h"
@@ -101,7 +101,7 @@ private:
TQPalette oldPalette;
};
-#endif // QT_NO_STYLE_INTERLACE
+#endif // TQT_NO_STYLE_INTERLACE
#endif
#endif
diff --git a/src/styles/ntqmotifplusstyle.h b/src/styles/ntqmotifplusstyle.h
index 16dbf1762..e7c546192 100644
--- a/src/styles/ntqmotifplusstyle.h
+++ b/src/styles/ntqmotifplusstyle.h
@@ -46,7 +46,7 @@
#include "ntqmotifstyle.h"
#endif // QT_H
-#if !defined(QT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
#if defined(QT_PLUGIN)
#define Q_EXPORT_STYLE_MOTIFPLUS
@@ -126,6 +126,6 @@ private:
};
-#endif // QT_NO_STYLE_MOTIFPLUS
+#endif // TQT_NO_STYLE_MOTIFPLUS
#endif // TQMOTIFPLUSSTYLE_H
diff --git a/src/styles/ntqmotifstyle.h b/src/styles/ntqmotifstyle.h
index 664208de6..75abd98fc 100644
--- a/src/styles/ntqmotifstyle.h
+++ b/src/styles/ntqmotifstyle.h
@@ -45,7 +45,7 @@
#include "ntqcommonstyle.h"
#endif // QT_H
-#if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
class TQPalette;
@@ -141,6 +141,6 @@ private:
#endif
};
-#endif // QT_NO_STYLE_MOTIF
+#endif // TQT_NO_STYLE_MOTIF
#endif // TQMOTIFSTYLE_H
diff --git a/src/styles/ntqplatinumstyle.h b/src/styles/ntqplatinumstyle.h
index 968fbb1d4..69b119bd9 100644
--- a/src/styles/ntqplatinumstyle.h
+++ b/src/styles/ntqplatinumstyle.h
@@ -45,7 +45,7 @@
#include "ntqwindowsstyle.h"
#endif // QT_H
-#if !defined(QT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
class TQPalette;
@@ -120,6 +120,6 @@ private: // Disabled copy constructor and operator=
#endif
};
-#endif // QT_NO_STYLE_PLATINUM
+#endif // TQT_NO_STYLE_PLATINUM
#endif // TQPLATINUMSTYLE_H
diff --git a/src/styles/ntqsgistyle.h b/src/styles/ntqsgistyle.h
index dfeda72a7..a7cbe2f4e 100644
--- a/src/styles/ntqsgistyle.h
+++ b/src/styles/ntqsgistyle.h
@@ -47,7 +47,7 @@
#include "ntqwidget.h"
#endif // QT_H
-#if !defined(QT_NO_STYLE_SGI) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN)
#if defined(QT_PLUGIN)
#define Q_EXPORT_STYLE_SGI
@@ -139,6 +139,6 @@ private:
};
-#endif // QT_NO_STYLE_SGI
+#endif // TQT_NO_STYLE_SGI
#endif // TQSGISTYLE_H
diff --git a/src/styles/ntqstylefactory.h b/src/styles/ntqstylefactory.h
index d011fe999..b2c1ba9d8 100644
--- a/src/styles/ntqstylefactory.h
+++ b/src/styles/ntqstylefactory.h
@@ -43,7 +43,7 @@
#include "ntqstringlist.h"
#endif // QT_H
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
class TQString;
class TQStyle;
@@ -51,12 +51,12 @@ class TQStyle;
class Q_EXPORT TQStyleFactory
{
public:
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
static TQStringList keys();
#endif
static TQStyle *create( const TQString& );
};
-#endif //QT_NO_STYLE
+#endif //TQT_NO_STYLE
#endif //TQSTYLEFACTORY_H
diff --git a/src/styles/ntqstyleplugin.h b/src/styles/ntqstyleplugin.h
index bf48d080b..0142d36fe 100644
--- a/src/styles/ntqstyleplugin.h
+++ b/src/styles/ntqstyleplugin.h
@@ -46,8 +46,8 @@
#include "ntqstringlist.h"
#endif // QT_H
-#ifndef QT_NO_STYLE
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_STYLE
+#ifndef TQT_NO_COMPONENT
class TQStyle;
class TQStylePluginPrivate;
@@ -66,7 +66,7 @@ private:
TQStylePluginPrivate *d;
};
-#endif // QT_NO_COMPONENT
-#endif // QT_NO_STYLE
+#endif // TQT_NO_COMPONENT
+#endif // TQT_NO_STYLE
#endif // TQSTYLEPLUGIN_H
diff --git a/src/styles/ntqwindowsstyle.h b/src/styles/ntqwindowsstyle.h
index eaee7ca98..c10afef85 100644
--- a/src/styles/ntqwindowsstyle.h
+++ b/src/styles/ntqwindowsstyle.h
@@ -45,7 +45,7 @@
#include "ntqcommonstyle.h"
#endif // QT_H
-#if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
#if defined(QT_PLUGIN)
#define Q_EXPORT_STYLE_WINDOWS
@@ -143,6 +143,6 @@ private:
#endif
};
-#endif // QT_NO_STYLE_WINDOWS
+#endif // TQT_NO_STYLE_WINDOWS
#endif // TQWINDOWSSTYLE_H
diff --git a/src/styles/qcdestyle.cpp b/src/styles/qcdestyle.cpp
index 931aa2d47..2f49aa752 100644
--- a/src/styles/qcdestyle.cpp
+++ b/src/styles/qcdestyle.cpp
@@ -40,7 +40,7 @@
#include "ntqcdestyle.h"
-#if !defined(QT_NO_STYLE_CDE) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN)
#include "ntqpainter.h"
#include "ntqdrawutil.h"
@@ -153,7 +153,7 @@ void TQCDEStyle::drawPrimitive( PrimitiveElement pe,
{
switch( pe ) {
case PE_Indicator: {
-#ifndef QT_NO_BUTTON
+#ifndef TQT_NO_BUTTON
bool down = flags & Style_Down;
bool on = flags & Style_On;
bool showUp = !( down ^ on );
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 43e659b39..a9bfbcf28 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -40,7 +40,7 @@
#include "ntqcommonstyle.h"
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
#include "ntqmutex.h"
#include "ntqmenubar.h"
@@ -837,7 +837,7 @@ void TQCommonStyle::drawPrimitive( PrimitiveElement pe,
activePainter = p;
switch (pe) {
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
case PE_CheckListController: {
p->drawPixmap(r, TQPixmap((const char **)check_list_controller_xpm));
break; }
@@ -1251,7 +1251,7 @@ void TQCommonStyle::drawPrimitive( PrimitiveElement pe,
drawPrimitive( PE_GroupBoxFrame, p, ceData, elementFlags, r, cg, flags, opt );
break;
case PE_GroupBoxFrame: {
-#ifndef QT_NO_FRAME
+#ifndef TQT_NO_FRAME
if ( opt.isDefault() )
break;
int lwidth = opt.lineWidth(), mlwidth = opt.midLineWidth();
@@ -1326,7 +1326,7 @@ void TQCommonStyle::drawControl( ControlElement element,
break; }
case CE_PushButton:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
TQRect br = r;
int dbi = pixelMetric(PM_ButtonDefaultIndicator, ceData, elementFlags, widget);
@@ -1352,7 +1352,7 @@ void TQCommonStyle::drawControl( ControlElement element,
case CE_PushButtonLabel:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
TQRect ir = r;
if ((elementFlags & CEF_IsDown) || (elementFlags & CEF_IsOn)) {
@@ -1372,7 +1372,7 @@ void TQCommonStyle::drawControl( ControlElement element,
if ((!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget)) || ((styleHint(SH_HideUnderlineAcceleratorWhenAltUp, ceData, elementFlags, TQStyleOption::Default, 0, widget)) && (!acceleratorsShown())))
tf |= NoAccel;
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
if ( !ceData.iconSet.isNull() ) {
TQIconSet::Mode mode =
(elementFlags & CEF_IsEnabled) ? TQIconSet::Normal : TQIconSet::Disabled;
@@ -1401,7 +1401,7 @@ void TQCommonStyle::drawControl( ControlElement element,
else if (!ceData.fgPixmap.isNull())
tf |= AlignHCenter;
} else
-#endif //QT_NO_ICONSET
+#endif //TQT_NO_ICONSET
tf |= AlignHCenter;
drawItem(p, ir, tf, cg,
flags & Style_Enabled, (ceData.fgPixmap.isNull())?NULL:&ceData.fgPixmap, ceData.text,
@@ -1420,7 +1420,7 @@ void TQCommonStyle::drawControl( ControlElement element,
case CE_CheckBoxLabel:
{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
if ((!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget)) || ((styleHint(SH_HideUnderlineAcceleratorWhenAltUp, ceData, elementFlags, TQStyleOption::Default, 0, widget)) && (!acceleratorsShown())))
alignment |= NoAccel;
@@ -1442,7 +1442,7 @@ void TQCommonStyle::drawControl( ControlElement element,
case CE_RadioButtonLabel:
{
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
if ((!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget)) || ((styleHint(SH_HideUnderlineAcceleratorWhenAltUp, ceData, elementFlags, TQStyleOption::Default, 0, widget)) && (!acceleratorsShown())))
alignment |= NoAccel;
@@ -1457,7 +1457,7 @@ void TQCommonStyle::drawControl( ControlElement element,
break;
}
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
case CE_TabBarTab:
{
if ( ceData.tabBarData.shape == TQTabBar::TriangularAbove ||
@@ -1520,8 +1520,8 @@ void TQCommonStyle::drawControl( ControlElement element,
drawPrimitive( PE_FocusRect, p, ceData, elementFlags, r, cg );
break;
}
-#endif // QT_NO_TABBAR
-#ifndef QT_NO_TOOLBOX
+#endif // TQT_NO_TABBAR
+#ifndef TQT_NO_TOOLBOX
case CE_ToolBoxTab:
{
int d = 20 + r.height() - 3;
@@ -1548,12 +1548,12 @@ void TQCommonStyle::drawControl( ControlElement element,
p->setBrush( NoBrush );
break;
}
-#endif // QT_NO_TOOLBOX
+#endif // TQT_NO_TOOLBOX
case CE_ProgressBarGroove:
qDrawShadePanel(p, r, cg, TRUE, 1, &cg.brush(TQColorGroup::Background));
break;
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
case CE_ProgressBarContents:
{
// Correct the highlight color if same as background,
@@ -1634,11 +1634,11 @@ void TQCommonStyle::drawControl( ControlElement element,
ceData.progressText, -1, pcolor );
}
break;
-#endif // QT_NO_PROGRESSBAR
+#endif // TQT_NO_PROGRESSBAR
case CE_MenuBarItem:
{
-#ifndef QT_NO_MENUDATA
+#ifndef TQT_NO_MENUDATA
if (opt.isDefault())
break;
@@ -1653,7 +1653,7 @@ void TQCommonStyle::drawControl( ControlElement element,
break;
}
-#ifndef QT_NO_TOOLBUTTON
+#ifndef TQT_NO_TOOLBUTTON
case CE_ToolButtonLabel:
{
TQRect rect = r;
@@ -1745,8 +1745,8 @@ void TQCommonStyle::drawControl( ControlElement element,
break;
}
-#endif // QT_NO_TOOLBUTTON
-#ifndef QT_NO_HEADER
+#endif // TQT_NO_TOOLBUTTON
+#ifndef TQT_NO_HEADER
case CE_HeaderLabel:
{
TQRect rect = r;
@@ -1774,7 +1774,7 @@ void TQCommonStyle::drawControl( ControlElement element,
drawItem ( p, rect, AlignVCenter, cg, flags & Style_Enabled,
0, ceData.textLabel, -1, &(cg.buttonText()) );
}
-#endif // QT_NO_HEADER
+#endif // TQT_NO_HEADER
default:
break;
}
@@ -1826,7 +1826,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
TQRect rect, wrect(ceData.rect);
switch (r) {
-#ifndef QT_NO_DIALOGBUTTONS
+#ifndef TQT_NO_DIALOGBUTTONS
case SR_DialogButtonAbort:
case SR_DialogButtonRetry:
case SR_DialogButtonIgnore:
@@ -1892,10 +1892,10 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
return TQRect(fw, start, wrect.width() - (fw*2), wrect.height() - start - (fw*2));
}
return TQRect(); }
-#endif //QT_NO_DIALOGBUTTONS
+#endif //TQT_NO_DIALOGBUTTONS
case SR_PushButtonContents:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
int dx1, dx2;
dx1 = pixelMetric(PM_DefaultFrameWidth, ceData, elementFlags, widget);
@@ -1913,7 +1913,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
case SR_PushButtonFocusRect:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
int dbw1 = 0, dbw2 = 0;
if ((elementFlags & CEF_IsDefault) || (elementFlags & CEF_AutoDefault)) {
dbw1 = pixelMetric(PM_ButtonDefaultIndicator, ceData, elementFlags, widget);
@@ -1941,7 +1941,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
case SR_CheckBoxContents:
{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
TQRect ir = subRect(SR_CheckBoxIndicator, ceData, elementFlags, widget);
rect.setRect(ir.right() + 6, wrect.y(),
wrect.width() - ir.width() - 6, wrect.height());
@@ -1951,7 +1951,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
case SR_CheckBoxFocusRect:
{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
if ( ceData.fgPixmap.isNull() && ceData.text.isEmpty() ) {
rect = subRect( SR_CheckBoxIndicator, ceData, elementFlags, widget );
rect.addCoords( 1, 1, -1, -1 );
@@ -1995,7 +1995,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
case SR_RadioButtonFocusRect:
{
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
if ( ceData.fgPixmap.isNull() && ceData.text.isEmpty() ) {
rect = subRect( SR_RadioButtonIndicator, ceData, elementFlags, widget );
rect.addCoords( 1, 1, -1, -1 );
@@ -2024,7 +2024,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
rect.setRect(3, 3, ceData.rect.width()-6-16, ceData.rect.height()-6);
break;
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case SR_SliderFocusRect:
{
int tickOffset = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget );
@@ -2037,9 +2037,9 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
rect = rect.intersect( ceData.rect ); // ## is this really necessary?
break;
}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
case SR_DockWindowHandleRect:
{
if (!(elementFlags & CEF_HasParentWidget))
@@ -2055,12 +2055,12 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
}
break;
}
-#endif // QT_NO_MAINWINDOW
+#endif // TQT_NO_MAINWINDOW
case SR_ProgressBarGroove:
case SR_ProgressBarContents:
{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
TQFontMetrics fm( ( (!(elementFlags & CEF_UseGenericParameters)) ? TQFontMetrics(ceData.font) :
TQApplication::fontMetrics() ) );
int textw = 0;
@@ -2079,7 +2079,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
case SR_ProgressBarLabel:
{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
TQFontMetrics fm( ( (!(elementFlags & CEF_UseGenericParameters)) ? TQFontMetrics(ceData.font) :
TQApplication::fontMetrics() ) );
int textw = 0;
@@ -2113,7 +2113,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
return rect;
}
-#ifndef QT_NO_RANGECONTROL
+#ifndef TQT_NO_RANGECONTROL
/*
I really need this and I don't want to expose it in TQRangeControl..
*/
@@ -2145,7 +2145,7 @@ static int qPositionFromValue( const TQStyleControlElementData &ceData, int logi
// no overflow because of this implicit assumption:
// span <= 4096
}
-#endif // QT_NO_RANGECONTROL
+#endif // TQT_NO_RANGECONTROL
/*! \reimp */
void TQCommonStyle::drawComplexControl( ComplexControl control,
@@ -2163,7 +2163,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
activePainter = p;
switch (control) {
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
case CC_ScrollBar:
{
TQRect addline, subline, addpage, subpage, slider, first, last;
@@ -2237,9 +2237,9 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
break;
}
-#endif // QT_NO_SCROLLBAR
+#endif // TQT_NO_SCROLLBAR
-#ifndef QT_NO_TOOLBUTTON
+#ifndef TQT_NO_TOOLBUTTON
case CC_ToolButton:
{
TQColorGroup c = cg;
@@ -2284,9 +2284,9 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
break;
}
-#endif // QT_NO_TOOLBUTTON
+#endif // TQT_NO_TOOLBUTTON
-#ifndef QT_NO_TITLEBAR
+#ifndef TQT_NO_TITLEBAR
case CC_TitleBar:
{
if ( controls & SC_TitleBarLabel ) {
@@ -2332,7 +2332,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarCloseButton, TQStyleOption::Default, widget ), ceData, elementFlags );
down = active & SC_TitleBarCloseButton;
if ( widget->testWFlags( WStyle_Tool )
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
|| ::tqt_cast<TQDockWindow*>(widget)
#endif
)
@@ -2418,7 +2418,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
p->restore();
}
}
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
if ( controls & SC_TitleBarSysMenu ) {
if ( !ceData.icon.isNull() ) {
ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarSysMenu, TQStyleOption::Default, widget ), ceData, elementFlags );
@@ -2428,10 +2428,10 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
#endif
break;
}
-#endif //QT_NO_TITLEBAR
+#endif //TQT_NO_TITLEBAR
case CC_SpinWidget: {
-#ifndef QT_NO_SPINWIDGET
+#ifndef TQT_NO_SPINWIDGET
SFlags flags;
PrimitiveElement pe;
@@ -2476,7 +2476,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
#endif
break; }
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case CC_Slider:
switch ( controls ) {
case SC_SliderTickmarks: {
@@ -2534,14 +2534,14 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
break; }
}
break;
-#endif // QT_NO_SLIDER
-#ifndef QT_NO_LISTVIEW
+#endif // TQT_NO_SLIDER
+#ifndef TQT_NO_LISTVIEW
case CC_ListView:
if ( controls & SC_ListView ) {
p->fillRect( r, ceData.viewportData.bgBrush );
}
break;
-#endif //QT_NO_LISTVIEW
+#endif //TQT_NO_LISTVIEW
default:
break;
}
@@ -2624,7 +2624,7 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
}
break; }
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
case CC_ScrollBar: {
int sliderstart = 0;
int sbextent = pixelMetric(PM_ScrollBarExtent, ceData, elementFlags, widget);
@@ -2694,9 +2694,9 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
}
break; }
-#endif // QT_NO_SCROLLBAR
+#endif // TQT_NO_SCROLLBAR
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case CC_Slider: {
int tickOffset = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget );
int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
@@ -2720,9 +2720,9 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
break;
}
break; }
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
-#if !defined(QT_NO_TOOLBUTTON) && !defined(QT_NO_POPUPMENU)
+#if !defined(TQT_NO_TOOLBUTTON) && !defined(TQT_NO_POPUPMENU)
case CC_ToolButton: {
int mbi = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags, widget);
@@ -2742,9 +2742,9 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
}
break;
}
-#endif // QT_NO_TOOLBUTTON && QT_NO_POPUPMENU
+#endif // TQT_NO_TOOLBUTTON && TQT_NO_POPUPMENU
-#ifndef QT_NO_TITLEBAR
+#ifndef TQT_NO_TITLEBAR
case CC_TitleBar: {
const int controlTop = 2;
const int controlHeight = ceData.rect.height() - controlTop * 2;
@@ -2793,7 +2793,7 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
default: break;
}
break; }
-#endif //QT_NO_TITLEBAR
+#endif //TQT_NO_TITLEBAR
default:
break;
@@ -2812,7 +2812,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
SubControl ret = SC_None;
switch (control) {
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
case CC_ListView:
{
if(pos.x() >= 0 && pos.x() <
@@ -2821,7 +2821,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
break;
}
#endif
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
case CC_ScrollBar:
{
TQRect r;
@@ -2842,7 +2842,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
#endif
case CC_TitleBar:
{
-#ifndef QT_NO_TITLEBAR
+#ifndef TQT_NO_TITLEBAR
TQRect r;
uint ctrl = SC_TitleBarLabel;
@@ -2900,7 +2900,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
if ( !(elementFlags & CEF_UseGenericParameters) ) {
if ( ceData.wflags & WStyle_Tool ) {
ret = TQMAX( TQFontMetrics(ceData.font).lineSpacing(), 16 );
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
} else if ( ceData.widgetObjectTypes.containsYesNo(TQDockWindow_static_string) ) {
ret = TQMAX( TQFontMetrics(ceData.font).lineSpacing(), 13 );
#endif
@@ -2949,7 +2949,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
ret = 196;
break;
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
case PM_ScrollBarExtent:
if ( elementFlags & CEF_UseGenericParameters ) {
ret = 16;
@@ -2965,7 +2965,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
ret = -1;
break;
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case PM_SliderThickness:
ret = 16;
break;
@@ -3002,7 +3002,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
ret = ceData.rect.height() - pixelMetric( PM_SliderLength, ceData, elementFlags, widget );
break;
}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
case PM_DockWindowSeparatorExtent:
ret = 6;
@@ -3046,7 +3046,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
ret = 2;
break;
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
case PM_TabBarTabVSpace:
{
if ( ceData.widgetObjectTypes.containsYesNo(TQTabBar_static_string) && ( ceData.tabBarData.shape == TQTabBar::RoundedAbove ||
@@ -3117,7 +3117,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
TQSize sz(contentsSize);
switch (contents) {
-#ifndef QT_NO_DIALOGBUTTONS
+#ifndef TQT_NO_DIALOGBUTTONS
case CT_DialogButtons: {
int w = contentsSize.width(), h = contentsSize.height();
const int bwidth = pixelMetric(PM_DialogButtonsButtonWidth, ceData, elementFlags, widget),
@@ -3154,10 +3154,10 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
const int fw = pixelMetric(PM_DefaultFrameWidth, ceData, elementFlags, widget) * 2;
sz = TQSize(w + fw, h + fw);
break; }
-#endif //QT_NO_DIALOGBUTTONS
+#endif //TQT_NO_DIALOGBUTTONS
case CT_PushButton:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
int w = contentsSize.width(),
h = contentsSize.height(),
bm = pixelMetric(PM_ButtonMargin, ceData, elementFlags, widget),
@@ -3179,7 +3179,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
case CT_CheckBox:
{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
TQRect irect = subRect(SR_CheckBoxIndicator, ceData, elementFlags, widget);
int h = pixelMetric( PM_IndicatorHeight, ceData, elementFlags, widget );
int margins = (ceData.fgPixmap.isNull() && ceData.text.isEmpty()) ? 0 : 10;
@@ -3191,7 +3191,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
case CT_RadioButton:
{
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
TQRect irect = subRect(SR_RadioButtonIndicator, ceData, elementFlags, widget);
int h = pixelMetric( PM_ExclusiveIndicatorHeight, ceData, elementFlags, widget );
int margins = (ceData.fgPixmap.isNull() && ceData.text.isEmpty()) ? 0 : 10;
@@ -3216,7 +3216,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
case CT_PopupMenuItem:
{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
if (opt.isDefault())
break;
@@ -3285,7 +3285,7 @@ int TQCommonStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDa
int ret;
switch (sh) {
-#ifndef QT_NO_DIALOGBUTTONS
+#ifndef TQT_NO_DIALOGBUTTONS
case SH_DialogButtons_DefaultButton:
ret = TQDialogButtons::Accept;
break;
@@ -3373,4 +3373,4 @@ TQPixmap TQCommonStyle::stylePixmap(StylePixmap, const TQStyleControlElementData
return TQPixmap();
}
-#endif // QT_NO_STYLE
+#endif // TQT_NO_STYLE
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/qcompactstyle.cpp
index 8ec016e9e..e6fd64e14 100644
--- a/src/styles/qcompactstyle.cpp
+++ b/src/styles/qcompactstyle.cpp
@@ -40,7 +40,7 @@
#include "ntqcompactstyle.h"
-#if !defined(QT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
#include "ntqfontmetrics.h"
#include "ntqpalette.h"
diff --git a/src/styles/qinterlacestyle.cpp b/src/styles/qinterlacestyle.cpp
index cf1efe43c..8a2134544 100644
--- a/src/styles/qinterlacestyle.cpp
+++ b/src/styles/qinterlacestyle.cpp
@@ -42,7 +42,7 @@
#include "ntqinterlacestyle.h"
-#if !defined(QT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
#include "ntqapplication.h"
#include "ntqpainter.h"
@@ -800,6 +800,6 @@ void TQInterlaceStyle::drawPanel( TQPainter *p, int x, int y, int w, int h,
}
}
-#endif // QT_NO_STYLE_INTERLACE
+#endif // TQT_NO_STYLE_INTERLACE
#endif
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index 90a8f6339..84352808b 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -40,7 +40,7 @@
#include "ntqmotifplusstyle.h"
-#if !defined(QT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
#include "ntqmenubar.h"
#include "ntqapplication.h"
@@ -178,19 +178,19 @@ void TQMotifPlusStyle::polish(TQPalette &)
void TQMotifPlusStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains("TQWidget")) {
-#ifndef QT_NO_FRAME
+#ifndef TQT_NO_FRAME
if ((ceData.widgetObjectTypes.contains("TQFrame")) && (ceData.frameStyle == TQFrame::Panel)) {
widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetStyle, TQStyleWidgetActionRequestData(TQFrame::WinPanel));
}
#endif
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
if ((ceData.widgetObjectTypes.contains("TQMenuBar")) && (ceData.frameStyle != TQFrame::NoFrame)) {
widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetStyle, TQStyleWidgetActionRequestData(TQFrame::StyledPanel | TQFrame::Raised));
}
#endif
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
if (ceData.widgetObjectTypes.contains("TQToolBar")) {
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetLayoutMargin, TQStyleWidgetActionRequestData(2));
}
@@ -711,7 +711,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
switch (element) {
case CE_PushButton:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
TQRect br = r;
int dbi = pixelMetric(PM_ButtonDefaultIndicator, ceData, elementFlags, widget);
@@ -739,7 +739,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
case CE_CheckBoxLabel:
{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
if (flags & Style_MouseOver) {
TQRegion r(ceData.rect);
r -= visualRect(subRect(SR_CheckBoxIndicator, ceData, elementFlags, widget), ceData, elementFlags);
@@ -762,7 +762,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
case CE_RadioButtonLabel:
{
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
if (flags & Style_MouseOver) {
TQRegion r(ceData.rect);
r -= visualRect(subRect(SR_RadioButtonIndicator, ceData, elementFlags, widget), ceData, elementFlags);
@@ -785,7 +785,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
case CE_MenuBarItem:
{
-#ifndef QT_NO_MENUDATA
+#ifndef TQT_NO_MENUDATA
if (opt.isDefault())
break;
@@ -803,7 +803,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
}
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
case CE_PopupMenuItem:
{
if (! widget || opt.isDefault())
@@ -935,11 +935,11 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
}
break;
}
-#endif // QT_NO_POPUPMENU
+#endif // TQT_NO_POPUPMENU
case CE_TabBarTab:
{
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
bool selected = flags & Style_Selected;
TQColorGroup g = ceData.colorGroup;
@@ -1054,7 +1054,7 @@ TQRect TQMotifPlusStyle::subRect(SubRect r, const TQStyleControlElementData &ceD
switch (r) {
case SR_PushButtonFocusRect:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
int dfi = pixelMetric(PM_ButtonDefaultIndicator, ceData, elementFlags, widget);
rect = ceData.rect;
@@ -1089,7 +1089,7 @@ TQRect TQMotifPlusStyle::subRect(SubRect r, const TQStyleControlElementData &ceD
case SR_ComboBoxFocusRect:
{
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
if (elementFlags & CEF_IsEditable) {
rect = querySubControlMetrics(CC_ComboBox, ceData, elementFlags,
SC_ComboBoxEditField, TQStyleOption::Default, widget);
@@ -1102,7 +1102,7 @@ TQRect TQMotifPlusStyle::subRect(SubRect r, const TQStyleControlElementData &ceD
case SR_SliderFocusRect:
{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
int tickOffset = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget );
int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
int x, y, wi, he;
@@ -1149,7 +1149,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
switch (control) {
case CC_ScrollBar:
{
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
TQRect addline, subline, addpage, subpage, slider, first, last;
bool maxedOut = (ceData.minSteps == ceData.maxSteps);
@@ -1268,7 +1268,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
case CC_ComboBox:
{
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
TQRect editfield, arrow;
editfield =
visualRect(querySubControlMetrics(CC_ComboBox,
@@ -1327,7 +1327,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
case CC_SpinWidget:
{
-#ifndef QT_NO_SPINWIDGET
+#ifndef TQT_NO_SPINWIDGET
SFlags flags = Style_Default;
if (controls & SC_SpinWidgetFrame)
@@ -1370,7 +1370,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
case CC_Slider:
{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
bool mouseover = (flags & Style_MouseOver);
TQRect groove = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderGroove,
@@ -1464,7 +1464,7 @@ TQRect TQMotifPlusStyle::querySubControlMetrics(ComplexControl control,
}
break; }
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
case CC_ComboBox: {
if (elementFlags & CEF_IsEditable) {
int space = (ceData.rect.height() - 13) / 2;
@@ -1499,7 +1499,7 @@ TQRect TQMotifPlusStyle::querySubControlMetrics(ComplexControl control,
break; }
#endif
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case CC_Slider: {
if (subcontrol == SC_SliderHandle) {
@@ -1626,4 +1626,4 @@ int TQMotifPlusStyle::styleHint(StyleHint hint,
}
-#endif // QT_NO_STYLE_MOTIFPLUS
+#endif // TQT_NO_STYLE_MOTIFPLUS
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index 2902faa4b..a95018f59 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -40,7 +40,7 @@
#include "ntqmotifstyle.h"
-#if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
#include "ntqpopupmenu.h"
#include "ntqapplication.h"
@@ -215,7 +215,7 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
bool act = flags & Style_Active;
switch( pe ) {
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
case PE_CheckListExclusiveIndicator: {
TQCheckListItem *item = opt.checkListItem();
TQListView *lv = item->listView();
@@ -261,7 +261,7 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
break;
case PE_Indicator: {
-#ifndef QT_NO_BUTTON
+#ifndef TQT_NO_BUTTON
bool on = flags & Style_On;
bool down = flags & Style_Down;
bool showUp = !( down ^ on );
@@ -417,7 +417,7 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
// We use rot() and translate() as it is more efficient that
// matrix transformations on the painter, and because it still
- // works with QT_NO_TRANSFORMATIONS defined.
+ // works with TQT_NO_TRANSFORMATIONS defined.
if ( pe == PE_ArrowUp || pe == PE_ArrowLeft ) {
if ( vertical ) {
@@ -832,7 +832,7 @@ void TQMotifStyle::drawControl( ControlElement element,
switch( element ) {
case CE_PushButton:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
int diw, x1, y1, x2, y2;
TQColorGroup newCg = cg;
p->setPen( cg.foreground() );
@@ -893,7 +893,7 @@ void TQMotifStyle::drawControl( ControlElement element,
case CE_TabBarTab:
{
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
if ( (elementFlags & CEF_UseGenericParameters) || !(elementFlags & CEF_HasParentWidget) || !opt.tab() )
break;
@@ -1015,7 +1015,7 @@ void TQMotifStyle::drawControl( ControlElement element,
case CE_ProgressBarLabel:
{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
const int unit_width = pixelMetric( PM_ProgressBarChunkWidth, ceData, elementFlags, widget );
int u = r.width() / unit_width;
int p_v = ceData.currentStep;
@@ -1047,7 +1047,7 @@ void TQMotifStyle::drawControl( ControlElement element,
break;
}
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
case CE_PopupMenuItem:
{
if ((elementFlags & CEF_UseGenericParameters) || opt.isDefault())
@@ -1187,7 +1187,7 @@ void TQMotifStyle::drawControl( ControlElement element,
break;
}
-#endif // QT_NO_POPUPMENU
+#endif // TQT_NO_POPUPMENU
case CE_MenuBarItem:
{
@@ -1287,7 +1287,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
case CC_Slider:
{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
TQRect groove = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderGroove,
opt, widget),
handle = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderHandle,
@@ -1329,7 +1329,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
}
case CC_ComboBox:
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
if ( sub & SC_ComboBoxArrow ) {
const TQComboBox * cb = (const TQComboBox *) widget;
int awh, ax, ay, sh, sy, dh, ew;
@@ -1386,7 +1386,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
break;
}
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
case CC_ListView:
{
if ( sub & SC_ListView ) {
@@ -1490,7 +1490,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
break;
}
-#endif // QT_NO_LISTVIEW
+#endif // TQT_NO_LISTVIEW
default:
TQCommonStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags,
@@ -1528,7 +1528,7 @@ int TQMotifStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementDa
case PM_SliderControlThickness:
{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
const TQSlider * sl = (const TQSlider *) widget;
int space = (sl->orientation() == Horizontal) ? sl->height()
: sl->width();
@@ -1554,7 +1554,7 @@ int TQMotifStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementDa
case PM_SliderSpaceAvailable:
{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
const TQSlider * sl = (const TQSlider *) widget;
if ( sl->orientation() == Horizontal )
ret = sl->width() - pixelMetric( PM_SliderLength, ceData, elementFlags, sl ) - 6;
@@ -1634,7 +1634,7 @@ TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
}
break; }
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case CC_Slider: {
if (sc == SC_SliderHandle) {
int tickOffset = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget );
@@ -1652,7 +1652,7 @@ TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
break; }
#endif
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
case CC_ScrollBar: {
if (elementFlags & CEF_UseGenericParameters)
return TQRect();
@@ -1733,7 +1733,7 @@ TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
break; }
#endif
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
case CC_ComboBox:
switch ( sc ) {
@@ -1777,7 +1777,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
switch(contents) {
case CT_PushButton:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
sz = TQCommonStyle::sizeFromContents(contents, ceData, elementFlags, contentsSize, opt, widget);
if (((elementFlags & CEF_IsDefault) || (elementFlags & CEF_AutoDefault)) &&
sz.width() < 80 && ceData.fgPixmap.isNull())
@@ -1788,7 +1788,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
case CT_PopupMenuItem:
{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
if ((elementFlags & CEF_UseGenericParameters) || opt.isDefault())
break;
@@ -1871,7 +1871,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
case SR_DockWindowHandleRect:
{
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
if ( (elementFlags & CEF_UseGenericParameters) || !(elementFlags & CEF_HasParentWidget) )
break;
@@ -1890,7 +1890,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
case SR_ProgressBarGroove:
case SR_ProgressBarContents:
{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
TQFontMetrics fm( ( (!(elementFlags & CEF_UseGenericParameters)) ? TQFontMetrics(ceData.font) :
TQApplication::fontMetrics() ) );
int textw = 0;
@@ -1909,7 +1909,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
case SR_ProgressBarLabel:
{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
TQFontMetrics fm( ( (!(elementFlags & CEF_UseGenericParameters)) ? TQFontMetrics(ceData.font) :
TQApplication::fontMetrics() ) );
int textw = 0;
@@ -1928,7 +1928,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
case SR_CheckBoxContents:
{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
TQRect ir = subRect(SR_CheckBoxIndicator, ceData, elementFlags, widget);
rect.setRect(ir.right() + 10, wrect.y(),
wrect.width() - ir.width() - 10, wrect.height());
@@ -1955,7 +1955,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
*/
void TQMotifStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
if ( !(ceData.windowState & WState_Polished ) ) {
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable);
}
@@ -1963,7 +1963,7 @@ void TQMotifStyle::polishPopupMenu( const TQStyleControlElementData &ceData, Con
}
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
static const char * const qt_close_xpm[] = {
"12 12 2 1",
" s None c None",
@@ -2274,7 +2274,7 @@ TQPixmap TQMotifStyle::stylePixmap(StylePixmap sp,
const TQStyleOption& opt,
const TQWidget *widget) const
{
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
switch (sp) {
case SP_TitleBarShadeButton:
return TQPixmap((const char **)qt_shade_xpm);
diff --git a/src/styles/qplatinumstyle.cpp b/src/styles/qplatinumstyle.cpp
index 09f67db24..097198f7b 100644
--- a/src/styles/qplatinumstyle.cpp
+++ b/src/styles/qplatinumstyle.cpp
@@ -40,7 +40,7 @@
#include "ntqplatinumstyle.h"
-#if !defined(QT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
#include "ntqapplication.h"
#include "ntqcombobox.h"
@@ -753,7 +753,7 @@ void TQPlatinumStyle::drawControl( ControlElement element,
switch( element ) {
case CE_PushButton:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
TQColorGroup myCg( cg );
int x1, y1, x2, y2;
bool useBevelButton;
@@ -861,7 +861,7 @@ void TQPlatinumStyle::drawControl( ControlElement element,
}
case CE_PushButtonLabel:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
bool on;
int x, y, w, h;
SFlags flags;
@@ -891,7 +891,7 @@ void TQPlatinumStyle::drawControl( ControlElement element,
g, flags, opt );
w -= dx;
}
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
if ( !ceData.iconSet.isNull() ) {
TQIconSet::Mode mode = ( elementFlags & CEF_IsEnabled )
? TQIconSet::Normal : TQIconSet::Disabled;
@@ -1078,7 +1078,7 @@ void TQPlatinumStyle::drawComplexControl( ComplexControl control,
p->drawPoint( a[6] );
}
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
if ( sub & SC_ComboBoxEditField ) {
// sadly this is pretty much the windows code, except
// for the first fillRect call...
@@ -1127,7 +1127,7 @@ void TQPlatinumStyle::drawComplexControl( ComplexControl control,
}
case CC_Slider:
{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
int len = pixelMetric( PM_SliderLength, ceData, elementFlags, widget );
int ticks = ceData.tickMarkSetting;
@@ -1327,7 +1327,7 @@ TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
const TQWidget *widget ) const
{
switch( control ) {
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
case CC_ComboBox:
switch( sc ) {
case SC_ComboBoxArrow: {
@@ -1343,7 +1343,7 @@ TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
}
break;
#endif
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
case CC_ScrollBar: {
int sliderStart = ceData.startStep;
int sbextent = pixelMetric( PM_ScrollBarExtent, ceData, elementFlags, widget );
@@ -1401,7 +1401,7 @@ TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
}
break; }
#endif
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case CC_Slider: {
int tickOffset = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget);
int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget);
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index aa88a6c95..c6a3c2ba7 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -40,7 +40,7 @@
#include "ntqsgistyle.h"
-#if !defined(QT_NO_STYLE_SGI) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN)
#include "ntqpopupmenu.h"
#include "ntqapplication.h"
@@ -60,7 +60,7 @@
#include "ntqmenubar.h"
#include <limits.h>
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
struct SliderLastPosition
{
SliderLastPosition() : rect(0,-1,0,-1), slider(0) {}
@@ -69,7 +69,7 @@ struct SliderLastPosition
};
#endif
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
struct ScrollbarLastPosition
{
ScrollbarLastPosition() : rect( 0,-1, 0,-1 ), scrollbar(0) {}
@@ -88,10 +88,10 @@ public:
const void* hotWidget;
TQPoint mousePos;
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
ScrollbarLastPosition lastScrollbarRect;
#endif
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
SliderLastPosition lastSliderRect;
#endif
};
@@ -234,7 +234,7 @@ TQSGIStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags
if ( (ceData.widgetObjectTypes.contains("TQButton")) || (ceData.widgetObjectTypes.contains("TQSlider")) || (ceData.widgetObjectTypes.contains("TQScrollBar")) ) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
widgetActionRequest(ceData, elementFlags, ptr, WAR_EnableMouseTracking);
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
if ( ceData.widgetObjectTypes.contains("TQScrollBar") ) {
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetBackgroundMode, TQStyleWidgetActionRequestData(TQWidget::NoBackground));
}
@@ -244,7 +244,7 @@ TQSGIStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags
f.setBold( TRUE );
f.setItalic( TRUE );
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetFont, TQStyleWidgetActionRequestData(f));
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
} else if ( ceData.widgetObjectTypes.contains("TQMenuBar") ) {
widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetStyle, TQStyleWidgetActionRequestData(TQFrame::StyledPanel | TQFrame::Raised));
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetBackgroundMode, TQStyleWidgetActionRequestData(TQWidget::PaletteBackground));
@@ -253,7 +253,7 @@ TQSGIStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags
f.setItalic( TRUE );
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetFont, TQStyleWidgetActionRequestData(f));
#endif
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
} else if ( ceData.widgetObjectTypes.contains("TQPopupMenu") ) {
TQStyleWidgetActionRequestData requestData;
widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetLineWidth, TQStyleWidgetActionRequestData(pixelMetric( PM_DefaultFrameWidth, TQStyleControlElementData(), CEF_None ) + 1));
@@ -273,12 +273,12 @@ TQSGIStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFla
{
if ( (ceData.widgetObjectTypes.contains("TQButton")) || (ceData.widgetObjectTypes.contains("TQSlider")) || (ceData.widgetObjectTypes.contains("TQScrollBar")) ) {
removeObjectEventHandler(ceData, elementFlags, ptr, this);
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
} else if ( ceData.widgetObjectTypes.contains("TQPopupMenu") ) {
widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetLineWidth, TQStyleWidgetActionRequestData(pixelMetric( PM_DefaultFrameWidth, TQStyleControlElementData(), CEF_None )));
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetFont, TQStyleWidgetActionRequestData(TQApplication::font()));
#endif
-#if !defined(QT_NO_MENUBAR) || !defined(QT_NO_COMBOBOX)
+#if !defined(TQT_NO_MENUBAR) || !defined(TQT_NO_COMBOBOX)
} else if ( (ceData.widgetObjectTypes.contains("TQMenuBar")) || (ceData.widgetObjectTypes.contains("TQComboBox")) ) {
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetFont, TQStyleWidgetActionRequestData(TQApplication::font()));
#endif
@@ -294,7 +294,7 @@ bool TQSGIStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co
switch ( e->type() ) {
case TQEvent::MouseButtonPress:
{
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
if (ceData.widgetObjectTypes.contains("TQScrollBar")) {
d->lastScrollbarRect.rect = ceData.sliderRect;
d->lastScrollbarRect.scrollbar = source;
@@ -302,7 +302,7 @@ bool TQSGIStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co
} else
#endif
{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
if (ceData.widgetObjectTypes.contains("TQSlider")) {
d->lastSliderRect.rect = ceData.sliderRect;
d->lastSliderRect.slider = source;
@@ -316,13 +316,13 @@ bool TQSGIStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co
case TQEvent::MouseButtonRelease:
{
if ( 0 ) {
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
} else if (ceData.widgetObjectTypes.contains("TQScrollBar")) {
TQRect oldRect = d->lastScrollbarRect.rect;
d->lastScrollbarRect.rect = TQRect( 0, -1, 0, -1 );
widgetActionRequest(ceData, elementFlags, source, WAR_RepaintRect, TQStyleWidgetActionRequestData(oldRect));
#endif
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
} else if (ceData.widgetObjectTypes.contains("TQSlider")) {
TQRect oldRect = d->lastSliderRect.rect;
d->lastSliderRect.rect = TQRect( 0, -1, 0, -1 );
@@ -957,7 +957,7 @@ void TQSGIStyle::drawControl( ControlElement element,
switch ( element ) {
case CE_PushButton:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
int x1, y1, x2, y2;
r.coords( &x1, &y1, &x2, &y2 );
@@ -1003,7 +1003,7 @@ void TQSGIStyle::drawControl( ControlElement element,
case CE_PopupMenuItem:
{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
if ( ( elementFlags & CEF_UseGenericParameters ) || opt.isDefault())
break;
TQMenuItem *mi = opt.menuItem();
@@ -1136,7 +1136,7 @@ void TQSGIStyle::drawControl( ControlElement element,
case CE_MenuBarItem:
{
-#ifndef QT_NO_MENUDATA
+#ifndef TQT_NO_MENUDATA
if (opt.isDefault())
break;
@@ -1202,7 +1202,7 @@ void TQSGIStyle::drawComplexControl( ComplexControl control,
switch ( control ) {
case CC_Slider:
{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
TQRect groove = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderGroove,
opt, widget),
handle = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderHandle,
@@ -1265,7 +1265,7 @@ void TQSGIStyle::drawComplexControl( ComplexControl control,
}
case CC_ComboBox:
{
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
if (sub & SC_ComboBoxFrame) {
TQRect fr =
TQStyle::visualRect( querySubControlMetrics( CC_ComboBox, ceData, elementFlags,
@@ -1312,7 +1312,7 @@ void TQSGIStyle::drawComplexControl( ComplexControl control,
case CC_ScrollBar:
{
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
bool maxedOut = (ceData.minSteps == ceData.maxSteps);
if ( maxedOut )
flags &= ~Style_Enabled;
@@ -1418,7 +1418,7 @@ TQSize TQSGIStyle::sizeFromContents( ContentsType contents,
switch(contents) {
case CT_PopupMenuItem:
{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
if ((elementFlags & CEF_UseGenericParameters) || opt.isDefault())
break;
@@ -1535,4 +1535,4 @@ int TQSGIStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData,
return ret;
}
-#endif // QT_NO_STYLE_SGI
+#endif // TQT_NO_STYLE_SGI
diff --git a/src/styles/qstylefactory.cpp b/src/styles/qstylefactory.cpp
index c8c797e48..576104cd8 100644
--- a/src/styles/qstylefactory.cpp
+++ b/src/styles/qstylefactory.cpp
@@ -41,7 +41,7 @@
#include "qstyleinterface_p.h" // up here for GCC 2.7.* compatibility
#include "ntqstylefactory.h"
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
#include "ntqapplication.h"
#include "ntqwindowsstyle.h"
@@ -51,17 +51,17 @@
#include "ntqplatinumstyle.h"
#include "ntqsgistyle.h"
#include "ntqcompactstyle.h"
-#ifndef QT_NO_STYLE_WINDOWSXP
+#ifndef TQT_NO_STYLE_WINDOWSXP
#include "qwindowsxpstyle.h"
#endif
-#ifndef QT_NO_STYLE_AQUA
+#ifndef TQT_NO_STYLE_AQUA
#include "qaquastyle.h"
#endif
-#ifndef QT_NO_STYLE_POCKETPC
+#ifndef TQT_NO_STYLE_POCKETPC
#include "qpocketpcstyle_wce.h"
#endif
-#if !defined( QT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
+#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
TQString p2qstring(const unsigned char *c); //qglobal.cpp
#include "qt_mac.h"
#include "qmacstyle_mac.h"
@@ -69,7 +69,7 @@ TQString p2qstring(const unsigned char *c); //qglobal.cpp
#include <stdlib.h>
#include <private/qpluginmanager_p.h>
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
class TQStyleFactoryPrivate : public TQObject
{
public:
@@ -96,7 +96,7 @@ TQStyleFactoryPrivate::~TQStyleFactoryPrivate()
instance = 0;
}
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
/*!
\class TQStyleFactory ntqstylefactory.h
@@ -124,61 +124,61 @@ TQStyle *TQStyleFactory::create( const TQString& key )
{
TQStyle *ret = 0;
TQString style = key.lower();
-#ifndef QT_NO_STYLE_WINDOWS
+#ifndef TQT_NO_STYLE_WINDOWS
if ( style == "windows" )
ret = new TQWindowsStyle;
else
#endif
-#ifndef QT_NO_STYLE_WINDOWSXP
+#ifndef TQT_NO_STYLE_WINDOWSXP
if ( style == "windowsxp" )
ret = new TQWindowsXPStyle;
else
#endif
-#ifndef QT_NO_STYLE_MOTIF
+#ifndef TQT_NO_STYLE_MOTIF
if ( style == "motif" )
ret = new TQMotifStyle;
else
#endif
-#ifndef QT_NO_STYLE_CDE
+#ifndef TQT_NO_STYLE_CDE
if ( style == "cde" )
ret = new TQCDEStyle;
else
#endif
-#ifndef QT_NO_STYLE_MOTIFPLUS
+#ifndef TQT_NO_STYLE_MOTIFPLUS
if ( style == "motifplus" )
ret = new TQMotifPlusStyle;
else
#endif
-#ifndef QT_NO_STYLE_PLATINUM
+#ifndef TQT_NO_STYLE_PLATINUM
if ( style == "platinum" )
ret = new TQPlatinumStyle;
else
#endif
-#ifndef QT_NO_STYLE_SGI
+#ifndef TQT_NO_STYLE_SGI
if ( style == "sgi")
ret = new TQSGIStyle;
else
#endif
-#ifndef QT_NO_STYLE_COMPACT
+#ifndef TQT_NO_STYLE_COMPACT
if ( style == "compact" )
ret = new TQCompactStyle;
else
#endif
-#ifndef QT_NO_STYLE_AQUA
+#ifndef TQT_NO_STYLE_AQUA
if ( style == "aqua" )
ret = new TQAquaStyle;
#endif
-#ifndef QT_NO_STYLE_POCKETPC
+#ifndef TQT_NO_STYLE_POCKETPC
if ( style == "pocketpc" )
ret = new TQPocketPCStyle;
#endif
-#if !defined( QT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
+#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
if( style.left(9) == "macintosh" )
ret = new TQMacStyle;
#endif
{ } // Keep these here - they make the #ifdefery above work
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
if(!ret) {
if ( !instance )
instance = new TQStyleFactoryPrivate;
@@ -195,7 +195,7 @@ TQStyle *TQStyleFactory::create( const TQString& key )
return ret;
}
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
/*!
Returns the list of keys this factory can create styles for.
@@ -204,50 +204,50 @@ TQStyle *TQStyleFactory::create( const TQString& key )
TQStringList TQStyleFactory::keys()
{
TQStringList list;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
if ( !instance )
instance = new TQStyleFactoryPrivate;
list = TQStyleFactoryPrivate::manager->featureList();
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
-#ifndef QT_NO_STYLE_WINDOWS
+#ifndef TQT_NO_STYLE_WINDOWS
if ( !list.contains( "Windows" ) )
list << "Windows";
#endif
-#ifndef QT_NO_STYLE_WINDOWSXP
+#ifndef TQT_NO_STYLE_WINDOWSXP
if ( !list.contains( "WindowsXP" ) && TQWindowsXPStyle::resolveSymbols() )
list << "WindowsXP";
#endif
-#ifndef QT_NO_STYLE_MOTIF
+#ifndef TQT_NO_STYLE_MOTIF
if ( !list.contains( "Motif" ) )
list << "Motif";
#endif
-#ifndef QT_NO_STYLE_CDE
+#ifndef TQT_NO_STYLE_CDE
if ( !list.contains( "CDE" ) )
list << "CDE";
#endif
-#ifndef QT_NO_STYLE_MOTIFPLUS
+#ifndef TQT_NO_STYLE_MOTIFPLUS
if ( !list.contains( "MotifPlus" ) )
list << "MotifPlus";
#endif
-#ifndef QT_NO_STYLE_PLATINUM
+#ifndef TQT_NO_STYLE_PLATINUM
if ( !list.contains( "Platinum" ) )
list << "Platinum";
#endif
-#ifndef QT_NO_STYLE_SGI
+#ifndef TQT_NO_STYLE_SGI
if ( !list.contains( "SGI" ) )
list << "SGI";
#endif
-#ifndef QT_NO_STYLE_COMPACT
+#ifndef TQT_NO_STYLE_COMPACT
if ( !list.contains( "Compact" ) )
list << "Compact";
#endif
-#ifndef QT_NO_STYLE_AQUA
+#ifndef TQT_NO_STYLE_AQUA
if ( !list.contains( "Aqua" ) )
list << "Aqua";
#endif
-#if !defined( QT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
+#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
TQString mstyle = "Macintosh";
Collection c = NewCollection();
if (c) {
@@ -265,4 +265,4 @@ TQStringList TQStyleFactory::keys()
return list;
}
#endif
-#endif // QT_NO_STYLE
+#endif // TQT_NO_STYLE
diff --git a/src/styles/qstyleinterface_p.h b/src/styles/qstyleinterface_p.h
index 0f962a08e..afca34be7 100644
--- a/src/styles/qstyleinterface_p.h
+++ b/src/styles/qstyleinterface_p.h
@@ -55,8 +55,8 @@
#include <private/qcom_p.h>
#endif // QT_H
-#ifndef QT_NO_STYLE
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_STYLE
+#ifndef TQT_NO_COMPONENT
class TQStyle;
@@ -70,7 +70,7 @@ struct Q_EXPORT TQStyleFactoryInterface : public TQFeatureListInterface
virtual TQStyle* create( const TQString& style ) = 0;
};
-#endif //QT_NO_COMPONENT
-#endif //QT_NO_STYLE
+#endif //TQT_NO_COMPONENT
+#endif //TQT_NO_STYLE
#endif //TQSTYLEINTERFACE_P_H
diff --git a/src/styles/qstyleplugin.cpp b/src/styles/qstyleplugin.cpp
index a76b4d1a4..b9370baab 100644
--- a/src/styles/qstyleplugin.cpp
+++ b/src/styles/qstyleplugin.cpp
@@ -40,8 +40,8 @@
#include "ntqstyleplugin.h"
-#ifndef QT_NO_STYLE
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_STYLE
+#ifndef TQT_NO_COMPONENT
#include "qstyleinterface_p.h"
#include "ntqobjectcleanuphandler.h"
@@ -181,5 +181,5 @@ TQStylePlugin::~TQStylePlugin()
// don't delete d, as this is deleted by d
}
-#endif // QT_NO_COMPONENT
-#endif // QT_NO_STYLE
+#endif // TQT_NO_COMPONENT
+#endif // TQT_NO_STYLE
diff --git a/src/styles/qt_styles.pri b/src/styles/qt_styles.pri
index 10e84b257..7eb9e5bcf 100644
--- a/src/styles/qt_styles.pri
+++ b/src/styles/qt_styles.pri
@@ -27,7 +27,7 @@ styles {
styles += windows
}
}
- else:DEFINES += QT_NO_STYLE_MAC
+ else:DEFINES += TQT_NO_STYLE_MAC
#embedded|!macx-*:styles -= aqua
contains( styles, aqua ) {
@@ -41,7 +41,7 @@ styles {
styles += windows
}
}
- else:DEFINES += QT_NO_STYLE_AQUA
+ else:DEFINES += TQT_NO_STYLE_AQUA
contains( styles, cde ) {
HEADERS +=$$STYLES_H/ntqcdestyle.h
@@ -52,7 +52,7 @@ styles {
styles += motif
}
}
- else:DEFINES += QT_NO_STYLE_CDE
+ else:DEFINES += TQT_NO_STYLE_CDE
contains( styles, motifplus ) {
HEADERS +=$$STYLES_H/ntqmotifplusstyle.h
@@ -62,7 +62,7 @@ styles {
styles += motif
}
}
- else:DEFINES += QT_NO_STYLE_MOTIFPLUS
+ else:DEFINES += TQT_NO_STYLE_MOTIFPLUS
contains( styles, interlace ) {
HEADERS +=$$STYLES_H/ntqinterlacestyle.h
@@ -72,7 +72,7 @@ styles {
styles += windows
}
}
- else:DEFINES += QT_NO_STYLE_INTERLACE
+ else:DEFINES += TQT_NO_STYLE_INTERLACE
contains( styles, platinum ) {
HEADERS +=$$STYLES_H/ntqplatinumstyle.h
@@ -82,7 +82,7 @@ styles {
styles += windows
}
}
- else:DEFINES += QT_NO_STYLE_PLATINUM
+ else:DEFINES += TQT_NO_STYLE_PLATINUM
contains( styles, windowsxp ) {
HEADERS +=$$STYLES_H/qwindowsxpstyle.h
@@ -92,7 +92,7 @@ styles {
styles += windows
}
}
- else:DEFINES += QT_NO_STYLE_WINDOWSXP
+ else:DEFINES += TQT_NO_STYLE_WINDOWSXP
contains( styles, sgi ) {
HEADERS +=$$STYLES_H/ntqsgistyle.h
@@ -102,7 +102,7 @@ styles {
styles += motif
}
}
- else:DEFINES += QT_NO_STYLE_SGI
+ else:DEFINES += TQT_NO_STYLE_SGI
contains( styles, compact ) {
HEADERS +=$$STYLES_H/ntqcompactstyle.h
@@ -112,7 +112,7 @@ styles {
styles += windows
}
}
- else:DEFINES += QT_NO_STYLE_COMPACT
+ else:DEFINES += TQT_NO_STYLE_COMPACT
wince-*:styles += pocketpc
contains( styles, pocketpc ) {
@@ -124,17 +124,17 @@ styles {
styles += windows
}
}
- else:DEFINES += QT_NO_STYLE_POCKETPC
+ else:DEFINES += TQT_NO_STYLE_POCKETPC
contains( styles, windows ) {
HEADERS +=$$STYLES_H/ntqwindowsstyle.h
SOURCES +=$$STYLES_CPP/qwindowsstyle.cpp
}
- else:DEFINES += QT_NO_STYLE_WINDOWS
+ else:DEFINES += TQT_NO_STYLE_WINDOWS
contains( styles, motif ) {
HEADERS +=$$STYLES_H/ntqmotifstyle.h
SOURCES +=$$STYLES_CPP/qmotifstyle.cpp
}
- else:DEFINES += QT_NO_STYLE_MOTIF
+ else:DEFINES += TQT_NO_STYLE_MOTIF
}
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index e7de564d2..d3b130707 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -40,7 +40,7 @@
#include "ntqwindowsstyle.h"
-#if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
#include "ntqpopupmenu.h"
#include "ntqapplication.h"
@@ -697,7 +697,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
const TQWidget *widget ) const
{
switch (element) {
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
case CE_TabBarTab:
{
if ( ( elementFlags & CEF_UseGenericParameters ) || (!( elementFlags & CEF_HasParentWidget )) || !opt.tab() )
@@ -812,7 +812,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
}
break;
}
-#endif // QT_NO_TABBAR
+#endif // TQT_NO_TABBAR
case CE_ToolBoxTab:
{
qDrawShadePanel( p, r, cg, flags & (Style_Sunken | Style_Down | Style_On) , 1,
@@ -820,7 +820,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
break;
}
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
case CE_PopupMenuItem:
{
if (( elementFlags & CEF_UseGenericParameters ) || opt.isDefault())
@@ -1034,7 +1034,7 @@ int TQWindowsStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementD
ret = 60;
break;
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case PM_SliderLength:
ret = 11;
break;
@@ -1066,7 +1066,7 @@ int TQWindowsStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementD
ret = thick;
break;
}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
case PM_MenuBarFrameWidth:
ret = 0;
@@ -1107,7 +1107,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
switch (contents) {
case CT_PushButton:
{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
sz = TQCommonStyle::sizeFromContents(contents, ceData, elementFlags, contentsSize, opt, widget);
int w = sz.width(), h = sz.height();
@@ -1127,7 +1127,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
case CT_PopupMenuItem:
{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
if (( elementFlags & CEF_UseGenericParameters ) || opt.isDefault())
break;
@@ -1198,14 +1198,14 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
*/
void TQWindowsStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
if ( !(ceData.windowState & WState_Polished ) ) {
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable);
}
#endif
}
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
static const char * const qt_close_xpm[] = {
"12 12 2 1",
"# c #000000",
@@ -1482,7 +1482,7 @@ static const char *const question_xpm[] = {
"..................***...........",
"...................**...........",
};
-#endif //QT_NO_IMAGEIO_XPM
+#endif //TQT_NO_IMAGEIO_XPM
/*!
\reimp
@@ -1493,7 +1493,7 @@ TQPixmap TQWindowsStyle::stylePixmap(StylePixmap stylepixmap,
const TQStyleOption& opt,
const TQWidget *widget) const
{
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
switch (stylepixmap) {
case SP_TitleBarShadeButton:
return TQPixmap( (const char **)qt_shade_xpm );
@@ -1520,7 +1520,7 @@ TQPixmap TQWindowsStyle::stylePixmap(StylePixmap stylepixmap,
default:
break;
}
-#endif //QT_NO_IMAGEIO_XPM
+#endif //TQT_NO_IMAGEIO_XPM
return TQCommonStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
}
@@ -1538,7 +1538,7 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
const TQWidget *widget ) const
{
switch (ctrl) {
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
case CC_ListView:
{
if ( sub & SC_ListView ) {
@@ -1698,9 +1698,9 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
}
}
break;
-#endif //QT_NO_LISTVIEW
+#endif //TQT_NO_LISTVIEW
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
case CC_ComboBox:
if ( sub & SC_ComboBoxArrow ) {
SFlags flags = Style_Default;
@@ -1755,9 +1755,9 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
}
break;
-#endif // QT_NO_COMBOBOX
+#endif // TQT_NO_COMBOBOX
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case CC_Slider:
{
int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
@@ -1963,7 +1963,7 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
break;
}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
default:
TQCommonStyle::drawComplexControl( ctrl, p, ceData, elementFlags, r, cg, flags, sub,
@@ -2037,13 +2037,13 @@ TQRect TQWindowsStyle::subRect(SubRect r, const TQStyleControlElementData &ceDat
TQRect rect;
switch (r) {
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
case SR_SliderFocusRect:
{
rect = ceData.rect;
break;
}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
case SR_ToolBoxTabContents:
rect = ceData.rect;
break;