| -rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 5 | ||||
| -rw-r--r-- | noncore/settings/packagemanager/oipkg.h | 7 |
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 @@ -37,8 +37,13 @@ _;:, .> :=|. This program is free software; you can #include <stdlib.h> #include <unistd.h> +extern "C" { +#include <libipkg.h> +}; +args_t m_ipkgArgs; // libipkg configuration arguments + const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location 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 @@ -38,12 +38,8 @@ _;:, .> :=|. This program is free software; you can #include <qpe/config.h> #include <qobject.h> -extern "C" { -#include <libipkg.h> -}; - // Ipkg execution options (m_ipkgExecOptions) #define FORCE_DEPENDS 0x0001 #define FORCE_REMOVE 0x0002 #define FORCE_REINSTALL 0x0004 @@ -78,9 +74,9 @@ public: const QString &destPath = QString::null ); OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined, const QString &name = QString::null ); - + bool executeCommand( OPackage::Command command = OPackage::NotDefined, const QStringList ¶meters = QStringList(), const QString &destination = QString::null, const QObject *receiver = 0l, @@ -93,9 +89,8 @@ public: void ipkgList( char *filelist ); private: Config *m_config; // Pointer to application configuration file - 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 QString m_rootPath; // Directory path where the 'root' destination is located |