author | drw <drw> | 2004-03-02 16:05:29 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-02 16:05:29 (UTC) |
commit | 49bee7ab52b819a07e9b6de4576eda467d632a66 (patch) (unidiff) | |
tree | 47ecafeed72340c945e88010aaff0d21a6a34964 /noncore/todayplugins/weather | |
parent | 31f776618b8615074b56dd2d3cdda3002fde671d (diff) | |
download | opie-49bee7ab52b819a07e9b6de4576eda467d632a66.zip opie-49bee7ab52b819a07e9b6de4576eda467d632a66.tar.gz opie-49bee7ab52b819a07e9b6de4576eda467d632a66.tar.bz2 |
Today weather plugin: libopie -> libopie2
Diffstat (limited to 'noncore/todayplugins/weather') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/todayplugins/weather/config.in | 2 | ||||
-rw-r--r-- | noncore/todayplugins/weather/opie-today-weatherplugin.control | 2 | ||||
-rw-r--r-- | noncore/todayplugins/weather/weather.pro | 2 | ||||
-rw-r--r-- | noncore/todayplugins/weather/weatherconfig.cpp | 13 | ||||
-rw-r--r-- | noncore/todayplugins/weather/weatherconfig.h | 2 | ||||
-rw-r--r-- | noncore/todayplugins/weather/weatherplugin.h | 6 | ||||
-rw-r--r-- | noncore/todayplugins/weather/weatherpluginimpl.h | 2 | ||||
-rw-r--r-- | noncore/todayplugins/weather/weatherpluginwidget.cpp | 6 |
8 files changed, 17 insertions, 18 deletions
diff --git a/noncore/todayplugins/weather/config.in b/noncore/todayplugins/weather/config.in index 7202983..ae35a59 100644 --- a/noncore/todayplugins/weather/config.in +++ b/noncore/todayplugins/weather/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config TODAY_WEATHER | 1 | config TODAY_WEATHER |
2 | boolean "opie-today-weatherplugin (current weather report)" | 2 | boolean "opie-today-weatherplugin (current weather report)" |
3 | default "y" | 3 | default "y" |
4 | depends (LIBQPE || LIBQPE-X11) && LIBOPIE | 4 | depends (LIBQPE || LIBQPE-X11) && LIBOPIE2CORE && LIBOPIE2PIM |
diff --git a/noncore/todayplugins/weather/opie-today-weatherplugin.control b/noncore/todayplugins/weather/opie-today-weatherplugin.control index 80b7d2b..7dbd315 100644 --- a/noncore/todayplugins/weather/opie-today-weatherplugin.control +++ b/noncore/todayplugins/weather/opie-today-weatherplugin.control | |||
@@ -4,7 +4,7 @@ Priority: optional | |||
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Dan Williams <drw@handhelds.org> | 5 | Maintainer: Dan Williams <drw@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: libqte2, opie-today | 7 | Depends: libqte2, libopiecore2, libopiepim2, opie-today |
8 | Description: Weather plugin for Today | 8 | Description: Weather plugin for Today |
9 | Displays current weather conditions. | 9 | Displays current weather conditions. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/noncore/todayplugins/weather/weather.pro b/noncore/todayplugins/weather/weather.pro index 5ad14e1..d1f8edd 100644 --- a/noncore/todayplugins/weather/weather.pro +++ b/noncore/todayplugins/weather/weather.pro | |||
@@ -17,7 +17,7 @@ INCLUDEPATH += $(OPIEDIR)/include \ | |||
17 | DEPENDPATH += $(OPIEDIR)/include \ | 17 | DEPENDPATH += $(OPIEDIR)/include \ |
18 | ../ ../library | 18 | ../ ../library |
19 | 19 | ||
20 | LIBS+= -lqpe -lopie | 20 | LIBS+= -lqpe -lopiecore2 -lopiepim2 |
21 | 21 | ||
22 | DESTDIR = $(OPIEDIR)/plugins/today | 22 | DESTDIR = $(OPIEDIR)/plugins/today |
23 | TARGET = todayweatherplugin | 23 | TARGET = todayweatherplugin |
diff --git a/noncore/todayplugins/weather/weatherconfig.cpp b/noncore/todayplugins/weather/weatherconfig.cpp index 99ee2a0..4663549 100644 --- a/noncore/todayplugins/weather/weatherconfig.cpp +++ b/noncore/todayplugins/weather/weatherconfig.cpp | |||
@@ -26,7 +26,11 @@ | |||
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <stdlib.h> | 29 | #include "weatherconfig.h" |
30 | |||
31 | #include <qpe/config.h> | ||
32 | #include <qpe/qpeapplication.h> | ||
33 | #include <qpe/resource.h> | ||
30 | 34 | ||
31 | #include <qcheckbox.h> | 35 | #include <qcheckbox.h> |
32 | #include <qclipboard.h> | 36 | #include <qclipboard.h> |
@@ -39,12 +43,7 @@ | |||
39 | #include <qspinbox.h> | 43 | #include <qspinbox.h> |
40 | #include <qwhatsthis.h> | 44 | #include <qwhatsthis.h> |
41 | 45 | ||
42 | #include <qpe/config.h> | 46 | #include <stdlib.h> |
43 | #include <qpe/qpeapplication.h> | ||
44 | #include <qpe/resource.h> | ||
45 | #include <opie/todayconfigwidget.h> | ||
46 | |||
47 | #include "weatherconfig.h" | ||
48 | 47 | ||
49 | WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name) | 48 | WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name) |
50 | : TodayConfigWidget(parent, name ) | 49 | : TodayConfigWidget(parent, name ) |
diff --git a/noncore/todayplugins/weather/weatherconfig.h b/noncore/todayplugins/weather/weatherconfig.h index d9ffec2..1780c7f 100644 --- a/noncore/todayplugins/weather/weatherconfig.h +++ b/noncore/todayplugins/weather/weatherconfig.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <qstring.h> | 32 | #include <qstring.h> |
33 | #include <qwidget.h> | 33 | #include <qwidget.h> |
34 | 34 | ||
35 | #include <opie/todayconfigwidget.h> | 35 | #include <opie2/todayconfigwidget.h> |
36 | 36 | ||
37 | class QCheckBox; | 37 | class QCheckBox; |
38 | class QLineEdit; | 38 | class QLineEdit; |
diff --git a/noncore/todayplugins/weather/weatherplugin.h b/noncore/todayplugins/weather/weatherplugin.h index 480d220..73e7104 100644 --- a/noncore/todayplugins/weather/weatherplugin.h +++ b/noncore/todayplugins/weather/weatherplugin.h | |||
@@ -29,12 +29,12 @@ | |||
29 | #ifndef WEATHER_PLUGIN_H | 29 | #ifndef WEATHER_PLUGIN_H |
30 | #define WEATHER_PLUGIN_H | 30 | #define WEATHER_PLUGIN_H |
31 | 31 | ||
32 | #include <opie2/todayplugininterface.h> | ||
33 | #include <opie2/todayconfigwidget.h> | ||
34 | |||
32 | #include <qstring.h> | 35 | #include <qstring.h> |
33 | #include <qwidget.h> | 36 | #include <qwidget.h> |
34 | 37 | ||
35 | #include <opie/todayplugininterface.h> | ||
36 | #include <opie/todayconfigwidget.h> | ||
37 | |||
38 | class WeatherPlugin : public TodayPluginObject | 38 | class WeatherPlugin : public TodayPluginObject |
39 | { | 39 | { |
40 | public: | 40 | public: |
diff --git a/noncore/todayplugins/weather/weatherpluginimpl.h b/noncore/todayplugins/weather/weatherpluginimpl.h index eaaae1d..d1a7400 100644 --- a/noncore/todayplugins/weather/weatherpluginimpl.h +++ b/noncore/todayplugins/weather/weatherpluginimpl.h | |||
@@ -29,7 +29,7 @@ | |||
29 | #ifndef WEATHER_PLUGIN_IMPL_H | 29 | #ifndef WEATHER_PLUGIN_IMPL_H |
30 | #define WEATHER_PLUGIN_IMPL_H | 30 | #define WEATHER_PLUGIN_IMPL_H |
31 | 31 | ||
32 | #include <opie/todayplugininterface.h> | 32 | #include <opie2/todayplugininterface.h> |
33 | 33 | ||
34 | class WeatherPlugin; | 34 | class WeatherPlugin; |
35 | 35 | ||
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp index 15d1c6e..ad99a43 100644 --- a/noncore/todayplugins/weather/weatherpluginwidget.cpp +++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <qpixmap.h> | 33 | #include <qpixmap.h> |
34 | #include <qtextstream.h> | 34 | #include <qtextstream.h> |
35 | 35 | ||
36 | #include <opie/oprocess.h> | 36 | #include <opie2/oprocess.h> |
37 | 37 | ||
38 | #include <qpe/config.h> | 38 | #include <qpe/config.h> |
39 | #include <qpe/resource.h> | 39 | #include <qpe/resource.h> |
@@ -85,7 +85,7 @@ void WeatherPluginWidget::retreiveData() | |||
85 | location = config.readEntry( "Location", "" ); | 85 | location = config.readEntry( "Location", "" ); |
86 | useMetric = config.readBoolEntry( "Metric", TRUE ); | 86 | useMetric = config.readBoolEntry( "Metric", TRUE ); |
87 | frequency = config.readNumEntry( "Frequency", 5 ); | 87 | frequency = config.readNumEntry( "Frequency", 5 ); |
88 | 88 | ||
89 | startTimer( frequency * 60000 ); | 89 | startTimer( frequency * 60000 ); |
90 | 90 | ||
91 | localFile = "/tmp/"; | 91 | localFile = "/tmp/"; |
@@ -114,7 +114,7 @@ void WeatherPluginWidget::displayWeather() | |||
114 | weatherData = QString::null; | 114 | weatherData = QString::null; |
115 | 115 | ||
116 | QFile file( localFile ); | 116 | QFile file( localFile ); |
117 | 117 | ||
118 | if ( file.size() > 0 && file.open( IO_ReadOnly ) ) | 118 | if ( file.size() > 0 && file.open( IO_ReadOnly ) ) |
119 | { | 119 | { |
120 | QTextStream data( &file ); | 120 | QTextStream data( &file ); |