merge noncore/settings/* except networksettings for which tille volunteered (thanks)

26 files changed, 91 insertions, 146 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
@@ -561,16 +561,12 @@ void Appearance::accept ( )
 	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 );
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
@@ -52,17 +52,18 @@ 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,18 +1,17 @@
-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 \
@@ -26,8 +25,7 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -12,31 +12,23 @@
     .i_,=:_.      -<s.       This file 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 General
 ..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:       
+++=   -.     .`     .:
  :     =  ...= . :.=-        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,17 +1,14 @@
-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 \
@@ -27,9 +24,7 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -34,44 +34,44 @@
 
 #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*))); 
+          this, SLOT(selectItem(QListViewItem*)));
   connect(restoreSource, SIGNAL(activated( int  )),
-          this, SLOT(sourceDirChanged(int))); 
+          this, SLOT(sourceDirChanged(int)));
   connect(updateList, SIGNAL(clicked()),
-          this, SLOT( fileListUpdate())); 
+          this, SLOT( fileListUpdate()));
 
   applicationSettings = new QListViewItem(backupList, "Application Settings", "",
                                           QDir::homeDirPath() + "/Settings/");
   selectItem(applicationSettings);
   applicationSettings = new QListViewItem(backupList, "Application Data", "",
                                           QDir::homeDirPath() + "/Applications/");
   selectItem(applicationSettings);
   documents= new QListViewItem(backupList, "Documents", "",
                                QDir::homeDirPath() + "/Documents/");
   selectItem(documents);
-  
+
   scanForApplicationSettings();
-  
+
   Config config("BackupAndRestore");
   config.setGroup("General");
   int totalLocations = config.readNumEntry("totalLocations",0);
-  
+
 //todo make less static here and use Storage class to get infos
   if(totalLocations == 0){
     backupLocations.insert("Documents", "/root/Documents");
     backupLocations.insert("CF", "/mnt/cf");
     backupLocations.insert("SD", "/mnt/card");
   }
@@ -83,25 +83,25 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
   }
   QMap<QString, QString>::Iterator it;
   for( it = backupLocations.begin(); it != backupLocations.end(); ++it ){
     storeToLocation->insertItem(it.key());
     restoreSource->insertItem(it.key());
   }
- 
-  // Read the list of items to ignore. 
+
+  // Read the list of items to ignore.
   QList<QString> dontBackupList;
   dontBackupList.setAutoDelete(true);
   config.setGroup("DontBackup");
   int total = config.readNumEntry("Total", 0);
   for(int i = 0; i < total; i++){
     dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), "")));
   }
 
   QList<QListViewItem> list;
   getAllItems(backupList->firstChild(), list);
-  
+
   for(uint i = 0; i < list.count(); i++){
     QString text = list.at(i)->text(HEADER_NAME);
     for(uint i2 = 0;  i2 < dontBackupList.count(); i2++){
       if(*dontBackupList.at(i2) == text){
         selectItem(list.at(i));
         break;
@@ -110,17 +110,17 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
   }
 }
 
 BackupAndRestore::~BackupAndRestore(){
   QList<QListViewItem> list;
   getAllItems(backupList->firstChild(), list);
-  
+
   Config config("BackupAndRestore");
   config.setGroup("DontBackup");
   config.clearGroup();
-  
+
   int count = 0;
   for(uint i = 0; i < list.count(); i++){
     if(list.at(i)->text(HEADER_BACKUP) == ""){
       config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME));
       count++;
     }
@@ -132,13 +132,13 @@ BackupAndRestore::~BackupAndRestore(){
 	  QFile::remove( tempFileName );
 }
 
 QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){
   while(item){
     if(item->childCount() > 0)
-      getAllItems(item->firstChild(), list);    
+      getAllItems(item->firstChild(), list);
     list.append(item);
     item = item->nextSibling();
   }
   return list;
 }
 
@@ -176,41 +176,41 @@ void BackupAndRestore::scanForApplicationSettings(){
     ++it;
   }
 }
 
 /**
  * The "Backup" button has been pressed.  Get a list of all of the files that
- * should be backed up.  If there are no files, emit and error and exit.  
+ * should be backed up.  If there are no files, emit and error and exit.
  * Determine the file name to store the backup in.  Backup the file(s) using
  * tar and gzip  --best.  Report failure or success
- */ 
+ */
 void BackupAndRestore::backupPressed(){
   QString backupFiles;
   if(getBackupFiles(backupFiles, NULL) == 0){
     QMessageBox::critical(this, "Message",
                           "No items selected.",QString("Ok") );
-    return;   
+    return;
   }
 
   setCaption(tr("Backup and Restore... working..."));
   QString outputFile = backupLocations[storeToLocation->currentText()];
 
   QDateTime datetime = QDateTime::currentDateTime();
-  QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + 
+  QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') +
 	  QString::number( datetime.date().day() ).rightJustify(2, '0');
 
   outputFile += "/" + dateString;
- 
+
   QString t = outputFile;
   int c = 1;
   while(QFile::exists(outputFile + EXTENSION)){
     outputFile = t + QString("%1").arg(c);
     c++;
   }
 
-  // We execute tar and compressing its output with gzip.. 
+  // We execute tar and compressing its output with gzip..
   // The error output will be written into a temp-file which could be provided
   // for debugging..
   qDebug( "Storing file: %s", outputFile.latin1() );
   outputFile += EXTENSION;
 
   qWarning( QString("(tar -c %1 | gzip > %2 ) 2> %3")
@@ -225,13 +225,13 @@ void BackupAndRestore::backupPressed(){
 		  .arg( tempFileName.latin1() ) );
 
    if(r != 0){
     perror("Error: ");
     QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
 
-     switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" 
+     switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n"
 				   + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ){
 
      case 1:
 	     qWarning("Details pressed !");
 	     ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
 	     QFile errorFile( tempFileName );
@@ -239,45 +239,45 @@ void BackupAndRestore::backupPressed(){
 		     QTextStream t( &errorFile );
 		     QString s;
 		     while ( !t.eof() ) {        // until end of file...
 			     s += t.readLine();       // line of text excluding '\n'
 		     }
 		     errorFile.close();
- 
+
 		     pErrDialog->m_textarea->setText( s );
 	     }else{
 		     pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" );
 	     }
 	     pErrDialog->showMaximized();
 	     pErrDialog->exec();
 	     delete pErrDialog;
 	     break;
      }
      setCaption(tr("Backup and Restore.. Failed !!"));
-     return;   
+     return;
    }
    else{
      QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) );
