merge core/settings/*

- light-and-power and security were a bit ugly, so I recommend someone
  who actually dealt with these files looking into if I got it right
  (not to tell about the frustratation about the fact that the ones who
  dealt with these files didn't do the merge in the first place :(

4 files changed, 7 insertions, 19 deletions

diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro
index b10b619..e1c6724 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -1,6 +1,5 @@
-TEMPLATE     = app
-CONFIG      += qt warn_on release
-DESTDIR      = $(OPIEDIR)/bin
+CONFIG      += qt warn_on release quick-app
+
 HEADERS      = buttonsettings.h \
                buttonutils.h \
                remapdlg.h
@@ -35,6 +34,4 @@ TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \
 	 ../../../i18n/zh_TW/buttonsettings.ts \
 	 ../../../i18n/da/buttonsettings.ts
 
-
-
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index 942d5e4..b6a07a8 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -56,7 +56,7 @@ struct buttoninfo {
 };
 
 
-ButtonSettings::ButtonSettings ( ) 
+ButtonSettings::ButtonSettings ( QWidget *parent , const char *name,  bool modal, WFlags f )
 	: QDialog ( 0, "ButtonSettings", false, WStyle_ContextHelp )
 {
 	const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
diff --git a/core/settings/button/buttonsettings.h b/core/settings/button/buttonsettings.h
index d41a209..67694d3 100644
--- a/core/settings/button/buttonsettings.h
+++ b/core/settings/button/buttonsettings.h
@@ -42,9 +42,10 @@ class ButtonSettings : public QDialog {
 	Q_OBJECT
 
 public:
-	ButtonSettings ( );
+	ButtonSettings ( QWidget *parent = 0, const char *name = 0,  bool modal = FALSE,WFlags f = 0 );
 	~ButtonSettings ( );
 
+	static QString appName() { return QString::fromLatin1("buttonsettings"); }
 	virtual void accept ( );
 	virtual void done ( int r );
 
diff --git a/core/settings/button/main.cpp b/core/settings/button/main.cpp
index db274f8..c063c3c 100644
--- a/core/settings/button/main.cpp
+++ b/core/settings/button/main.cpp
@@ -28,16 +28,6 @@
 #include "buttonsettings.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-
-int main ( int argc, char** argv )
-{
-	QPEApplication a ( argc,argv );
-
-	ButtonSettings dlg;
-	a. showMainWidget ( &dlg );
-	dlg. showMaximized ( );
-
-	return a. exec ( );
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> )