merge core/apps/*

3 files changed, 5 insertions, 15 deletions

diff --git a/core/apps/textedit/main.cpp b/core/apps/textedit/main.cpp
index f80c5d8..edab73d 100644
--- a/core/apps/textedit/main.cpp
+++ b/core/apps/textedit/main.cpp
@@ -12,24 +12,15 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "textedit.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char **argv )
-{
-    QPEApplication a( argc, argv );
-    
-    TextEdit e;
-    a.showMainDocumentWidget(&e);
-//     if ( argc == 3 && argv[1] == QCString("-f") )
-//   e.openFile(argv[2]);
-
-    return a.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<TextEdit> )
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index e0cbea2..303b707 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -45,44 +45,45 @@ class QToolBar;
 class QLineEdit;
 class QAction;
 class FileSelector;
 class QpeEditor;
 class QPopupMenu;
 class QTimer;
 
 class TextEdit : public QMainWindow
 {
    Q_OBJECT
 
 public:
+   static QString appName() { return QString::fromLatin1("textedit"); }
    TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
    ~TextEdit();
 
 protected:
    QPopupMenu *font;
    QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction, *searchBarAction, *nAutoSave;
    bool edited, edited1;
    void openFile( const QString & );
    QCopChannel * channel;
 
    bool featureAutoSave;
    void closeEvent( QCloseEvent *e );
    void doSearchBar();
    int savePrompt();
    void setTimer();
 private slots:
    void editorChanged();
    void receive(const QCString&, const QByteArray&);
    void timerCrank();
-   void doTimer(bool); 
+   void doTimer(bool);
    void editPasteTimeDate();
    void doPrompt(bool);
    void doDesktop(bool);
    void doFilePerms(bool);
    void doAbout();
    void setDocument(const QString&);
    void changeFont();
    void fileNew();
    void fileRevert();
    void fileOpen();
    void changeStartConfig(bool);
    bool save();
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 2577340..b958ff5 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,15 +1,13 @@
-TEMPLATE  = app
-CONFIG    += qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
+CONFIG    += qt warn_on release quick-app
 HEADERS = textedit.h filePermissions.h
 SOURCES = main.cpp textedit.cpp filePermissions.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = textedit
 
 TRANSLATIONS = ../../../i18n/de/textedit.ts \
          ../../../i18n/nl/textedit.ts \
    ../../../i18n/da/textedit.ts \
    ../../../i18n/xx/textedit.ts \
          ../../../i18n/en/textedit.ts \