diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/widgets/qcombobox_p.h
--- a/src/gui/widgets/qcombobox_p.h	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/gui/widgets/qcombobox_p.h	Tue Feb 02 00:43:10 2010 +0200
@@ -231,7 +231,6 @@
 public Q_SLOTS:
     void scrollItemView(int action);
     void updateScrollers();
-    void setCurrentIndex(const QModelIndex &index);
     void viewDestroyed();
 
 protected:
@@ -343,6 +342,8 @@
     void init();
     QComboBoxPrivateContainer* viewContainer();
     void updateLineEditGeometry();
+    Qt::MatchFlags matchFlags() const;
+    void _q_editingFinished();
     void _q_returnPressed();
     void _q_complete();
     void _q_itemSelected(const QModelIndex &item);
@@ -357,9 +358,8 @@
 #endif
     void _q_resetButton();
     void _q_dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-    void _q_rowsAboutToBeInserted(const QModelIndex & parent, int start, int end);
+    void _q_updateIndexBeforeChange();
     void _q_rowsInserted(const QModelIndex & parent, int start, int end);
-    void _q_rowsAboutToBeRemoved(const QModelIndex & parent, int start, int end);
     void _q_rowsRemoved(const QModelIndex & parent, int start, int end);
     void updateArrow(QStyle::StateFlag state);
     bool updateHoverControl(const QPoint &pos);