5 files changed, 1 insertions, 48 deletions

diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp
index c2029b7..f9a80c5 100644
--- a/noncore/multimedia/opierec/device.cpp
+++ b/noncore/multimedia/opierec/device.cpp
@@ -1,20 +1,14 @@
 // device.cpp
 
 #include "device.h"
-#include "qtrec.h"
 
-#include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include <qslider.h>
-#include <qmessagebox.h>
 
-#include <qfile.h>
-#include <qtextstream.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 #include <unistd.h>
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp
index 0c4ac78..1ab6510 100644
--- a/noncore/multimedia/opierec/helpwindow.cpp
+++ b/noncore/multimedia/opierec/helpwindow.cpp
@@ -6,42 +6,19 @@
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 
 #include "helpwindow.h"
-#include <qstatusbar.h>
-#include <qstringlist.h>
 #include <qlayout.h>
 
-#include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 
 #include <qaction.h>
-#include <qpixmap.h>
-#include <qpopupmenu.h>
 #include <qmenubar.h>
-#include <qtoolbutton.h>
-#include <qiconset.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qstylesheet.h>
-#include <qmessagebox.h>
-#include <qfiledialog.h>
-#include <qapplication.h>
-#include <qcombobox.h>
-#include <qevent.h>
-#include <qlineedit.h>
-#include <qobjectlist.h>
-#include <qfileinfo.h>
-#include <qfile.h>
-#include <qdatastream.h>
-#include <qprinter.h>
-#include <qsimplerichtext.h>
-#include <qpaintdevicemetrics.h>
 
 #include <ctype.h>
 
 HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name )
     : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL()
 {
diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control
index e8396ae..455691f 100644
--- a/noncore/multimedia/opierec/opierec.control
+++ b/noncore/multimedia/opierec/opierec.control
@@ -1,7 +1,7 @@
-Package: opierec
+Package: opie-rec
 Files: bin/opierec pics/opierec apps/Applications/opierec.desktop 
 Priority: optional
 Section: multimedia/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Version: 1.5-2
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 28f6546..0307d99 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -5,15 +5,12 @@
 ****************************************************************************/
 
 #define DEV_VERSION
 
 #include "pixmaps.h"
 #include "qtrec.h"
-#include "helpwindow.h"
-#include "device.h"
-#include "wavFile.h"
 
 #include <pthread.h>
 
 extern "C" {
 #include "adpcm.h"
 }
@@ -21,45 +18,32 @@ extern "C" {
 #include <sys/soundcard.h>
 
 // #if defined (QTOPIA_INTERNAL_FSLP)
 // #include <qpe/lnkproperties.h>
 // #endif
 
-#include <qpe/applnk.h>
 #include <qpe/config.h>
-#include <qpe/ir.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 
-#include <qlineedit.h>
-#include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
-#include <qcursor.h>
 //#include <qdatetime.h>
 #include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
 #include <qgroupbox.h>
-#include <qiconview.h>
-#include <qimage.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlineedit.h>
 #include <qlistview.h>
 #include <qmessagebox.h>
-#include <qpixmap.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
-#include <qregexp.h>
 #include <qslider.h>
 #include <qtabwidget.h>
 #include <qtimer.h>
-#include <qvariant.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <math.h>
 #include <mntent.h>
 #include <stdio.h>
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp
index 0bb5736..7bfffb6 100644
--- a/noncore/multimedia/opierec/wavFile.cpp
+++ b/noncore/multimedia/opierec/wavFile.cpp
@@ -1,12 +1,10 @@
 //wavFile.cpp
 #include "wavFile.h"
 #include "qtrec.h"
 
-#include <qdatetime.h>
-#include <qstring.h>
 #include <qmessagebox.h>
 #include <qdir.h>
 
 #include <qpe/timestring.h>
 #include <qpe/config.h>