merge noncore/apps/* except

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

4 files changed, 7 insertions, 14 deletions

diff --git a/noncore/apps/opie-sheet/main.cpp b/noncore/apps/opie-sheet/main.cpp
index e42b4a5..d0a2995 100644
--- a/noncore/apps/opie-sheet/main.cpp
+++ b/noncore/apps/opie-sheet/main.cpp
@@ -16,13 +16,7 @@
 
 #include "mainwindow.h"
 
-int main(int argc, char **argv)
-{
-  QPEApplication application(argc, argv);
+#include <opie/oapplicationfactory.h>
 
-  MainWindow windowMain;
-  windowMain.setHelpFile(application.qpeDir()+"/help/html/"+QString(argv[0])+".html");
-  application.showMainDocumentWidget(&windowMain);
+OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
 
-  return application.exec();
-}
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index 43e5131..3915e52 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -43,8 +43,8 @@
 #define DEFAULT_NUM_COLS (26*3)
 #define DEFAULT_NUM_SHEETS 3
 
-MainWindow::MainWindow()
-           :QMainWindow()
+MainWindow::MainWindow(QWidget *parent, const char* n, WFlags fl)
+           :QMainWindow(parent, n, fl)
 {
   // initialize variables
   documentModified=FALSE;
diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h
index 10d6650..370d82e 100644
--- a/noncore/apps/opie-sheet/mainwindow.h
+++ b/noncore/apps/opie-sheet/mainwindow.h
@@ -120,7 +120,8 @@ class MainWindow: public QMainWindow
     void selectorFileOpen(const DocLnk &lnkDoc);
 
   public:
-    MainWindow();
+      static QString appName() { return QString::fromLatin1("sheetqt"); }
+    MainWindow(QWidget *p, const char*, WFlags);
     ~MainWindow();
 
     void setHelpFile(const QString &help_filename)          { helpFile=help_filename; }
diff --git a/noncore/apps/opie-sheet/opie-sheet.pro b/noncore/apps/opie-sheet/opie-sheet.pro
index 1435af6..acd5fa0 100644
--- a/noncore/apps/opie-sheet/opie-sheet.pro
+++ b/noncore/apps/opie-sheet/opie-sheet.pro
@@ -1,6 +1,4 @@
-        TEMPLATE= app
-        CONFIG  = qt warn_on release
-        DESTDIR         = $(OPIEDIR)/bin
+        CONFIG  = qt warn_on release quick-app
         HEADERS         = mainwindow.h sheet.h cellformat.h finddlg.h numberdlg.h sortdlg.h textdlg.h
         SOURCES         = main.cpp mainwindow.cpp sheet.cpp cellformat.cpp finddlg.cpp numberdlg.cpp sortdlg.cpp textdlg.cpp
         INCLUDEPATH+= $(OPIEDIR)/include