--- a/src/hbwidgets/widgets/hbcombobox.cpp	Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox.cpp	Fri May 14 16:09:54 2010 +0300
@@ -29,7 +29,7 @@
 #include <hblistview.h>
 #include <hbtoucharea.h>
 #include <hbtextitem.h>
-#include <hbstyleoptioncombobox.h>
+#include <hbstyleoptioncombobox_p.h>
 #include <QStandardItemModel>
 #include <QDebug>
 
@@ -280,7 +280,7 @@
     if( d->mEditable) {
         return d->mLineEdit->validator( );
     }
-    return NULL;
+    return 0;
 }
 
 /*!
@@ -314,30 +314,6 @@
 }
 
 /*!
-    \deprecated HbComboBox::insertPolicy() const
-    is deprecated.
-    \sa setInsertPolicy
-*/
-HbComboBox::InsertPolicy HbComboBox::insertPolicy( ) const
-{
-    Q_D( const HbComboBox );
-    qDebug() << "this is deprecated and will cease to exist in the near future.";
-    return d->insertPolicy;
-}
-
-/*!
-    \deprecated HbComboBox::setInsertPolicy(HbComboBox::InsertPolicy)
-    is deprecated.
-    \sa insertPolicy
-*/
-void HbComboBox::setInsertPolicy( InsertPolicy policy )
-{
-    Q_D( HbComboBox );
-    qDebug() << "this is deprecated and will cease to exist in the near future.";
-    d->insertPolicy = policy;
-}
-
-/*!
     @beta
     Sets the model to \a model 
     comboBox Owns the model set by the Application.
@@ -488,7 +464,7 @@
                     if( d->mLineEdit ) {
                         d->mLineEdit->setText( QString() );
                     } else {
-                        d->mText = QString( );
+                        d->mText.clear();
                         HbStyleOptionComboBox comboBoxOption;
                         initStyleOption(&comboBoxOption);
                         style()->updatePrimitive( d->mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption);
@@ -635,7 +611,7 @@
             if( d->mLineEdit ) {
                 d->mLineEdit->setText( QString() );
             } else {
-                d->mText = QString( );
+                d->mText.clear();
                 HbStyleOptionComboBox comboBoxOption;
                 initStyleOption(&comboBoxOption);
                 style()->updatePrimitive( d->mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption);