-rw-r--r-- | noncore/settings/netsystemtime/config.in | 2 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/main.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/mainwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/mainwindow.h | 7 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/netsystemtime.pro | 2 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/opie-systemtime.control | 2 |
6 files changed, 9 insertions, 11 deletions
diff --git a/noncore/settings/netsystemtime/config.in b/noncore/settings/netsystemtime/config.in index ea90f65..37ac303 100644 --- a/noncore/settings/netsystemtime/config.in +++ b/noncore/settings/netsystemtime/config.in @@ -2,3 +2,3 @@ boolean "opie-systemtime (clock setup tool with NTP ability)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp index da98eee..4a2d17c 100644 --- a/noncore/settings/netsystemtime/main.cpp +++ b/noncore/settings/netsystemtime/main.cpp @@ -29,7 +29,5 @@ #include "mainwindow.h" -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> - +#include <opie2/oapplicationfactory.h> OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp index 66e1ca3..7df41d4 100644 --- a/noncore/settings/netsystemtime/mainwindow.cpp +++ b/noncore/settings/netsystemtime/mainwindow.cpp @@ -34,7 +34,4 @@ #include "predicttabwidget.h" -#include <opie/oprocess.h> -#include <opie/otabwidget.h> - #include <qpe/config.h> #include <qpe/datebookdb.h> diff --git a/noncore/settings/netsystemtime/mainwindow.h b/noncore/settings/netsystemtime/mainwindow.h index 1cdbc1a..d4a9713 100644 --- a/noncore/settings/netsystemtime/mainwindow.h +++ b/noncore/settings/netsystemtime/mainwindow.h @@ -32,4 +32,7 @@ #include <qdialog.h> +#include <opie2/oprocess.h> +#include <opie2/otabwidget.h> + class TimeTabWidget; class FormatTabWidget; @@ -38,6 +41,6 @@ class NTPTabWidget; class PredictTabWidget; -class OProcess; -class OTabWidget; +using Opie::OTabWidget; + class QDateTime; class QSocket; diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro index 56f7f6c..70ef67d 100644 --- a/noncore/settings/netsystemtime/netsystemtime.pro +++ b/noncore/settings/netsystemtime/netsystemtime.pro @@ -15,5 +15,5 @@ SOURCES = main.cpp \ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 TARGET = systemtime diff --git a/noncore/settings/netsystemtime/opie-systemtime.control b/noncore/settings/netsystemtime/opie-systemtime.control index 1ebc1da..58afc31 100644 --- a/noncore/settings/netsystemtime/opie-systemtime.control +++ b/noncore/settings/netsystemtime/opie-systemtime.control @@ -6,5 +6,5 @@ Provides: opie-netsystemtime Maintainer: Patrick S. Vogt <tille@handhelds.org>, Dan Williams <drw@handhelds.org> Architecture: arm -Depends: task-opie-minimal, ntpdate, libopie1 +Depends: task-opie-minimal, ntpdate, libopiecore2, libopieui2 Description: System time This utility allows the system time to be set manually |