summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-07-12 09:39:46 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-07-13 09:46:34 +0900
commit2081343a38fcf12e7ae321f594ce4e07d042de9a (patch)
treec2ab7e6c2da598db3da12a05dcf6d40833cbbbaf
parentf4a20352864856a7d9161ac975143b1df4ed5434 (diff)
downloadtde-style-baghira-2081343a38fcf12e7ae321f594ce4e07d042de9a.tar.gz
tde-style-baghira-2081343a38fcf12e7ae321f594ce4e07d042de9a.zip
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 31149c65cca5348dfd890dfb2ffe027f544f6ccb)
-rw-r--r--style/eventfilter.cpp2
-rw-r--r--style/polish.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/style/eventfilter.cpp b/style/eventfilter.cpp
index ed445d7..a701e60 100644
--- a/style/eventfilter.cpp
+++ b/style/eventfilter.cpp
@@ -13,7 +13,7 @@ bool LiquidStyle::objectEventHandler( const TQStyleControlElementData &ceData,
return true;
}
- if (!ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+ if (!ceData.widgetObjectTypes.contains("TQObject")) {
return false;
}
TQObject* obj = reinterpret_cast<TQObject*>(source);
diff --git a/style/polish.cpp b/style/polish.cpp
index a810d37..064fcdb 100644
--- a/style/polish.cpp
+++ b/style/polish.cpp
@@ -206,7 +206,7 @@ void LiquidStyle::polish( TQPalette &pal )
void LiquidStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
- if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQApplication")) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
popupBack.resize(0,0);
TQPalette pal( app->palette() );
@@ -236,7 +236,7 @@ void LiquidStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
// if (w->sizePolicy().horData() == TQSizePolicy::Minimum || w->sizePolicy().horData() == TQSizePolicy::MinimumExpanding)
// tqWarning("%s, \"%s\"",w->className(), w->name());
// installObjectEventHandler(ceData, elementFlags, ptr, this);
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
bool tmpBool = false;
@@ -755,7 +755,7 @@ void LiquidStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
void LiquidStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) {
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
bool isViewport;