2 files changed, 7 insertions, 3 deletions

diff --git a/libopie2/qt3/opieui/ocombobox.cpp b/libopie2/qt3/opieui/ocombobox.cpp
index a1dd5f5..8dbda8f 100644
--- a/libopie2/qt3/opieui/ocombobox.cpp
+++ b/libopie2/qt3/opieui/ocombobox.cpp
@@ -311,25 +311,28 @@ OCompletionBox * OComboBox::completionBox( bool create )
 
 // QWidget::create() turns off mouse-Tracking which would break auto-hiding
 void OComboBox::create( WId id, bool initializeWindow, bool destroyOldWindow )
 {
     QComboBox::create( id, initializeWindow, destroyOldWindow );
     //OCursor::setAutoHideCursor( lineEdit(), true, true );
 }
 
 void OComboBox::setLineEdit( OLineEdit *edit )
 {
     #if QT_VERSION > 290
     QComboBox::setLineEdit( edit );
-    d->olineEdit = dynamic_cast<OLineEdit*>( edit );
+    if ( !edit->inherits( "OLineEdit" ) )
+        d->olineEdit = 0;
+    else
+        d->olineEdit = static_cast<OLineEdit*>( edit );
     setDelegate( d->olineEdit );
 
     // forward some signals. We only emit returnPressed() ourselves.
     if ( d->olineEdit ) {
         connect( d->olineEdit, SIGNAL( completion( const QString& )),
                  SIGNAL( completion( const QString& )) );
         connect( d->olineEdit, SIGNAL( substringCompletion( const QString& )),
                  SIGNAL( substringCompletion( const QString& )) );
         connect( d->olineEdit,
                  SIGNAL( textRotation( OCompletionBase::KeyBindingType )),
                  SIGNAL( textRotation( OCompletionBase::KeyBindingType )) );
         connect( d->olineEdit,
diff --git a/libopie2/qt3/opieui/oeditlistbox.cpp b/libopie2/qt3/opieui/oeditlistbox.cpp
index 3c53552..0e95274 100644
--- a/libopie2/qt3/opieui/oeditlistbox.cpp
+++ b/libopie2/qt3/opieui/oeditlistbox.cpp
@@ -402,15 +402,16 @@ QStringList OEditListBox::items() const
 
 void OEditListBox::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 
 /*======================================================================================
  * CustomEditor
  *======================================================================================*/
 
 OEditListBox::CustomEditor::CustomEditor( OComboBox *combo )
 {
     m_representationWidget = combo;
-    m_lineEdit = dynamic_cast<OLineEdit*>( combo->lineEdit() );
-    assert( m_lineEdit );
+    assert( combo->lineEdit()->inherits( "OLineEdit" ) );
+    m_lineEdit = static_cast<OLineEdit*>( combo->lineEdit() );
+
 }