summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 17:12:28 (UTC)
committer drw <drw>2004-02-23 17:12:28 (UTC)
commit2f11aa15eeb70dd8826523597adb8947fdffbaa7 (patch) (side-by-side diff)
treeacc6ceb27c67437734e94b39b06835edac5d5bad
parent20b0e62e6c23cdaed9a30d6fad73431edc60be53 (diff)
downloadopie-2f11aa15eeb70dd8826523597adb8947fdffbaa7.zip
opie-2f11aa15eeb70dd8826523597adb8947fdffbaa7.tar.gz
opie-2f11aa15eeb70dd8826523597adb8947fdffbaa7.tar.bz2
ZSafe: libopie->libopie2
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/zsafe/config.in2
-rw-r--r--noncore/apps/zsafe/opie-zsafe.control2
-rw-r--r--noncore/apps/zsafe/zsafe.cpp5
-rw-r--r--noncore/apps/zsafe/zsafe.pro2
4 files changed, 7 insertions, 4 deletions
diff --git a/noncore/apps/zsafe/config.in b/noncore/apps/zsafe/config.in
index 4b1e968..6e321f3 100644
--- a/noncore/apps/zsafe/config.in
+++ b/noncore/apps/zsafe/config.in
@@ -1,5 +1,5 @@
config ZSAFE
boolean "zsafe (Zaurus Password Manager)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI
diff --git a/noncore/apps/zsafe/opie-zsafe.control b/noncore/apps/zsafe/opie-zsafe.control
index b58a987..6288fac 100644
--- a/noncore/apps/zsafe/opie-zsafe.control
+++ b/noncore/apps/zsafe/opie-zsafe.control
@@ -1,9 +1,9 @@
Package: opie-zsafe
Files: bin/zsafe apps/Applications/zsafe.desktop pics/zsafe/*.png
Priority: optional
Section: opie/applications
Version: $QPE_VERSION$EXTRAVERSION
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopieui2
Maintainer: Carsten Schneider <zcarsten@gmx.net>
Description: This is a password manager program for Opie.
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index bdd2aed..f43a206 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -25,13 +25,16 @@
#include "infoform.h"
#include "zlistview.h"
#include "shadedlistitem.h"
#ifndef DESKTOP
#ifndef NO_OPIE
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
+
+using Opie::OFileDialog;
+using Opie::OFileSelector;
#else
#include "scqtfileedit.h"
#endif
#endif
#include <qclipboard.h>
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index 65bcb79..1e8e4ac 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -7,11 +7,11 @@ SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp \
categorylist.cpp zlistview.cpp shadedlistitem.cpp\
scqtfileedit.cpp scqtfileedit.moc.cpp \
scqtfiledlg.cpp
INTERFACES = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopie
+LIBS += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopieui2
TARGET = zsafe
include ( $(OPIEDIR)/include.pro )