author | drw <drw> | 2004-02-22 16:43:28 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-22 16:43:28 (UTC) |
commit | a607c211c7ad47f1083fa820da5632a1d2110e44 (patch) (unidiff) | |
tree | 364b2e0cd0e80d409ad4462e00c5b510eb75744a | |
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 | |||
@@ -1,4 +1,4 @@ | |||
1 | config NETSYSTEMTIME | 1 | config NETSYSTEMTIME |
2 | boolean "opie-systemtime (clock setup tool with NTP ability)" | 2 | boolean "opie-systemtime (clock setup tool with NTP ability)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | 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 | |||
@@ -19,17 +19,15 @@ | |||
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "mainwindow.h" | 29 | #include "mainwindow.h" |
30 | 30 | ||
31 | #include <qpe/qpeapplication.h> | 31 | #include <opie2/oapplicationfactory.h> |
32 | #include <opie/oapplicationfactory.h> | ||
33 | |||
34 | 32 | ||
35 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 33 | 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 | |||
@@ -24,27 +24,24 @@ | |||
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "mainwindow.h" | 29 | #include "mainwindow.h" |
30 | #include "timetabwidget.h" | 30 | #include "timetabwidget.h" |
31 | #include "formattabwidget.h" | 31 | #include "formattabwidget.h" |
32 | #include "settingstabwidget.h" | 32 | #include "settingstabwidget.h" |
33 | #include "ntptabwidget.h" | 33 | #include "ntptabwidget.h" |
34 | #include "predicttabwidget.h" | 34 | #include "predicttabwidget.h" |
35 | 35 | ||
36 | #include <opie/oprocess.h> | ||
37 | #include <opie/otabwidget.h> | ||
38 | |||
39 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
40 | #include <qpe/datebookdb.h> | 37 | #include <qpe/datebookdb.h> |
41 | #include <qpe/qpeapplication.h> | 38 | #include <qpe/qpeapplication.h> |
42 | #include <qpe/qpedialog.h> | 39 | #include <qpe/qpedialog.h> |
43 | 40 | ||
44 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 41 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
45 | #include <qpe/qcopenvelope_qws.h> | 42 | #include <qpe/qcopenvelope_qws.h> |
46 | #endif | 43 | #endif |
47 | 44 | ||
48 | #include <qlayout.h> | 45 | #include <qlayout.h> |
49 | #include <qmessagebox.h> | 46 | #include <qmessagebox.h> |
50 | #include <qsocket.h> | 47 | #include <qsocket.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 | |||
@@ -22,32 +22,35 @@ | |||
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifndef MAINWINDOW_H | 29 | #ifndef MAINWINDOW_H |
30 | #define MAINWINDOW_H | 30 | #define MAINWINDOW_H |
31 | 31 | ||
32 | #include <qdialog.h> | 32 | #include <qdialog.h> |
33 | 33 | ||
34 | #include <opie2/oprocess.h> | ||
35 | #include <opie2/otabwidget.h> | ||
36 | |||
34 | class TimeTabWidget; | 37 | class TimeTabWidget; |
35 | class FormatTabWidget; | 38 | class FormatTabWidget; |
36 | class SettingsTabWidget; | 39 | class SettingsTabWidget; |
37 | class NTPTabWidget; | 40 | class NTPTabWidget; |
38 | class PredictTabWidget; | 41 | class PredictTabWidget; |
39 | 42 | ||
40 | class OProcess; | 43 | using Opie::OTabWidget; |
41 | class OTabWidget; | 44 | |
42 | class QDateTime; | 45 | class QDateTime; |
43 | class QSocket; | 46 | class QSocket; |
44 | class QTimer; | 47 | class QTimer; |
45 | 48 | ||
46 | class MainWindow : public QDialog | 49 | class MainWindow : public QDialog |
47 | { | 50 | { |
48 | Q_OBJECT | 51 | Q_OBJECT |
49 | 52 | ||
50 | public: | 53 | public: |
51 | MainWindow( QWidget *parent = 0, const char *name = 0, bool modal = FALSE,WFlags f = 0); | 54 | MainWindow( QWidget *parent = 0, const char *name = 0, bool modal = FALSE,WFlags f = 0); |
52 | ~MainWindow(); | 55 | ~MainWindow(); |
53 | static QString appName() { return QString::fromLatin1("systemtime"); } | 56 | static QString appName() { return QString::fromLatin1("systemtime"); } |
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 | |||
@@ -5,17 +5,17 @@ HEADERS = mainwindow.h \ | |||
5 | settingstabwidget.h \ | 5 | settingstabwidget.h \ |
6 | predicttabwidget.h \ | 6 | predicttabwidget.h \ |
7 | ntptabwidget.h | 7 | ntptabwidget.h |
8 | SOURCES = main.cpp \ | 8 | SOURCES = main.cpp \ |
9 | mainwindow.cpp \ | 9 | mainwindow.cpp \ |
10 | timetabwidget.cpp \ | 10 | timetabwidget.cpp \ |
11 | formattabwidget.cpp \ | 11 | formattabwidget.cpp \ |
12 | settingstabwidget.cpp \ | 12 | settingstabwidget.cpp \ |
13 | predicttabwidget.cpp \ | 13 | predicttabwidget.cpp \ |
14 | ntptabwidget.cpp | 14 | ntptabwidget.cpp |
15 | INCLUDEPATH+= $(OPIEDIR)/include | 15 | INCLUDEPATH+= $(OPIEDIR)/include |
16 | DEPENDPATH+= $(OPIEDIR)/include | 16 | DEPENDPATH+= $(OPIEDIR)/include |
17 | LIBS += -lqpe -lopie | 17 | LIBS += -lqpe -lopiecore2 -lopieui2 |
18 | 18 | ||
19 | TARGET = systemtime | 19 | TARGET = systemtime |
20 | 20 | ||
21 | include ( $(OPIEDIR)/include.pro ) | 21 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -1,12 +1,12 @@ | |||
1 | Package: opie-systemtime | 1 | Package: opie-systemtime |
2 | Files: plugins/application/libsystemtime.so* bin/systemtime apps/Settings/netsystemtime.desktop etc/ntpservers pics/netsystemtime | 2 | Files: plugins/application/libsystemtime.so* bin/systemtime apps/Settings/netsystemtime.desktop etc/ntpservers pics/netsystemtime |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Provides: opie-netsystemtime | 5 | Provides: opie-netsystemtime |
6 | Maintainer: Patrick S. Vogt <tille@handhelds.org>, Dan Williams <drw@handhelds.org> | 6 | Maintainer: Patrick S. Vogt <tille@handhelds.org>, Dan Williams <drw@handhelds.org> |
7 | Architecture: arm | 7 | Architecture: arm |
8 | Depends: task-opie-minimal, ntpdate, libopie1 | 8 | Depends: task-opie-minimal, ntpdate, libopiecore2, libopieui2 |
9 | Description: System time | 9 | Description: System time |
10 | This utility allows the system time to be set manually | 10 | This utility allows the system time to be set manually |
11 | or synced with a timerserver via Internet. | 11 | or synced with a timerserver via Internet. |
12 | Version: $QPE_VERSION$EXTRAVERSION | 12 | Version: $QPE_VERSION$EXTRAVERSION |