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

3 files changed, 5 insertions, 14 deletions

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;