1 files changed, 8 insertions, 9 deletions

diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index d134651..7941ab8 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -28,25 +28,24 @@
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "oipkgconfigdlg.h"
 
+#include <qpe/resource.h>
+
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qscrollview.h>
 #include <qwhatsthis.h>
 
-#include <qpe/resource.h>
-
-using namespace Opie::Ui;
 OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
     : QDialog( parent, QString::null, true, WStyle_ContextHelp )
     , m_ipkg( ipkg )
     , m_configs( 0x0 )
     , m_installOptions( installOptions )
     , m_serverNew( false )
@@ -98,37 +97,37 @@ void OIpkgConfigDlg::accept()
         if ( confItem )
         {
             confItem->setValue( m_proxyHttpServer->text() );
             confItem->setActive( m_proxyHttpActive->isChecked() );
         }
         else
-            m_configs->append( new OConfItem( QString::null, OConfItem::Option, "http_proxy",
+            m_configs->append( new OConfItem( OConfItem::Option, "http_proxy",
                                m_proxyHttpServer->text(), m_proxyHttpActive->isChecked() ) );
 
         confItem = findConfItem( OConfItem::Option, "ftp_proxy" );
         if ( confItem )
         {
             confItem->setValue( m_proxyFtpServer->text() );
             confItem->setActive( m_proxyFtpActive->isChecked() );
         }
         else
-            m_configs->append( new OConfItem( QString::null, OConfItem::Option, "ftp_proxy",
+            m_configs->append( new OConfItem( OConfItem::Option, "ftp_proxy",
                                m_proxyFtpServer->text(), m_proxyFtpActive->isChecked() ) );
 
         confItem = findConfItem( OConfItem::Option, "proxy_username" );
         if ( confItem )
             confItem->setValue( m_proxyUsername->text() );
         else
-            m_configs->append( new OConfItem( QString::null, OConfItem::Option, "proxy_username",
+            m_configs->append( new OConfItem( OConfItem::Option, "proxy_username",
                                m_proxyUsername->text() ) );
 
         confItem = findConfItem( OConfItem::Option, "proxy_password" );
         if ( confItem )
             confItem->setValue( m_proxyPassword->text() );
         else
-            m_configs->append( new OConfItem( QString::null, OConfItem::Option, "proxy_password",
+            m_configs->append( new OConfItem( OConfItem::Option, "proxy_password",
                                m_proxyPassword->text() ) );
 
         m_ipkg->setConfigItems( m_configs );
     }
 
     // Save options configuration
@@ -529,13 +528,13 @@ void OIpkgConfigDlg::slotServerUpdate()
             }
         }
     }
     else
     {
         // Add new destination to configuration list
-        m_configs->append( new OConfItem( QString::null, OConfItem::Source, newName,
+        m_configs->append( new OConfItem( OConfItem::Source, newName,
                            m_serverLocation->text(), m_serverActive->isChecked() ) );
         m_configs->sort();
 
         m_serverList->insertItem( newName );
         m_serverList->setCurrentItem( m_serverList->count() );
         m_serverNew = false;
@@ -615,13 +614,13 @@ void OIpkgConfigDlg::slotDestUpdate()
             }
         }
     }
     else
     {
         // Add new destination to configuration list
-        m_configs->append( new OConfItem( QString::null, OConfItem::Destination, newName,
+        m_configs->append( new OConfItem( OConfItem::Destination, newName,
                            m_destLocation->text(), m_destActive->isChecked() ) );
         m_configs->sort();
 
         m_destList->insertItem( newName );
         m_destList->setCurrentItem( m_destList->count() );
         m_destNew = false;