Convert to use libipkg

1 files changed, 9 insertions, 8 deletions

diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h
index 4065f48..824fa17 100644
--- a/noncore/settings/packagemanager/oipkg.h
+++ b/noncore/settings/packagemanager/oipkg.h
@@ -29,12 +29,16 @@
 
 */
 
 #ifndef OIPKG_H
 #define OIPKG_H
 
+extern "C" {
+#include <libipkg.h>
+};
+
 #include <qobject.h>
 
 #include <qpe/config.h>
 
 #include "oconfitem.h"
 #include "opackage.h"
@@ -43,13 +47,12 @@
 #define FORCE_DEPENDS                           0x0001
 #define FORCE_REMOVE                            0x0002
 #define FORCE_REINSTALL                         0x0004
 #define FORCE_OVERWRITE                         0x0008
 
 class OConfItemList;
-class OProcess;
 
 class OIpkg : public QObject
 {
     Q_OBJECT
 
 public:
@@ -73,28 +76,26 @@ public:
     OPackageList *availablePackages( const QString &server = QString::null );
     OPackageList *installedPackages( const QString &destName = QString::null,
                                      const QString &destPath = QString::null );
 
     bool executeCommand( OPackage::Command command = OPackage::NotDefined, QStringList *parameters = 0x0,
                          const QString &destination = QString::null, const QObject *receiver = 0x0,
-                         const char *slotOutput = 0x0, const char *slotErrors = 0x0,
-                         const char *slotFinished = 0x0, bool rawOutput = true );
+                         const char *slotOutput = 0x0, bool rawOutput = true );
     void abortCommand();
 
+    void ipkgOutput( char *msg );
+
 private:
     Config        *m_config;            // Pointer to application configuration file
-    QString        m_ipkgExec;          // Fully qualified path/filename of ipkg binary
+    args_t         m_ipkgArgs;          // libipkg configuration arguments
     OConfItemList *m_confInfo;          // Contains info from all Ipkg configuration files
     int            m_ipkgExecOptions;   // Bit-mapped flags for Ipkg execution options
     int            m_ipkgExecVerbosity; // Ipkg execution verbosity level
-    OProcess      *m_ipkgProcess;       // Pointer to process which Ipkg will run in
 
     void           loadConfiguration();
     OConfItemList *filterConfItems( OConfItem::Type typefilter = OConfItem::NotDefined );
 
 signals:
-    void execOutput( OProcess *process, char *buffer, int length );
-    void execErrors( OProcess *process, char *buffer, int length );
-    void execFinished( OProcess *process, char *buffer, int length );
+    void execOutput( char *msg );
 };
 
 #endif