Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent d1903dde17
commit 1e760a2dfe

@ -1671,8 +1671,8 @@ void QtCurveStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
} }
else if(::tqqt_cast<TQPopupMenu *>(widget)) else if(::tqqt_cast<TQPopupMenu *>(widget))
widget->setBackgroundMode(NoBackground); // PaletteBackground); widget->setBackgroundMode(NoBackground); // PaletteBackground);
else if (ceData.widgetObjectTypes.contains("KToolBarSeparator") || else if (ceData.widgetObjectTypes.contains("TDEToolBarSeparator") ||
(ceData.widgetObjectTypes.contains("KListViewSearchLineWidget") && (ceData.widgetObjectTypes.contains("TDEListViewSearchLineWidget") &&
widget->parent() && ::tqqt_cast<TQToolBar *>(widget->parent()))) widget->parent() && ::tqqt_cast<TQToolBar *>(widget->parent())))
{ {
widget->setName(kdeToolbarWidget); widget->setName(kdeToolbarWidget);
@ -1724,7 +1724,7 @@ void QtCurveStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
{ {
if(!widget->parent() || if(!widget->parent() ||
0!=qstrcmp(TQT_TQWIDGET(widget->parent())->className(), 0!=qstrcmp(TQT_TQWIDGET(widget->parent())->className(),
"KListViewSearchLineWidget") || "TDEListViewSearchLineWidget") ||
onToolBar(widget)) onToolBar(widget))
{ {
installObjectEventHandler(ceData, elementFlags, ptr, this); installObjectEventHandler(ceData, elementFlags, ptr, this);
@ -1924,7 +1924,7 @@ void QtCurveStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
SHADE_SELECTED==opts.shadeMenubars || (SHADE_CUSTOM==opts.shadeMenubars &&TOO_DARK(itsMenubarCols[ORIGINAL_SHADE]))) SHADE_SELECTED==opts.shadeMenubars || (SHADE_CUSTOM==opts.shadeMenubars &&TOO_DARK(itsMenubarCols[ORIGINAL_SHADE])))
widget->setPalette(TQApplication::palette()); widget->setPalette(TQApplication::palette());
} }
else if (ceData.widgetObjectTypes.contains("KToolBarSeparator")) else if (ceData.widgetObjectTypes.contains("TDEToolBarSeparator"))
{ {
widget->setBackgroundMode(PaletteBackground); widget->setBackgroundMode(PaletteBackground);
removeObjectEventHandler(ceData, elementFlags, ptr, this); removeObjectEventHandler(ceData, elementFlags, ptr, this);
@ -2111,7 +2111,7 @@ bool QtCurveStyle::objectEventHandler( const TQStyleControlElementData &ceData,
opts.menuBgndAppearance, WIDGET_OTHER); opts.menuBgndAppearance, WIDGET_OTHER);
return false; return false;
} }
else if (object->inherits("KToolBarSeparator")) else if (object->inherits("TDEToolBarSeparator"))
{ {
TQFrame *frame(::tqqt_cast<TQFrame *>(object)); TQFrame *frame(::tqqt_cast<TQFrame *>(object));
@ -3240,7 +3240,7 @@ void QtCurveStyle::drawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const TQS
} }
else if(0==flags) // Header on popup menu? else if(0==flags) // Header on popup menu?
{ TQWidget *widget(p && p->device() ? dynamic_cast<TQWidget*>(p->device()) : 0L); { TQWidget *widget(p && p->device() ? dynamic_cast<TQWidget*>(p->device()) : 0L);
bool menuTitle(widget && 0==qstrcmp(ceData.widgetObjectTypes[ceData.widgetObjectTypes.count()-1].ascii(), "KPopupTitle")); bool menuTitle(widget && 0==qstrcmp(ceData.widgetObjectTypes[ceData.widgetObjectTypes.count()-1].ascii(), "TDEPopupTitle"));
const TQColor *use(buttonColors(cg)); const TQColor *use(buttonColors(cg));
TQRect r2(r); TQRect r2(r);

Loading…
Cancel
Save