From 48d026a1747f74cfbda29cfc573536dd1444dc69 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 21:03:04 -0600 Subject: Rename kiobuffer and KHTML --- cmake | 2 +- styles/dotnet/dotnet.cpp | 8 ++++---- styles/dotnet/dotnet.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake b/cmake index 9a217903..274366fb 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 49e51e39..d5c0f437 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -100,9 +100,9 @@ dotNETstyle::~dotNETstyle() { } -bool dotNETstyle::inheritsKHTML(const TQWidget* w) const +bool dotNETstyle::inheritsTDEHTML(const TQWidget* w) const { - if (w->parentWidget(true) && w->parentWidget(true)->parentWidget(true) && w->parentWidget(true)->parentWidget(true)->parentWidget(true) && w->parentWidget(true)->parentWidget(true)->parentWidget(true)->inherits("KHTMLView")) { + if (w->parentWidget(true) && w->parentWidget(true)->parentWidget(true) && w->parentWidget(true)->parentWidget(true)->parentWidget(true) && w->parentWidget(true)->parentWidget(true)->parentWidget(true)->inherits("TDEHTMLView")) { return true; } else { return false; @@ -124,7 +124,7 @@ void dotNETstyle::polish(const TQStyleControlElementData &ceData, ControlElement // to update the palette again. // bool extraPalette = false; - if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsKHTML(widget)) { + if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsTDEHTML(widget)) { installObjectEventHandler(ceData, elementFlags, ptr, this); updatePalette( (TQComboBox*) widget ); // extraPalette = true; @@ -156,7 +156,7 @@ void dotNETstyle::unPolish(const TQStyleControlElementData &ceData, ControlEleme if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast(ptr); - if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsKHTML(widget)) { + if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsTDEHTML(widget)) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } } diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h index fb02ef3f..416f20ae 100644 --- a/styles/dotnet/dotnet.h +++ b/styles/dotnet/dotnet.h @@ -41,7 +41,7 @@ public: dotNETstyle(); virtual ~dotNETstyle(); - bool inheritsKHTML( const TQWidget* widget ) const; + bool inheritsTDEHTML( const TQWidget* widget ) const; void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); -- cgit v1.2.3