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 @@
   config TODAY_WEATHER
     boolean "opie-today-weatherplugin (current weather report)"
     default "y"
-    depends (LIBQPE || LIBQPE-X11) && LIBOPIE
+    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
@@ -1,10 +1,10 @@
 Package: opie-today-weatherplugin
 Files: plugins/today/libtodayweatherplugin.so* pics/todayweatherplugin
 Priority: optional
 Section: opie/applications
 Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
-Depends: libqte2, opie-today
+Depends: libqte2, libopiecore2, libopiepim2, opie-today
 Description: Weather plugin for Today
  Displays current weather conditions.
 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
@@ -14,12 +14,12 @@ SOURCES = weatherplugin.cpp       \
 
 INCLUDEPATH     += $(OPIEDIR)/include \
 		../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
 		../ ../library
 
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2 -lopiepim2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayweatherplugin
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -23,31 +23,30 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <stdlib.h>
+#include "weatherconfig.h"
+
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
 
 #include <qcheckbox.h>
 #include <qclipboard.h>
 #include <qfontmetrics.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qwhatsthis.h>
 
-#include <qpe/config.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <opie/todayconfigwidget.h>
-
-#include "weatherconfig.h"
+#include <stdlib.h>
 
 WeatherPluginConfig::WeatherPluginConfig( QWidget *parent,  const char* name)
 	: TodayConfigWidget(parent,  name )
 {
 	Config config( "todayweatherplugin");
 	config.setGroup( "Config" );
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
@@ -29,13 +29,13 @@
 #ifndef WEATHER_PLUGIN_CONFIG_H
 #define WEATHER_PLUGIN_CONFIG_H
 
 #include <qstring.h>
 #include <qwidget.h>
 
-#include <opie/todayconfigwidget.h>
+#include <opie2/todayconfigwidget.h>
 
 class QCheckBox;
 class QLineEdit;
 class QPushButton;
 class QSpinBox;
 
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
@@ -26,18 +26,18 @@
 
 */
 
 #ifndef WEATHER_PLUGIN_H
 #define WEATHER_PLUGIN_H
 
+#include <opie2/todayplugininterface.h>
+#include <opie2/todayconfigwidget.h>
+
 #include <qstring.h>
 #include <qwidget.h>
 
-#include <opie/todayplugininterface.h>
-#include <opie/todayconfigwidget.h>
-
 class WeatherPlugin : public TodayPluginObject
 {
 	public:
 		WeatherPlugin();
 		~WeatherPlugin();
 
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
@@ -26,13 +26,13 @@
 
 */
 
 #ifndef WEATHER_PLUGIN_IMPL_H
 #define WEATHER_PLUGIN_IMPL_H
 
-#include <opie/todayplugininterface.h>
+#include <opie2/todayplugininterface.h>
 
 class WeatherPlugin;
 
 class WeatherPluginImpl : public TodayPluginInterface
 {
 	public:
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
@@ -30,13 +30,13 @@
 #include <qimage.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qtextstream.h>
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include "weatherpluginwidget.h"
 
@@ -82,13 +82,13 @@ void WeatherPluginWidget::retreiveData()
 	Config config( "todayweatherplugin");
 	config.setGroup( "Config" );
 
 	location = config.readEntry( "Location", "" );
 	useMetric = config.readBoolEntry( "Metric", TRUE );
 	frequency = config.readNumEntry( "Frequency", 5 );
-	
+
 	startTimer( frequency * 60000 );
 
 	localFile = "/tmp/";
 	localFile.append( location );
 	localFile.append( ".TXT" );
 
@@ -111,13 +111,13 @@ void WeatherPluginWidget::retreiveData()
 
 void WeatherPluginWidget::displayWeather()
 {
 	weatherData = QString::null;
 
 	QFile file( localFile );
-	
+
 	if ( file.size() > 0 && file.open( IO_ReadOnly ) )
 	{
 		QTextStream data( &file );
 		while ( !data.eof() )
 		{
 			weatherData.append( data.readLine() );