4 files changed, 5 insertions, 12 deletions

diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control
index eab3ef0..841b040 100644
--- a/noncore/apps/opie-reader/opie-reader.control
+++ b/noncore/apps/opie-reader/opie-reader.control
@@ -1,10 +1,10 @@
 Package: opie-reader
-Files: plugins/application/libreader.so* bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
+Files: bin/reader bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
 Priority: optional
 Section: applications
 Maintainer: Tim Wentford <timwentford@hotmail.com>
 Architecture: arm
 Depends: task-opie-minimal
 License: GPL
 Description: E-Book reader
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/opierec/main.cpp b/noncore/multimedia/opierec/main.cpp
index 5f7c02f..4a94800 100644
--- a/noncore/multimedia/opierec/main.cpp
+++ b/noncore/multimedia/opierec/main.cpp
@@ -2,21 +2,15 @@
  main.cpp  -  main routine
  ***************************************************************************/
 //// main.cpp
 ////  copyright 2001, 2002, by L. J. Potter <ljp@llornkcor.com>
 /***************************************************************************
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include "qtrec.h"
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main(int argc, char* argv[]) {
-    QPEApplication a(argc, argv);
-    QtRec qtrec;
-    a.showMainWidget( &qtrec);
- return a.exec();
-}
-
-
+OPIE_EXPORT_APP( OApplicationFactory<QtRec> )
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 3447f99..aa14864 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.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   = adpcm.h pixmaps.h helpwindow.h qtrec.h device.h wavFile.h
 SOURCES   = adpcm.c helpwindow.cpp main.cpp qtrec.cpp device.cpp wavFile.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lstdc++ -lpthread
 INTERFACES  = 
 TARGET    = opierec
-DESTDIR = $(OPIEDIR)/bin
 #TMAKE_CXXFLAGS += -DQT_QWS_VERCEL_IDR -DQWS -fno-exceptions -fno-rtti
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/opierec/qtrec.h b/noncore/multimedia/opierec/qtrec.h
index 7965c74..5d6ed62 100644
--- a/noncore/multimedia/opierec/qtrec.h
+++ b/noncore/multimedia/opierec/qtrec.h
@@ -47,24 +47,25 @@ class QLineEdit;
 //#define BUFSIZE 2048
 #define FRAGSIZE 0x7fff000A;
 
 #define WAVE_FORMAT_DVI_ADPCM (0x0011)
 #define WAVE_FORMAT_PCM (0x0001)
 //AFMT_IMA_ADPCM
 
 class QtRec : public QWidget
 { 
    Q_OBJECT
 
 public:
+	static QString appName() { return QString::fromLatin1("opierec"); }
    QtRec( QWidget* parent=0, const char* name=0, WFlags fl=0 );
    ~QtRec();
    QSlider *OutputSlider,*InputSlider;
 
 public slots:
 private:
 //    int fragment;
    int fd1;
    int secCount;
    QString timeString; 
 
    QLineEdit *renameBox;