summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/installdlg.cpp4
-rw-r--r--noncore/settings/packagemanager/installdlg.h2
-rw-r--r--noncore/settings/packagemanager/main.cpp2
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.h2
-rw-r--r--noncore/settings/packagemanager/opie-packagemanager.control2
-rw-r--r--noncore/settings/packagemanager/packageinfodlg.cpp2
-rw-r--r--noncore/settings/packagemanager/packageinfodlg.h2
-rw-r--r--noncore/settings/packagemanager/packagemanager.pro5
8 files changed, 7 insertions, 14 deletions
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 0c2ea78..aedd972 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -42,13 +42,13 @@
42#include <qpushbutton.h> 42#include <qpushbutton.h>
43 43
44#include <qpe/fileselector.h> 44#include <qpe/fileselector.h>
45#include <qpe/resource.h> 45#include <qpe/resource.h>
46#include <qpe/storage.h> 46#include <qpe/storage.h>
47 47
48#include <opie/ofiledialog.h> 48#include <opie2/ofiledialog.h>
49 49
50#include "opackagemanager.h" 50#include "opackagemanager.h"
51 51
52InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo, 52InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
53 OPackage::Command command1, QStringList *packages1, 53 OPackage::Command command1, QStringList *packages1,
54 OPackage::Command command2, QStringList *packages2, 54 OPackage::Command command2, QStringList *packages2,
@@ -272,13 +272,13 @@ void InstallDlg::slotBtnOptions()
272 QStringList text; 272 QStringList text;
273 text << "text/*"; 273 text << "text/*";
274 map.insert(tr( "Text" ), text ); 274 map.insert(tr( "Text" ), text );
275 text << "*"; 275 text << "*";
276 map.insert( tr( "All" ), text ); 276 map.insert( tr( "All" ), text );
277 277
278 QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); 278 QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
279 if( !filename.isEmpty() ) 279 if( !filename.isEmpty() )
280 { 280 {
281 QString currentFileName = QFileInfo( filename ).fileName(); 281 QString currentFileName = QFileInfo( filename ).fileName();
282 DocLnk doc; 282 DocLnk doc;
283 doc.setType( "text/plain" ); 283 doc.setType( "text/plain" );
284 doc.setFile( filename ); 284 doc.setFile( filename );
diff --git a/noncore/settings/packagemanager/installdlg.h b/noncore/settings/packagemanager/installdlg.h
index 7efe721..4da9cf6 100644
--- a/noncore/settings/packagemanager/installdlg.h
+++ b/noncore/settings/packagemanager/installdlg.h
@@ -29,14 +29,12 @@
29 29
30#ifndef INSTALLDLG_H 30#ifndef INSTALLDLG_H
31#define INSTALLDLG_H 31#define INSTALLDLG_H
32 32
33#include <qwidget.h> 33#include <qwidget.h>
34 34
35#include <opie/oprocess.h>
36
37#include "opackage.h" 35#include "opackage.h"
38 36
39class QComboBox; 37class QComboBox;
40class QLabel; 38class QLabel;
41class QMultiLineEdit; 39class QMultiLineEdit;
42class QPushButton; 40class QPushButton;
diff --git a/noncore/settings/packagemanager/main.cpp b/noncore/settings/packagemanager/main.cpp
index b731695..18ed644 100644
--- a/noncore/settings/packagemanager/main.cpp
+++ b/noncore/settings/packagemanager/main.cpp
@@ -26,9 +26,9 @@
26 Boston, MA 02111-1307, USA. 26 Boston, MA 02111-1307, USA.
27 27
28*/ 28*/
29 29
30#include "mainwindow.h" 30#include "mainwindow.h"
31 31
32#include <opie/oapplicationfactory.h> 32#include <opie2/oapplicationfactory.h>
33 33
34OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) 34OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h
index ef8c596..88e020a 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.h
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.h
@@ -33,13 +33,13 @@
33#ifndef OIPKGCONFIGDLG_H 33#ifndef OIPKGCONFIGDLG_H
34#define OIPKGCONFIGDLG_H 34#define OIPKGCONFIGDLG_H
35 35
36#include <qdialog.h> 36#include <qdialog.h>
37#include <qlayout.h> 37#include <qlayout.h>
38 38
39#include <opie/otabwidget.h> 39#include <opie2/otabwidget.h>
40 40
41#include "oipkg.h" 41#include "oipkg.h"
42 42
43class QCheckBox; 43class QCheckBox;
44class QComboBox; 44class QComboBox;
45class QLineEdit; 45class QLineEdit;
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index cad2cdd..3794748 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -1,10 +1,10 @@
1Package: opie-packagemanager 1Package: opie-packagemanager
2Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop 2Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop
3Priority: optional 3Priority: optional
4Section: opie/settings 4Section: opie/settings
5Depends: task-opie-minimal 5Depends: task-opie-minimal, libopiecore2, libopieui2
6Replaces: packagemanager 6Replaces: packagemanager
7Architecture: arm 7Architecture: arm
8Maintainer: Dan Williams (drw@handhelds.org) 8Maintainer: Dan Williams (drw@handhelds.org)
9Description: Opie package management client 9Description: Opie package management client
10Version: 0.3.0$EXTRAVERSION 10Version: 0.3.0$EXTRAVERSION
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index 7daf336..7abd17e 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -33,13 +33,13 @@
33 33
34#include <qlayout.h> 34#include <qlayout.h>
35#include <qpushbutton.h> 35#include <qpushbutton.h>
36 36
37#include <qpe/resource.h> 37#include <qpe/resource.h>
38 38
39#include <opie/otabwidget.h> 39#include <opie2/otabwidget.h>
40 40
41PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package ) 41PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
42 : QWidget( 0x0 ) 42 : QWidget( 0x0 )
43 , m_packman( pm ) 43 , m_packman( pm )
44 , m_information( this ) 44 , m_information( this )
45 , m_files( this ) 45 , m_files( this )
diff --git a/noncore/settings/packagemanager/packageinfodlg.h b/noncore/settings/packagemanager/packageinfodlg.h
index 13a15e2..7ed9f0a 100644
--- a/noncore/settings/packagemanager/packageinfodlg.h
+++ b/noncore/settings/packagemanager/packageinfodlg.h
@@ -30,14 +30,12 @@
30#ifndef PACKAGEINFODLG_H 30#ifndef PACKAGEINFODLG_H
31#define PACKAGEINFODLG_H 31#define PACKAGEINFODLG_H
32 32
33#include <qmultilineedit.h> 33#include <qmultilineedit.h>
34#include <qwidget.h> 34#include <qwidget.h>
35 35
36#include <opie/oprocess.h>
37
38#include "opackage.h" 36#include "opackage.h"
39 37
40class QPushButton; 38class QPushButton;
41 39
42class OPackage; 40class OPackage;
43class OPackageManager; 41class OPackageManager;
diff --git a/noncore/settings/packagemanager/packagemanager.pro b/noncore/settings/packagemanager/packagemanager.pro
index 9a64322..e05db76 100644
--- a/noncore/settings/packagemanager/packagemanager.pro
+++ b/noncore/settings/packagemanager/packagemanager.pro
@@ -1,10 +1,7 @@
1CONFIG = qt warn_on release quick-app 1CONFIG = qt warn_on release quick-app
2//TEMPLATE = app
3//CONFIG += qte warn_on debug
4//DESTDIR = $(OPIEDIR)/bin
5 2
6SOURCES = opackage.cpp \ 3SOURCES = opackage.cpp \
7 oconfitem.cpp \ 4 oconfitem.cpp \
8 oipkg.cpp \ 5 oipkg.cpp \
9 oipkgconfigdlg.cpp \ 6 oipkgconfigdlg.cpp \
10 opackagemanager.cpp \ 7 opackagemanager.cpp \
@@ -29,10 +26,10 @@ HEADERS = opackage.h \
29 26
30DEFINES += IPKG_LIB 27DEFINES += IPKG_LIB
31DEFINES += HAVE_MKDTEMP 28DEFINES += HAVE_MKDTEMP
32TARGET = packagemanager 29TARGET = packagemanager
33INCLUDEPATH += $(OPIEDIR)/include $(IPKGDIR) 30INCLUDEPATH += $(OPIEDIR)/include $(IPKGDIR)
34DEPENDPATH += $(OPIEDIR)/include 31DEPENDPATH += $(OPIEDIR)/include
35LIBS += -lqpe -lopie -lipkg 32LIBS += -lqpe -lopiecore2 -lopieui2 -lipkg
36 33
37include ( $(OPIEDIR)/include.pro ) 34include ( $(OPIEDIR)/include.pro )
38 35