author | drw <drw> | 2004-02-21 23:10:07 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-21 23:10:07 (UTC) |
commit | 34e88368f668b454b6fcbd0ce579323dd187df24 (patch) (side-by-side diff) | |
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 @@ -44,9 +44,9 @@ #include <qpe/fileselector.h> #include <qpe/resource.h> #include <qpe/storage.h> -#include <opie/ofiledialog.h> +#include <opie2/ofiledialog.h> #include "opackagemanager.h" InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo, @@ -274,9 +274,9 @@ void InstallDlg::slotBtnOptions() map.insert(tr( "Text" ), text ); text << "*"; map.insert( tr( "All" ), text ); - QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); + QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); if( !filename.isEmpty() ) { QString currentFileName = QFileInfo( filename ).fileName(); DocLnk doc; 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 @@ -31,10 +31,8 @@ #define INSTALLDLG_H #include <qwidget.h> -#include <opie/oprocess.h> - #include "opackage.h" class QComboBox; class QLabel; 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 @@ -28,7 +28,7 @@ */ #include "mainwindow.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> 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 @@ -35,9 +35,9 @@ #include <qdialog.h> #include <qlayout.h> -#include <opie/otabwidget.h> +#include <opie2/otabwidget.h> #include "oipkg.h" class QCheckBox; 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,9 +1,9 @@ Package: opie-packagemanager Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop Priority: optional Section: opie/settings -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2 Replaces: packagemanager Architecture: arm Maintainer: Dan Williams (drw@handhelds.org) Description: Opie package management client 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 @@ -35,9 +35,9 @@ #include <qpushbutton.h> #include <qpe/resource.h> -#include <opie/otabwidget.h> +#include <opie2/otabwidget.h> PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package ) : QWidget( 0x0 ) , m_packman( pm ) 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 @@ -32,10 +32,8 @@ #include <qmultilineedit.h> #include <qwidget.h> -#include <opie/oprocess.h> - #include "opackage.h" class QPushButton; 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,8 +1,5 @@ CONFIG = qt warn_on release quick-app -//TEMPLATE = app -//CONFIG += qte warn_on debug -//DESTDIR = $(OPIEDIR)/bin SOURCES = opackage.cpp \ oconfitem.cpp \ oipkg.cpp \ @@ -31,8 +28,8 @@ DEFINES += IPKG_LIB DEFINES += HAVE_MKDTEMP TARGET = packagemanager INCLUDEPATH += $(OPIEDIR)/include $(IPKGDIR) DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie -lipkg +LIBS += -lqpe -lopiecore2 -lopieui2 -lipkg include ( $(OPIEDIR)/include.pro ) |