[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdetoys/kweather
From: Arto Hytönen <amthpublic () gmail ! com>
Date: 2007-09-06 22:08:10
Message-ID: 1189116490.597473.19701.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 709234 by amth:
QtModule/QClass fixes
M +5 -5 dockwidget.cpp
M +3 -4 dockwidget.h
M +6 -8 kcmweather.cpp
M +3 -2 kcmweather.h
M +3 -4 kcmweatherservice.cpp
M +7 -7 kweather.cpp
M +3 -1 metar_parser.cpp
M +3 -3 metar_parser.h
M +4 -2 reportmain.cpp
M +5 -4 reportview.cpp
M +2 -1 reportview.h
M +6 -5 serviceconfigwidget.cpp
M +27 -27 sidebarwidget.cpp
M +4 -4 stationdatabase.cpp
M +2 -2 stationdatabase.h
M +3 -2 sun.h
M +3 -5 tests/metar_parser_test.cpp
M +3 -4 tests/stationdatabase_test.cpp
M +2 -4 tests/sun_test.cpp
M +7 -6 weatherbar.cpp
M +4 -3 weatherbar.h
M +4 -5 weatherbutton.cpp
M +4 -5 weatherbutton.h
M +7 -7 weatherlib.cpp
M +5 -4 weatherlib.h
M +3 -2 weatherservice.cpp
--- trunk/KDE/kdetoys/kweather/dockwidget.cpp #709233:709234
@@ -19,15 +19,15 @@
#include "dockwidget.h"
#include "weatherbutton.h"
+#include <QtGui/QLabel>
+#include <QtCore/QTimer>
+#include <QtGui/QPixmap>
+#include <QtGui/QBoxLayout>
-#include <qlabel.h>
-#include <qtimer.h>
-#include <QPixmap>
-#include <QBoxLayout>
-
#include <kdebug.h>
#include <kglobalsettings.h>
#include <klocale.h>
+
#include "serviceinterface.h"
dockwidget::dockwidget(const QString &location, QWidget *parent)
--- trunk/KDE/kdetoys/kweather/dockwidget.h #709233:709234
@@ -18,11 +18,10 @@
#ifndef DOCKWIDGET_H
#define DOCKWIDGET_H
-#include <qfont.h>
-#include <qpixmap.h>
-#include <qwidget.h>
+#include <QtGui/QFont>
+#include <QtGui/QPixmap>
+#include <QtGui/QWidget>
-
class QLabel;
class WeatherButton;
class OrgKdeKweatherServiceInterface;
--- trunk/KDE/kdetoys/kweather/kcmweather.cpp #709233:709234
@@ -21,13 +21,12 @@
without including the source code for Qt in the source distribution.
*/
-#include <q3buttongroup.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-//Added by qt3to4:
-#include <QVBoxLayout>
-#include <QFocusEvent>
+#include <Qt3Support/Q3ButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QFocusEvent>
#include <kaboutdata.h>
#include <kconfig.h>
@@ -40,7 +39,6 @@
#include <kcomponentdata.h>
#include "dockwidget.h"
-
#include "kcmweather.h"
#include "serviceinterface.h"
--- trunk/KDE/kdetoys/kweather/kcmweather.h #709233:709234
@@ -24,8 +24,9 @@
#define KCMWEATHER_H
#include <kcmodule.h>
-//Added by qt3to4:
-#include <QFocusEvent>
+
+#include <QtGui/QFocusEvent>
+
#include "ui_prefdialogdata.h"
class OrgKdeKweatherServiceInterface;
--- trunk/KDE/kdetoys/kweather/kcmweatherservice.cpp #709233:709234
@@ -21,16 +21,15 @@
without including the source code for Qt in the source distribution.
*/
-#include <qlayout.h>
-//Added by qt3to4:
-#include <QVBoxLayout>
+#include <QtGui/QLayout>
+#include <QtGui/QVBoxLayout>
#include <kaboutdata.h>
#include <kdebug.h>
#include <klocale.h>
#include <kcomponentdata.h>
-#include "serviceconfigwidget.h"
+#include "serviceconfigwidget.h"
#include "kcmweatherservice.h"
extern "C"
--- trunk/KDE/kdetoys/kweather/kweather.cpp #709233:709234
@@ -27,20 +27,20 @@
#include <ksettings/dialog.h>
#include <ksettings/dispatcher.h>
#include <kaboutdata.h>
+#include <ktoolinvocation.h>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
+#include <QtGui/QMouseEvent>
+#include <QtCore/QTextStream>
+#include <QtGui/QResizeEvent>
-#include <qfile.h>
-#include <qtimer.h>
-#include <QMouseEvent>
-#include <QTextStream>
-#include <QResizeEvent>
-#include <ktoolinvocation.h>
-
#include "kweather.h"
#include "reportview.h"
#include "dockwidget.h"
#include "kweatheradaptor.h"
#include "serviceinterface.h"
+
extern "C"
{
KDE_EXPORT K3PanelApplet* init(QWidget *parent, const QString& configFile)
--- trunk/KDE/kdetoys/kweather/metar_parser.cpp #709233:709234
@@ -18,8 +18,10 @@
* *
***************************************************************************/
-#include <qdatetime.h>
+#include <QtCore/QDateTime>
+
#include <kdebug.h>
+
#include <math.h>
#include "metar_parser.h"
--- trunk/KDE/kdetoys/kweather/metar_parser.h #709233:709234
@@ -22,9 +22,9 @@
#include <klocale.h>
#include <kdatetime.h>
-#include <qdatetime.h>
-#include <qregexp.h>
-#include <qstringlist.h>
+#include <QtCore/QDateTime>
+#include <QtCore/QRegExp>
+#include <QtCore/QStringList>
class StationDatabase;
--- trunk/KDE/kdetoys/kweather/reportmain.cpp #709233:709234
@@ -29,8 +29,10 @@
#include <kglobal.h>
#include <klocale.h>
#include <ktoolinvocation.h>
-#include <QDBusConnection>
-#include <QDBusConnectionInterface>
+
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusConnectionInterface>
+
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData("reportview", 0, ki18n("Weather Report"),
--- trunk/KDE/kdetoys/kweather/reportview.cpp #709233:709234
@@ -24,11 +24,12 @@
#include <khtmlview.h>
#include <kglobalsettings.h>
#include <kcolorscheme.h>
-#include <QScrollArea>
+#include <kvbox.h>
-#include <qpixmap.h>
-#include <qapplication.h>
-#include <kvbox.h>
+#include <QtGui/QScrollArea>
+#include <QtGui/QPixmap>
+#include <QtGui/QApplication>
+
#include "reportview.h"
#include "serviceinterface.h"
--- trunk/KDE/kdetoys/kweather/reportview.h #709233:709234
@@ -19,8 +19,9 @@
#define REPORTVIEW_H
#include <kdialog.h>
-#include <qstringlist.h>
+#include <QtCore/QStringList>
+
class OrgKdeKweatherServiceInterface;
class KHTMLPart;
--- trunk/KDE/kdetoys/kweather/serviceconfigwidget.cpp #709233:709234
@@ -17,11 +17,10 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qimage.h>
-#include <q3header.h>
-//Added by qt3to4:
-#include <QPixmap>
-#include <QByteArray>
+#include <QtGui/QImage>
+#include <Qt3Support/Q3Header>
+#include <QtGui/QPixmap>
+#include <QtCore/QByteArray>
#include <kconfig.h>
#include <kdialog.h>
@@ -31,7 +30,9 @@
#include <kpushbutton.h>
#include <kstandarddirs.h>
#include <ktoolinvocation.h>
+
#include <serviceinterface.h>
+
#include "serviceconfigwidget.h"
class StationItem : public Q3ListViewItem
--- trunk/KDE/kdetoys/kweather/sidebarwidget.cpp #709233:709234
@@ -1,4 +1,4 @@
- /*
+/*
* This file is part of the KDE project
* Copyright (C) 2002 Ian Reinhart Geiser <geiseri@kde.org>
*
@@ -18,32 +18,32 @@
*
* $Id$
*/
-
- #include "sidebarwidget.h"
- #include <q3scrollview.h>
-
- sidebarwidget::sidebarwidget(QWidget* parent, const char* name) :
- sidebarwidgetbase(parent,name)
- {
- view = new KVBox(reportGrid->viewport());
- reportGrid->addChild(view);
- reportGrid->setResizePolicy(Q3ScrollView::AutoOneFit);
- }
-
- sidebarwidget::~sidebarwidget()
- {
+
+#include "sidebarwidget.h"
+
+#include <Qt3Support/Q3ScrollView>
+
+sidebarwidget::sidebarwidget(QWidget* parent, const char* name) :
+ sidebarwidgetbase(parent,name)
+{
+ view = new KVBox(reportGrid->viewport());
+ reportGrid->addChild(view);
+ reportGrid->setResizePolicy(Q3ScrollView::AutoOneFit);
+}
+
+sidebarwidget::~sidebarwidget()
+{
+
+}
- }
-
- void sidebarwidget::addWidget(QWidget *w, const QString &s)
- {
- w->setFixedWidth(reportGrid->visibleWidth ());
- }
-
- QWidget *sidebarwidget::viewport()
- {
- return view;
- }
+void sidebarwidget::addWidget(QWidget *w, const QString &s)
+{
+ w->setFixedWidth(reportGrid->visibleWidth ());
+}
+QWidget *sidebarwidget::viewport()
+{
+ return view;
+}
+
#include "sidebarwidget.moc"
-
--- trunk/KDE/kdetoys/kweather/stationdatabase.cpp #709233:709234
@@ -14,10 +14,10 @@
#include "stationdatabase.h"
-#include <qstringlist.h>
-#include <qfile.h>
-//Added by qt3to4:
-#include <QTextStream>
+#include <QtCore/QStringList>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+
#include <kdebug.h>
#if 0
--- trunk/KDE/kdetoys/kweather/stationdatabase.h #709233:709234
@@ -14,8 +14,8 @@
#ifndef STATIONDATABASE_H
#define STATIONDATABASE_H
-#include <qmap.h>
-#include <qstring.h>
+#include <QtCore/QMap>
+#include <QtCore/QString>
#include <klocale.h>
#include <kstandarddirs.h>
--- trunk/KDE/kdetoys/kweather/sun.h #709233:709234
@@ -18,8 +18,9 @@
#ifndef SUN_H
#define SUN_H
-#include <qstring.h>
-#include <qdatetime.h>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
+
#include <kdatetime.h>
class Sun
--- trunk/KDE/kdetoys/kweather/tests/metar_parser_test.cpp #709233:709234
@@ -18,11 +18,9 @@
* *
****************************************************************************/
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qstringlist.h>
-
-
+#include <QtCore/QDteTime>
+#include <QtCore/QFile>
+#include <QtCore/QStringList>
#include <QtTest/QtTest>
#include "stationdatabase.h"
--- trunk/KDE/kdetoys/kweather/tests/stationdatabase_test.cpp #709233:709234
@@ -15,10 +15,9 @@
* *
****************************************************************************/
-#include <qfile.h>
-#include <qstring.h>
-#include <qdatetime.h>
-
+#include <QtCore/QFile>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
#include <QtTest/QtTest>
#include "stationdatabase.h"
--- trunk/KDE/kdetoys/kweather/tests/sun_test.cpp #709233:709234
@@ -15,15 +15,13 @@
* *
****************************************************************************/
-#include <qstring.h>
-#include <qdatetime.h>
-
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
#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/weatherbar.cpp #709233:709234
@@ -23,19 +23,20 @@
#include "dockwidget.h"
#include "sidebarwidget.h"
-#include <qlabel.h>
-#include <qfont.h>
-#include <qlayout.h>
-#include <q3scrollview.h>
-#include <q3groupbox.h>
+#include <QtGui/QLabel>
+#include <QtGui/QFont>
+#include <QtGui/QLayout>
+#include <Qt3Support/Q3ScrollView>
+#include <Qt3Support/Q3GroupBox>
+
#include <klocale.h>
#include <kdebug.h>
#include <kconfig.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
+
#include <dcopref.h>
-
KonqSidebarWeather::KonqSidebarWeather(const KComponentData &inst, QObject* parent,
QWidget* widgetParent,
QString& desktopName, const char* name)
--- trunk/KDE/kdetoys/kweather/weatherbar.h #709233:709234
@@ -26,10 +26,11 @@
#include <kparts/part.h>
#include <kparts/factory.h>
#include <kparts/browserextension.h>
-#include <q3dict.h>
-#include <qlayout.h>
-#include <qtimer.h>
+#include <Qt3Support/Q3Dict>
+#include <QtGui/QLayout>
+#include <QtCore/QTimer>
+
class dockwidget;
class sidebarwidget;
--- trunk/KDE/kdetoys/kweather/weatherbutton.cpp #709233:709234
@@ -19,11 +19,10 @@
#include "weatherbutton.h"
-#include <qpainter.h>
-//Added by qt3to4:
-#include <QPixmap>
-#include <QResizeEvent>
-#include <QEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QResizeEvent>
+#include <QtCore/QEvent>
#include <kcursor.h>
#include <kglobalsettings.h>
--- trunk/KDE/kdetoys/kweather/weatherbutton.h #709233:709234
@@ -20,11 +20,10 @@
#ifndef WEATHERBUTTON_H
#define WEATHERBUTTON_H
-#include <q3button.h>
-#include <qpixmap.h>
-//Added by qt3to4:
-#include <QResizeEvent>
-#include <QEvent>
+#include <Qt3Support/Q3Button>
+#include <QtGui/QPixmap>
+#include <QtGui/QResizeEvent>
+#include <QtCore/QEvent>
class WeatherButton : public Q3Button
{
--- trunk/KDE/kdetoys/kweather/weatherlib.cpp #709233:709234
@@ -15,28 +15,28 @@
* *
***************************************************************************/
-#include <qfile.h>
-#include <qdatetime.h>
-#include <qtextstream.h>
+#include <QtCore/QFile>
+#include <QtCore/QDateTime>
+#include <QtCore/QTextStream>
+
+#include <math.h>
+#include <unistd.h>
+
#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>
-#include <math.h>
#include <kdatetime.h>
#include <kio/job.h>
#include <kurl.h>
#include <ktemporaryfile.h>
-#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/weatherlib.h #709233:709234
@@ -17,11 +17,12 @@
#ifndef WEATHERLIB_H
#define WEATHERLIB_H
-#include <qobject.h>
-#include <qstring.h>
-#include <qregexp.h>
-#include <q3dict.h>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QRegExp>
+#include <Qt3Support/Q3Dict>
+
class KJob;
namespace KIO
{
--- trunk/KDE/kdetoys/kweather/weatherservice.cpp #709233:709234
@@ -26,12 +26,13 @@
#include <klocale.h>
#include <kstandarddirs.h>
+#include <QtGui/QPixmap>
+#include <QtGui/QApplication>
+
#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)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic