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>
pull/4/head
Michele Calgaro 10 months ago
parent 25c1960451
commit 1a898e5b81
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -353,7 +353,7 @@ void MandrivaStyle::updateHoverControl(const TQPoint &pos, const TQStyleControlE
void MandrivaStyle::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;
@ -363,7 +363,7 @@ void MandrivaStyle::applicationPolish(const TQStyleControlElementData &ceData, C
void MandrivaStyle::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);
// Put in order of highest occurance to maximize hit rate
@ -418,7 +418,7 @@ void MandrivaStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
void MandrivaStyle::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);
TQFont f = TQApplication::font();
@ -3030,7 +3030,7 @@ bool MandrivaStyle::objectEventHandler( const TQStyleControlElementData &ceData,
return true;
}
if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
if (ceData.widgetObjectTypes.contains("TQObject")) {
TQObject* obj = reinterpret_cast<TQObject*>(source);
TQToolBar* toolbar;

Loading…
Cancel
Save