summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2023-07-12 09:55:46 +0900
committerMichele Calgaro <[email protected]>2023-07-13 09:49:04 +0900
commit7165d58bcaf0659d04518122103dd9630baeff8c (patch)
tree4c394e9df899667151ebb7d0ecd3f49c470a1632
parent0928cd3afd4e4d80ad317c81ae1226968ef5b8c1 (diff)
downloadtde-style-lipstik-7165d58bcaf0659d04518122103dd9630baeff8c.tar.gz
tde-style-lipstik-7165d58bcaf0659d04518122103dd9630baeff8c.zip
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 906fa0a7b30522bb43f89b89e761213961e69d9f)
-rw-r--r--style/lipstik.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/style/lipstik.cpp b/style/lipstik.cpp
index e63324a..d28a2be 100644
--- a/style/lipstik.cpp
+++ b/style/lipstik.cpp
@@ -277,7 +277,7 @@ LipstikStyle::~LipstikStyle()
void LipstikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr)
{
- if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQApplication")) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
if (!qstrcmp(app->argv()[0], "kicker"))
kickerMode = true;
@@ -288,7 +288,7 @@ void LipstikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co
void LipstikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
@@ -313,7 +313,7 @@ void LipstikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
} else if(::tqqt_cast<TQScrollBar*>(widget)) {
widget->setMouseTracking(true);
installObjectEventHandler(ceData, elementFlags, ptr, this);
- } else if (widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) || widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) {
+ } else if (widget->inherits("TQSplitterHandle") || widget->inherits("TQDockWindowHandle") ) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
} else if (::tqqt_cast<TQLineEdit*>(widget)) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
@@ -345,7 +345,7 @@ void LipstikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
void LipstikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
@@ -357,7 +357,7 @@ void LipstikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) ||
::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) ||
::tqqt_cast<TQToolButton*>(widget) || ::tqqt_cast<TQLineEdit*>(widget) ||
- widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) )
+ widget->inherits("TQSplitterHandle") )
{
removeObjectEventHandler(ceData, elementFlags, ptr, this);
}
@@ -3409,7 +3409,7 @@ void LipstikStyle::drawComplexControl(ComplexControl control,
// Tricky... (I'm lucky TQtCurve has already gone there... thanks Craig!)
if (_drawToolBarGradient) {
bool horizontal=false;
- if ( ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING) ) {
+ if ( ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar") ) {
if ( TQt::Horizontal==ceData.toolBarData.orientation ) {
horizontal=true;
}
@@ -3925,7 +3925,7 @@ TQSize LipstikStyle::sizeFromContents(ContentsType t,
case CT_ToolButton:
{
- if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
+ if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"))
return TQSize( s.width()+2*4+_toolBarSpacing, s.height()+2*4 );
else
return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
@@ -3970,7 +3970,7 @@ bool LipstikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
if (TDEStyle::objectEventHandler(ceData, elementFlags, source, ev) )
return true;
- if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQObject")) {
TQObject* obj = reinterpret_cast<TQObject*>(source);
if (!obj->isWidgetType() ) return false;