1 files changed, 8 insertions, 26 deletions

diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 77ad220..e6d6a81 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -89,42 +89,42 @@ OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *paren
 void OIpkgConfigDlg::accept()
 {
     // Save server, destination and proxy configuration
     if ( !m_installOptions )
     {
         // Update proxy information before saving settings
-        OConfItem *confItem = findConfItem( OConfItem::Option, "http_proxy" );
+        OConfItem *confItem = m_ipkg->findConfItem( OConfItem::Option, "http_proxy" );
         if ( confItem )
         {
             confItem->setValue( m_proxyHttpServer->text() );
             confItem->setActive( m_proxyHttpActive->isChecked() );
         }
         else
             m_configs->append( new OConfItem( OConfItem::Option, "http_proxy",
                                m_proxyHttpServer->text(), QString::null,
                                m_proxyHttpActive->isChecked() ) );
 
-        confItem = findConfItem( OConfItem::Option, "ftp_proxy" );
+        confItem = m_ipkg->findConfItem( OConfItem::Option, "ftp_proxy" );
         if ( confItem )
         {
             confItem->setValue( m_proxyFtpServer->text() );
             confItem->setActive( m_proxyFtpActive->isChecked() );
         }
         else
             m_configs->append( new OConfItem( OConfItem::Option, "ftp_proxy",
                                m_proxyFtpServer->text(), QString::null,
                                m_proxyFtpActive->isChecked() ) );
 
-        confItem = findConfItem( OConfItem::Option, "proxy_username" );
+        confItem = m_ipkg->findConfItem( OConfItem::Option, "proxy_username" );
         if ( confItem )
             confItem->setValue( m_proxyUsername->text() );
         else
             m_configs->append( new OConfItem( OConfItem::Option, "proxy_username",
                                m_proxyUsername->text() ) );
 
-        confItem = findConfItem( OConfItem::Option, "proxy_password" );
+        confItem = m_ipkg->findConfItem( OConfItem::Option, "proxy_password" );
         if ( confItem )
             confItem->setValue( m_proxyPassword->text() );
         else
             m_configs->append( new OConfItem( OConfItem::Option, "proxy_password",
                                m_proxyPassword->text() ) );
 
@@ -390,30 +390,12 @@ void OIpkgConfigDlg::initData()
     if ( options & FORCE_OVERWRITE )
         m_optForceOverwrite->setChecked( true );
 
     m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() );
 }
 
-OConfItem *OIpkgConfigDlg::findConfItem( OConfItem::Type type, const QString &name )
-{
-    // Find selected server in list
-    OConfItemListIterator configIt( *m_configs );
-    OConfItem *config = 0l;
-    for ( ; configIt.current(); ++configIt )
-    {
-        config = configIt.current();
-        if ( config->type() == type && config->name() == name )
-            break;
-    }
-
-    if ( config && config->type() == type && config->name() == name )
-        return config;
-
-    return 0l;
-}
-
 void OIpkgConfigDlg::slotServerSelected( int index )
 {
     m_serverCurrent = index;
     
     // Enable Edit and Delete buttons
     m_serverEditBtn->setEnabled( true );
@@ -439,13 +421,13 @@ void OIpkgConfigDlg::slotServerNew()
         delete server;
 }
 
 void OIpkgConfigDlg::slotServerEdit()
 {
     // Find selected server in list
-    OConfItem *server = findConfItem( OConfItem::Source, m_serverList->currentText() );
+    OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() );
 
     // Edit server
     if ( server )
     {
         QString origName = server->name();
         OIpkgServerDlg dlg( server, this );
@@ -458,13 +440,13 @@ void OIpkgConfigDlg::slotServerEdit()
     }
 }
 
 void OIpkgConfigDlg::slotServerDelete()
 {
     // Find selected server in list
-    OConfItem *server = findConfItem( OConfItem::Source, m_serverList->currentText() );
+    OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() );
 
     // Delete server
     if ( server )
     {
         m_configs->removeRef( server );
         m_serverList->removeItem( m_serverCurrent );
@@ -499,13 +481,13 @@ void OIpkgConfigDlg::slotDestNew()
         delete dest;
 }
 
 void OIpkgConfigDlg::slotDestEdit()
 {
     // Find selected destination in list
-    OConfItem *dest = findConfItem( OConfItem::Destination, m_destList->currentText() );
+    OConfItem *dest = m_ipkg->findConfItem( OConfItem::Destination, m_destList->currentText() );
 
     // Edit destination
     if ( dest )
     {
         QString origName = dest->name();
         OIpkgDestDlg dlg( dest, this );
@@ -518,13 +500,13 @@ void OIpkgConfigDlg::slotDestEdit()
     }
 }
 
 void OIpkgConfigDlg::slotDestDelete()
 {
     // Find selected destination in list
-    OConfItem *destination = findConfItem( OConfItem::Destination, m_destList->currentText() );
+    OConfItem *destination = m_ipkg->findConfItem( OConfItem::Destination, m_destList->currentText() );
 
     // Delete destination
     if ( destination )
     {
         m_configs->removeRef( destination );
         m_destList->removeItem( m_destCurrent );