summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp5
-rw-r--r--noncore/settings/packagemanager/oipkg.h7
2 files changed, 6 insertions, 6 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index 127204d..7bc2040 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -38,6 +38,11 @@ _;:, .> :=|. This program is free software; you can
38#include <stdlib.h> 38#include <stdlib.h>
39#include <unistd.h> 39#include <unistd.h>
40 40
41extern "C" {
42#include <libipkg.h>
43};
44args_t m_ipkgArgs; // libipkg configuration arguments
45
41const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file 46const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file
42const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files 47const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files
43const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists 48const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists
diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h
index 0263f50..4e390fa 100644
--- a/noncore/settings/packagemanager/oipkg.h
+++ b/noncore/settings/packagemanager/oipkg.h
@@ -39,10 +39,6 @@ _;:, .> :=|. This program is free software; you can
39 39
40#include <qobject.h> 40#include <qobject.h>
41 41
42extern "C" {
43#include <libipkg.h>
44};
45
46// Ipkg execution options (m_ipkgExecOptions) 42// Ipkg execution options (m_ipkgExecOptions)
47#define FORCE_DEPENDS 0x0001 43#define FORCE_DEPENDS 0x0001
48#define FORCE_REMOVE 0x0002 44#define FORCE_REMOVE 0x0002
@@ -79,7 +75,7 @@ public:
79 75
80 OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined, 76 OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined,
81 const QString &name = QString::null ); 77 const QString &name = QString::null );
82 78
83 bool executeCommand( OPackage::Command command = OPackage::NotDefined, 79 bool executeCommand( OPackage::Command command = OPackage::NotDefined,
84 const QStringList &parameters = QStringList(), 80 const QStringList &parameters = QStringList(),
85 const QString &destination = QString::null, 81 const QString &destination = QString::null,
@@ -94,7 +90,6 @@ public:
94 90
95private: 91private:
96 Config *m_config; // Pointer to application configuration file 92 Config *m_config; // Pointer to application configuration file
97 args_t m_ipkgArgs; // libipkg configuration arguments
98 OConfItemList *m_confInfo; // Contains info from all Ipkg configuration files 93 OConfItemList *m_confInfo; // Contains info from all Ipkg configuration files
99 int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options 94 int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options
100 int m_ipkgExecVerbosity; // Ipkg execution verbosity level 95 int m_ipkgExecVerbosity; // Ipkg execution verbosity level