From 35615947e11575a61456c8483e7f6d67fe59d5ed Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Wed, 29 Oct 2003 17:22:08 +0000
Subject: merge noncore/settings/* except networksettings for which tille volunteered (thanks)

---
(limited to 'noncore/settings/usermanager')

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
@@ -9,11 +9,6 @@
 
 #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
@@ -27,6 +27,7 @@ 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();
 
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,13 +1,11 @@
-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 \
--
cgit v0.9.0.2