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

4 files changed, 6 insertions, 19 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> )