26 files changed, 45 insertions, 100 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 00128d3..9e5eede 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -555,28 +555,24 @@ void Appearance::accept ( )
                 fl |= ( it-> noFont ( ) ? 0x02 : 0 );
                 fl |= ( it-> noDeco ( ) ? 0x04 : 0 );
                 exceptstr = QString::number ( fl, 32 );
                 exceptstr.append( it-> pattern ( ));
                 sl << exceptstr;
         }
         config. writeEntry ( "NoStyle", sl, ';' );
         config. writeEntry ( "ForceStyle", m_force-> isChecked ( ));
 
         config. write ( ); // need to flush the config info first
         Global::applyStyle ( );
 
-        if ( QMessageBox::warning ( this, tr( "Restart" ), tr( "Do you want to restart %1 now?" ). arg ( ODevice::inst ( )-> system ( ) == System_Zaurus ? "Qtopia" : "Opie" ),  tr( "Yes" ), tr( "No" ), 0, 0, 1 ) == 0 ) {
-                QCopEnvelope e( "QPE/System", "restart()" );
-        }
-
         QDialog::accept ( );
 }
 
 void Appearance::done ( int r )
 {
         QDialog::done ( r );
         close ( );
 }
 
 
 void Appearance::styleClicked ( int index )
 {
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index da9e976..51e9636 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -46,24 +46,25 @@ class SampleWindow;
 class OFontSelector;
 class QListView;
 class QListViewItem;
 class Config;
 
 class Appearance : public QDialog
 {
     Q_OBJECT
 
 public:
     Appearance( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Appearance();
+    static QString appName() { return QString::fromLatin1("appearance"); }
 
 protected:
         virtual void accept ( );
         virtual void done ( int r );
 
 protected slots:
     void styleClicked ( int );
     void styleSettingsClicked ( );
     void decoClicked ( int );
     void fontClicked ( const QFont & );
     void colorClicked ( int );
 
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro
index e37536d..145de2f 100644
--- a/noncore/settings/appearance2/appearance2.pro
+++ b/noncore/settings/appearance2/appearance2.pro
@@ -1,33 +1,31 @@
-TEMPLATE  = app
-CONFIG    = qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
+CONFIG    = qt warn_on release quick-app
 HEADERS   = appearance.h editScheme.h sample.h
 SOURCES   = appearance.cpp editScheme.cpp main.cpp sample.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += ../$(OPIEDIR)/include
 LIBS            += -lqpe -lopie
-TARGET    = appearance
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
+        TARGET          = appearance
+
 TRANSLATIONS = ../../../i18n/de/appearance.ts \
          ../../../i18n/nl/appearance.ts \
          ../../../i18n/xx/appearance.ts \
          ../../../i18n/en/appearance.ts \
          ../../../i18n/es/appearance.ts \
          ../../../i18n/fr/appearance.ts \
          ../../../i18n/hu/appearance.ts \
          ../../../i18n/ja/appearance.ts \
          ../../../i18n/ko/appearance.ts \
          ../../../i18n/no/appearance.ts \
          ../../../i18n/pl/appearance.ts \
          ../../../i18n/pt/appearance.ts \
          ../../../i18n/pt_BR/appearance.ts \
          ../../../i18n/sl/appearance.ts \
          ../../../i18n/zh_CN/appearance.ts \
          ../../../i18n/zh_TW/appearance.ts \
          ../../../i18n/da/appearance.ts
 
 
-
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/appearance2/main.cpp b/noncore/settings/appearance2/main.cpp
index ad24cf3..5595429 100644
--- a/noncore/settings/appearance2/main.cpp
+++ b/noncore/settings/appearance2/main.cpp
@@ -19,24 +19,16 @@
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "appearance.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
 
-int main ( int argc, char **argv )
-{
-        QPEApplication app ( argc, argv );
-    
-        Appearance m;
-        app. showMainDocumentWidget ( &m );
-
-        return app. exec ( );
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<Appearance> )
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index cadb381..1e9af61 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -1,35 +1,30 @@
-        TEMPLATE= app
-        #CONFIG         = qt warn_on debug
-        CONFIG  = qt warn_on release
+        CONFIG  = qt warn_on release quick-app
         HEADERS         = backuprestore.h
         SOURCES         = main.cpp backuprestore.cpp
         INCLUDEPATH+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
         INTERFACES= backuprestorebase.ui errordialog.ui
         TARGET  = backup
-        DESTDIR         = $(OPIEDIR)/bin
 
 TRANSLATIONS = ../../../i18n/de/backup.ts \
          ../../../i18n/nl/backup.ts \
         ../../../i18n/xx/backup.ts \
         ../../../i18n/en/backup.ts \
         ../../../i18n/es/backup.ts \
         ../../../i18n/fr/backup.ts \
         ../../../i18n/hu/backup.ts \
         ../../../i18n/ja/backup.ts \
         ../../../i18n/ko/backup.ts \
         ../../../i18n/no/backup.ts \
         ../../../i18n/pl/backup.ts \
         ../../../i18n/pt/backup.ts \
         ../../../i18n/pt_BR/backup.ts \
         ../../../i18n/sl/backup.ts \
         ../../../i18n/zh_CN/backup.ts \
         ../../../i18n/zh_TW/backup.ts \
         ../../../i18n/it/backup.ts \
         ../../../i18n/da/backup.ts
 
 
-
-
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 922523b..1c854d9 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -28,26 +28,26 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
 #define HEADER_NAME 0
 #define HEADER_BACKUP 1
 #define BACKUP_LOCATION 2
 
 #define EXTENSION ".bck"
 
 const QString tempFileName = "/tmp/backup.err";
 
 
-BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
-        : BackupAndRestoreBase(parent, name){
+BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags fl)
+        : BackupAndRestoreBase(parent, name,  fl){
   this->showMaximized();
   backupList->header()->hide();
   restoreList->header()->hide();
   connect(backupButton, SIGNAL(clicked()),
           this, SLOT(backupPressed()));
   connect(restoreButton, SIGNAL(clicked()),
           this, SLOT(restore()));
   connect(backupList, SIGNAL(clicked( QListViewItem * )),
           this, SLOT(selectItem(QListViewItem*))); 
   connect(restoreSource, SIGNAL(activated( int  )),
           this, SLOT(sourceDirChanged(int))); 
   connect(updateList, SIGNAL(clicked()),
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index 8c733e3..4bdc758 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -5,27 +5,28 @@
 #include "backuprestorebase.h"
 #include <qmap.h>
 #include <qlist.h>
 
 class QListViewItem;
 
 class BackupAndRestore : public BackupAndRestoreBase { 
 
 Q_OBJECT
         
 public:
 
-  BackupAndRestore( QWidget* parent = 0, const char* name = 0);
+  BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
   ~BackupAndRestore();
   
+  static QString appName() { return QString::fromLatin1("backup"); }
   
 private slots:
   void backupPressed();
   void restore();
   void selectItem(QListViewItem *currentItem);
   void sourceDirChanged(int);
   void rescanFolder(QString directory);
   void fileListUpdate();
 
 private:
   void scanForApplicationSettings();
   int getBackupFiles(QString &backupFiles, QListViewItem *parent);
diff --git a/noncore/settings/backup/main.cpp b/noncore/settings/backup/main.cpp
index 676e1f0..b375a3b 100644
--- a/noncore/settings/backup/main.cpp
+++ b/noncore/settings/backup/main.cpp
@@ -1,14 +1,8 @@
 #include "backuprestore.h"
 #include "qnetworkprotocol.h"
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main(int argc, char *argv[]) {
-  QPEApplication a( argc, argv );
   
-  BackupAndRestore app(0, "mainwindow");
-  a.showMainWidget(&app);
-  return a.exec();
-}
-
-// main.cpp
+OPIE_EXPORT_APP( OApplicationFactory<BackupAndRestore> )
 
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index eb9e0b9..f181f7e 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -1,15 +1,13 @@
-        TEMPLATE= app
-        CONFIG  += qt warn_on release
-        DESTDIR         = $(OPIEDIR)/bin
+        CONFIG  += qt warn_on release quick-app
         HEADERS         = settings.h
         SOURCES         = language.cpp main.cpp
         INTERFACES= languagesettingsbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
         TARGET  = language
 
 TRANSLATIONS = ../../../i18n/de/language.ts \
          ../../../i18n/nl/language.ts \
          ../../../i18n/xx/language.ts \
          ../../../i18n/en/language.ts \
diff --git a/noncore/settings/language/main.cpp b/noncore/settings/language/main.cpp
index a760ff3..8bdf8a5 100644
--- a/noncore/settings/language/main.cpp
+++ b/noncore/settings/language/main.cpp
@@ -12,25 +12,16 @@
 ** 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 "settings.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
 
-int main(int argc, char** argv)
-{
-    QPEApplication a(argc,argv);
-
-    LanguageSettings dlg;
-
-    a.showMainWidget(&dlg);
-
-    return a.exec();
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<LanguageSettings> )
diff --git a/noncore/settings/language/settings.h b/noncore/settings/language/settings.h
index 22cc987..a157d26 100644
--- a/noncore/settings/language/settings.h
+++ b/noncore/settings/language/settings.h
@@ -26,24 +26,26 @@
 #include "languagesettingsbase.h"
 
 class QPEDialogListener;
 
 class LanguageSettings : public LanguageSettingsBase
 { 
     Q_OBJECT
 
 public:
     LanguageSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~LanguageSettings();
 
+    static QString appName() { return QString::fromLatin1("language"); }
+
 protected:
     void accept();
     void reject();
     void done(int);
 
     QStrList langAvail;
 
 private slots:
     void applyLanguage();
     void reset();
 
 private:
diff --git a/noncore/settings/mediummount/main.cpp b/noncore/settings/mediummount/main.cpp
index 118a725..b8cdeaf 100644
--- a/noncore/settings/mediummount/main.cpp
+++ b/noncore/settings/mediummount/main.cpp
@@ -1,17 +1,10 @@
 #include "mediumwidget.h"
 #include "mediumglobal.h"
 #include "mainwindow.h"
 
 #include <qpixmap.h>
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char ** argv )
-{
-    QPEApplication a( argc, argv );
+OPIE_EXPORT_APP( OApplicationFactory<MediumMountSetting::MainWindow> )
 
-    MediumMountSetting::MainWindow mw;
-    a.showMainWidget( &mw );
-    mw.showMaximized();
-
-    return a.exec();
-}
diff --git a/noncore/settings/mediummount/mainwindow.h b/noncore/settings/mediummount/mainwindow.h
index 71dac79..9649863 100644
--- a/noncore/settings/mediummount/mainwindow.h
+++ b/noncore/settings/mediummount/mainwindow.h
@@ -8,24 +8,25 @@
 
 class QVBoxLayout;
 class QTabWidget;
 
 namespace MediumMountSetting {
   class MediumMountWidget;
   class MediumGlobalWidget;
   class MainWindow : public QDialog {
     Q_OBJECT
   public:
     MainWindow(QWidget *parent = 0, const char *name = 0 ,  bool modal = FALSE, WFlags = 0);
     ~MainWindow();
+    static QString appName() { return QString::fromLatin1("mediummount"); }
 
   private slots:
     void slotGlobalChanged(int );
     void slotCheckingChanged(int );
     void accept();
     void done( int );
   private:
     void init();
     QTabWidget *m_tab;
     QVBoxLayout *m_lay;
     MediumGlobalWidget *m_global;
     QList<MediumMountWidget> m_mediums;
diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro
index 97bbbaf..6e29fa5 100644
--- a/noncore/settings/mediummount/mediummount.pro
+++ b/noncore/settings/mediummount/mediummount.pro
@@ -1,16 +1,16 @@
         TEMPLATE= app
 DESTDIR         = $(OPIEDIR)/bin/
         #CONFIG         = qt warn_on debug
-        CONFIG  = qt warn_on release
+        CONFIG  = qt warn_on release quick-app
         HEADERS         = mediumwidget.h mediumglobal.h mainwindow.h
         SOURCES         = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc
         INCLUDEPATH+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET          = mediummount
 
 TRANSLATIONS = ../../../i18n/de/mediummount.ts \
          ../../../i18n/nl/mediummount.ts \
          ../../../i18n/da/mediummount.ts \
          ../../../i18n/xx/mediummount.ts \
          ../../../i18n/en/mediummount.ts \
diff --git a/noncore/settings/mediummount/mediumwidget.h b/noncore/settings/mediummount/mediumwidget.h
index 7f7b755..0f27117 100644
--- a/noncore/settings/mediummount/mediumwidget.h
+++ b/noncore/settings/mediummount/mediumwidget.h
@@ -18,24 +18,25 @@ class QGroupBox;
 class QVBox;
 class QHBox;
 class QLineEdit;
 
 namespace MediumMountSetting {
 
   class MediumMountWidget : public QWidget {
     Q_OBJECT
   public:
     MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 );
     ~MediumMountWidget();
 
+
     void writeConfig();
     
   private slots:
     void slotAdd();
     void slotStateChanged();
 
   private:
     void readConfig();
     void initGUI();
   
     bool m_dirty : 1;
 
diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp
index 4b20a61..da98eee 100644
--- a/noncore/settings/netsystemtime/main.cpp
+++ b/noncore/settings/netsystemtime/main.cpp
@@ -20,22 +20,16 @@
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "mainwindow.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char ** argv )
-{
-    QPEApplication a( argc, argv );
 
-    MainWindow mw;
-    a.showMainWidget( &mw );
-
-    return a.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index 2d240ba..66e1ca3 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -30,36 +30,37 @@
 #include "timetabwidget.h"
 #include "formattabwidget.h"
 #include "settingstabwidget.h"
 #include "ntptabwidget.h"
 #include "predicttabwidget.h"
 
 #include <opie/oprocess.h>
 #include <opie/otabwidget.h>
 
 #include <qpe/config.h>
 #include <qpe/datebookdb.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/qpedialog.h>
 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qsocket.h>
 #include <qstring.h>
 #include <qtimer.h>
 
-MainWindow::MainWindow()
+MainWindow::MainWindow( QWidget *parent , const char *name,  bool modal, WFlags f )
         : QDialog( 0x0, 0x0, TRUE, 0 )
 {
         setCaption( tr( "SystemTime" ) );
 
         QVBoxLayout *layout = new QVBoxLayout( this );
         layout->setMargin( 2 );
         layout->setSpacing( 4 );
 
         // Create main tabbed control
         mainWidget = new OTabWidget( this );
 
         // Default object pointers to null
@@ -70,29 +71,28 @@ MainWindow::MainWindow()
         mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) );
         mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) );
         mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) );
         mainWidget->addTab( predictTab = new PredictTabWidget( mainWidget ), "netsystemtime/predicttab", tr( "Predict" ) );
         Config config( "ntp" );
         config.setGroup( "settings" );
         slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", FALSE ) );
         slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", FALSE ) );
 
         mainWidget->setCurrentTab( tr( "Time" ) );
         layout->addWidget( mainWidget );
 
-        // Create QCOP channel
-        QCopChannel *channel = new QCopChannel( "QPE/Application/netsystemtime", this );
-        connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
+        connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
                          this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) );
 
+
         // Create NTP socket
         ntpSock = new QSocket( this );
         connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) );
         slotProbeNTPServer();
 
         // Create timer for automatic time lookups
         ntpTimer = new QTimer( this );
 
         // Connect everything together
         connect( timeTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) );
         connect( timeTab, SIGNAL(tzChanged(const QString &)), predictTab, SLOT(slotTZChanged(const QString &)) );
         connect( timeTab, SIGNAL(getPredictedTime()), predictTab, SLOT(slotSetPredictedTime()) );
