1 files changed, 9 insertions, 13 deletions

diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index dc42d8b..8109070 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -1,33 +1,29 @@
+#include "profileeditordialog.h"
+#include "metafactory.h"
+#include "comboboxhelper.h"
+
+
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qscrollview.h>
 
-#include "metafactory.h"
-#include "profileeditordialog.h"
+
 
 using namespace Opie::Ui;
-namespace {
-    void setCurrent( const QString& str, QComboBox* bo ) {
-        for (int i = 0; i < bo->count(); i++ ) {
-            if ( bo->text(i) == str ) {
-                bo->setCurrentItem( i );
-            }
-        }
-    };
-}
+
 
 ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
                                           const Profile& prof )
     : QDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof )
 {
     initUI();
 
 	// Apply current profile
 	// plugin_plugin->load(profile);
 	// ... (reset profile name line edit etc.)
 }
 
@@ -115,26 +111,26 @@ void ProfileEditorDialog::initUI()
     QStringList::Iterator it;
     for (it =list.begin(); it != list.end(); ++it ) {
         m_conCmb->insertItem( (*it) );
     }
     list = m_fact->terminalWidgets();
     for (it =list.begin(); it != list.end(); ++it ) {
         m_termCmb->insertItem( (*it) );
     }
 
     // load profile values
     m_name->setText(m_prof.name());
     slotKeyActivated( "Default Keyboard" );
-    setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb );
-    setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb );
+    ComboboxHelper::setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb );
+    ComboboxHelper::setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb );
     slotConActivated(  m_fact->external(m_prof.ioLayerName()  ) );
     slotTermActivated( m_fact->external(m_prof.terminalName() ) );
     m_autoConnect->setChecked(m_prof.autoConnect());
 
 
     // signal and slots
     connect(m_conCmb, SIGNAL(activated(const QString&) ),
             this, SLOT(slotConActivated(const QString&) ) );
     connect(m_termCmb, SIGNAL(activated(const QString&) ),
             this, SLOT(slotTermActivated(const QString&) ) );
 
 }