-     
+
    }
    setCaption(tr("Backup and Restore"));
 }
 
 /***
  * Get a list of all of the files to backup.
- */ 
+ */
 int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){
   QListViewItem * currentItem;
   QString currentHome;
   if(!parent)
     currentItem = backupList->firstChild();
   else{
     currentItem = parent->firstChild();
     currentHome = parent->text(BACKUP_LOCATION);
   }
-  
+
   uint count = 0;
   while( currentItem != 0 ){
     if(currentItem->text(HEADER_BACKUP) == "B" ){
       if(currentItem->childCount() == 0 ){
         if(parent == NULL)
     backupFiles += currentItem->text(BACKUP_LOCATION);
@@ -314,13 +314,13 @@ void BackupAndRestore::fileListUpdate()
  */
 void BackupAndRestore::rescanFolder(QString directory){
   //qDebug(QString("rescanFolder: ") + directory.latin1());
   QDir d(directory);
   if(!d.exists())
     return;
-  
+
   d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs);
   const QFileInfoList *list = d.entryInfoList();
   QFileInfoListIterator it( *list );
   QFileInfo *file;
   while ( (file=it.current()) ) {  // for each file...
     // If it is a dir and not .. or . then add it as a tab and go down.
@@ -338,55 +338,55 @@ void BackupAndRestore::rescanFolder(QString directory){
   }
 }
 
 /**
  * Restore a backup file.
  * Report errors or success
- */ 
+ */
 void BackupAndRestore::restore(){
   QListViewItem *restoreItem = restoreList->currentItem();
   if(!restoreItem){
     QMessageBox::critical(this, tr( "Message" ),
                           tr( "Please select something to restore." ),QString( tr( "Ok") ) );
-    return;   
+    return;
   }
   setCaption(tr("Backup and Restore... working..."));
 
   QString restoreFile = backupLocations[restoreSource->currentText()];
-  
+
   restoreFile += "/" + restoreItem->text(0);
-  
+
   int r = system(QString("tar -C / -zxf %1 2> %3")
 		 .arg( restoreFile.latin1() )
 		 .arg( tempFileName.latin1() ) );
   if(r != 0){
     QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
-    switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" 
+    switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n"
 				  + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) {
     case 1:
 	    qWarning("Details pressed !");
 	    ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
 	    QFile errorFile( tempFileName );
 	    if ( errorFile.open(IO_ReadOnly) ) {
 		    QTextStream t( &errorFile );
 		    QString s;
 		    while ( !t.eof() ) {        // until end of file...
 			    s += t.readLine();       // line of text excluding '\n'
 		    }
 		    errorFile.close();
-		    
+
 		    pErrDialog->m_textarea->setText( s );
 	    }else{
 		    pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) );
 	    }
 	    pErrDialog->showMaximized();
 	    pErrDialog->exec();
 	    delete pErrDialog;
 
 	    setCaption(tr("Backup and Restore.. Failed !!"));
-	    return;   
+	    return;
 
 	    break;
 
     }
   }
   else{
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
@@ -1,26 +1,27 @@
-#ifndef WINDOW_H 
+#ifndef WINDOW_H
 #define WINDOW_H
 
 #include <qmainwindow.h>
 #include "backuprestorebase.h"
 #include <qmap.h>
 #include <qlist.h>
 
 class QListViewItem;
 
-class BackupAndRestore : public BackupAndRestoreBase { 
+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);
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,9 +1,7 @@
-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
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
@@ -18,19 +18,10 @@
 **
 **********************************************************************/
 
 #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
@@ -32,12 +32,14 @@ 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;
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
@@ -14,12 +14,13 @@ namespace MediumMountSetting {
   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 );
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,10 +1,10 @@
 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
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
@@ -23,12 +23,13 @@ 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();
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
@@ -26,16 +26,10 @@
 
 */
 
 #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
@@ -36,24 +36,25 @@
 #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 );
@@ -63,29 +64,28 @@ MainWindow::MainWindow()
 	mainWidget = new OTabWidget( this );
 
 	// Default object pointers to null
 	ntpProcess = 0x0;
 	ntpTab = 0x0;
 
-	// Add tab widgets 
+	// Add tab widgets
 	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&)),
-			 this, SLOT(slotQCopReceive(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();
 
@@ -107,13 +107,14 @@ MainWindow::MainWindow()
 
 	// 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;
@@ -162,13 +163,13 @@ void MainWindow::reject()
 
 void MainWindow::runNTP()
 {
 	if ( !ntpDelayElapsed() && ntpInteractive )
 	{
 		QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) );
-		
+
 		switch (
 			QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No )
 			)
 		{
 			case QMessageBox::Yes: break;
 			case QMessageBox::No:  return;
@@ -195,14 +196,14 @@ void MainWindow::runNTP()
 		connect( ntpProcess, SIGNAL(processExited(OProcess*)),
 				 this, SLOT(slotNtpFinished(OProcess*)) );
 	}
 
 	else
 		ntpProcess->clearArguments();
-	
-	*ntpProcess << "ntpdate" << srv;
+
+	*ntpProcess << "ntpdate"  << srv;
 	bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput );
 	if ( !ret )
 	{
 		QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) );
 		if ( ntpTabEnabled )
 			ntpTab->addNtpOutput( tr( "Error while executing ntpdate" ) );
