merge noncore/apps/* except

 - advancedfm (ljp, please...)
 - odict (tille, please...)

4 files changed, 17 insertions, 43 deletions

diff --git a/noncore/apps/oxygen/main.cpp b/noncore/apps/oxygen/main.cpp
index c8fcdb4..ac992aa 100644
--- a/noncore/apps/oxygen/main.cpp
+++ b/noncore/apps/oxygen/main.cpp
@@ -17,13 +17,8 @@
 
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 #include "oxygen.h"
 
-int main(int argc, char **argv)
-{
-    QPEApplication app(argc, argv);
-    Oxygen *oxi = new Oxygen();
-    app.setMainWidget(oxi);
-    oxi->showMaximized();
-    return app.exec();
-}
+
+OPIE_EXPORT_APP( OApplicationFactory<Oxygen> )
diff --git a/noncore/apps/oxygen/oxygen.cpp b/noncore/apps/oxygen/oxygen.cpp
index 5999cb0..5bdc2aa 100644
--- a/noncore/apps/oxygen/oxygen.cpp
+++ b/noncore/apps/oxygen/oxygen.cpp
@@ -25,15 +25,15 @@
 #include "psewidget.h"
 
 
-Oxygen::Oxygen() : QMainWindow()
+Oxygen::Oxygen( QWidget *parent, const char *name,  WFlags f) : QMainWindow( parent, name, f )
 {
     loadNames();
     calcDlgUI *CalcDlgUI = new calcDlgUI();
     PSEWidget *pse = new PSEWidget(names);
     dataWidgetUI *DataWidgetUI = new dataWidgetUI(names);
-    
+
     setCaption( tr( "Oxygen" ) );
-    
+
     QTabWidget *tabw = new QTabWidget( this , "qtab" );
     tabw->addTab( pse, tr( "PSE" ));
     tabw->addTab( DataWidgetUI , tr( "Data" ) );
diff --git a/noncore/apps/oxygen/oxygen.h b/noncore/apps/oxygen/oxygen.h
index 57fe9fe..c59662d 100644
--- a/noncore/apps/oxygen/oxygen.h
+++ b/noncore/apps/oxygen/oxygen.h
@@ -13,12 +13,13 @@ class QStringList;
 
 class Oxygen : public QMainWindow
 {
-	Q_OBJECT
+    Q_OBJECT
 	
-    public:
-		Oxygen();
-
-	private:
-		void loadNames();
-		QStringList names;
+  public:
+    Oxygen(QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    static QString appName() { return QString::fromLatin1("oxygen"); }
+    
+ private:
+    void loadNames();
+    QStringList names;
 };
diff --git a/noncore/apps/oxygen/oxygen.pro b/noncore/apps/oxygen/oxygen.pro
index a41bf7b..71d4dac 100644
--- a/noncore/apps/oxygen/oxygen.pro
+++ b/noncore/apps/oxygen/oxygen.pro
@@ -1,5 +1,4 @@
-TEMPLATE	= app
-CONFIG		= qt warn_on release
+CONFIG		= qt warn_on release quick-app
 HEADERS		= oxygen.h \
             kmolcalc.h \
             kmolelements.h \
@@ -20,30 +19,9 @@ SOURCES		= main.cpp \
           datawidgetui.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS		+= -lqpe -lstdc++
+LIBS		+= -lqpe 
 INTERFACES	= calcdlg.ui 
-TARGET 		= oxygen
-DESTDIR		= $(OPIEDIR)/bin
-
-TRANSLATIONS = ../../../i18n/de/oxygen.ts \
-	 ../../../i18n/nl/oxygen.ts \
-	 ../../../i18n/xx/oxygen.ts \
-	 ../../../i18n/en/oxygen.ts \
-	 ../../../i18n/es/oxygen.ts \
-	 ../../../i18n/fr/oxygen.ts \
-	 ../../../i18n/hu/oxygen.ts \
-	 ../../../i18n/ja/oxygen.ts \
-	 ../../../i18n/ko/oxygen.ts \
-	 ../../../i18n/no/oxygen.ts \
-	 ../../../i18n/pl/oxygen.ts \
-	 ../../../i18n/pt/oxygen.ts \
-	 ../../../i18n/pt_BR/oxygen.ts \
-	 ../../../i18n/sl/oxygen.ts \
-	 ../../../i18n/zh_CN/oxygen.ts \
-	 ../../../i18n/zh_TW/oxygen.ts \
-   	 ../../../i18n/it/oxygen.ts \
-   	 ../../../i18n/da/oxygen.ts
-
 
+TARGET	= oxygen
 
 include ( $(OPIEDIR)/include.pro )