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

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
@@ -566,6 +566,2 @@ void Appearance::accept ( )
 
-	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 ( );
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
@@ -57,2 +57,3 @@ public:
     ~Appearance();
+    static QString appName() { return QString::fromLatin1("appearance"); }
 
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,4 +1,2 @@
-TEMPLATE  = app
-CONFIG    = qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
+CONFIG    = qt warn_on release quick-app
 HEADERS   = appearance.h editScheme.h sample.h
@@ -8,3 +6,2 @@ DEPENDPATH  += ../$(OPIEDIR)/include
 LIBS            += -lqpe -lopie
-TARGET    = appearance
 INCLUDEPATH += $(OPIEDIR)/include
@@ -12,2 +9,4 @@ DEPENDPATH  += $(OPIEDIR)/include
 
+TARGET 		= appearance
+
 TRANSLATIONS = ../../../i18n/de/appearance.ts \
@@ -31,3 +30,2 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -30,13 +30,5 @@
 #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,4 +1,2 @@
-TEMPLATE	= app
-#CONFIG		= qt warn_on debug
-CONFIG		= qt warn_on release
+CONFIG		= qt warn_on release quick-app
 HEADERS		= backuprestore.h
@@ -10,3 +8,2 @@ INTERFACES	= backuprestorebase.ui errordialog.ui
 TARGET		= backup
-DESTDIR		= $(OPIEDIR)/bin
 
@@ -32,4 +29,2 @@ TRANSLATIONS = ../../../i18n/de/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
@@ -39,4 +39,4 @@ 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();
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
@@ -16,5 +16,6 @@ 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"); }
   
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
@@ -3,12 +3,6 @@
 #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,4 +1,2 @@
-TEMPLATE	= app
-CONFIG		+= qt warn_on release
-DESTDIR		= $(OPIEDIR)/bin
+CONFIG		+= qt warn_on release quick-app
 HEADERS		= settings.h
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
@@ -23,14 +23,5 @@
 #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
@@ -37,2 +37,4 @@ public:
 
+    static QString appName() { return QString::fromLatin1("language"); }
+
 protected:
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
@@ -6,12 +6,5 @@
 #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
@@ -19,2 +19,3 @@ namespace MediumMountSetting {
     ~MainWindow();
+    static QString appName() { return QString::fromLatin1("mediummount"); }
 
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
@@ -3,3 +3,3 @@ 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
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
@@ -29,2 +29,3 @@ namespace MediumMountSetting {
 
+
     void writeConfig();
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
@@ -31,11 +31,5 @@
 #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
@@ -41,2 +41,3 @@
 #include <qpe/qpeapplication.h>
+#include <qpe/qpedialog.h>
 
@@ -52,3 +53,3 @@
 
-MainWindow::MainWindow()
+MainWindow::MainWindow( QWidget *parent , const char *name,  bool modal, WFlags f )
 	: QDialog( 0x0, 0x0, TRUE, 0 )
@@ -81,7 +82,6 @@ MainWindow::MainWindow()
 
-	// 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
@@ -112,3 +112,4 @@ MainWindow::MainWindow()
 	// Display app
-	showMaximized();
+	//showMaximized();
+	(void)new QPEDialogListener(this);
 }
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
@@ -50,4 +50,5 @@ class MainWindow : public QDialog
 public:
-	MainWindow();
+	MainWindow( QWidget *parent = 0, const char *name = 0,  bool modal = FALSE,WFlags f = 0);
 	~MainWindow();
+	static QString appName() { return QString::fromLatin1("systemtime"); }
 
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,4 +1,2 @@
-TEMPLATE	= app
-CONFIG		= qt warn_on debug
-#CONFIG		= qt warn_on release
+CONFIG		= qt warn_on release quick-app
 HEADERS		= mainwindow.h          \
@@ -19,4 +17,3 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS		+= -lqpe -lopie
-INTERFACES	= 
-DESTDIR		= $(OPIEDIR)/bin
+
 TARGET		= systemtime
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
@@ -23,11 +23,7 @@
 #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,4 +1,2 @@
-TEMPLATE  = app
-CONFIG    += qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
+CONFIG    += qt warn_on release quick-app
 HEADERS   = soundsettings.h soundsettingsbase.h
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
@@ -31,2 +31,3 @@ Q_OBJECT
 public:
+ static QString appName() { return QString::fromLatin1("sound"); }
  SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
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,3 +1,3 @@
 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
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
@@ -11,9 +11,4 @@
 #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
@@ -29,2 +29,3 @@ class UserConfig : public QMainWindow
 public:
+	static QString appName() { return QString::fromLatin1("appname"); }
 	UserConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
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,4 +1,3 @@
-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
@@ -9,3 +8,2 @@ LIBS            += -lqpe -lopie -lcrypt
 TARGET		= usermanager
-DESTDIR         = $(OPIEDIR)/bin