1 files changed, 5 insertions, 18 deletions

diff --git a/noncore/apps/opie-console/serialconfigwidget.cpp b/noncore/apps/opie-console/serialconfigwidget.cpp
index c4c9c99..4efb286 100644
--- a/noncore/apps/opie-console/serialconfigwidget.cpp
+++ b/noncore/apps/opie-console/serialconfigwidget.cpp
@@ -1,46 +1,33 @@
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcombobox.h>
-
 #include "iolayerbase.h"
 #include "serialconfigwidget.h"
+#include "comboboxhelper.h"
 
-namespace {
-    void setCurrent( const QString& str, QComboBox* bo ) {
-        uint b = bo->count();
-        for (int i = 0; i < bo->count(); i++ ) {
-            if ( bo->text(i) == str ) {
-                bo->setCurrentItem( i );
-                return;
-            }
-        }
-        bo->insertItem( str );
-        bo->setCurrentItem( b );
-    }
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qcombobox.h>
 
 
-}
 
 SerialConfigWidget::SerialConfigWidget( const QString& name,
                                         QWidget* parent,
                                         const char* na )
     : ProfileDialogConnectionWidget( name, parent, na ) {
 
     m_lay = new QVBoxLayout(this );
     m_device = new QLabel(tr("Device"), this );
     m_deviceCmb = new QComboBox(this );
     m_deviceCmb->setEditable( TRUE );
 
     m_base = new IOLayerBase(this, "base");
 
     m_lay->addWidget( m_device );
     m_lay->addWidget( m_deviceCmb );
     m_lay->addWidget( m_base );
 
     m_deviceCmb->insertItem( "/dev/ttyS0" );
     m_deviceCmb->insertItem( "/dev/ttyS1" );
     m_deviceCmb->insertItem( "/dev/ttySA0");
     m_deviceCmb->insertItem( "/dev/ttySA1");
 
 }
 SerialConfigWidget::~SerialConfigWidget() {
@@ -95,49 +82,49 @@ void SerialConfigWidget::load( const Profile& prof ) {
     default:
         m_base->setSpeed(IOLayerBase::Baud_9600 );
         break;
     }
 
     if ( dbits == 5) {
         m_base->setData( IOLayerBase::Data_Five );
     } else if (rad_flow == 6) {
         m_base->setData( IOLayerBase::Data_Six );
     } else if (rad_flow == 7) {
         m_base->setData( IOLayerBase::Data_Seven );
     } else {
         m_base->setData( IOLayerBase::Data_Eight );
     }
 
     if ( sbits == 2) {
         m_base->setStop( IOLayerBase::Stop_Two );
     } else if ( sbits == 15 ) {
         m_base->setStop( IOLayerBase::Stop_OnePointFive );
     } else {
         m_base->setStop( IOLayerBase::Stop_One );
     }
 
     if ( prof.readEntry("Device").isEmpty() ) return;
-    setCurrent( prof.readEntry("Device"), m_deviceCmb );
+    ComboboxHelper::setCurrent( prof.readEntry("Device"), m_deviceCmb );
 
 }
 /*
  * save speed,
  * flow,
  * parity
  */
 void SerialConfigWidget::save( Profile& prof ) {
     int flow, parity, speed,  data, stop;
     flow = parity = speed = data = stop = 0;
     prof.writeEntry("Device", m_deviceCmb->currentText() );
 
     switch( m_base->flow() ) {
     case IOLayerBase::None:
         flow = 0;
         break;
     case IOLayerBase::Software:
         flow = 2;
         break;
     case IOLayerBase::Hardware:
         flow = 1;
         break;
     }