@@ -294,13 +295,13 @@ void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen )
 }
 
 void MainWindow::slotNtpFinished( OProcess *p )
 {
 	QString output;
 	QDateTime dt = QDateTime::currentDateTime();
-	
+
 	//  Verify run was successful
 	if ( p->exitStatus() != 0 || !p->normalExit() )
 	{
 		if ( isVisible() && ntpInteractive )
 		{
 			output = tr( "Error while getting time from\n server: " );
@@ -335,13 +336,13 @@ void MainWindow::slotNtpFinished( OProcess *p )
 
 	float timeShift = diff.toFloat();
 	if ( timeShift == 0.0 )
 		return;
 	int secsSinceLast = time - lastLookup;
 	output = tr( "%1 seconds").arg(QString::number( timeShift ));
-	
+
 	// Display information on time server tab
 	if ( ntpTabEnabled )
 	{
 		ntpTab->setTimeShift( output );
 		ntpTab->setNewTime( dt.toString() );
 	}
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
@@ -45,14 +45,15 @@ 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:
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,9 +1,7 @@
-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
@@ -14,14 +12,13 @@ SOURCES		= main.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 \
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
@@ -18,16 +18,12 @@
 **
 **********************************************************************/
 
 #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,9 +1,7 @@
-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
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
@@ -26,12 +26,13 @@
 
 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(); */
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,8 +1,8 @@
 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.
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
@@ -6,14 +6,9 @@
  *   (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
@@ -24,12 +24,13 @@
 
 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;
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,16 +1,14 @@
-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 \