| author | drw <drw> | 2004-02-22 16:43:28 (UTC) |
|---|---|---|
| committer | drw <drw> | 2004-02-22 16:43:28 (UTC) |
| commit | a607c211c7ad47f1083fa820da5632a1d2110e44 (patch) (side-by-side diff) | |
| tree | 364b2e0cd0e80d409ad4462e00c5b510eb75744a /noncore | |
| parent | 58c4c8a50f2a30f5736ee53fdd46c3bf6bc4f8c4 (diff) | |
| download | opie-a607c211c7ad47f1083fa820da5632a1d2110e44.zip opie-a607c211c7ad47f1083fa820da5632a1d2110e44.tar.gz opie-a607c211c7ad47f1083fa820da5632a1d2110e44.tar.bz2 | |
System Time: libopie->libopie2
| -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 @@ -3,2 +3,2 @@ 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 @@ -30,5 +30,3 @@ -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> - +#include <opie2/oapplicationfactory.h> 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 @@ -35,5 +35,2 @@ -#include <opie/oprocess.h> -#include <opie/otabwidget.h> - #include <qpe/config.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 @@ -33,2 +33,5 @@ +#include <opie2/oprocess.h> +#include <opie2/otabwidget.h> + class TimeTabWidget; @@ -39,4 +42,4 @@ class PredictTabWidget; -class OProcess; -class OTabWidget; +using Opie::OTabWidget; + class QDateTime; 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 @@ -16,3 +16,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 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 @@ -7,3 +7,3 @@ Maintainer: Patrick S. Vogt <tille@handhelds.org>, Dan Williams <drw@handhelds.o Architecture: arm -Depends: task-opie-minimal, ntpdate, libopie1 +Depends: task-opie-minimal, ntpdate, libopiecore2, libopieui2 Description: System time |