no need to diff...

9 files changed, 0 insertions, 1636 deletions

diff --git a/noncore/unsupported/oipkg/main.cpp b/noncore/unsupported/oipkg/main.cpp
deleted file mode 100644
index 96a5e8d..0000000
--- a/noncore/unsupported/oipkg/main.cpp
+++ b/dev/null
@@ -1,33 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#include "packagemanager.h"
-
-#include <qpe/qpeapplication.h>
-
-int main( int argc, char ** argv )
-{
-    QPEApplication a( argc, argv );
-
-    PackageManager mw;
-    a.showMainDocumentWidget( &mw );
-    
-    return a.exec();
-}
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro
deleted file mode 100644
index 87f8c5d..0000000
--- a/noncore/unsupported/oipkg/oipkg.pro
+++ b/dev/null
@@ -1,12 +0,0 @@
-DESTDIR		= $(OPIEDIR)/bin
-TEMPLATE	= app
-CONFIG		= qt warn_on release
-HEADERS		= packagemanager.h
-SOURCES		= packagemanager.cpp \
-		  main.cpp
-INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe
-INTERFACES	= packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui
-TARGET		= oipkg
-
diff --git a/noncore/unsupported/oipkg/opie-oipkg.control b/noncore/unsupported/oipkg/opie-oipkg.control
deleted file mode 100644
index a5fa508..0000000
--- a/noncore/unsupported/oipkg/opie-oipkg.control
+++ b/dev/null
@@ -1,9 +0,0 @@
-Files: bin/oipkg apps/Settings/oipkg.desktop
-Priority: optional
-Section: opie/settings
-Maintainer: Patrick Vogt <tille@almana.ch>
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION)
-Description: Package Manager
- A GUI front-end to ipkg for the Opie environment.
diff --git a/noncore/unsupported/oipkg/packagemanager.cpp b/noncore/unsupported/oipkg/packagemanager.cpp
deleted file mode 100644
index 642eae9..0000000
--- a/noncore/unsupported/oipkg/packagemanager.cpp
+++ b/dev/null
@@ -1,897 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "packagemanager.h"
-#include "pkdesc.h"
-#include "pkfind.h"
-#include "pksettings.h"
-
-#include <qpe/process.h>
-#include <qpe/resource.h>
-#include <qpe/stringutil.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/applnk.h>
-
-#include <qprogressbar.h>
-#include <qcombobox.h>
-#include <qdict.h>
-#include <qfile.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlistview.h>
-#include <qlistbox.h>
-#include <qmessagebox.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qregexp.h>
-#include <qtextstream.h>
-#include <qtextview.h>
-#include <qtoolbutton.h>
-
-#include <stdlib.h>
-
-static QPixmap *pm_uninstalled=0;
-static QPixmap *pm_installed=0;
-static QPixmap *pm_uninstall=0;
-static QPixmap *pm_install=0;
-
-
-class PackageItem : public QCheckListItem {
-    bool installed;
-public:
-    PackageItem(QListView* lv, const QString& name, const QString& desc, const QString& size, bool inst ) :
-	QCheckListItem(lv,name,CheckBox), installed(inst)
-    {
-	setText(1,desc);
-	setText(2,size);
-    }
-
-    void paintCell( QPainter *p,  const QColorGroup & cg,
-                    int column, int width, int alignment )
-    {
-	if ( !p )
-	    return;
-
-	p->fillRect( 0, 0, width, height(),
-	    isSelected()? cg.highlight() : cg.base() );
-
-	if ( column != 0 ) {
-	    // The rest is text
-	    QListViewItem::paintCell( p, cg, column, width, alignment );
-	    return;
-	}
-
-	QListView *lv = listView();
-	if ( !lv )
-	    return;
-	int marg = lv->itemMargin();
-	int r = marg;
-
-	QPixmap pm = statePixmap();
-	p->drawPixmap(marg,(height()-pm.height())/2,pm);
-	r += pm.width()+1;
-
-	p->translate( r, 0 );
-	QListViewItem::paintCell( p, cg, column, width - r, alignment );
-    }
-
-    void paintFocus( QPainter *p, const QColorGroup & cg,
-                             const QRect & r )
-    {
-	// Skip QCheckListItem
-	// (makes you wonder what we're getting from QCheckListItem)
-	QListViewItem::paintFocus(p,cg,r);
-    }
-
-    QPixmap statePixmap() const
-    {
-	if ( !isOn() ) {
-	    if ( !installed )
-		return *pm_uninstalled;
-	    else
-		return *pm_installed;
-	} else {
-	    if ( !installed )
-		return *pm_install;
-	    else
-		return *pm_uninstall;
-	}
-    }
-
-    QString name() const { return text(0); }
-    QString description() const { return text(1); }
-    bool isInstalled() const { return installed; }
-
-    QString key( int column, bool ascending ) const
-    {
-	if ( column == 2 ) {
-	    QString t = text(2);
-	    double bytes=t.toDouble();
-	    if ( t.contains('M') ) bytes*=1024*1024;
-	    else if ( t.contains('K') || t.contains('k') ) bytes*=1024;
-	    if ( !ascending ) bytes=999999999-bytes;
-	    return QString().sprintf("%09d",(int)bytes);
-	} else {
-	    return QListViewItem::key(column,ascending);
-	}
-    }
-};
-
-/* 
- *  Constructs a PackageManager which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-PackageManager::PackageManager( QWidget* parent,  const char* name, WFlags fl )
-    : PackageManagerBase( parent, name, fl )
-{
-    settings = new PackageManagerSettings(this,0,TRUE);
-    connect( settings->newserver, SIGNAL(clicked()), this, SLOT(newServer()) );
-    connect( settings->removeserver, SIGNAL(clicked()), this, SLOT(removeServer()) );
-    connect( settings->servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
-    connect( doit, SIGNAL(clicked()), this, SLOT(doIt()) );
-    settings->servername->setEnabled(FALSE);
-    settings->serverurl->setEnabled(FALSE);
-    serverurl.setAutoDelete(TRUE);
-
-    if (!pm_uninstalled) {
-	pm_uninstalled = new QPixmap(Resource::loadPixmap("uninstalled"));
-	pm_installed = new QPixmap(Resource::loadPixmap("installed"));
-	pm_install = new QPixmap(Resource::loadPixmap("install"));
-	pm_uninstall = new QPixmap(Resource::loadPixmap("uninstall"));
-    }
-
-    QFontMetrics fm = fontMetrics();
-    int w0 = fm.width(PackageManagerBase::tr("Package"))+30;
-    int w2 = fm.width("00000")+4;
-    list->setColumnWidth(0,w0);
-    list->setColumnWidth(1,228-w2-w0); // ### screen-biased
-    list->setColumnWidth(2,w2);
-    list->setColumnWidthMode(0,QListView::Manual);
-    list->setColumnWidthMode(1,QListView::Manual);
-    list->setColumnWidthMode(2,QListView::Manual);
-    list->setSelectionMode( QListView::Multi );
-    details = 0;
-    ipkg_old = 0;
-    readSettings();
-    updatePackageList();
-    progress->hide();
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-PackageManager::~PackageManager()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
-void PackageManager::newServer()
-{
-    int i = settings->servers->count();
-    if ( settings->servername->isEnabled() || settings->serverurl->text().isEmpty() ) {
-	serverurl.insert(i,new QString("http://"));
-	settings->servers->insertItem(tr("New"));
-    } else {
-	// allows one-level undo
-	serverurl.insert(i,new QString(settings->serverurl->text()));
-	settings->servers->insertItem(settings->servername->text());
-    }
-    settings->servers->setSelected(i,TRUE);
-    editServer(i);
-}
-
-void PackageManager::editServer(int i)
-{
-    if ( settings->servername->isEnabled() ) {
-	disconnect( settings->servername, SIGNAL(textChanged(const QString&)), this, SLOT(nameChanged(const QString&)) );
-	disconnect( settings->serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(urlChanged(const QString&)) );
-    } else {
-	settings->servername->setEnabled(TRUE);
-	settings->serverurl->setEnabled(TRUE);
-    }
-
-    settings->servername->setText( settings->servers->text(i) );
-    settings->serverurl->setText( *serverurl[i] );
-
-    editedserver = i;
-
-    connect( settings->servername, SIGNAL(textChanged(const QString&)), this, SLOT(nameChanged(const QString&)) );
-    connect( settings->serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(urlChanged(const QString&)) );
-}
-
-void PackageManager::removeServer()
-{
-    disconnect( settings->servername, SIGNAL(textChanged(const QString&)), this, SLOT(nameChanged(const QString&)) );
-    disconnect( settings->serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(urlChanged(const QString&)) );
-    settings->servername->setText(settings->servers->text(editedserver));
-    settings->serverurl->setText(*serverurl[editedserver]);
-    disconnect( settings->servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
-    settings->servers->removeItem(editedserver);
-    connect( settings->servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
-    settings->servername->setEnabled(FALSE);
-    settings->serverurl->setEnabled(FALSE);
-}
-
-void PackageManager::nameChanged(const QString& t)
-{
-    disconnect( settings->servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
-    settings->servers->changeItem( t, editedserver );
-    connect( settings->servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
-}
-
-void PackageManager::urlChanged(const QString& t)
-{
-    serverurl.replace(editedserver, new QString(t));
-}
-
-static void selectComboItem(QComboBox *cb, const QString s)
-{
-    for (int i=0; i<cb->count(); i++) {
-	if ( cb->text(i) == s ) {
-	    cb->setCurrentItem(i);
-	    return;
-	}
-    }
-}
-
-void PackageManager::updatePackageList()
-{
-    disconnect(section,SIGNAL(activated(int)),this,SLOT(updatePackageList()));
-    disconnect(subsection,SIGNAL(activated(int)),this,SLOT(updatePackageList()));
-
-    list->clear();
-    QString cursection = section->currentText();
-    QString cursubsection = subsection->currentText();
-    QString all=tr("All");
-    if ( cursection == all ) cursection=QString::null;
-    if ( cursubsection == all ) cursubsection=QString::null;
-    section->clear();
-    subsection->clear();
-
-    QDict<void> sections;
-    QDict<void> subsections;
-    QDict<void> installed;
-
-    QRegExp separatorRegExp( ":[\t ]+" );
-
-    QString status = ipkgStatusOutput();
-    if ( !status.isEmpty() ) {
-	QStringList lines = QStringList::split('\n',status,TRUE);
-	QString name;
-	QString status;
-	for (QStringList::Iterator it = lines.begin(); it!=lines.end(); ++it) {
-	    QString line = *it;
-	    if ( line.length()<=1 ) {
-		// EOR
-		if ( !name.isEmpty() ) {
-		    if ( status.contains(" installed") )
-			installed.replace(name,(void*)1);
-		    name="";
-		}
-		status="";
-	    } else if ( line[0] == ' ' || line[0] == '\t' ) {
-		// continuation
-	    } else {
-		int sep = line.find(separatorRegExp);
-		if ( sep >= 0 ) {
-		    QString tag = line.left(sep);
-		    if ( tag == "Package" ) {
-			name = line.mid(sep+2).simplifyWhiteSpace();
-		    } else if ( tag == "Status" ) {
-			status = line.mid(sep+1);
-		    }
-		}
-	    }
-	}
-    }
-
-    QString info = ipkgInfoOutput();
-    if ( !info.isEmpty() ) {
-	QStringList lines = QStringList::split('\n',info,TRUE);
-	QString description_short;
-	QString name;
-	QString size;
-	QString sec;
-	for (QStringList::Iterator it = lines.begin(); it!=lines.end(); ++it) {
-	    QString line = *it;
-	    if ( line.length()<=1 ) {
-		// EOR
-		if ( !name.isEmpty() ) {
-		    int sl = sec.find('/');
-		    QString s = sl < 0 ? sec : sec.left(sl);
-		    QString ss = sl < 0 ? QString::null : sec.mid(sl+1);
-		    sections.replace(s,(void*)1);
-		    if ( cursection.isNull()
-			|| cursection == s
-			    && (cursubsection.isNull() || cursubsection == ss) )
-		    {
-			if ( !cursection.isNull() && !ss.isNull() )
-			    subsections.replace(ss,(void*)1);
-			description_short[0] = description_short[0].upper();
-			if ( description_short.left(4) == "The " )
-			    description_short = description_short.mid(4);
-			if ( description_short.left(2) == "A " )
-			    description_short = description_short.mid(2);
-			description_short[0] = description_short[0].upper();
-			new PackageItem(list,name,description_short,size,
-			       installed.find(name));
-		    }
-		    installed.remove( name );
-		}
-		name="";
-		size="";
-		sec="main";
-	    } else if ( line[0] == ' ' || line[0] == '\t' ) {
-		// continuation
-	    } else {
-		int sep = line.find(separatorRegExp);
-		if ( sep >= 0 ) {
-		    QString tag = line.left(sep);
-		    if ( tag == "Package" ) {
-			name = line.mid(sep+2).simplifyWhiteSpace();
-		    } else if ( tag == "Description" ) {
-			description_short = line.mid(sep+2).simplifyWhiteSpace();
-		    } else if ( tag == "Installed-Size" ) {
-			size = line.mid(sep+2).simplifyWhiteSpace();
-		    } else if ( tag == "Section" ) {
-			sec = line.mid(sep+2).simplifyWhiteSpace();
-		    }
-		}
-	    }
-	}
-	if ( installed.count() && cursection.isNull() ) {
-	    // we have some packages without description
-	    QDictIterator<void> it( installed );
-	    for( ; it.current(); ++it )
-		new PackageItem( list, it.currentKey(), "", "?" , TRUE );
-	}
-
-	QStringList s;
-	QDictIterator<void> it( sections );
-	for( ; it.current(); ++it )
-	    s.append(it.currentKey());
-	s.sort();
-	section->insertItem(all);
-	section->insertStringList(s);
-	selectComboItem(section,cursection.isNull()?all:cursection);
-	if ( cursection.isNull() ) {
-	    subsection->setEnabled(FALSE);
-	} else {
-	    subsection->setEnabled(TRUE);
-	    QStringList s;
-	    QDictIterator<void> it( subsections );
-	    for( ; it.current(); ++it )
-		s.append(it.currentKey());
-	    s.sort();
-	    subsection->insertItem(all);
-	    subsection->insertStringList(s);
-	    selectComboItem(subsection,cursubsection.isNull()?all:cursubsection);
-	}
-    } else {
-	new QListViewItem(list,"ERROR");
-    }
-
-    connect(section,SIGNAL(activated(int)),SLOT(updatePackageList()));
-    connect(subsection,SIGNAL(activated(int)),this,SLOT(updatePackageList()));
-}
-
-PackageItem* PackageManager::current() const
-{
-    return (PackageItem*)list->currentItem();
-}
-
-/* 
- * public slot
- */
-void PackageManager::doCurrentDetails(bool multi)
-{
-    PackageItem* pit = current();
-    if ( pit ) {
-	if ( !details ) {
-	    details = new PackageDetails;
-	    connect( details->install, SIGNAL(clicked()),
-		    this, SLOT(installCurrent()));
-	    connect( details->remove, SIGNAL(clicked()),
-		    this, SLOT(removeCurrent()));
-	    details->description->setTextFormat(RichText);
-	}
-	if ( multi ) {
-	    disconnect( details->ignore, SIGNAL(clicked()),
-		    details, SLOT(close()));
-	    connect( details->ignore, SIGNAL(clicked()),
-		    this, SLOT(doNextDetails()));
-	} else {
-	    disconnect( details->ignore, SIGNAL(clicked()),
-		    this, SLOT(doNextDetails()));
-	    connect( details->ignore, SIGNAL(clicked()),
-		    details, SLOT(close()));
-	}
-	pit->setSelected(FALSE);
-	details->setCaption("Package: " + pit->name());
-	details->description->setText(fullDetails(pit->name()));
-	details->install->setEnabled(!pit->isInstalled());
-	details->remove->setEnabled(pit->isInstalled());
-	details->showMaximized();
-    }
-}
-
-void PackageManager::doDetails()
-{
-    doCurrentDetails(FALSE);
-}
-
-void PackageManager::doNextDetails()
-{
-    QListViewItem* i = list->firstChild();
-    for ( ; i; i = i->nextSibling() ) {
-	if ( i->isSelected() )
-	    break;
-    }
-    list->setCurrentItem(i);
-    if ( i ) {
-	doCurrentDetails(TRUE);
-    } else if ( details )
-	details->close();
-}
-
-QString PackageManager::fullDetails(const QString& pk)
-{
-    QString status;
-    Process ipkg_status(QStringList() << "ipkg" << "info" << pk);
-    if ( ipkg_status.exec("",status) ) {
-	QStringList lines = QStringList::split('\n',status,TRUE);
-	QString description;
-	for (QStringList::Iterator it = lines.begin(); it!=lines.end(); ++it) {
-	    QString line = *it;
-	    if ( line == " ." ) {
-		description.append("<p>");
-	    } else if ( line[0] == ' ' || line[0] == '\t' ) {
-		// continuation
-		description.append(" ");
-		description.append(Qtopia::escapeString(line));
-	    } else {
-		int sep = line.find(QRegExp(":[\t ]+"));
-		if ( sep >= 0 ) {
-		    QString tag = line.left(sep);
-		    description.append("<br>");
-		    description.append("<b>");
-		    description.append(Qtopia::escapeString(tag));
-		    description.append(":</b> ");
-		    description.append(Qtopia::escapeString(line.mid(sep+2)));
-		} else {
-		    description.append(" ");
-		    description.append(Qtopia::escapeString(line));
-		}
-	    }
-	}
-	return description;
-    }
-
-    return QString::null;
-}
-
-void PackageManager::installCurrent()
-{
-    current()->setOn(TRUE);
-    details->close();
-}
-
-void PackageManager::removeCurrent()
-{
-    current()->setOn(TRUE);
-    details->close();
-}
-
-bool PackageManager::readIpkgConfig(const QString& conffile)
-{
-    QFile conf(conffile);
-    if ( conf.open(IO_ReadOnly) ) {
-	QTextStream s(&conf);
-	settings->servers->clear();
-	serverurl.clear();
-	ipkg_old=0;
-	int currentserver=0;
-	while ( !s.atEnd() ) {
-	    QString l = s.readLine();
-	    QStringList token = QStringList::split(' ', l);
-	    if ( token[0] == "src" || token[0] == "#src" ) {
-		currentserver=settings->servers->count();
-		serverurl.insert(settings->servers->count(),new QString(token[2]));
-		int a = token[0] == "src" ? 1 : 0;
-		int i = settings->servers->count();
-		settings->servers->insertItem(token[1]);
-		settings->servers->setSelected(i,a);
-	    } else if ( token[0] == "dest" ) {
-		// needs UI
-	    } else if ( token[0] == "option" ) {
-		// ### somehow need to use the settings from netsetup
-// 		if ( token[1] == "http_proxy" )
-// 		    settings->http->setText(token[2]);
-// 		else if ( token[1] == "ftp_proxy" )
-// 		    settings->ftp->setText(token[2]);
-// 		else if ( token[1] == "proxy_username" )
-// 		    settings->username->setText(token[2]);
-// 		else if ( token[1] == "proxy_password" )
-// 		    settings->password->setText(token[2]);
-	    } else {
-		// Old style?
-		int eq = l.find('=');
-		if ( eq >= 0 ) {
-		    QString v = l.mid(eq+1).stripWhiteSpace();
-		    if ( v[0] == '"' || v[0] == '\'' ) {
-			int cl=v.find(v[0],1);
-			if ( cl >= 0 )
-			    v = v.mid(1,cl-1);
-		    }
-		    if ( l.left(12) == "IPKG_SOURCE=" ) {
-			ipkg_old=1;
-			currentserver=settings->servers->count();
-			serverurl.insert(settings->servers->count(),new QString(v));
-			settings->servers->insertItem(v);
-		    } else if ( l.left(13) == "#IPKG_SOURCE=" ) {
-			serverurl.insert(settings->servers->count(),new QString(v));
-			settings->servers->insertItem(v);
-		    } else if ( l.left(10) == "IPKG_ROOT=" ) {
-			// ### no UI
-// 		    } else if ( l.left(20) == "IPKG_PROXY_USERNAME=" ) {
-// 			settings->username->setText(v);
-// 		    } else if ( l.left(20) == "IPKG_PROXY_PASSWORD=" ) {
-// 			settings->password->setText(v);
-// 		    } else if ( l.left(16) == "IPKG_PROXY_HTTP=" ) {
-// 			settings->http->setText(v);
-// 		    } else if ( l.left(16) == "IPKG_PROXY_FTP=" ) {
-// 			settings->ftp->setText(v);
-		    }
-		}
-	    }
-	}
-	if ( ipkg_old ) {
-	    settings->servers->setSelectionMode(QListBox::Single);
-	    settings->servers->setSelected(currentserver,TRUE);
-	}
-	return TRUE;
-    } else {
-	return FALSE;
-    }
-}
-
-/* 
- * public slot
- */
-void PackageManager::doSettings()
-{
-    settings->showMaximized();
-    if ( settings->exec() ) {
-	writeSettings();
-	startRun();
-	runIpkg("update");
-	endRun();
-	updatePackageList();
-    } else {
-	readSettings();
-    }
-}
-
-void PackageManager::readSettings()
-{
-    // read from config file(s)
-    readIpkgConfig("/etc/ipkg.conf");
-}
-
-void PackageManager::writeSettings()
-{
-    QFile conf("/etc/ipkg.conf");
-    if ( conf.open(IO_WriteOnly) ) {
-	QTextStream s(&conf);
-	s << "# Written by Qtopia Package Manager\n";
-	if ( !ipkg_old ) {
-	    for (int i=0; i<(int)settings->servers->count(); i++) {
-		QString url = serverurl[i] ? *serverurl[i] : QString("???");
-//		if ( !settings->servers->isSelected(i) )
-//		    s << "#";
-		s << "src " << settings->servers->text(i) << " " << url << "\n";
-	    }
-	    s << "dest root /\n"; // ### need UI
-// 	    if ( !settings->username->text().isEmpty() )
-// 		s << "option proxy_username " << settings->username->text() << "\n";
-// 	    if ( !settings->password->text().isEmpty() )
-// 		s << "option proxy_password " << settings->password->text() << "\n";
-// 	    if ( !settings->http->text().isEmpty() )
-// 		s << "option http_proxy " << settings->http->text() << "\n";
-// 	    if ( !settings->ftp->text().isEmpty() )
-// 		s << "option ftp_proxy " << settings->ftp->text() << "\n";
-	} else {
-	    // Old style
-	    bool src_selected=FALSE;
-	    for (int i=0; i<(int)settings->servers->count(); i++) {
-		if ( settings->servers->isSelected(i) ) {
-		    src_selected=TRUE;
-		} else {
-		    s << "#";
-		}
-		s << "IPKG_SOURCE=\"" << settings->servers->text(i) << "\"\n";
-	    }
-	    if ( !src_selected )
-		s << "IPKG_SOURCE=\"" << settings->servers->currentText() << "\"\n";
-	    s << "IPKG_ROOT=/\n"
-// 	      << "IPKG_PROXY_USERNAME=\"" << settings->username->text() << "\"\n"
-// 	      << "IPKG_PROXY_PASSWORD=\"" << settings->password->text() << "\"\n"
-// 	      << "IPKG_PROXY_HTTP=\"" << settings->http->text() << "\"\n"
-// 	      << "IPKG_PROXY_FTP=\"" << settings->ftp->text() << "\"\n"
-	    ;
-	}
-	conf.close();
-    }
-}
-
-/* 
- * public slot
- */
-void PackageManager::doFind()
-{
-    Search s(this, 0, TRUE);
-    if ( s.exec() ) {
-	QString p = s.pattern->text();
-	if ( p.isEmpty() ) {
-	    list->selectAll(FALSE);
-	} else {
-	    selectPackages(findPackages(p));
-	    doNextDetails();
-	}
-    }
-}
-
-void PackageManager::selectPackages( const QStringList& l )
-{
-    QDict<void> d;
-    for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it)
-	d.replace(*it,(void*)1);
-    QListViewItem* i;
-    for ( i = list->firstChild(); i; i = i->nextSibling() ) {
-	PackageItem* pit = (PackageItem*)i;
-	i->setSelected( d[pit->name()] );
-    }
-}
-
-QStringList PackageManager::findPackages( const QRegExp& r )
-{
-    QStringList matches;
-
-    QString info = ipkgInfoOutput();
-    if ( !info.isEmpty() ) {
-	QStringList lines = QStringList::split('\n',info,TRUE);
-	QRegExp re = r;
-	QString description="";
-	QString name;
-	for (QStringList::Iterator it = lines.begin(); it!=lines.end(); ++it) {
-	    QString line = *it;
-	    if ( line.length()<=1 ) {
-		// EOR
-		if ( re.match(description) >= 0 )
-		    matches.append(name);
-		description="";
-		name="";
-	    } else if ( line[0] == ' ' || line[0] == '\t' ) {
-		// continuation
-		description.append(" ");
-		description.append(Qtopia::escapeString(line));
-	    } else {
-		int sep = line.find(QRegExp(":[\t ]+"));
-		if ( sep >= 0 ) {
-		    QString tag = line.left(sep);
-		    if ( tag == "Package" )
-			name = line.mid(sep+2).simplifyWhiteSpace();
-		    if ( !description.isEmpty() )
-			description.append("<br>");
-		    description.append("<b>");
-		    description.append(Qtopia::escapeString(tag));
-		    description.append(":</b> ");
-		    description.append(Qtopia::escapeString(line.mid(sep+2)));
-		}
-	    }
-	}
-    }
-
-    return matches;
-}
-
-/* 
- * public slot
- */
-void PackageManager::doUpgrade()
-{
-    startMultiRun(2);
-    runIpkg("update");
-    runIpkg("upgrade");
-    updatePackageList();
-    endRun();
-}
-
-
-void PackageManager::doIt()
-{
-    bool ok = commitWithIpkg();
-    updatePackageList(); // things may have changed
-    if (!ok) qApp->beep();
-}
-
-bool PackageManager::commitWithIpkg()
-{
-    // A full implementation would do the following, but we'll just do
-    // it simply and non-interactively for now.
-    //
-    // setenv IPKG_CONF_DIR for a null $IPKG_CONF_DIR/ipkg.conf
-    // setenv IPKG_SOURCE, IPKG_ROOT, etc.
-    // run ipkg, processing interactivity as dialogs
-    //   - "... (Y/I/N/O/D) [default=N] ?"  -> ...
-    //   - "[Press ENTER to continue]" (if D chosen above)
-    //   - "The following packages are marked `Essential'... Install them now [Y/n] ?"
-    //   - "The following packages...ready to be installed:... Install them now [Y/n] ?"
-    // return FALSE cancelled
-
-    QStringList to_remove, to_install;
-
-    for ( QListViewItem* i = list->firstChild(); i; i = i->nextSibling() ) {
-	PackageItem* pit = (PackageItem*)i;
-	if ( pit->isOn() ) {
-	    if ( pit->isInstalled() )
-		to_remove.append(pit->name());
-	    else
-		to_install.append(pit->name());
-	}
-    }
-
-    bool ok=TRUE;
-
-    int jobs = to_remove.count()+to_install.count();
-    if ( jobs ) {
-	startMultiRun(jobs);
-
-	if ( to_remove.count() ) {
-	    for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it) {
-		if ( runIpkg("remove " + *it) != 0 ) {
-		    ok = FALSE;
-		}
-	    }
-	}
-	if ( to_install.count() ) {
-	    for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it) {
-		if ( runIpkg("install " + *it) != 0 ) {
-		    ok = FALSE;
-		}
-	    }
-	}
-
-	// ##### If we looked in the list of files, we could send out accurate
-	// ##### messages. But we don't bother yet, and just do an "all".
-	QCopEnvelope e("QPE/System", "linkChanged(QString)");
-	QString lf = QString::null;
-	e << lf;
-
-#if QT_VERSION > 230 // a bug breaks this otherwise
-	if ( !ok )
-	    QMessageBox::warning(this, "Error", "<p><tt>ipkg</tt> says something went wrong. Sorry.");
-#endif
-
-	endRun();
-    }
-
-    return ok;
-}
-
-QString PackageManager::ipkgStatusOutput()
-{
-    if ( cachedIpkgStatusOutput.isEmpty() ) {
-	Process ipkg_status( QStringList() << "ipkg" << "status" );
-	ipkg_status.exec( 0, cachedIpkgStatusOutput );
-    }
-    return QString::fromLocal8Bit( cachedIpkgStatusOutput );
-}
-
-QString PackageManager::ipkgInfoOutput()
-{
-    if ( cachedIpkgInfoOutput.isEmpty() ) {
-	Process ipkg_info( QStringList() << "ipkg" << "info" );
-	ipkg_info.exec( 0, cachedIpkgInfoOutput );
-    }
-    return QString::fromLocal8Bit( cachedIpkgInfoOutput );
-}
-
-void PackageManager::setCachedIpkgOutputDirty()
-{
-    cachedIpkgInfoOutput = cachedIpkgStatusOutput = QString::null;
-}
-
-void PackageManager::startMultiRun(int jobs)
-{
-    startRun();
-    progress->setTotalSteps(jobs);
-    progress->setProgress(0);
-}
-
-void PackageManager::startRun()
-{
-    progress->show();
-    doit->hide();
-}
-
-void PackageManager::endRun()
-{
-    doit->show();
-    progress->hide();
-}
-
-int PackageManager::runIpkg(const QString& args)
-{
-    if ( progress->progress() == -1 )
-	startMultiRun(1);
-    else
-	startRun();
-    QString cmd = "ipkg ";
-    if ( ipkg_old )
-	cmd += "</dev/null ";
-    else
-	cmd += "-force-defaults ";
-    int r = system((cmd+args).latin1());
-    progress->setProgress(progress->progress()+1);
-    setCachedIpkgOutputDirty();
-    endRun();
-    return r;
-}
-
-// simple hack to get support for ipkg mimetype
-void PackageManager::maybeInstall( const QString &ipk )
-{
-    int pos = ipk.findRev( "/" );
-    QString package = ipk.mid( pos + 1 );
-    pos = package.find ( "_" );
-    if ( pos != -1 )
-	package = package.left( pos );
-    switch ( QMessageBox::information( 0, tr( "Install Package" ),
-				       tr("Are you sure you want to\ninstall package\n\n%1")
-				       .arg(package), QMessageBox::Yes,
-				       QMessageBox::No|QMessageBox::Default|QMessageBox::Escape, 0 ) ) {
-	case QMessageBox::Yes: {
-	    startRun();
-	    runIpkg("install " + ipk );
-	    QCopEnvelope e("QPE/System", "linkChanged(QString)");
-	    QString lf = QString::null;
-	    e << lf;
-	    endRun();
-	}
-	break;
-	case QMessageBox::No:
-	default:
-	    // do nothing
-	    break;
-    }
-}
-
-void PackageManager::setDocument(const QString& fileref)
-{
-    if ( fileref.isNull() )
-	return;
-    DocLnk doc( fileref );
-    if ( doc.file().isEmpty() )
-	return;
-    maybeInstall( doc.file() );
-    updatePackageList();
-}
diff --git a/noncore/unsupported/oipkg/packagemanager.h b/noncore/unsupported/oipkg/packagemanager.h
deleted file mode 100644
index a3f89d0..0000000
--- a/noncore/unsupported/oipkg/packagemanager.h
+++ b/dev/null
@@ -1,94 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef PACKAGEMANAGER_H
-#define PACKAGEMANAGER_H
-#include "packagemanagerbase.h"
-#include <qintdict.h>
-
-class PackageItem;
-class PackageDetails;
-class PackageManagerSettings;
-
-class PackageManager : public PackageManagerBase
-{ 
-    Q_OBJECT
-
-public:
-    PackageManager( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~PackageManager();
-
-    
-public slots:
-    void doDetails();
-    void doSettings();
-    void doFind();
-    void doUpgrade();
-    void setDocument(const QString& fileref);
-
-protected slots:
-    void doIt();
-    
-private slots:
-    void installCurrent();
-    void removeCurrent();
-    void doNextDetails();
-
-    void newServer();
-    void editServer(int);
-    void removeServer();
-    void nameChanged(const QString&);
-    void urlChanged(const QString&);
-    void updatePackageList();
-
-private:
-    void maybeInstall( const QString &ipk );
-    void startRun();
-    void endRun();
-    void startMultiRun(int jobs);
-    int runIpkg(const QString& args);
-    QString fullDetails(const QString& pk);
-
-    bool readIpkgConfig(const QString& conffile);
-
-    void doCurrentDetails(bool);
-    PackageItem* current() const;
-
-    QStringList findPackages( const QRegExp& re );
-    void selectPackages( const QStringList& l );
-
-    bool commitWithIpkg();
-
-    QString ipkgStatusOutput();
-    QString ipkgInfoOutput();
-    void setCachedIpkgOutputDirty();
-
-    PackageManagerSettings* settings;
-    QIntDict<QString> serverurl;
-    int editedserver;
-    int ipkg_old;
-    void writeSettings();
-    void readSettings();
-
-    PackageDetails* details;
-    QCString cachedIpkgStatusOutput;
-    QCString cachedIpkgInfoOutput;
-};
-
-#endif // PACKAGEMANAGER_H
diff --git a/noncore/unsupported/oipkg/packagemanagerbase.ui b/noncore/unsupported/oipkg/packagemanagerbase.ui
deleted file mode 100644
index 9d5a178..0000000
--- a/noncore/unsupported/oipkg/packagemanagerbase.ui
+++ b/dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>PackageManagerBase</class>
-<widget>
-    <class>QWidget</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>Form1</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>257</width>
-            <height>290</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Package Manager</string>
-    </property>
-    <property>
-        <name>layoutMargin</name>
-    </property>
-    <property>
-        <name>layoutSpacing</name>
-    </property>
-    <grid>
-        <property stdset="1">
-            <name>margin</name>
-            <number>3</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>3</number>
-        </property>
-        <widget row="0"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel1</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Section:</string>
-            </property>
-        </widget>
-        <widget row="2"  column="0"  rowspan="1"  colspan="3" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout1</cstring>
-            </property>
-            <property>
-                <name>layoutSpacing</name>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>4</number>
-                </property>
-                <widget>
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>upgrade</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Upgrade all</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>doit</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Do it!</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QProgressBar</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>progress</cstring>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>settings_btn</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string></string>
-                    </property>
-                    <property stdset="1">
-                        <name>pixmap</name>
-                        <pixmap>image0</pixmap>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>find_btn</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string></string>
-                    </property>
-                    <property stdset="1">
-                        <name>pixmap</name>
-                        <pixmap>image1</pixmap>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>info_btn</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string></string>
-                    </property>
-                    <property stdset="1">
-                        <name>pixmap</name>
-                        <pixmap>image2</pixmap>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget row="0"  column="2" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>subsection</cstring>
-            </property>
-        </widget>
-        <widget row="0"  column="1" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>section</cstring>
-            </property>
-        </widget>
-        <widget row="1"  column="0"  rowspan="1"  colspan="3" >
-            <class>QListView</class>
-            <column>
-                <property>
-                    <name>text</name>
-                    <string>Package</string>
-                </property>
-                <property>
-                    <name>clickable</name>
-                    <bool>true</bool>
-                </property>
-                <property>
-                    <name>resizeable</name>
-                    <bool>true</bool>
-                </property>
-            </column>
-            <column>
-                <property>
-                    <name>text</name>
-                    <string>Description</string>
-                </property>
-                <property>
-                    <name>clickable</name>
-                    <bool>true</bool>
-                </property>
-                <property>
-                    <name>resizeable</name>
-                    <bool>true</bool>
-                </property>
-            </column>
-            <column>
-                <property>
-                    <name>text</name>
-                    <string>Size</string>
-                </property>
-                <property>
-                    <name>clickable</name>
-                    <bool>true</bool>
-                </property>
-                <property>
-                    <name>resizeable</name>
-                    <bool>true</bool>
-                </property>
-            </column>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>list</cstring>
-            </property>
-            <property stdset="1">
-                <name>allColumnsShowFocus</name>
-                <bool>true</bool>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<images>
-    <image>
-        <name>image0</name>
-        <data format="XPM.GZ" length="1897">789c5dd3c972db381006e0bb9f82e5beb9527fb88baca939387b9c7851363b49e50082a4e445966dc98b3c35ef3e602f4c3cd6e9d3df683420f8f94e7472b41fed3cdf5aadddfad4477eee6ea29df676b1d8fcfcf5f73f5bdb491a2559546751bafd6c6b7bba8e7c74b0bcec0660124031ff0d26cfaec2474c6aaf6e4757bcbe1e9cc4630e7162fd66a3a5be50e7ea925d9969aeae34ff31388dd3d081f373752ec66f4bfd2b766da61b732af547ea4aebdfa8bde4b41a9c2559acf907b3aebf505bbf4fec7a7433ba663b7396b0cfd495fa44adfbe3ed68599f9b33f1f7c17932d6bf16e7b1d64fd5364f6b96fde896edf24aeb63b3e6976add9feecdb9e4fd68c7ebbbc1456a392a711117fcd8b05417da9fefaf70a31bb3d66fd4b59ed79bb5ff5cdd6afddde0322d139defc12c392dd585e61bb3e60bb62b751e9c9a0b39dfcc5cca7ed7ea5a723a339762cb6d3e9e679295added70bb3e62bf144e7c737b3e62fcd938c9daaedbe0e464bff477633a9f57c4e5c59bf2f83ab2c58ea0fcd15f7a735bba96a9df7caacf564ae1a36bfa7dad7addc0f3d9a6bcf39ffffb9dc252e67f37d3bef3ab92ff07e4ddb383ddf9eba9379c0efd1173ed5fc585dfa82f7e3dfdfb7c12de7fc5edba22d6bd98fdf6bdbb5e1c2b99e7fdfaeec529defa3ba54bf63779dd379b3c17dd9757dc9fe2aee53cd3f8fe6f5b4cbeec3373dbb53f792233137b27e7fb4ccffdeace7bb1a2db9f5efe53cd3b57d407068e0d1a2432f196698e3146738c70516b8c41257b896df052bac718b3bdce3019b903c62172fe4cde1155ee30ddee21dde630f1ff011fb38d09e8738c2149fc2b77bf88c2ff81ab26f360b8ec31427f88e1f884396842cfd3d2732e428506212b2fd3fd7715aa12610910b49f2e7bae99a1af2d492474cddffd7514f331434a3399d3edd2f6467744e17b4a04b5ad2155d3fd9ef986e688515ade9364c7bf8f43ee92eacbda707dad023ed6efffbd7d67f2c679e40</data>
-    </image>
-    <image>
-        <name>image1</name>
-        <data format="XPM.GZ" length="1182">789c55d34b739b301007f0bb3f05636e9e0e0181304ca78724b6f3b4e3043b76d2e94148c28f183b7ec7e9f4bb97d52ea4151cf4fbaf249619386b58e37ed76a9cd5b63bb19b494b4ec5c66aa87d9e9f7efefaf1bb56f702abb8796c79f56fb5ba6349abb75a6a9827c5dc76cd008e8801726c18c105ec1225f205e8b965b583840b288901d2368c0a9ac58218211551225320733dc9ccde47a01f33c962200372e613ef91dce50cd82772e4aba1085cdfbc7b0fc91517c00130644184d52b64e88566ef3b918766b126c6589d5734d536304a632f0e804fc038682aacee0ca5283a017e0285145a48e0033265a9a9ce88213200a641445dad916535238a54018740c963afe9037da410d89547d4d8c60752869203af89027947d4d29cec1aaa983753e033326578540b592ebe45aa5099a34e40c59550e6abbb216ae4a5a12eab2ba466c88b923a041e892172020420df2a9abd53a2409e1335726ba8339699bd076288dc130572032c6ac4bc62065c1a662517c40ce938b64885908e1926513a9b4c67735125f6fc6db1c897ab775926729d2ff27c53fcd465924e8a607f387e548938eef3c3f6789a7d259fdbf3e9c565ab6d9749e7eafae6b675b7beef564f17bdf6faa1dd7f7c4acac4e988a2c1ee60f89c94493146e3d1cbabeb255f493192840dfde4dfa48806c1ff09644efdcff7da5f08a60ed0</data>
-    </image>
-    <image>
-        <name>image2</name>
-        <data format="XPM.GZ" length="702">789c7dd1c96ac3301006e0bb9f4224b75092d891b550fa082d3d164a0f238d27abb33a1ba5ef5ecfd89098868e7cd0f75b23c97834501fefaf6a304a0e1554f3a8e20cf66a80c7b2bc7e7ebd7c27bd54abfac9ac4a7b4f496fa8a27adbac0b9e633def8fa5986b66ea783067cccc672ef3cc0d53a77aac659f8310b4d3c03c330d98dc08fb2db1e19c692736b513e652186c6e0373d7d2378c4c37b1e864f1b1617d29e145189c77b2f8da121bae985efbd46be6b665de300863cdc88496be61c5840800c282197430417a17420c10907962c63c9a98334b214688f276cac4820773cf244319192609a5e48f74ea9fa40f21e27d52f016d3d92d99132d80086ec97255ae3744dbbb2ec4dd9e4abc4f0e441576926379c2ce5978be5cbbc9704b84dd1bc29f64d8f43cfcae9fe7e417c79f9e92</data>
-    </image>
-</images>
-<connections>
-    <connection>
-        <sender>settings_btn</sender>
-        <signal>clicked()</signal>
-        <receiver>Form1</receiver>
-        <slot>doSettings()</slot>
-    </connection>
-    <connection>
-        <sender>find_btn</sender>
-        <signal>clicked()</signal>
-        <receiver>Form1</receiver>
-        <slot>doFind()</slot>
-    </connection>
-    <connection>
-        <sender>info_btn</sender>
-        <signal>clicked()</signal>
-        <receiver>Form1</receiver>
-        <slot>doDetails()</slot>
-    </connection>
-    <connection>
-        <sender>list</sender>
-        <signal>doubleClicked(QListViewItem*)</signal>
-        <receiver>Form1</receiver>
-        <slot>doDetails()</slot>
-    </connection>
-    <connection>
-        <sender>upgrade</sender>
-        <signal>clicked()</signal>
-        <receiver>Form1</receiver>
-        <slot>doUpgrade()</slot>
-    </connection>
-    <slot access="public">doFind()</slot>
-    <slot access="public">doDetails()</slot>
-    <slot access="public">doSettings()</slot>
-    <slot access="public">doUpgrade()</slot>
-</connections>
-</UI>
diff --git a/noncore/unsupported/oipkg/pkdesc.ui b/noncore/unsupported/oipkg/pkdesc.ui
deleted file mode 100644
index 494d3d6..0000000
--- a/noncore/unsupported/oipkg/pkdesc.ui
+++ b/dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>PackageDetails</class>
-<widget>
-    <class>QDialog</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>Form7</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>221</width>
-            <height>291</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>(pkgname)</string>
-    </property>
-    <property>
-        <name>layoutMargin</name>
-    </property>
-    <property>
-        <name>layoutSpacing</name>
-    </property>
-    <vbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>6</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>3</number>
-        </property>
-        <widget>
-            <class>QTextView</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>description</cstring>
-            </property>
-        </widget>
-        <widget>
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout4</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget>
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>install</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Install</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>remove</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Remove</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>ignore</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Ignore</string>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-    </vbox>
-</widget>
-</UI>
diff --git a/noncore/unsupported/oipkg/pkfind.ui b/noncore/unsupported/oipkg/pkfind.ui
deleted file mode 100644
index 7a24c00..0000000
--- a/noncore/unsupported/oipkg/pkfind.ui
+++ b/dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>Search</class>
-<widget>
-    <class>QDialog</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>Form5</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>196</width>
-            <height>55</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Search Packages</string>
-    </property>
-    <hbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>11</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget>
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel4</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Find:</string>
-            </property>
-        </widget>
-        <widget>
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>pattern</cstring>
-            </property>
-        </widget>
-    </hbox>
-</widget>
-</UI>
diff --git a/noncore/unsupported/oipkg/pksettings.ui b/noncore/unsupported/oipkg/pksettings.ui
deleted file mode 100644
index f182752..0000000
--- a/noncore/unsupported/oipkg/pksettings.ui
+++ b/dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>PackageManagerSettings</class>
-<widget>
-    <class>QDialog</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>Form4</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>549</width>
-            <height>683</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Package Servers</string>
-    </property>
-    <grid>
-        <property stdset="1">
-            <name>margin</name>
-            <number>11</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget row="3"  column="0"  rowspan="1"  colspan="2" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout4</cstring>
-            </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget row="0"  column="1" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>servername</cstring>
-                    </property>
-                </widget>
-                <widget row="0"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>TextLabel1_3</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Name:</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="1" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>serverurl</cstring>
-                    </property>
-                </widget>
-                <widget row="1"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>TextLabel2_3</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>URL:</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget row="2"  column="0" >
-            <class>QPushButton</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>newserver</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>New</string>
-            </property>
-            <property stdset="1">
-                <name>autoDefault</name>
-                <bool>false</bool>
-            </property>
-        </widget>
-        <widget row="2"  column="1" >
-            <class>QPushButton</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>removeserver</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Remove</string>
-            </property>
-            <property stdset="1">
-                <name>autoDefault</name>
-                <bool>false</bool>
-            </property>
-        </widget>
-        <widget row="1"  column="0"  rowspan="1"  colspan="2" >
-            <class>QListBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>servers</cstring>
-            </property>
-            <property stdset="1">
-                <name>selectionMode</name>
-                <enum>Multi</enum>
-            </property>
-        </widget>
-        <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout2</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget>
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Servers</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Servers</string>
-                    </property>
-                </widget>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer2</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-            </hbox>
-        </widget>
-    </grid>
-</widget>
-</UI>