@@ -101,25 +101,26 @@ MainWindow::MainWindow()
                          timeTab, SLOT(slotDateFormatChanged(const DateFormat &)) );
         connect( formatTab, SIGNAL(weekStartChanged(int)), timeTab, SLOT(slotWeekStartChanged(int)) );
         connect( settingsTab, SIGNAL(ntpDelayChanged(int)), this, SLOT(slotNTPDelayChanged(int)) );
         connect( settingsTab, SIGNAL(displayNTPTab(bool)), this, SLOT(slotDisplayNTPTab(bool)) );
         connect( settingsTab, SIGNAL(displayPredictTab(bool)), this, SLOT(slotDisplayPredictTab(bool)) );
         connect( predictTab, SIGNAL(setTime(const QDateTime &)), this, SLOT(slotSetTime(const QDateTime &)) );
 
         // Do initial time server check
         slotNTPDelayChanged( config.readNumEntry( "ntpRefreshFreq", 1440 ) );
         slotCheckNtp( -1 );
 
         // Display app
-        showMaximized();
+        //showMaximized();
+        (void)new QPEDialogListener(this);
 }
 
 MainWindow::~MainWindow()
 {
         if ( ntpProcess )
                 delete ntpProcess;
 }
 
 void MainWindow::accept()
 {
         // Turn off the screensaver (Note: needs to be encased in { } so that it deconstructs and sends)
         {
diff --git a/noncore/settings/netsystemtime/mainwindow.h b/noncore/settings/netsystemtime/mainwindow.h
index fa94335..1cdbc1a 100644
--- a/noncore/settings/netsystemtime/mainwindow.h
+++ b/noncore/settings/netsystemtime/mainwindow.h
@@ -39,26 +39,27 @@ class PredictTabWidget;
 
 class OProcess;
 class OTabWidget;
 class QDateTime;
 class QSocket;
 class QTimer;
 
 class MainWindow : public QDialog
 {
         Q_OBJECT
 
 public:
-        MainWindow();
+        MainWindow( QWidget *parent = 0, const char *name = 0,  bool modal = FALSE,WFlags f = 0);
         ~MainWindow();
+        static QString appName() { return QString::fromLatin1("systemtime"); }
 
 protected:
         void accept();
         void reject();
 
 private:
         OTabWidget *mainWidget;
 
         TimeTabWidget     *timeTab;
         FormatTabWidget   *formatTab;
         SettingsTabWidget *settingsTab;
         NTPTabWidget      *ntpTab;
diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro
index 7a12dd1..2140f2e 100644
--- a/noncore/settings/netsystemtime/netsystemtime.pro
+++ b/noncore/settings/netsystemtime/netsystemtime.pro
@@ -1,33 +1,30 @@
-        TEMPLATE= app
-        CONFIG  = qt warn_on debug
-        #CONFIG         = qt warn_on release
+        CONFIG  = qt warn_on release quick-app
         HEADERS         = mainwindow.h          \
                                 timetabwidget.h     \
                                 formattabwidget.h   \
                                 settingstabwidget.h \
                                 predicttabwidget.h  \
                                 ntptabwidget.h
         SOURCES         = main.cpp                \
                                 mainwindow.cpp        \
                                 timetabwidget.cpp     \
                                 formattabwidget.cpp   \
                                 settingstabwidget.cpp \
                                 predicttabwidget.cpp  \
                                 ntptabwidget.cpp
         INCLUDEPATH+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
         LIBS    += -lqpe -lopie
-        INTERFACES= 
-        DESTDIR         = $(OPIEDIR)/bin
+
         TARGET  = systemtime
 
 TRANSLATIONS = ../../../i18n/de/systemtime.ts \
          ../../../i18n/nl/systemtime.ts \
          ../../../i18n/da/systemtime.ts \
          ../../../i18n/xx/systemtime.ts \
          ../../../i18n/en/systemtime.ts \
          ../../../i18n/es/systemtime.ts \
          ../../../i18n/fr/systemtime.ts \
          ../../../i18n/hu/systemtime.ts \
          ../../../i18n/ja/systemtime.ts \
          ../../../i18n/ko/systemtime.ts \
diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp
index 33b0523..d919ce4 100644
--- a/noncore/settings/sound/main.cpp
+++ b/noncore/settings/sound/main.cpp
@@ -12,22 +12,18 @@
 ** 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 "soundsettings.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
+
+OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> )
 
 
-int main(int argc, char** argv)
-{
-    QPEApplication a(argc,argv);
-    SoundSettings dlg;
-    a.showMainWidget(&dlg);
-    return a.exec();
-}
 
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index 48c612e..c0a1ed3 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -1,15 +1,13 @@
-TEMPLATE  = app
-CONFIG    += qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
+CONFIG    += qt warn_on release quick-app
 HEADERS   = soundsettings.h soundsettingsbase.h
 SOURCES   = soundsettings.cpp soundsettingsbase.cpp main.cpp
 #INTERFACES = soundsettingsbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET    = sound
 
 TRANSLATIONS = ../../../i18n/de/sound.ts \
          ../../../i18n/nl/sound.ts \
          ../../../i18n/da/sound.ts \
          ../../../i18n/xx/sound.ts \
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h
index 71ce6f5..57a360f 100644
--- a/noncore/settings/sound/soundsettings.h
+++ b/noncore/settings/sound/soundsettings.h
@@ -20,24 +20,25 @@
 #ifndef SOUNDSETTINGS_H
 #define SOUNDSETTINGS_H
 
 
 #include "soundsettingsbase.h"
 
 
 class SoundSettings : public SoundSettingsBase
 { 
 Q_OBJECT
   
 public:
+ static QString appName() { return QString::fromLatin1("sound"); }
  SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   
 protected:
    bool noWarning;
 /*  void accept(); */
 /*  void reject(); */
  void updateStorageCombo();
  void updateLocationCombo();
   
 private slots:
  void setKeyButton( int);
  void setSizeLimitButton(const QString &);
diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control
index d05858c..4deccf4 100644
--- a/noncore/settings/sshkeys/opie-sshkeys.control
+++ b/noncore/settings/sshkeys/opie-sshkeys.control
@@ -1,9 +1,9 @@
 Package: opie-sshkeys
-Files: plugins/application/libsshkeys.so* bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
+Files:  bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
 Priority: optional
 Section: opie/settings
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass
 Description: Utility for managing ssh-agent keys.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/usermanager/main.cpp b/noncore/settings/usermanager/main.cpp
index aa78286..515ea9a 100644
--- a/noncore/settings/usermanager/main.cpp
+++ b/noncore/settings/usermanager/main.cpp
@@ -1,19 +1,14 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "usermanager.h"
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char ** argv )
-{
-        QPEApplication a( argc, argv );
-        UserConfig mw(0,0,0);
-        a.showMainWidget( &mw );
-        return a.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<UserConfig> )
diff --git a/noncore/settings/usermanager/usermanager.h b/noncore/settings/usermanager/usermanager.h
index 6782923..313646a 100644
--- a/noncore/settings/usermanager/usermanager.h
+++ b/noncore/settings/usermanager/usermanager.h
@@ -18,24 +18,25 @@
 
 #include <qpe/qpetoolbar.h>
 
 #include "userdialog.h"
 #include "groupdialog.h"
 #include "passwd.h"
 
 class UserConfig : public QMainWindow
 {
         Q_OBJECT
         
 public:
+        static QString appName() { return QString::fromLatin1("appname"); }
         UserConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
         ~UserConfig();
 
 private:
         QToolButton *adduserToolButton;
         QToolButton *edituserToolButton;
         QToolButton *deleteuserToolButton;
         QToolButton *addgroupToolButton;
         QToolButton *editgroupToolButton;
         QToolButton *deletegroupToolButton;
         QTabWidget *myTabWidget;
         QListView *usersIconView;
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 576a233..f61fb63 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -1,22 +1,20 @@
-        TEMPLATE= app
         #CONFIG         = qt warn_on debug
-        CONFIG  = qt warn_on release
+        CONFIG  = qt warn_on release quick-app
         HEADERS         = usermanager.h userdialog.h groupdialog.h passwd.h
         SOURCES         = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp
         INCLUDEPATH+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie -lcrypt
         TARGET  = usermanager
-DESTDIR         = $(OPIEDIR)/bin
 
 TRANSLATIONS = ../../../i18n/de/usermanager.ts \
          ../../../i18n/nl/usermanager.ts \
         ../../../i18n/xx/usermanager.ts \
         ../../../i18n/en/usermanager.ts \
         ../../../i18n/es/usermanager.ts \
         ../../../i18n/fr/usermanager.ts \
         ../../../i18n/hu/usermanager.ts \
         ../../../i18n/ja/usermanager.ts \
         ../../../i18n/ko/usermanager.ts \
         ../../../i18n/no/usermanager.ts \
         ../../../i18n/pl/usermanager.ts \