diff --git a/src/widget/ia_ora.cpp b/src/widget/ia_ora.cpp
index 8ae0735..2220e6d 100644
--- a/src/widget/ia_ora.cpp
+++ b/src/widget/ia_ora.cpp
@@ -374,7 +374,7 @@ void MandrivaStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
 			|| widget->inherits( "TQCheckBox" )
 			|| widget->inherits("TQSplitterHandle") )
 		{
-			widget->installEventFilter(this);
+			installObjectEventHandler(ceData, elementFlags, ptr, this);
 			if (widget->inherits( "TQScrollBar" ) || widget->inherits( "TQComboBox" ))
 			   widget->setMouseTracking( true );
 		}
@@ -385,7 +385,7 @@ void MandrivaStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
 		}
 		else if (widget->inherits("TQPushButton") )
 		{
-			widget->installEventFilter(this);
+			installObjectEventHandler(ceData, elementFlags, ptr, this);
 			widget->setBackgroundMode( TQWidget::PaletteBackground );
 		}
 		else if ( widget->inherits( "TDEToolBarSeparator" ) || widget->inherits( "TQToolBarSeparator" ) )
@@ -394,7 +394,7 @@ void MandrivaStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
 		}
 		else if (widget->inherits("TQToolBarExtensionWidget"))
 		{
-			widget->installEventFilter(this);
+			installObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 		else if ( widget->parentWidget() &&
 				( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) )
@@ -403,12 +403,12 @@ void MandrivaStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
 			TQListBox* listbox = (TQListBox*) widget;
 			listbox->setLineWidth( 1 );
 			listbox->setBackgroundMode( NoBackground );
-			widget->installEventFilter( this );
+			installObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 		else if ( !qstrcmp( widget->name(), kdeToolbarWidget) )
 		{
 			widget->setBackgroundMode( NoBackground ); // We paint the whole background.
-			widget->installEventFilter(this);
+			installObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	}
 
@@ -431,7 +431,7 @@ void MandrivaStyle::unPolish(const TQStyleControlElementData &ceData, ControlEle
 			|| widget->inherits( "TQCheckBox" )
 			|| widget->inherits("TQSplitterHandle"))
 		{
-			widget->removeEventFilter(this);
+			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 		else if (   widget->inherits("TQMenuBar")
 				 || widget->inherits("TQPopupMenu"))
@@ -440,11 +440,11 @@ void MandrivaStyle::unPolish(const TQStyleControlElementData &ceData, ControlEle
 		}
 		else if ( widget->inherits("TQPushButton") )
 		{
-			widget->removeEventFilter(this);
+			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 		else if (widget->inherits("TQToolBarExtensionWidget"))
 		{
-			widget->removeEventFilter(this);
+			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 		else if ( widget->parentWidget() &&
 				  ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) )
@@ -453,7 +453,7 @@ void MandrivaStyle::unPolish(const TQStyleControlElementData &ceData, ControlEle
 			TQListBox* listbox = (TQListBox*) widget;
 			listbox->setLineWidth( 1 );
 			listbox->setBackgroundMode( PaletteBackground );
-			widget->removeEventFilter( this );
+			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 			widget->clearMask();
 		}
 		//For toolbar internal separators, return to button, too (can't use tqt_cast here since don't have access to the class)
@@ -464,7 +464,7 @@ void MandrivaStyle::unPolish(const TQStyleControlElementData &ceData, ControlEle
 		else if ( !qstrcmp( widget->name(), kdeToolbarWidget) )
 		{
 			widget->setBackgroundMode( PaletteBackground );
-			widget->removeEventFilter(this);
+			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	}