author | drw <drw> | 2004-02-21 23:10:07 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-21 23:10:07 (UTC) |
commit | 34e88368f668b454b6fcbd0ce579323dd187df24 (patch) (unidiff) | |
tree | 9f10a8a7dfa6ef9d48d7281d6aa508a431384ac6 /noncore/settings | |
parent | 57598b2a111ea924c5ad632cefb4ad7697c35759 (diff) | |
download | opie-34e88368f668b454b6fcbd0ce579323dd187df24.zip opie-34e88368f668b454b6fcbd0ce579323dd187df24.tar.gz opie-34e88368f668b454b6fcbd0ce579323dd187df24.tar.bz2 |
Package Manager: libopie->libopie2
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 | |||
@@ -46,5 +46,5 @@ | |||
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" |
@@ -276,5 +276,5 @@ void InstallDlg::slotBtnOptions() | |||
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 | { |
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 | |||
@@ -33,6 +33,4 @@ | |||
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 | ||
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 | |||
@@ -30,5 +30,5 @@ | |||
30 | #include "mainwindow.h" | 30 | #include "mainwindow.h" |
31 | 31 | ||
32 | #include <opie/oapplicationfactory.h> | 32 | #include <opie2/oapplicationfactory.h> |
33 | 33 | ||
34 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 34 | OPIE_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 | |||
@@ -37,5 +37,5 @@ | |||
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" |
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 | |||
@@ -3,5 +3,5 @@ Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/package | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Depends: task-opie-minimal | 5 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
6 | Replaces: packagemanager | 6 | Replaces: packagemanager |
7 | Architecture: arm | 7 | Architecture: arm |
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 | |||
@@ -37,5 +37,5 @@ | |||
37 | #include <qpe/resource.h> | 37 | #include <qpe/resource.h> |
38 | 38 | ||
39 | #include <opie/otabwidget.h> | 39 | #include <opie2/otabwidget.h> |
40 | 40 | ||
41 | PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package ) | 41 | PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package ) |
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 | |||
@@ -34,6 +34,4 @@ | |||
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 | ||
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,6 +1,3 @@ | |||
1 | CONFIG = qt warn_on release quick-app | 1 | CONFIG = qt warn_on release quick-app |
2 | //TEMPLATE = app | ||
3 | //CONFIG += qte warn_on debug | ||
4 | //DESTDIR = $(OPIEDIR)/bin | ||
5 | 2 | ||
6 | SOURCES = opackage.cpp \ | 3 | SOURCES = opackage.cpp \ |
@@ -33,5 +30,5 @@ TARGET = packagemanager | |||
33 | INCLUDEPATH += $(OPIEDIR)/include $(IPKGDIR) | 30 | INCLUDEPATH += $(OPIEDIR)/include $(IPKGDIR) |
34 | DEPENDPATH += $(OPIEDIR)/include | 31 | DEPENDPATH += $(OPIEDIR)/include |
35 | LIBS += -lqpe -lopie -lipkg | 32 | LIBS += -lqpe -lopiecore2 -lopieui2 -lipkg |
36 | 33 | ||
37 | include ( $(OPIEDIR)/include.pro ) | 34 | include ( $(OPIEDIR)/include.pro ) |