From 49f9b290287ed4df63901c5912ddbb3c1ae5d515 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdetoys@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kweather/dockwidget.cpp | 4 ++-- kweather/dockwidget.h | 2 +- kweather/kcmweather.cpp | 8 ++++---- kweather/kcmweather.h | 2 +- kweather/kcmweatherservice.cpp | 8 ++++---- kweather/kcmweatherservice.h | 2 +- kweather/kweather.cpp | 8 ++++---- kweather/kweather.h | 2 +- kweather/reportview.cpp | 2 +- kweather/serviceconfigwidget.cpp | 4 ++-- kweather/serviceconfigwidget.h | 2 +- kweather/sidebarwidget.cpp | 4 ++-- kweather/sidebarwidget.h | 2 +- kweather/sun.cpp | 4 ++-- kweather/weatherbar.cpp | 4 ++-- kweather/weatherbar.h | 2 +- kweather/weatherbutton.cpp | 4 ++-- kweather/weatherbutton.h | 2 +- kweather/weatherlib.cpp | 4 ++-- kweather/weatherlib.h | 2 +- kweather/weatherservice.cpp | 2 +- kweather/weatherservice.h | 2 +- 22 files changed, 38 insertions(+), 38 deletions(-) (limited to 'kweather') diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp index 6005315..04576b1 100644 --- a/kweather/dockwidget.cpp +++ b/kweather/dockwidget.cpp @@ -30,8 +30,8 @@ #include #include -dockwidget::dockwidget(const TQString &location, TQWidget *tqparent, - const char *name) : TQWidget(tqparent,name), m_locationCode( location ), m_orientation(Qt::Horizontal ) +dockwidget::dockwidget(const TQString &location, TQWidget *parent, + const char *name) : TQWidget(parent,name), m_locationCode( location ), m_orientation(Qt::Horizontal ) { m_font = KGlobalSettings::generalFont(); setBackgroundOrigin( AncestorOrigin ); diff --git a/kweather/dockwidget.h b/kweather/dockwidget.h index 72c1a43..54ce388 100644 --- a/kweather/dockwidget.h +++ b/kweather/dockwidget.h @@ -34,7 +34,7 @@ class dockwidget : public TQWidget TQ_OBJECT public: - dockwidget(const TQString &location, TQWidget *tqparent=0, const char *name=0); + dockwidget(const TQString &location, TQWidget *parent=0, const char *name=0); ~dockwidget(); enum {ShowIconOnly=1, ShowTempOnly=2, ShowAll=3 }; diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp index 7388dc8..d49d3a0 100644 --- a/kweather/kcmweather.cpp +++ b/kweather/kcmweather.cpp @@ -43,14 +43,14 @@ extern "C" { - KDE_EXPORT KCModule *create_weather( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_weather( TQWidget *parent, const char * ) { - return new KCMWeather( tqparent, "kweather" ); + return new KCMWeather( parent, "kweather" ); } } -KCMWeather::KCMWeather( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMWeather::KCMWeather( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { mWeatherService = new WeatherService_stub( "KWeatherService", "WeatherService" ); diff --git a/kweather/kcmweather.h b/kweather/kcmweather.h index 8a836f1..d5ef450 100644 --- a/kweather/kcmweather.h +++ b/kweather/kcmweather.h @@ -33,7 +33,7 @@ class KCMWeather : public KCModule TQ_OBJECT public: - KCMWeather( TQWidget *tqparent = 0, const char *name = 0 ); + KCMWeather( TQWidget *parent = 0, const char *name = 0 ); ~KCMWeather(); virtual void load(); diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp index 834d77a..db8325d 100644 --- a/kweather/kcmweatherservice.cpp +++ b/kweather/kcmweatherservice.cpp @@ -33,13 +33,13 @@ extern "C" { - KDE_EXPORT KCModule *create_weatherservice( TQWidget *tqparent, const char * ) { - return new KCMWeatherService( tqparent, "kweather" ); + KDE_EXPORT KCModule *create_weatherservice( TQWidget *parent, const char * ) { + return new KCMWeatherService( parent, "kweather" ); } } -KCMWeatherService::KCMWeatherService( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mWidget = new ServiceConfigWidget( this ); diff --git a/kweather/kcmweatherservice.h b/kweather/kcmweatherservice.h index bd5075e..cbd5949 100644 --- a/kweather/kcmweatherservice.h +++ b/kweather/kcmweatherservice.h @@ -34,7 +34,7 @@ class KCMWeatherService : public KCModule TQ_OBJECT public: - KCMWeatherService( TQWidget *tqparent = 0, const char *name = 0 ); + KCMWeatherService( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index d65be55..9b8c481 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -40,18 +40,18 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kweather"); kweather *theApplet = new kweather(configFile, KPanelApplet::Normal, - 0, tqparent, "kweather"); + 0, parent, "kweather"); return theApplet; } } kweather::kweather(const TQString& configFile, Type t, int actions, - TQWidget *tqparent, const char *name): - KPanelApplet(configFile, t, actions, tqparent, name), weatherIface(), + TQWidget *parent, const char *name): + KPanelApplet(configFile, t, actions, parent, name), weatherIface(), mFirstRun( false ), mReport( 0 ), mClient( 0 ), mContextMenu( 0 ), mWeatherService( 0 ), settingsDialog( 0 ), mTextColor(TQt::black) { diff --git a/kweather/kweather.h b/kweather/kweather.h index 70f0a44..79c1bfe 100644 --- a/kweather/kweather.h +++ b/kweather/kweather.h @@ -36,7 +36,7 @@ class kweather : public KPanelApplet, public weatherIface TQ_OBJECT public: - kweather(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *tqparent = 0, const char *name = 0); + kweather(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = 0, const char *name = 0); ~kweather(); void help(); void resizeEvent(TQResizeEvent*); diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp index bba90cf..f25df19 100644 --- a/kweather/reportview.cpp +++ b/kweather/reportview.cpp @@ -55,7 +55,7 @@ reportView::reportView(const TQString &reportLocation) reportView::~reportView(){ delete m_weatherService; // we do not have to delete m_reportView because this class is - // the tqparent of the TQVBox, and that is the tqparent of the KHTMLPart. + // the parent of the TQVBox, and that is the parent of the KHTMLPart. KConfig config( "weather_panelappletrc" ); config.setGroup( "General Options" ); diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp index 52f5e25..08a3b51 100644 --- a/kweather/serviceconfigwidget.cpp +++ b/kweather/serviceconfigwidget.cpp @@ -55,8 +55,8 @@ class StationItem : public TQListViewItem static void parseStationEntry( const TQString &line, TQString &name, TQString &uid ); -ServiceConfigWidget::ServiceConfigWidget( TQWidget *tqparent, const char *name ) - : wsPrefs( tqparent, name ), mService(0) +ServiceConfigWidget::ServiceConfigWidget( TQWidget *parent, const char *name ) + : wsPrefs( parent, name ), mService(0) { mService = new WeatherService_stub( "KWeatherService", "WeatherService" ); connect( mAllStations, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQT_SLOT( addStation() ) ); diff --git a/kweather/serviceconfigwidget.h b/kweather/serviceconfigwidget.h index 3f65194..01625fe 100644 --- a/kweather/serviceconfigwidget.h +++ b/kweather/serviceconfigwidget.h @@ -31,7 +31,7 @@ class ServiceConfigWidget : public wsPrefs TQ_OBJECT public: - ServiceConfigWidget( TQWidget *tqparent, const char *name = 0 ); + ServiceConfigWidget( TQWidget *parent, const char *name = 0 ); virtual ~ServiceConfigWidget(); signals: diff --git a/kweather/sidebarwidget.cpp b/kweather/sidebarwidget.cpp index 0ef9e30..0a7c080 100644 --- a/kweather/sidebarwidget.cpp +++ b/kweather/sidebarwidget.cpp @@ -22,8 +22,8 @@ #include "sidebarwidget.h" #include - sidebarwidget::sidebarwidget(TQWidget* tqparent, const char* name) : - sidebarwidgetbase(tqparent,name) + sidebarwidget::sidebarwidget(TQWidget* parent, const char* name) : + sidebarwidgetbase(parent,name) { view = new TQVBox(reportGrid->viewport()); reportGrid->addChild(view); diff --git a/kweather/sidebarwidget.h b/kweather/sidebarwidget.h index c917452..383e145 100644 --- a/kweather/sidebarwidget.h +++ b/kweather/sidebarwidget.h @@ -31,7 +31,7 @@ class sidebarwidget : public sidebarwidgetbase Q_OBJECT TQ_OBJECT public: - sidebarwidget(TQWidget* tqparent, const char* name = 0); + sidebarwidget(TQWidget* parent, const char* name = 0); virtual ~sidebarwidget(); void addWidget(TQWidget *w, const TQString &s); TQWidget *viewport(); diff --git a/kweather/sun.cpp b/kweather/sun.cpp index 43809cb..8cabdb9 100644 --- a/kweather/sun.cpp +++ b/kweather/sun.cpp @@ -282,7 +282,7 @@ static int __sunriset__( int year, int month, int day, double lon, double lat, double sr; /* Solar distance, astronomical units */ double sRA; /* Sun's Right Ascension */ double sdec; /* Sun's declination */ - double sradius; /* Sun's aptqparent radius */ + double sradius; /* Sun's apparent radius */ double t; /* Diurnal arc */ double tsouth; /* Time when Sun is at south */ double sidtime; /* Local sidereal time */ @@ -303,7 +303,7 @@ static int __sunriset__( int year, int month, int day, double lon, double lat, /* Compute time when Sun is at south - in hours UT */ tsouth = 12.0 - rev180(sidtime - sRA) / 15.0; - /* Compute the Sun's aptqparent radius, degrees */ + /* Compute the Sun's apparent radius, degrees */ sradius = 0.2666 / sr; /* Do correction to upper limb, if necessary */ diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp index 540e912..c77333d 100644 --- a/kweather/weatherbar.cpp +++ b/kweather/weatherbar.cpp @@ -36,11 +36,11 @@ #include -KonqSidebarWeather::KonqSidebarWeather(KInstance* inst, TQObject* tqparent, +KonqSidebarWeather::KonqSidebarWeather(KInstance* inst, TQObject* parent, TQWidget* widgetParent, TQString& desktopName, const char* name) - : KonqSidebarPlugin(inst, tqparent, widgetParent, desktopName, name), + : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name), DCOPObject(name) { diff --git a/kweather/weatherbar.h b/kweather/weatherbar.h index cd8cb47..0d00c13 100644 --- a/kweather/weatherbar.h +++ b/kweather/weatherbar.h @@ -40,7 +40,7 @@ class KonqSidebarWeather: public KonqSidebarPlugin, virtual public DCOPObject TQ_OBJECT K_DCOP public: - KonqSidebarWeather(KInstance* inst, TQObject* tqparent, TQWidget* widgetParent, + KonqSidebarWeather(KInstance* inst, TQObject* parent, TQWidget* widgetParent, TQString& desktopName_, const char* name = 0); ~KonqSidebarWeather(); diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp index cc3c145..ceb4360 100644 --- a/kweather/weatherbutton.cpp +++ b/kweather/weatherbutton.cpp @@ -29,8 +29,8 @@ #include #include -WeatherButton::WeatherButton( TQWidget *tqparent, const char *name ) - : TQButton( tqparent, name ), m_highlight( false ) +WeatherButton::WeatherButton( TQWidget *parent, const char *name ) + : TQButton( parent, name ), m_highlight( false ) { setBackgroundOrigin( AncestorOrigin ); diff --git a/kweather/weatherbutton.h b/kweather/weatherbutton.h index fd060fe..4f1eb52 100644 --- a/kweather/weatherbutton.h +++ b/kweather/weatherbutton.h @@ -29,7 +29,7 @@ class WeatherButton : public TQButton TQ_OBJECT public: - WeatherButton( TQWidget *tqparent, const char *name ); + WeatherButton( TQWidget *parent, const char *name ); void setPixmap( const TQPixmap &pix ); protected: diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp index 1fee670..40eab31 100644 --- a/kweather/weatherlib.cpp +++ b/kweather/weatherlib.cpp @@ -77,8 +77,8 @@ void WeatherLib::Data::clear() } } -WeatherLib::WeatherLib(StationDatabase *stationDB, TQObject *tqparent, const char *name) - : TQObject (tqparent, name) +WeatherLib::WeatherLib(StationDatabase *stationDB, TQObject *parent, const char *name) + : TQObject (parent, name) { KGlobal::locale()->insertCatalogue("kweather"); diff --git a/kweather/weatherlib.h b/kweather/weatherlib.h index b745b26..88957c0 100644 --- a/kweather/weatherlib.h +++ b/kweather/weatherlib.h @@ -37,7 +37,7 @@ class WeatherLib : public TQObject public: class Data; - WeatherLib(StationDatabase *stationDB, TQObject *tqparent =0L, const char *name =0L); + WeatherLib(StationDatabase *stationDB, TQObject *parent =0L, const char *name =0L); virtual ~WeatherLib(); TQString temperature(const TQString &stationID); diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp index c45315f..da179b6 100644 --- a/kweather/weatherservice.cpp +++ b/kweather/weatherservice.cpp @@ -31,7 +31,7 @@ #include "stationdatabase.h" #include "sun.h" -WeatherService::WeatherService(TQObject *tqparent, const char *name) : TQObject (tqparent, name), DCOPObject("WeatherService") +WeatherService::WeatherService(TQObject *parent, const char *name) : TQObject (parent, name), DCOPObject("WeatherService") { kdDebug(12006) << "Starting new service... " << endl; diff --git a/kweather/weatherservice.h b/kweather/weatherservice.h index 81235cd..deae981 100644 --- a/kweather/weatherservice.h +++ b/kweather/weatherservice.h @@ -44,7 +44,7 @@ class WeatherService : public TQObject, public DCOPObject void slotStationRemoved(const TQString &stationID); public: - WeatherService(TQObject *tqparent, const char *name); + WeatherService(TQObject *parent, const char *name); ~WeatherService(); k_dcop_signals: -- cgit v1.2.3