diff options
Diffstat (limited to 'styles/phase')
| -rw-r--r-- | styles/phase/phasestyle.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index 782116a6..4379e6ac 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -54,7 +54,7 @@ #include "phasestyle.h" #include "bitmaps.h" -static const char* TQSPLITTERHANDLE = TQSPLITTERHANDLE_OBJECT_NAME_STRING; +static const char* TQSPLITTERHANDLE = "TQSplitterHandle"; static const char* TQTOOLBAREXTENSION = "TQToolBarExtensionWidget"; static const char* KTOOLBARWIDGET = "tde toolbar widget"; @@ -138,7 +138,7 @@ PhaseStyle::~PhaseStyle() void PhaseStyle::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")) kicker_ = true; } @@ -151,7 +151,7 @@ void PhaseStyle::applicationPolish(const TQStyleControlElementData &ceData, Cont void PhaseStyle::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 (::tqqt_cast<TQMenuBar*>(widget) || @@ -213,7 +213,7 @@ void PhaseStyle::polish(TQPalette &pal) void PhaseStyle::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 (::tqqt_cast<TQMenuBar*>(widget) || @@ -638,7 +638,7 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element, horiz = true; } - if ((ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) || + if ((ceData.widgetObjectTypes.contains("TQPopupMenu")) || (ceData.widgetObjectTypes.contains("TDEPopupTitle"))) { // kicker/kdesktop menu titles drawPhaseBevel(painter, x,y,w,h, @@ -894,7 +894,7 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element, widget = dynamic_cast<TQWidget*>(painter->device()); bool flat = true; - if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) { + if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) { TQToolBar *toolbar = ::tqqt_cast<TQToolBar*>(widget->parent()); if (toolbar) { // toolbar not floating or in a TQMainWindow @@ -1349,7 +1349,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } case CE_PopupMenuItem: { - if (!ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQPopupMenu")) { TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; @@ -1503,7 +1503,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } case CE_TabBarTab: { - if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQTabBar")) { // this guy can get complicated, we we do it elsewhere drawPhaseTab(painter, x, y, w, h, group, ceData, elementFlags, option, flags); @@ -1522,7 +1522,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } case CE_ProgressBarContents: { - if (!ceData.widgetObjectTypes.contains(TQPROGRESSBAR_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQProgressBar")) { TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; @@ -1847,7 +1847,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, y2 = rect.bottom(); // check for TQToolBar parent - if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) { + if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) { toolbar = (btn)?::tqqt_cast<TQToolBar*>(btn->parent()):NULL; horiz = (ceData.toolBarData.orientation == TQt::Horizontal); if (normal) { // draw background @@ -1967,7 +1967,7 @@ int PhaseStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementData return 24; case PM_TabBarTabVSpace: - if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQTabBar")) { if (ceData.tabBarData.shape == TQTabBar::RoundedAbove) { return 10; } else { @@ -2161,7 +2161,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, case CT_PopupMenuItem: { if (!widget || option.isDefault()) return contentsize; - if (!ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQPopupMenu")) { return TDEStyle::sizeFromContents(contents, ceData, elementFlags, contentsize, option, widget); } @@ -2261,7 +2261,7 @@ int PhaseStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); if (TDEStyle::objectEventHandler(ceData, elementFlags, source, event)) return true; |