User Manager: libopie->libopie2

5 files changed, 6 insertions, 6 deletions

diff --git a/noncore/settings/usermanager/main.cpp b/noncore/settings/usermanager/main.cpp
index 515ea9a..d7147d1 100644
--- a/noncore/settings/usermanager/main.cpp
+++ b/noncore/settings/usermanager/main.cpp
@@ -5,10 +5,10 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "usermanager.h"
-#include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<UserConfig> )
diff --git a/noncore/settings/usermanager/opie-usermanager.control b/noncore/settings/usermanager/opie-usermanager.control
index 5061366..52930d2 100644
--- a/noncore/settings/usermanager/opie-usermanager.control
+++ b/noncore/settings/usermanager/opie-usermanager.control
@@ -1,10 +1,10 @@
 Package: opie-usermanager
 Files: plugins/application/libusermanager.so* bin/usermanager apps/Settings/usermanager.desktop pics/usermanager/*
 Priority: optional
 Section: opie/settings
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Architecture: arm
 Maintainer: Ted Parnefors <zaurus@bredband.net>
 License: GPL
 Description: User/Group manager for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index 08de352..eb9a289 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -8,13 +8,13 @@
  ***************************************************************************/
 
 #include "userdialog.h"
 #include "passwd.h"
 
 /* OPIE */
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
diff --git a/noncore/settings/usermanager/userdialog.h b/noncore/settings/usermanager/userdialog.h
index 3272afc..a94e49b 100644
--- a/noncore/settings/usermanager/userdialog.h
+++ b/noncore/settings/usermanager/userdialog.h
@@ -17,13 +17,13 @@
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 
 #include <qpe/resource.h>
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
 class UserDialog : public QDialog 
 {
         Q_OBJECT
 private:
         QTabWidget *myTabWidget;
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 0b2f056..f20c9c3 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -1,10 +1,10 @@
         #CONFIG         = qt warn_on debug
         CONFIG  = qt warn_on release quick-app
         HEADERS         = usermanager.h userdialog.h groupdialog.h passwd.h
         SOURCES         = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp
         INCLUDEPATH+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopie -lcrypt
+LIBS            += -lqpe -lopiecore2 -lopieui2 -lcrypt
         TARGET  = usermanager
 
 include ( $(OPIEDIR)/include.pro )