summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/packagemanager/ChangeLog9
-rw-r--r--noncore/settings/packagemanager/README2
-rw-r--r--noncore/settings/packagemanager/TODO9
-rw-r--r--noncore/settings/packagemanager/entrydlg.cpp4
-rw-r--r--noncore/settings/packagemanager/filterdlg.h4
-rw-r--r--noncore/settings/packagemanager/global.h37
-rw-r--r--noncore/settings/packagemanager/installdlg.cpp15
-rw-r--r--noncore/settings/packagemanager/main.cpp3
-rw-r--r--noncore/settings/packagemanager/mainwindow.cpp22
-rw-r--r--noncore/settings/packagemanager/mainwindow.h8
-rw-r--r--noncore/settings/packagemanager/oconfitem.cpp5
-rw-r--r--noncore/settings/packagemanager/oconfitem.h23
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp7
-rw-r--r--noncore/settings/packagemanager/oipkg.h14
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.cpp17
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.h4
-rw-r--r--noncore/settings/packagemanager/opackagemanager.cpp6
-rw-r--r--noncore/settings/packagemanager/opackagemanager.h8
-rw-r--r--noncore/settings/packagemanager/opie-packagemanager.control2
-rw-r--r--noncore/settings/packagemanager/packageinfodlg.cpp13
-rw-r--r--noncore/settings/packagemanager/packageinfodlg.h4
-rw-r--r--noncore/settings/packagemanager/promptdlg.cpp4
22 files changed, 93 insertions, 127 deletions
diff --git a/noncore/settings/packagemanager/ChangeLog b/noncore/settings/packagemanager/ChangeLog
index d53a2b3..c9e33c4 100644
--- a/noncore/settings/packagemanager/ChangeLog
+++ b/noncore/settings/packagemanager/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-21 Dan Williams <drw@handhelds.org>
+
+ * Released version 0.4.0
+ * Added saving of ipkg configuration information
+ * Re-initialize ipkg when configuration information changes
+ * Added QWhatsThis for all UI controls
+ * Remove Location from OConfItem as it is not used/needed
+ * Re-ordered includes to follow Opie standards
+
2004-02-13 Dan Williams <drw@handhelds.org>
* Released version 0.3.0
diff --git a/noncore/settings/packagemanager/README b/noncore/settings/packagemanager/README
index 9324f9c..bf93c98 100644
--- a/noncore/settings/packagemanager/README
+++ b/noncore/settings/packagemanager/README
@@ -2,7 +2,7 @@
/*
/* Opie - Package Manager
/* ========================
-/* Version 0.3.0
+/* Version 0.4.0
/*
/* A package management client for Opie
/*
diff --git a/noncore/settings/packagemanager/TODO b/noncore/settings/packagemanager/TODO
index 448ade3..633c589 100644
--- a/noncore/settings/packagemanager/TODO
+++ b/noncore/settings/packagemanager/TODO
@@ -2,7 +2,7 @@
/*
/* Opie - Package Manager
/* ========================
-/* Version 0.3.0
+/* Version 0.4.0
/*
/* A package management client for Opie
/*
@@ -16,10 +16,9 @@
= Current release =
======================
-1. Save configuration information (i.e. /etc/ipkg.conf)
-2. Link non-root destination apps
-3. Implement QCOP interface for installing, removing, etc.
-4. Redesign configuration dialog
+1. Link non-root destination apps
+2. Implement QCOP interface for installing, removing, etc.
+3. Redesign configuration dialog
======================
= Future releases =
diff --git a/noncore/settings/packagemanager/entrydlg.cpp b/noncore/settings/packagemanager/entrydlg.cpp
index 663abd2..fd275e1 100644
--- a/noncore/settings/packagemanager/entrydlg.cpp
+++ b/noncore/settings/packagemanager/entrydlg.cpp
@@ -29,13 +29,13 @@
#include "entrydlg.h"
+#include <qpe/qpeapplication.h>
+
#include <qlabel.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qpushbutton.h>
-#include <qpe/qpeapplication.h>
-
EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, bool modal )
: QDialog( parent, name, modal )
{
diff --git a/noncore/settings/packagemanager/filterdlg.h b/noncore/settings/packagemanager/filterdlg.h
index de9ea80..bd89b42 100644
--- a/noncore/settings/packagemanager/filterdlg.h
+++ b/noncore/settings/packagemanager/filterdlg.h
@@ -30,6 +30,8 @@
#ifndef FILTERDLG_H
#define FILTERDLG_H
+#include "opackagemanager.h"
+
#include <qcheckbox.h>
#include <qdialog.h>
#include <qcombobox.h>
@@ -37,8 +39,6 @@
#include <qlineedit.h>
#include <qscrollview.h>
-#include "opackagemanager.h"
-
class FilterDlg : public QDialog
{
Q_OBJECT
diff --git a/noncore/settings/packagemanager/global.h b/noncore/settings/packagemanager/global.h
deleted file mode 100644
index 0fe5b85..0000000
--- a/noncore/settings/packagemanager/global.h
+++ b/dev/null
@@ -1,37 +0,0 @@
-/*
-                This file is part of the Opie Project
-
-              Copyright (c) 2003 Dan Williams <drw@handhelds.org>
- =.
- .=l.
-           .>+-=
- _;:,     .>    :=|. This program is free software; you can
-.> <`_,   >  .   <= redistribute it and/or modify it under
-:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
-.="- .-=="i,     .._ License as published by the Free Software
- - .   .-<_>     .<> Foundation; either version 2 of the License,
-     ._= =}       : or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s. This program is distributed in the hope that
-     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . . without even the implied warranty of
-    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ; Library General Public License for more
-++=   -.     .`     .: details.
- :     =  ...= . :.=-
- -.   .:....=;==+<; You should have received a copy of the GNU
-  -_. . .   )=.  = Library General Public License along with
-    --        :-=` this library; see the file COPYING.LIB.
- If not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-
-*/
-
-#ifndef GLOBAL_H
-#define GLOBAL_H
-
-#define VERSION "0.0.0"
-
-#endif \ No newline at end of file
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 4a55c10..0cb30e2 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -29,7 +29,11 @@
#include "installdlg.h"
-#include <sys/vfs.h>
+#include <opie2/ofiledialog.h>
+
+#include <qpe/fileselector.h>
+#include <qpe/resource.h>
+#include <qpe/storage.h>
#include <qapplication.h>
#include <qcombobox.h>
@@ -41,15 +45,10 @@
#include <qmultilineedit.h>
#include <qpushbutton.h>
-#include <qpe/fileselector.h>
-#include <qpe/resource.h>
-#include <qpe/storage.h>
-
-#include <opie2/ofiledialog.h>
+#include <sys/vfs.h>
#include "opackagemanager.h"
-using namespace Opie::Ui;
InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
OPackage::Command command1, QStringList *packages1,
OPackage::Command command2, QStringList *packages2,
@@ -276,7 +275,7 @@ void InstallDlg::slotBtnOptions()
text << "*";
map.insert( tr( "All" ), text );
- QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+ QString filename = Opie::Ui::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
if( !filename.isEmpty() )
{
QString currentFileName = QFileInfo( filename ).fileName();
diff --git a/noncore/settings/packagemanager/main.cpp b/noncore/settings/packagemanager/main.cpp
index c050e1a..3792881 100644
--- a/noncore/settings/packagemanager/main.cpp
+++ b/noncore/settings/packagemanager/main.cpp
@@ -31,5 +31,4 @@
#include <opie2/oapplicationfactory.h>
-using namespace Opie::Core;
-OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp
index 810046f..991cc81 100644
--- a/noncore/settings/packagemanager/mainwindow.cpp
+++ b/noncore/settings/packagemanager/mainwindow.cpp
@@ -27,6 +27,17 @@
*/
+#include "mainwindow.h"
+#include "installdlg.h"
+#include "filterdlg.h"
+#include "promptdlg.h"
+#include "entrydlg.h"
+#include "packageinfodlg.h"
+
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
+
#include <qaction.h>
#include <qdir.h>
#include <qlayout.h>
@@ -38,17 +49,6 @@
#include <qtoolbar.h>
#include <qwhatsthis.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-
-#include "mainwindow.h"
-#include "installdlg.h"
-#include "filterdlg.h"
-#include "promptdlg.h"
-#include "entrydlg.h"
-#include "packageinfodlg.h"
-
MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ )
: QMainWindow( parent, name, WStyle_ContextHelp )
, m_config( "packman" )
diff --git a/noncore/settings/packagemanager/mainwindow.h b/noncore/settings/packagemanager/mainwindow.h
index fb555c5..632effb 100644
--- a/noncore/settings/packagemanager/mainwindow.h
+++ b/noncore/settings/packagemanager/mainwindow.h
@@ -30,6 +30,10 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
+#include "opackagemanager.h"
+
+#include <qpe/config.h>
+
#include <qlabel.h>
#include <qlistview.h>
#include <qmainwindow.h>
@@ -38,10 +42,6 @@
#include <qtoolbar.h>
#include <qwidgetstack.h>
-#include <qpe/config.h>
-
-#include "opackagemanager.h"
-
class QAction;
class QLineEdit;
diff --git a/noncore/settings/packagemanager/oconfitem.cpp b/noncore/settings/packagemanager/oconfitem.cpp
index 940a6de..a90730c 100644
--- a/noncore/settings/packagemanager/oconfitem.cpp
+++ b/noncore/settings/packagemanager/oconfitem.cpp
@@ -31,10 +31,9 @@
#include "oconfitem.h"
-OConfItem::OConfItem( const QString &location, Type type, const QString &name,
+OConfItem::OConfItem( Type type, const QString &name,
const QString &value, bool active )
- : m_location( location )
- , m_type( type )
+ : m_type( type )
, m_name( name )
, m_value( value )
, m_active( active )
diff --git a/noncore/settings/packagemanager/oconfitem.h b/noncore/settings/packagemanager/oconfitem.h
index aeee511..db77980 100644
--- a/noncore/settings/packagemanager/oconfitem.h
+++ b/noncore/settings/packagemanager/oconfitem.h
@@ -40,23 +40,20 @@ class OConfItem
public:
enum Type { Source, Destination, Option, Arch, NotDefined };
- OConfItem( const QString &location = 0x0, Type type = NotDefined, const QString &name = 0x0,
- const QString &value = 0x0, bool active = true );
+ OConfItem( Type type = NotDefined, const QString &name = 0x0, const QString &value = 0x0,
+ bool active = true );
- const QString &location() { return m_location; }
Type type() { return m_type; }
const QString &name() { return m_name; }
const QString &value() { return m_value; }
bool active() { return m_active; }
- void setLocation( const QString &location ) { m_location = location; }
void setType( Type type ) { m_type = type; }
void setName( const QString &name ) { m_name = name; }
void setValue( const QString &value ) { m_value = value; }
void setActive( bool active ) { m_active = active; }
private:
- QString m_location; // Configuration file where item is located
Type m_type; // Type of configuration item
QString m_name; // Name of item
QString m_value; // Value of item
@@ -70,22 +67,22 @@ private:
int compareItems( QCollection::Item item1, QCollection::Item item2 )
{
// Sort by OConfItem location then by type
- QString loc1 = reinterpret_cast<OConfItem*>(item1)->location();
- QString loc2 = reinterpret_cast<OConfItem*>(item2)->location();
- if ( loc1 < loc2 )
- return -1;
- else if ( loc1 == loc2 )
- {
OConfItem::Type type1 = reinterpret_cast<OConfItem*>(item1)->type();
OConfItem::Type type2 = reinterpret_cast<OConfItem*>(item2)->type();
if ( type1 < type2 )
return -1;
else if ( type1 == type2 )
+ {
+ QString name1 = reinterpret_cast<OConfItem*>(item1)->name();
+ QString name2 = reinterpret_cast<OConfItem*>(item2)->name();
+ if ( name1 < name2 )
+ return -1;
+ else if ( name1 == name2 )
return 0;
- else /*if ( type1 > type2 )*/
+ else /*if ( name1 > name2 )*/
return 1;
}
- else /*if ( loc1 > loc2 )*/
+ else /*if ( type1 > type2 )*/
return 1;
}
};
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index 696a64a..87a30bb 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -31,13 +31,12 @@
#include "oipkg.h"
-#include <stdlib.h>
-#include <string.h>
-
#include <qdir.h>
#include <qfile.h>
#include <qtextstream.h>
+#include <stdlib.h>
+
const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file
const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files
const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists
@@ -529,7 +528,7 @@ void OIpkg::loadConfiguration()
bool active = !line.startsWith( "#" );
// Add to list
- m_confInfo->append( new OConfItem( absFile, type, name, value, active ) );
+ m_confInfo->append( new OConfItem( type, name, value, active ) );
}
}
}
diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h
index ea126cf..b8a859a 100644
--- a/noncore/settings/packagemanager/oipkg.h
+++ b/noncore/settings/packagemanager/oipkg.h
@@ -32,16 +32,16 @@
#ifndef OIPKG_H
#define OIPKG_H
-extern "C" {
-#include <libipkg.h>
-};
-
-#include <qobject.h>
+#include "oconfitem.h"
+#include "opackage.h"
#include <qpe/config.h>
-#include "oconfitem.h"
-#include "opackage.h"
+#include <qobject.h>
+
+extern "C" {
+#include <libipkg.h>
+};
// Ipkg execution options (m_ipkgExecOptions)
#define FORCE_DEPENDS 0x0001
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
@@ -31,6 +31,8 @@
#include "oipkgconfigdlg.h"
+#include <qpe/resource.h>
+
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qgroupbox.h>
@@ -41,9 +43,6 @@
#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 )
@@ -101,7 +100,7 @@ void OIpkgConfigDlg::accept()
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" );
@@ -111,21 +110,21 @@ void OIpkgConfigDlg::accept()
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 );
@@ -532,7 +531,7 @@ 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();
@@ -618,7 +617,7 @@ 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();
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h
index 0aba898..800d94a 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.h
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.h
@@ -33,11 +33,11 @@
#ifndef OIPKGCONFIGDLG_H
#define OIPKGCONFIGDLG_H
+#include <opie2/otabwidget.h>
+
#include <qdialog.h>
#include <qlayout.h>
-#include <opie2/otabwidget.h>
-
#include "oipkg.h"
class QCheckBox;
diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp
index 3633e05..f75d3b3 100644
--- a/noncore/settings/packagemanager/opackagemanager.cpp
+++ b/noncore/settings/packagemanager/opackagemanager.cpp
@@ -29,12 +29,12 @@
*/
-#include <ctype.h>
+#include "opackagemanager.h"
+#include "oipkgconfigdlg.h"
#include <qpe/qpeapplication.h>
-#include "opackagemanager.h"
-#include "oipkgconfigdlg.h"
+#include <ctype.h>
OPackageManager::OPackageManager( Config *config, QObject *parent, const char *name )
: QObject( parent, name )
diff --git a/noncore/settings/packagemanager/opackagemanager.h b/noncore/settings/packagemanager/opackagemanager.h
index b710a51..58e597b 100644
--- a/noncore/settings/packagemanager/opackagemanager.h
+++ b/noncore/settings/packagemanager/opackagemanager.h
@@ -32,13 +32,13 @@
#ifndef OPACKAGEMANAGER_H
#define OPACKAGEMANAGER_H
-#include <qdict.h>
-#include <qobject.h>
-#include <qstringlist.h>
+#include "oipkg.h"
#include <qpe/config.h>
-#include "oipkg.h"
+#include <qdict.h>
+#include <qobject.h>
+#include <qstringlist.h>
class OPackageManager : public QObject
{
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index aff8866..09bb18b 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -7,4 +7,4 @@ Replaces: packagemanager
Architecture: arm
Maintainer: Dan Williams (drw@handhelds.org)
Description: Opie package management client
-Version: 0.3.0$EXTRAVERSION
+Version: 0.4.0$EXTRAVERSION
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index 73d3de7..d27eacb 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -31,14 +31,14 @@
#include "opackage.h"
#include "opackagemanager.h"
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <opie2/otabwidget.h>
#include <qpe/resource.h>
-#include <opie2/otabwidget.h>
+#include <qlayout.h>
+#include <qpushbutton.h>
+#include <qwhatsthis.h>
-using namespace Opie::Ui;
PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
: QWidget( 0x0 )
, m_packman( pm )
@@ -51,10 +51,11 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr
QVBoxLayout *layout = new QVBoxLayout( this, 4, 2 );
- OTabWidget *tabWidget = new OTabWidget( this );
+ Opie::Ui::OTabWidget *tabWidget = new Opie::Ui::OTabWidget( this );
layout->addWidget( tabWidget );
// Information tab
+ QWhatsThis::add( &m_information, tr( "This area contains information about the package." ) );
m_information.reparent( tabWidget, QPoint( 0, 0 ) );
m_information.setReadOnly( true );
tabWidget->addTab( &m_information, "UtilsIcon", tr( "Information" ) );
@@ -82,12 +83,14 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr
{
QWidget *filesWidget = new QWidget( tabWidget );
QVBoxLayout *filesLayout = new QVBoxLayout( filesWidget, 2, 2 );
+ QWhatsThis::add( &m_files, tr( "This area contains a list of files contained in this package." ) );
m_files.reparent( filesWidget, QPoint( 0, 0 ) );
m_files.setReadOnly( true );
filesLayout->addWidget( &m_files );
QPushButton *btn = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ),
tr( "Retrieve file list" ), filesWidget );
+ QWhatsThis::add( btn, tr( "Tap here to retrieve list of files contained in this package." ) );
filesLayout->addWidget( btn );
connect( btn, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) );
tabWidget->addTab( filesWidget, "binary", tr( "File list" ) );
diff --git a/noncore/settings/packagemanager/packageinfodlg.h b/noncore/settings/packagemanager/packageinfodlg.h
index 7ed9f0a..ec031e1 100644
--- a/noncore/settings/packagemanager/packageinfodlg.h
+++ b/noncore/settings/packagemanager/packageinfodlg.h
@@ -30,11 +30,11 @@
#ifndef PACKAGEINFODLG_H
#define PACKAGEINFODLG_H
+#include "opackage.h"
+
#include <qmultilineedit.h>
#include <qwidget.h>
-#include "opackage.h"
-
class QPushButton;
class OPackage;
diff --git a/noncore/settings/packagemanager/promptdlg.cpp b/noncore/settings/packagemanager/promptdlg.cpp
index 4e82ba9..841b98e 100644
--- a/noncore/settings/packagemanager/promptdlg.cpp
+++ b/noncore/settings/packagemanager/promptdlg.cpp
@@ -29,13 +29,13 @@
#include "promptdlg.h"
+#include <qpe/qpeapplication.h>
+
#include <qlabel.h>
#include <qlayout.h>
#include <qpushbutton.h>
#include <qwidgetlist.h>
-#include <qpe/qpeapplication.h>
-
PromptDlg::PromptDlg( const QString &caption, const QString &text, const QString &btn1, const QString &btn2,
QWidget *parent )
: QWidget( parent, QString::null, WType_Modal | WType_TopLevel | WStyle_Dialog )