[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdetoys/kweather
From: Frederik Schwarzer <schwarzerf () gmail ! com>
Date: 2007-04-18 19:48:54
Message-ID: 1176925734.781605.17282.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 655576 by schwarzer:
partial revert of r655393 to make it compile again :/
(sorry for the trouble)
M +5 -4 kcmweather.cpp
M +3 -3 kcmweatherservice.cpp
M +6 -6 kweather.cpp
M +4 -4 metar_parser.cpp
M +5 -4 metar_parser_test.cpp
M +2 -3 reportview.cpp
M +1 -2 serviceconfigwidget.cpp
M +3 -3 stationdatabase_test.cpp
M +1 -2 sun.cpp
M +4 -3 sun_test.cpp
M +8 -7 weatherlib.cpp
M +5 -6 weatherservice.cpp
--- trunk/KDE/kdetoys/kweather/kcmweather.cpp #655575:655576
@@ -21,10 +21,6 @@
without including the source code for Qt in the source distribution.
*/
-#include "kcmweather.h"
-#include "dockwidget.h"
-#include "serviceinterface.h"
-
#include <q3buttongroup.h>
#include <qcheckbox.h>
#include <qlabel.h>
@@ -43,6 +39,11 @@
#include <kcolorbutton.h>
#include <kcomponentdata.h>
+#include "dockwidget.h"
+
+#include "kcmweather.h"
+#include "serviceinterface.h"
+
extern "C"
{
KDE_EXPORT KCModule *create_weather( QWidget *parent, const char * )
--- trunk/KDE/kdetoys/kweather/kcmweatherservice.cpp #655575:655576
@@ -21,9 +21,6 @@
without including the source code for Qt in the source distribution.
*/
-#include "kcmweatherservice.h"
-#include "serviceconfigwidget.h"
-
#include <qlayout.h>
//Added by qt3to4:
#include <QVBoxLayout>
@@ -32,7 +29,10 @@
#include <kdebug.h>
#include <klocale.h>
#include <kcomponentdata.h>
+#include "serviceconfigwidget.h"
+#include "kcmweatherservice.h"
+
extern "C"
{
KDE_EXPORT KCModule *create_weatherservice( QWidget *parent, const char * ) {
--- trunk/KDE/kdetoys/kweather/kweather.cpp #655575:655576
@@ -16,12 +16,6 @@
* *
***************************************************************************/
-#include "kweather.h"
-#include "reportview.h"
-#include "dockwidget.h"
-#include "kweatheradaptor.h"
-#include "serviceinterface.h"
-
#include <kaboutapplicationdialog.h>
#include <kcmultidialog.h>
#include <kdebug.h>
@@ -34,6 +28,7 @@
#include <ksettings/dispatcher.h>
#include <kaboutdata.h>
+
#include <qfile.h>
#include <qtimer.h>
#include <QMouseEvent>
@@ -41,6 +36,11 @@
#include <QResizeEvent>
#include <ktoolinvocation.h>
+#include "kweather.h"
+#include "reportview.h"
+#include "dockwidget.h"
+#include "kweatheradaptor.h"
+#include "serviceinterface.h"
extern "C"
{
KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
--- trunk/KDE/kdetoys/kweather/metar_parser.cpp #655575:655576
@@ -18,14 +18,14 @@
* *
***************************************************************************/
+#include <qdatetime.h>
+#include <kdebug.h>
+#include <math.h>
+
#include "metar_parser.h"
#include "stationdatabase.h"
#include "sun.h"
-#include <qdatetime.h>
-#include <kdebug.h>
-#include <math.h>
-
// Temperature conversion macros
#define TEMP_C_TO_F(x) ( ((x) * 9/5) + 32 )
#define TEMP_F_TO_C(x) ( ((x) - 32) * 5/9 )
--- trunk/KDE/kdetoys/kweather/metar_parser_test.cpp #655575:655576
@@ -18,16 +18,17 @@
* *
****************************************************************************/
-#include "metar_parser_test.h"
-#include "stationdatabase.h"
-#include "metar_parser.h"
-
#include <qdatetime.h>
#include <qfile.h>
#include <qstringlist.h>
+
#include <QtTest/QtTest>
+#include "stationdatabase.h"
+#include "metar_parser.h"
+#include "metar_parser_test.h"
+
const int localUTCOffset = -300;
StationDatabase *MetarParserTest::stationDb = NULL;
--- trunk/KDE/kdetoys/kweather/reportview.cpp #655575:655576
@@ -15,9 +15,6 @@
* *
***************************************************************************/
-#include "reportview.h"
-#include "serviceinterface.h"
-
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kdebug.h>
@@ -31,6 +28,8 @@
#include <qpixmap.h>
#include <qapplication.h>
#include <kvbox.h>
+#include "reportview.h"
+#include "serviceinterface.h"
reportView::reportView(const QString &reportLocation)
: KDialog( 0),
--- trunk/KDE/kdetoys/kweather/serviceconfigwidget.cpp #655575:655576
@@ -17,8 +17,6 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "serviceconfigwidget.h"
-
#include <qimage.h>
#include <q3header.h>
//Added by qt3to4:
@@ -34,6 +32,7 @@
#include <kstandarddirs.h>
#include <ktoolinvocation.h>
#include <serviceinterface.h>
+#include "serviceconfigwidget.h"
class StationItem : public Q3ListViewItem
{
--- trunk/KDE/kdetoys/kweather/stationdatabase_test.cpp #655575:655576
@@ -15,15 +15,15 @@
* *
****************************************************************************/
-#include "stationdatabase_test.h"
-#include "stationdatabase.h"
-
#include <qfile.h>
#include <qstring.h>
#include <qdatetime.h>
#include <QtTest/QtTest>
+#include "stationdatabase.h"
+#include "stationdatabase_test.h"
+
StationDatabaseTest::StationDatabaseTest()
: pSDB(NULL)
{
--- trunk/KDE/kdetoys/kweather/sun.cpp #655575:655576
@@ -24,11 +24,10 @@
* *
***************************************************************************/
-#include "sun.h"
-
#include <kdebug.h>
#include <math.h>
+#include "sun.h"
/* A function to compute the number of days elapsed since 2000 Jan 0.0 */
/* (which is equal to 1999 Dec 31, 0h UT) */
--- trunk/KDE/kdetoys/kweather/sun_test.cpp #655575:655576
@@ -15,14 +15,15 @@
* *
****************************************************************************/
-#include "sun_test.h"
-#include "sun.h"
-
#include <qstring.h>
#include <qdatetime.h>
#include <QtTest/QtTest>
+#include "sun.h"
+#include "sun_test.h"
+
+
SunTest::SunTest()
: sun( "42-25N", "087-52W", QDate(2004, 6, 1), -300 )
{
--- trunk/KDE/kdetoys/kweather/weatherlib.cpp #655575:655576
@@ -15,13 +15,6 @@
* *
***************************************************************************/
-#include "weatherlib.h"
-#include "metar_parser.h"
-#include "stationdatabase.h"
-#include "sun.h"
-
-#include "weatherlib.moc"
-
#include <qfile.h>
#include <qdatetime.h>
#include <qtextstream.h>
@@ -36,6 +29,14 @@
#include <unistd.h>
#include <kpassivepopup.h>
+#include "metar_parser.h"
+#include "stationdatabase.h"
+#include "sun.h"
+#include "weatherlib.h"
+
+#include "weatherlib.moc"
+
+
class WeatherLib::Data
{
public:
--- trunk/KDE/kdetoys/kweather/weatherservice.cpp #655575:655576
@@ -19,12 +19,6 @@
Boston, MA 02110-1301, USA.
*/
-#include "weatherservice.h"
-#include "weatherlib.h"
-#include "stationdatabase.h"
-#include "sun.h"
-#include "serviceadaptor.h"
-
#include <kdebug.h>
#include <kconfig.h>
#include <kconfiggroup.h>
@@ -32,8 +26,13 @@
#include <klocale.h>
#include <kstandarddirs.h>
+#include "weatherlib.h"
+#include "weatherservice.h"
+#include "stationdatabase.h"
+#include "sun.h"
#include <QPixmap>
#include <QApplication>
+#include "serviceadaptor.h"
WeatherService::WeatherService(QObject *parent, const char *name)
: QObject (parent, name)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic