author | drw <drw> | 2004-02-13 18:56:44 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-13 18:56:44 (UTC) |
commit | ed80e76bb5fd0cc8c346e3a27e4be858d5cf5c98 (patch) (unidiff) | |
tree | 446720b4302433a7ef6df33336605c03dc79de8d /noncore/settings/packagemanager/oipkg.cpp | |
parent | f3cf623e76060c8f4ee7c2eef241de02d63a2614 (diff) | |
download | opie-ed80e76bb5fd0cc8c346e3a27e4be858d5cf5c98.zip opie-ed80e76bb5fd0cc8c346e3a27e4be858d5cf5c98.tar.gz opie-ed80e76bb5fd0cc8c346e3a27e4be858d5cf5c98.tar.bz2 |
Do proper version string comparison and fix string alignment code in PromptDlg to eliminate QT warning messages
Diffstat (limited to 'noncore/settings/packagemanager/oipkg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index eb07a61..086e91b 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp | |||
@@ -22,25 +22,24 @@ | |||
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | 29 | ||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "oipkg.h" | 32 | #include "oipkg.h" |
33 | 33 | ||
34 | #include <stdio.h> | ||
35 | #include <stdlib.h> | 34 | #include <stdlib.h> |
36 | #include <string.h> | 35 | #include <string.h> |
37 | 36 | ||
38 | #include <qdir.h> | 37 | #include <qdir.h> |
39 | #include <qfile.h> | 38 | #include <qfile.h> |
40 | #include <qmessagebox.h> | 39 | #include <qmessagebox.h> |
41 | #include <qtextstream.h> | 40 | #include <qtextstream.h> |
42 | 41 | ||
43 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file | 42 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file |
44 | const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files | 43 | const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files |
45 | const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists | 44 | const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists |
46 | const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location | 45 | const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location |
@@ -60,25 +59,24 @@ char *fIpkgResponse( char */*question*/ ) | |||
60 | return 0x0; | 59 | return 0x0; |
61 | } | 60 | } |
62 | 61 | ||
63 | int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ ) | 62 | int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ ) |
64 | { | 63 | { |
65 | oipkg->ipkgStatus( desc ); | 64 | oipkg->ipkgStatus( desc ); |
66 | return 0; | 65 | return 0; |
67 | } | 66 | } |
68 | 67 | ||
69 | int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, | 68 | int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, |
70 | void */*userdata*/ ) | 69 | void */*userdata*/ ) |
71 | { | 70 | { |
72 | printf( "*****List*****\n%s\n", desc ); | ||
73 | oipkg->ipkgList( desc ); | 71 | oipkg->ipkgList( desc ); |
74 | return 0; | 72 | return 0; |
75 | } | 73 | } |
76 | 74 | ||
77 | OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) | 75 | OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) |
78 | : QObject( parent, name ) | 76 | : QObject( parent, name ) |
79 | , m_config( config ) | 77 | , m_config( config ) |
80 | , m_confInfo( NULL ) | 78 | , m_confInfo( NULL ) |
81 | , m_ipkgExecOptions( 0 ) | 79 | , m_ipkgExecOptions( 0 ) |
82 | , m_ipkgExecVerbosity( 1 ) | 80 | , m_ipkgExecVerbosity( 1 ) |
83 | { | 81 | { |
84 | oipkg = this; | 82 | oipkg = this; |