From 59d26af15be9b541ef6d6ed7471d7660ffad2967 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:42:35 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- amor/amor.cpp | 26 +++++++++++++------------- amor/amoranim.cpp | 6 +++--- amor/amorbubble.cpp | 2 +- amor/amordialog.cpp | 2 +- amor/amorpm.cpp | 4 ++-- amor/amorwidget.cpp | 4 ++-- amor/main.cpp | 2 +- eyesapplet/eyes.h | 2 +- fifteenapplet/fifteenapplet.cpp | 6 +++--- fifteenapplet/fifteenapplet.h | 4 ++-- fifteenapplet/qttableview.cpp | 10 +++++----- fifteenapplet/qttableview.h | 6 +++--- kmoon/kmoonapplet.cpp | 6 +++--- kmoon/kmoonapplet.h | 2 +- kmoon/kmoonwidget.cpp | 8 ++++---- kmoon/kmoonwidget.h | 2 +- kodo/kimagenumber.h | 2 +- kodo/kodometer.h | 2 +- kodo/main.cpp | 4 ++-- kteatime/main.cpp | 4 ++-- kteatime/timeedit.h | 4 ++-- kteatime/toplevel.cpp | 10 +++++----- ktux/sprite.cpp | 2 +- ktux/spriteanim.cpp | 2 +- ktux/spritepm.cpp | 6 +++--- kweather/dockwidget.h | 2 +- kweather/kcmweatherapplet.cpp | 4 ++-- kweather/kcmweatherapplet.h | 2 +- kweather/kcmweatherservice.cpp | 4 ++-- kweather/kcmweatherservice.h | 2 +- kweather/kcmweatherstations.cpp | 4 ++-- kweather/kcmweatherstations.h | 2 +- kweather/kweather.cpp | 12 ++++++------ kweather/kweather.h | 2 +- kweather/reportmain.cpp | 2 +- kweather/sidebarwidget.cpp | 6 +++--- kweather/sidebarwidget.h | 2 +- kweather/stationsconfigwidget.cpp | 8 ++++---- kweather/stationsconfigwidget.h | 2 +- kweather/weather_icon.cpp | 4 ++-- kweather/weatherbar.cpp | 6 +++--- kweather/weatherbar.h | 2 +- kweather/weatherlib.cpp | 18 +++++++++--------- kweather/weatherlib.h | 2 +- kworldwatch/applet.h | 2 +- kworldwatch/cities.cpp | 2 +- kworldwatch/flags.cpp | 4 ++-- kworldwatch/flow.cpp | 8 ++++---- kworldwatch/flow.h | 6 +++--- kworldwatch/main.cpp | 8 ++++---- kworldwatch/main.h | 2 +- kworldwatch/mapwidget.cpp | 8 ++++---- kworldwatch/mapwidget.h | 2 +- kworldwatch/zoneclock.cpp | 8 ++++---- kworldwatch/zoneclock.h | 4 ++-- 55 files changed, 134 insertions(+), 134 deletions(-) diff --git a/amor/amor.cpp b/amor/amor.cpp index 249d831..d983283 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -122,15 +122,15 @@ QueueItem::QueueItem(itemType ty, TQString te, int ti) // Amor::Amor() : DCOPObject( "AmorIface" ), TQObject() { - mAmor = 0; - mBubble = 0; + mAmor = nullptr; + mBubble = nullptr; mForceHideAmorWidget = false; if (readConfig()) { mTargetWin = 0; mNextTarget = 0; - mAmorDialog = 0; - mMenu = 0; + mAmorDialog = nullptr; + mMenu = nullptr; mCurrAnim = mBaseAnim; mPosition = mCurrAnim->hotspot().x(); mState = Normal; @@ -275,7 +275,7 @@ void Amor::reset() { hideBubble(); - mAmor->setPixmap(0L); // get rid of your old copy of the pixmap + mAmor->setPixmap(nullptr); // get rid of your old copy of the pixmap AmorPixmapManager::manager()->reset(); mTips.reset(); @@ -322,21 +322,21 @@ bool Amor::readConfig() // read selected theme if (!mTheme.setTheme(mConfig.mTheme)) { - KMessageBox::error(0, i18n("Error reading theme: ") + mConfig.mTheme); + KMessageBox::error(nullptr, i18n("Error reading theme: ") + mConfig.mTheme); return false; } if ( !mTheme.isStatic() ) { const char *groups[] = { ANIM_BASE, ANIM_NORMAL, ANIM_FOCUS, ANIM_BLUR, - ANIM_DESTROY, ANIM_SLEEP, ANIM_WAKE, 0 }; + ANIM_DESTROY, ANIM_SLEEP, ANIM_WAKE, nullptr }; // Read all the standard animation groups for (int i = 0; groups[i]; i++) { if (mTheme.readGroup(groups[i]) == false) { - KMessageBox::error(0, i18n("Error reading group: ") + groups[i]); + KMessageBox::error(nullptr, i18n("Error reading group: ") + groups[i]); return false; } } @@ -345,7 +345,7 @@ bool Amor::readConfig() { if ( mTheme.readGroup( ANIM_BASE ) == false ) { - KMessageBox::error(0, i18n("Error reading group: ") + ANIM_BASE); + KMessageBox::error(nullptr, i18n("Error reading group: ") + ANIM_BASE); return false; } } @@ -410,7 +410,7 @@ void Amor::hideBubble(bool forceDequeue) mTipsQueue.dequeue(); delete mBubble; - mBubble = 0; + mBubble = nullptr; } } @@ -606,7 +606,7 @@ void Amor::slotMouseClicked(const TQPoint &pos) if (!mMenu) { - KHelpMenu* help = new KHelpMenu(0, TDEGlobal::instance()->aboutData(), false); + KHelpMenu* help = new KHelpMenu(nullptr, TDEGlobal::instance()->aboutData(), false); TDEPopupMenu* helpMnu = help->menu(); mMenu = new TDEPopupMenu(); mMenu->insertTitle("Amor"); // I really don't want this i18n'ed @@ -632,7 +632,7 @@ void Amor::slotCursorTimeout() { TQPoint currPos = TQCursor::pos(); TQPoint diff = currPos - mCursPos; - time_t now = time(0); + time_t now = time(nullptr); if (mForceHideAmorWidget) return; // we're hidden, do nothing @@ -754,7 +754,7 @@ void Amor::slotAbout() i18n("Original Author: Martin R. Jones \n") + i18n("Current Maintainer: Gerardo Puga \n" ) + "\nhttp://www.powerup.com.au/~mjones/amor/"; - KMessageBox::about(0, about, i18n("About Amor")); + KMessageBox::about(nullptr, about, i18n("About Amor")); } //--------------------------------------------------------------------------- diff --git a/amor/amoranim.cpp b/amor/amoranim.cpp index b8e67fd..4c167f3 100644 --- a/amor/amoranim.cpp +++ b/amor/amoranim.cpp @@ -56,7 +56,7 @@ AmorAnim::~AmorAnim() // const TQPixmap *AmorAnim::frame() { - const TQPixmap *pixmap = 0; + const TQPixmap *pixmap = nullptr; if (validFrame()) pixmap = AmorPixmapManager::manager()->pixmap(*mSequence.at(mCurrent)); @@ -134,7 +134,7 @@ void AmorAnim::readConfig(TDEConfigBase &config) AmorThemeManager::AmorThemeManager() : mMaximumSize(0, 0) { - mConfig = 0; + mConfig = nullptr; mAnimations.setAutoDelete(true); } @@ -202,7 +202,7 @@ AmorAnim *AmorThemeManager::random(const TQString & group) return animGroup->at( idx ); } - return 0; + return nullptr; } //--------------------------------------------------------------------------- diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp index dc2b383..a6aefdd 100644 --- a/amor/amorbubble.cpp +++ b/amor/amorbubble.cpp @@ -45,7 +45,7 @@ // Constructor // AmorBubble::AmorBubble() - : TQWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ) + : TQWidget(nullptr, nullptr, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ) { mOriginX = 0; mOriginY = 0; diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp index ad5d3a2..bcc3c15 100644 --- a/amor/amordialog.cpp +++ b/amor/amordialog.cpp @@ -43,7 +43,7 @@ // Constructor // AmorDialog::AmorDialog() - : KDialogBase(0, "amordlg", false, i18n("Options"), Ok|Apply|Cancel, Ok ) + : KDialogBase(nullptr, "amordlg", false, i18n("Options"), Ok|Apply|Cancel, Ok ) { mConfig.read(); TQVBox *mainwidget = makeVBoxMainWidget(); diff --git a/amor/amorpm.cpp b/amor/amorpm.cpp index 75a87b3..b72964d 100644 --- a/amor/amorpm.cpp +++ b/amor/amorpm.cpp @@ -27,7 +27,7 @@ #include "amorpm.h" // static -AmorPixmapManager *AmorPixmapManager::mManager = 0; +AmorPixmapManager *AmorPixmapManager::mManager = nullptr; //--------------------------------------------------------------------------- // @@ -71,7 +71,7 @@ const TQPixmap *AmorPixmapManager::load(const TQString & img) else { delete pixmap; - pixmap = 0; + pixmap = nullptr; } } diff --git a/amor/amorwidget.cpp b/amor/amorwidget.cpp index c60cd5d..2eb082a 100644 --- a/amor/amorwidget.cpp +++ b/amor/amorwidget.cpp @@ -35,8 +35,8 @@ // Constructor // AmorWidget::AmorWidget() - : TQWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ), - mPixmap(0) + : TQWidget(nullptr, nullptr, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ), + mPixmap(nullptr) { setBackgroundMode( NoBackground ); dragging = false; diff --git a/amor/main.cpp b/amor/main.cpp index 27783c1..7099622 100644 --- a/amor/main.cpp +++ b/amor/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) TDEAboutData aboutData( "amor", I18N_NOOP("amor"), AMOR_VERSION, description, TDEAboutData::License_GPL, "(c) 1999, Martin R. Jones"); - aboutData.addAuthor("Martin R. Jones",0, "mjones@kde.org"); + aboutData.addAuthor("Martin R. Jones",nullptr, "mjones@kde.org"); aboutData.addAuthor("Gerardo Puga", I18N_NOOP("Current maintainer"), "gpuga@gioia.ing.unlp.edu.ar"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/eyesapplet/eyes.h b/eyesapplet/eyes.h index d5cc291..37f6208 100644 --- a/eyesapplet/eyes.h +++ b/eyesapplet/eyes.h @@ -29,7 +29,7 @@ class EyesApplet : public KPanelApplet public: EyesApplet(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); int widthForHeight(int height) const; int heightForWidth(int width) const; diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp index 33de0bb..78d002b 100644 --- a/fifteenapplet/fifteenapplet.cpp +++ b/fifteenapplet/fifteenapplet.cpp @@ -49,7 +49,7 @@ extern "C" FifteenApplet::FifteenApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name), _aboutData(0) + : KPanelApplet(configFile, type, actions, parent, name), _aboutData(nullptr) { // setup table _table = new PiecesTable(this); @@ -59,7 +59,7 @@ FifteenApplet::FifteenApplet(const TQString& configFile, Type type, int actions, TQHBoxLayout *_layout = new TQHBoxLayout(this); _layout->add(_table); - srand(time(0)); + srand(time(nullptr)); } int FifteenApplet::widthForHeight(int h) const @@ -81,7 +81,7 @@ void FifteenApplet::about() "Select \"Randomize Pieces\" from the right mouse button menu\n" "to start a game."), TDEAboutData::License_BSD, "(c) 2001, Matthias Elter"); - _aboutData->addAuthor("Matthias Elter", 0, "elter@kde.org"); + _aboutData->addAuthor("Matthias Elter", nullptr, "elter@kde.org"); } TDEAboutApplication dialog(_aboutData); diff --git a/fifteenapplet/fifteenapplet.h b/fifteenapplet/fifteenapplet.h index 15fdc65..3d0451e 100644 --- a/fifteenapplet/fifteenapplet.h +++ b/fifteenapplet/fifteenapplet.h @@ -38,7 +38,7 @@ class PiecesTable : public QtTableView public: - PiecesTable(TQWidget* parent = 0, const char* name = 0); + PiecesTable(TQWidget* parent = nullptr, const char* name = nullptr); TQPopupMenu* popup() { return _menu; } protected: @@ -71,7 +71,7 @@ class FifteenApplet : public KPanelApplet public: FifteenApplet(const TQString& configFile, Type t = Stretch, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); int widthForHeight(int height) const; int heightForWidth(int width) const; diff --git a/fifteenapplet/qttableview.cpp b/fifteenapplet/qttableview.cpp index 4f72f34..a118af5 100644 --- a/fifteenapplet/qttableview.cpp +++ b/fifteenapplet/qttableview.cpp @@ -41,7 +41,7 @@ enum ScrollBarDirtyFlags { class QCornerSquare : public TQWidget // internal class { public: - QCornerSquare( TQWidget *, const char* = 0 ); + QCornerSquare( TQWidget *, const char* = nullptr ); void paintEvent( TQPaintEvent * ); }; @@ -153,8 +153,8 @@ QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f ) xOffs = yOffs = 0; // zero total pixel offset cellH = cellW = 0; // user defined cell size tFlags = 0; - vScrollBar = hScrollBar = 0; // no scroll bars - cornerSquare = 0; + vScrollBar = hScrollBar = nullptr; // no scroll bars + cornerSquare = nullptr; sbDirty = 0; eraseInPaint = false; verSliding = false; @@ -1049,7 +1049,7 @@ int QtTableView::lastColVisible() const bool QtTableView::rowIsVisible( int row ) const { - return rowYPos( row, 0 ); + return rowYPos( row, nullptr ); } /*! @@ -1059,7 +1059,7 @@ bool QtTableView::rowIsVisible( int row ) const bool QtTableView::colIsVisible( int col ) const { - return colXPos( col, 0 ); + return colXPos( col, nullptr ); } diff --git a/fifteenapplet/qttableview.h b/fifteenapplet/qttableview.h index 608c03d..11d845a 100644 --- a/fifteenapplet/qttableview.h +++ b/fifteenapplet/qttableview.h @@ -37,7 +37,7 @@ public: void repaint( const TQRect &, bool erase=true ); protected: - QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + QtTableView( TQWidget *parent=nullptr, const char *name=nullptr, WFlags f=0 ); ~QtTableView(); int numRows() const; @@ -132,9 +132,9 @@ private: virtual void setHorScrollBar( bool on, bool update = true ); virtual void setVerScrollBar( bool on, bool update = true ); void updateView(); - int findRawRow( int yPos, int *cellMaxY, int *cellMinY = 0, + int findRawRow( int yPos, int *cellMaxY, int *cellMinY = nullptr, bool goOutsideView = false ) const; - int findRawCol( int xPos, int *cellMaxX, int *cellMinX = 0, + int findRawCol( int xPos, int *cellMaxX, int *cellMinX = nullptr, bool goOutsideView = false ) const; int maxColsVisible() const; diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp index 5f9158b..b26d7ff 100644 --- a/kmoon/kmoonapplet.cpp +++ b/kmoon/kmoonapplet.cpp @@ -67,7 +67,7 @@ MoonPAWidget::MoonPAWidget(const TQString& configFile, Type type, int actions, TQ_SLOT(settings())); // missuse timerEvent for initialising - timerEvent(0); + timerEvent(nullptr); } MoonPAWidget::~MoonPAWidget() @@ -82,7 +82,7 @@ void MoonPAWidget::showAbout() i18n("About Moon Phase Indicator"), KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes, - 0, "about", true, true, + nullptr, "about", true, true, KStdGuiItem::ok() ); TQPixmap ret = DesktopIcon("kmoon"); @@ -100,7 +100,7 @@ void MoonPAWidget::showAbout() dialog->setIcon(ret); - KMessageBox::createKMessageBox(dialog, ret, text, TQStringList(), TQString(), 0, KMessageBox::Notify); + KMessageBox::createKMessageBox(dialog, ret, text, TQStringList(), TQString(), nullptr, KMessageBox::Notify); } void MoonPAWidget::settings() diff --git a/kmoon/kmoonapplet.h b/kmoon/kmoonapplet.h index d13a5ca..e77a32f 100644 --- a/kmoon/kmoonapplet.h +++ b/kmoon/kmoonapplet.h @@ -36,7 +36,7 @@ class MoonPAWidget : public KPanelApplet public: MoonPAWidget(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); ~MoonPAWidget(); int widthForHeight(int height) const { return height; } diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp index 8a5d390..c1d5375 100644 --- a/kmoon/kmoonwidget.cpp +++ b/kmoon/kmoonwidget.cpp @@ -73,7 +73,7 @@ void MoonWidget::calcStatus( time_t time ) do { double JDE = moonphasebylunation(lun, 0); last_new = next_new; - next_new = JDtoDate(JDE, 0); + next_new = JDtoDate(JDE, nullptr); lun++; } while (next_new < time); @@ -83,17 +83,17 @@ void MoonWidget::calcStatus( time_t time ) ln.setTime_t( last_new ); kdDebug() << TDEGlobal::locale()->formatDateTime( ln ) << endl; - time_t first_quarter = JDtoDate( moonphasebylunation( lun, 1 ), 0 ); + time_t first_quarter = JDtoDate( moonphasebylunation( lun, 1 ), nullptr ); TQDateTime fq; fq.setTime_t( first_quarter ); kdDebug() << TDEGlobal::locale()->formatDateTime( fq ) << endl; - time_t full_moon = JDtoDate( moonphasebylunation( lun, 2 ), 0 ); + time_t full_moon = JDtoDate( moonphasebylunation( lun, 2 ), nullptr ); TQDateTime fm; fm.setTime_t( full_moon ); kdDebug() << TDEGlobal::locale()->formatDateTime( fm ) << endl; - time_t third_quarter = JDtoDate( moonphasebylunation( lun, 3 ), 0 ); + time_t third_quarter = JDtoDate( moonphasebylunation( lun, 3 ), nullptr ); TQDateTime tq; tq.setTime_t( third_quarter ); kdDebug() << TDEGlobal::locale()->formatDateTime( tq ) << endl; diff --git a/kmoon/kmoonwidget.h b/kmoon/kmoonwidget.h index cddc5c1..579d8d2 100644 --- a/kmoon/kmoonwidget.h +++ b/kmoon/kmoonwidget.h @@ -33,7 +33,7 @@ class MoonWidget : public TQWidget public: - MoonWidget(TQWidget *parent = 0, const char *name = 0); + MoonWidget(TQWidget *parent = nullptr, const char *name = nullptr); ~MoonWidget(); void calcStatus( time_t time ); diff --git a/kodo/kimagenumber.h b/kodo/kimagenumber.h index 0fa78c1..96602c1 100644 --- a/kodo/kimagenumber.h +++ b/kodo/kimagenumber.h @@ -35,7 +35,7 @@ class KImageNumber : public TQFrame TQ_PROPERTY( double m_value READ value WRITE setValue ) public: - KImageNumber(const TQString& font, TQWidget* parent=0, const char* name=0); + KImageNumber(const TQString& font, TQWidget* parent=nullptr, const char* name=nullptr); virtual ~KImageNumber(); diff --git a/kodo/kodometer.h b/kodo/kodometer.h index 13eaeb1..3ce2f18 100644 --- a/kodo/kodometer.h +++ b/kodo/kodometer.h @@ -92,7 +92,7 @@ class Kodometer : public TQFrame public: - Kodometer(TQWidget* = 0, const char* = 0); + Kodometer(TQWidget* = nullptr, const char* = nullptr); ~Kodometer() {} void refresh(void); void readSettings(void); diff --git a/kodo/main.cpp b/kodo/main.cpp index 2414fa4..b97afca 100644 --- a/kodo/main.cpp +++ b/kodo/main.cpp @@ -68,9 +68,9 @@ int main(int argc, char *argv[]) I18N_NOOP("KOdometer measures your desktop mileage"), TDEAboutData::License_GPL, "(c) 1998, Armen Nakashian", - I18N_NOOP("A mouse odometer"), 0, + I18N_NOOP("A mouse odometer"), nullptr, "dev@gioelebarabucci.com"); - aboutData->addAuthor("Armen Nakashian", 0, + aboutData->addAuthor("Armen Nakashian", nullptr, "armen@tourismo.com", "http://yawara.anime.net/kodo/"); aboutData->addCredit("Gioele Barabucci", diff --git a/kteatime/main.cpp b/kteatime/main.cpp index be661b3..3ed69de 100644 --- a/kteatime/main.cpp +++ b/kteatime/main.cpp @@ -43,8 +43,8 @@ int main(int argc, char *argv[]) TDEAboutData aboutData( "kteatime", I18N_NOOP("KTeaTime"), version, description, TDEAboutData::License_GPL, "(c) 1998-1999, Matthias Hoelzer-Kluepfel\n(c) 2002-2003, Martin Willers"); - aboutData.addAuthor("Matthias Hoelzer-Kluepfel",0, "hoelzer@kde.org"); - aboutData.addAuthor("Martin Willers", 0, "willers@xm-arts.de"); + aboutData.addAuthor("Matthias Hoelzer-Kluepfel",nullptr, "hoelzer@kde.org"); + aboutData.addAuthor("Martin Willers", nullptr, "willers@xm-arts.de"); aboutData.addCredit("Daniel Teske", I18N_NOOP("Many patches"), "teske@bigfoot.com"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kteatime/timeedit.h b/kteatime/timeedit.h index 6fe4b95..06d1e18 100644 --- a/kteatime/timeedit.h +++ b/kteatime/timeedit.h @@ -24,7 +24,7 @@ class WrappingSpinBox : public TQSpinBox public: - WrappingSpinBox(int minValue, int maxValue, int step = 1, TQWidget *parent=0, const char *name=0); + WrappingSpinBox(int minValue, int maxValue, int step = 1, TQWidget *parent=nullptr, const char *name=nullptr); ~WrappingSpinBox(); void stepUp(); @@ -46,7 +46,7 @@ class TimeEdit : public TQWidget public: - TimeEdit(TQWidget* parent = 0, const char* name = 0); + TimeEdit(TQWidget* parent = nullptr, const char* name = nullptr); ~TimeEdit(); void setValue(int value); diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp index 8965eaa..8bd516d 100644 --- a/kteatime/toplevel.cpp +++ b/kteatime/toplevel.cpp @@ -120,7 +120,7 @@ TopLevel::TopLevel() : KSystemTray() this, TQ_SLOT(stop()), actionCollection(), "stop"); confAct = new TDEAction(i18n("&Configure..."), "configure", 0, this, TQ_SLOT(config()), actionCollection(), "configure"); - anonAct = new TDEAction(i18n("&Anonymous..."), 0, 0, + anonAct = new TDEAction(i18n("&Anonymous..."), nullptr, 0, this, TQ_SLOT(anonymous()), actionCollection(), "anonymous"); // TDEAction *quitAct = actionCollection()->action("file_quit"); @@ -174,8 +174,8 @@ TopLevel::TopLevel() : KSystemTray() teaAnim1Pixmap = loadIcon("tea_anim1"); teaAnim2Pixmap = loadIcon("tea_anim2"); - confdlg = 0L; - anondlg = 0L; + confdlg = nullptr; + anondlg = nullptr; stop(); // reset timer, disable some menu entries, etc. } @@ -543,7 +543,7 @@ void TopLevel::anonymous() /* enable/disable buttons for editing listbox */ void TopLevel::enable_controls() { - bool haveSelection = (listbox->currentItem() != 0); + bool haveSelection = (listbox->currentItem() != nullptr); bool amFirst = (listbox->currentItem() == listbox->firstChild()); bool amLast = true; if (haveSelection) @@ -866,7 +866,7 @@ void TopLevel::config() int i = 0; teas.clear(); teas.resize(listbox->childCount()); - for (TQListViewItemIterator it(listbox); it.current() != 0; ++it) { + for (TQListViewItemIterator it(listbox); it.current() ; ++it) { teas[i].name = static_cast(it.current())->name(); teas[i].time = static_cast(it.current())->time(); if (it.current() == current_item) diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp index 3a82f7c..6bb013b 100644 --- a/ktux/sprite.cpp +++ b/ktux/sprite.cpp @@ -47,7 +47,7 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name ) : TQDialog( parent, name, true ) { TDEGlobal::locale()->insertCatalogue("ktux"); - saver = 0; + saver = nullptr; readSettings(); diff --git a/ktux/spriteanim.cpp b/ktux/spriteanim.cpp index fe4e70e..15ccab7 100644 --- a/ktux/spriteanim.cpp +++ b/ktux/spriteanim.cpp @@ -60,7 +60,7 @@ SpriteDef::SpriteDef(TDEConfigBase &config) //--------------------------------------------------------------------------- SpriteObject *SpriteDef::create( TQCanvas *c ) { - SpriteObject *sprite = 0; + SpriteObject *sprite = nullptr; if (mSeq) { int startX = mStartX.random(); diff --git a/ktux/spritepm.cpp b/ktux/spritepm.cpp index ca11f56..7faf930 100644 --- a/ktux/spritepm.cpp +++ b/ktux/spritepm.cpp @@ -10,7 +10,7 @@ #include "spritepm.h" // static -SpritePixmapManager *SpritePixmapManager::mManager = 0; +SpritePixmapManager *SpritePixmapManager::mManager = nullptr; //--------------------------------------------------------------------------- // @@ -55,7 +55,7 @@ const TQPixmap *SpritePixmapManager::load(const TQString & img) else { delete pixmap; - pixmap = 0; + pixmap = nullptr; kdDebug() << "read failed" << endl;; } } @@ -86,7 +86,7 @@ SpritePixmapSequence::SpritePixmapSequence(TQPtrList pm, TQPtrListaddAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); + about->addAuthor( "Tobias Koenig", nullptr, "tokoe@kde.org" ); setAboutData(about); } diff --git a/kweather/kcmweatherapplet.h b/kweather/kcmweatherapplet.h index 41df3f6..d1a9019 100644 --- a/kweather/kcmweatherapplet.h +++ b/kweather/kcmweatherapplet.h @@ -32,7 +32,7 @@ class KCMWeatherApplet : public TDECModule TQ_OBJECT public: - KCMWeatherApplet( TQWidget *parent = 0, const char *name = 0 ); + KCMWeatherApplet( TQWidget *parent = nullptr, const char *name = nullptr ); ~KCMWeatherApplet(); virtual void load(); diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp index aa11467..7abbf5b 100644 --- a/kweather/kcmweatherservice.cpp +++ b/kweather/kcmweatherservice.cpp @@ -71,10 +71,10 @@ KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name ) TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmweatherservice" ), I18N_NOOP( "KWeather Configure Dialog" ), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2003 Tobias Koenig" ) ); - about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); + about->addAuthor( "Tobias Koenig", nullptr, "tokoe@kde.org" ); setAboutData(about); } diff --git a/kweather/kcmweatherservice.h b/kweather/kcmweatherservice.h index 51c60e0..796a8a3 100644 --- a/kweather/kcmweatherservice.h +++ b/kweather/kcmweatherservice.h @@ -32,7 +32,7 @@ class KCMWeatherService : public TDECModule TQ_OBJECT public: - KCMWeatherService( TQWidget *parent = 0, const char *name = 0 ); + KCMWeatherService( TQWidget *parent = nullptr, const char *name = nullptr ); ~KCMWeatherService(); virtual void load(); diff --git a/kweather/kcmweatherstations.cpp b/kweather/kcmweatherstations.cpp index 9dc6991..022dd1f 100644 --- a/kweather/kcmweatherstations.cpp +++ b/kweather/kcmweatherstations.cpp @@ -50,10 +50,10 @@ KCMWeatherStations::KCMWeatherStations( TQWidget *parent, const char *name ) layout->addWidget( mWidget ); TDEAboutData *about = new TDEAboutData( "kcmweatherstations", I18N_NOOP( "KWeather Configure Dialog" ), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2003 Tobias Koenig" ) ); - about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); + about->addAuthor( "Tobias Koenig", nullptr, "tokoe@kde.org" ); setAboutData(about); } diff --git a/kweather/kcmweatherstations.h b/kweather/kcmweatherstations.h index a235b61..b7a53ef 100644 --- a/kweather/kcmweatherstations.h +++ b/kweather/kcmweatherstations.h @@ -34,7 +34,7 @@ class KCMWeatherStations : public TDECModule public: - KCMWeatherStations( TQWidget *parent = 0, const char *name = 0 ); + KCMWeatherStations( TQWidget *parent = nullptr, const char *name = nullptr ); virtual void load(); virtual void save(); diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index 9843914..0c49dad 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -53,8 +53,8 @@ extern "C" kweather::kweather(const TQString& configFile, Type t, int actions, 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) + mFirstRun( false ), mReport( nullptr ), mClient( nullptr ), + mContextMenu( nullptr ), mWeatherService( nullptr ), settingsDialog( nullptr ), mTextColor(TQt::black) { kdDebug(12004) << "Constructor " << endl; setObjId("weatherIface"); @@ -144,7 +144,7 @@ void kweather::about(){ aboutData.addCredit( "John Ratke", I18N_NOOP( "Improvements and more code cleanups" ), "jratke@comcast.net" ); - TDEAboutApplication about(&aboutData, this, 0); + TDEAboutApplication about(&aboutData, this, nullptr); about.setProgramLogo( TDEGlobal::instance()->iconLoader()->iconPath( "kweather", -TDEIcon::SizeLarge ) ); about.exec(); } @@ -156,7 +156,7 @@ void kweather::preferences() savePrefs(); - if ( settingsDialog == 0 ) + if ( !settingsDialog ) { settingsDialog = new KCMultiDialog( this ); connect( settingsDialog, TQ_SIGNAL( configCommitted() ), TQ_SLOT( slotPrefsAccepted() ) ); @@ -187,7 +187,7 @@ void kweather::doReport() } kdDebug(12004) << "Showing out the report" << endl; - if ( mReport == 0 ) + if ( !mReport ) { mReport = new reportView(reportLocation); @@ -200,7 +200,7 @@ void kweather::doReport() void kweather::slotReportFinished(){ mReport->delayedDestruct(); - mReport = 0; + mReport = nullptr; } /** load the application */ diff --git a/kweather/kweather.h b/kweather/kweather.h index 9762535..ddf4fed 100644 --- a/kweather/kweather.h +++ b/kweather/kweather.h @@ -36,7 +36,7 @@ class kweather : public KPanelApplet, public weatherIface public: - kweather(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = 0, const char *name = 0); + kweather(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = nullptr, const char *name = nullptr); ~kweather(); void help(); void resizeEvent(TQResizeEvent*); diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp index 6b0c21c..f413458 100644 --- a/kweather/reportmain.cpp +++ b/kweather/reportmain.cpp @@ -11,7 +11,7 @@ static TDECmdLineOptions options[] = { - { "+location", I18N_NOOP( "METAR location code for the report" ), 0 }, + { "+location", I18N_NOOP( "METAR location code for the report" ), nullptr }, TDECmdLineLastOption }; diff --git a/kweather/sidebarwidget.cpp b/kweather/sidebarwidget.cpp index 6a785d1..e518d46 100644 --- a/kweather/sidebarwidget.cpp +++ b/kweather/sidebarwidget.cpp @@ -36,7 +36,7 @@ #include sidebarwidget::sidebarwidget(TQWidget* parent, const char* name) - : TQWidget(parent,name), settingsDialog(0) + : TQWidget(parent,name), settingsDialog(nullptr) { mainLayout = new TQVBoxLayout(this); @@ -87,9 +87,9 @@ void sidebarwidget::slotRefresh() void sidebarwidget::slotConfigure() { - if ( settingsDialog == 0 ) + if ( !settingsDialog ) { - settingsDialog = new KCMultiDialog(0); + settingsDialog = new KCMultiDialog(nullptr); connect( settingsDialog, TQ_SIGNAL( configCommitted() ), this, TQ_SLOT( slotRefresh() ) ); settingsDialog->addModule( "kcmweatherstations.desktop" ); diff --git a/kweather/sidebarwidget.h b/kweather/sidebarwidget.h index 4ed141c..a64afd0 100644 --- a/kweather/sidebarwidget.h +++ b/kweather/sidebarwidget.h @@ -35,7 +35,7 @@ class sidebarwidget : public TQWidget TQ_OBJECT public: - sidebarwidget(TQWidget* parent, const char* name = 0); + sidebarwidget(TQWidget* parent, const char* name = nullptr); virtual ~sidebarwidget(); TQWidget *viewport(); TQScrollView *reportGrid; diff --git a/kweather/stationsconfigwidget.cpp b/kweather/stationsconfigwidget.cpp index 3adb8e0..f372f0f 100644 --- a/kweather/stationsconfigwidget.cpp +++ b/kweather/stationsconfigwidget.cpp @@ -57,7 +57,7 @@ class StationItem : public TQListViewItem static void parseStationEntry( const TQString &line, TQString &name, TQString &uid ); StationsConfigWidget::StationsConfigWidget( TQWidget *parent, const char *name ) - : stationsConfig( parent, name ), mService(0) + : stationsConfig( parent, name ), mService(nullptr) { mService = new WeatherService_stub( "KWeatherService", "WeatherService" ); connect( mAllStations, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQ_SLOT( addStation() ) ); @@ -79,7 +79,7 @@ void StationsConfigWidget::addStation() return; StationItem *item = dynamic_cast( mAllStations->selectedItem() ); - if ( item == 0 ) + if ( !item ) return; mService->addStation( item->uid() ); @@ -94,7 +94,7 @@ void StationsConfigWidget::removeStation() return; StationItem *item = dynamic_cast( mSelectedStations->selectedItem() ); - if ( item == 0 ) + if ( !item ) return; mService->removeStation( item->uid() ); @@ -145,7 +145,7 @@ void StationsConfigWidget::scanStations() void StationsConfigWidget::selectionChanged( TQListViewItem *item ) { - mRemoveButton->setEnabled( item != 0 ); + mRemoveButton->setEnabled( item != nullptr ); } void StationsConfigWidget::modified() diff --git a/kweather/stationsconfigwidget.h b/kweather/stationsconfigwidget.h index 3056dd6..3fdd347 100644 --- a/kweather/stationsconfigwidget.h +++ b/kweather/stationsconfigwidget.h @@ -31,7 +31,7 @@ class StationsConfigWidget : public stationsConfig public: - StationsConfigWidget( TQWidget *parent, const char *name = 0 ); + StationsConfigWidget( TQWidget *parent, const char *name = nullptr ); virtual ~StationsConfigWidget(); signals: diff --git a/kweather/weather_icon.cpp b/kweather/weather_icon.cpp index 1100ded..4965a4a 100644 --- a/kweather/weather_icon.cpp +++ b/kweather/weather_icon.cpp @@ -6,7 +6,7 @@ #include "weather_icon.h" -WeatherIconPrivate* WeatherIconPrivate::s_instance = 0; +WeatherIconPrivate* WeatherIconPrivate::s_instance = nullptr; WeatherIconPrivate::WeatherIconPrivate() { @@ -20,7 +20,7 @@ WeatherIconPrivate::~WeatherIconPrivate() WeatherIconPrivate* WeatherIconPrivate::instance() { - if ( s_instance == 0 ) + if ( !s_instance ) s_instance = new WeatherIconPrivate(); return s_instance; diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp index f66e1d1..c3ac723 100644 --- a/kweather/weatherbar.cpp +++ b/kweather/weatherbar.cpp @@ -75,7 +75,7 @@ KonqSidebarWeather::~KonqSidebarWeather() void* KonqSidebarWeather::provides(const TQString&) { - return 0; + return nullptr; } void KonqSidebarWeather::emitStatusBarText(const TQString& s) @@ -129,7 +129,7 @@ void KonqSidebarWeather::updateWidgets() if( !reply.isValid() ) { kdDebug() << "Starting KWeatherService" << endl; if( !startWeatherService() ) { - KMessageBox::sorry(0, i18n("Could not start the weather service!")); + KMessageBox::sorry(nullptr, i18n("Could not start the weather service!")); return; } @@ -174,7 +174,7 @@ void KonqSidebarWeather::updateWidgets() } } } else { - KMessageBox::sorry(0, i18n("The weather service is unreachable!")); + KMessageBox::sorry(nullptr, i18n("The weather service is unreachable!")); } timeOut->start(15*60000); diff --git a/kweather/weatherbar.h b/kweather/weatherbar.h index 349b82f..8229524 100644 --- a/kweather/weatherbar.h +++ b/kweather/weatherbar.h @@ -42,7 +42,7 @@ class KonqSidebarWeather: public KonqSidebarPlugin, virtual public DCOPObject K_DCOP public: KonqSidebarWeather(TDEInstance* inst, TQObject* parent, TQWidget* widgetParent, - TQString& desktopName_, const char* name = 0); + TQString& desktopName_, const char* name = nullptr); ~KonqSidebarWeather(); virtual void* provides(const TQString&); diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp index 31e6c5a..6afc0a9 100644 --- a/kweather/weatherlib.cpp +++ b/kweather/weatherlib.cpp @@ -63,7 +63,7 @@ class WeatherLib::Data }; WeatherLib::Data::Data() - : target( 0 ), job( 0 ) + : target( nullptr ), job( nullptr ) { clear(); } @@ -73,12 +73,12 @@ void WeatherLib::Data::clear() age = TQDateTime::currentDateTime(); downloading = false; updated = false; - job = 0; + job = nullptr; if ( target ) { delete target; - target = 0; + target = nullptr; } } @@ -118,7 +118,7 @@ void WeatherLib::slotCopyDone(TDEIO::Job* job) } // Find the job TQDictIterator it( data ); - Data *d = 0L; + Data *d = nullptr; for( ; it.current(); ++it ) { kdDebug(12006) << "Searching for job..." << endl; @@ -155,7 +155,7 @@ void WeatherLib::slotCopyDone(TDEIO::Job* job) // File error kdDebug( 12006 ) << "File empty error..." << endl; KPassivePopup::message( i18n("KWeather Error!"), - i18n("The temp file %1 was empty.").arg(d->target->name()), 0L,"error" ); + i18n("The temp file %1 was empty.").arg(d->target->name()), nullptr,"error" ); d->updated = false; } } @@ -164,12 +164,12 @@ void WeatherLib::slotCopyDone(TDEIO::Job* job) // File error kdDebug( 12006 ) << "File read error..." << endl; KPassivePopup::message( i18n("KWeather Error!"), - i18n("Could not read the temp file %1.").arg(d->target->name()), 0L,"error" ); + i18n("Could not read the temp file %1.").arg(d->target->name()), nullptr,"error" ); d->updated = false; } delete d->target; - d->target = 0L; - d->job = 0L; + d->target = nullptr; + d->job = nullptr; } else if( job->error() == TDEIO::ERR_DOES_NOT_EXIST) @@ -177,7 +177,7 @@ void WeatherLib::slotCopyDone(TDEIO::Job* job) data.remove(d->wi.reportLocation); kdDebug( 12006 ) << "Bad station data so i am going to remove it" << endl; KPassivePopup::message( i18n("KWeather Error!"), - i18n("The requested station does not exist."), 0L,"error" ); + i18n("The requested station does not exist."), nullptr,"error" ); } else if(job->error() == TDEIO::ERR_COULD_NOT_CONNECT || job->error() == TDEIO::ERR_UNKNOWN_HOST) diff --git a/kweather/weatherlib.h b/kweather/weatherlib.h index 07b638d..0fa1bf6 100644 --- a/kweather/weatherlib.h +++ b/kweather/weatherlib.h @@ -37,7 +37,7 @@ class WeatherLib : public TQObject public: class Data; - WeatherLib(StationDatabase *stationDB, TQObject *parent =0L, const char *name =0L); + WeatherLib(StationDatabase *stationDB, TQObject *parent =nullptr, const char *name =nullptr); virtual ~WeatherLib(); TQString temperature(const TQString &stationID); diff --git a/kworldwatch/applet.h b/kworldwatch/applet.h index 5b4f22e..a3f0f5f 100644 --- a/kworldwatch/applet.h +++ b/kworldwatch/applet.h @@ -47,7 +47,7 @@ class KWWApplet : public KPanelApplet public: KWWApplet(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); ~KWWApplet(); int widthForHeight(int height) const; diff --git a/kworldwatch/cities.cpp b/kworldwatch/cities.cpp index ab7cfd9..8963c90 100644 --- a/kworldwatch/cities.cpp +++ b/kworldwatch/cities.cpp @@ -174,7 +174,7 @@ void CityList::paint(TQPainter *p, int width, int height, int offset) City *CityList::getNearestCity(int w, int h, int offset, int x, int y, TQPoint &where) { - City *result = 0; + City *result = nullptr; double dist = 1.0e10; TQPtrListIterator it(_cities); diff --git a/kworldwatch/flags.cpp b/kworldwatch/flags.cpp index f66462e..4798ab3 100644 --- a/kworldwatch/flags.cpp +++ b/kworldwatch/flags.cpp @@ -39,7 +39,7 @@ FlagList::FlagList() _flags.setAutoDelete(true); _flagPixmap = TQPixmap(locate("data", "kworldclock/pics/flag.png")); - _flagMask = TQPixmap(locate("data", "kworldclock/pics/flag-mask.xpm"), 0, TQPixmap::ThresholdDither); + _flagMask = TQPixmap(locate("data", "kworldclock/pics/flag-mask.xpm"), nullptr, TQPixmap::ThresholdDither); _flagMask.setMask(_flagMask.createHeuristicMask()); } @@ -87,7 +87,7 @@ void FlagList::paint(TQPainter *p, int width, int height, int offset) void FlagList::removeNearestFlag(const TQPoint &target, int w, int h, int offset) { - Flag *flag = 0; + Flag *flag = nullptr; TQPoint diff; diff --git a/kworldwatch/flow.cpp b/kworldwatch/flow.cpp index a9bbffc..7a5fb9a 100644 --- a/kworldwatch/flow.cpp +++ b/kworldwatch/flow.cpp @@ -34,7 +34,7 @@ uint SimpleFlowIterator::count() const TQLayoutItem *SimpleFlowIterator::current() { - return idx < int(count()) ? list->at(idx) : 0; + return idx < int(count()) ? list->at(idx) : nullptr; } TQLayoutItem *SimpleFlowIterator::next() @@ -44,7 +44,7 @@ TQLayoutItem *SimpleFlowIterator::next() TQLayoutItem *SimpleFlowIterator::takeCurrent() { - return idx < int(count()) ? list->take( idx ) : 0; + return idx < int(count()) ? list->take( idx ) : nullptr; } SimpleFlow::~SimpleFlow() @@ -104,7 +104,7 @@ int SimpleFlow::doLayout( const TQRect &r, bool testonly ) int h = 0; //height of this line so far. TQPtrListIterator it(list); TQLayoutItem *o; - while ( (o=it.current()) != 0 ) { + while ( (o=it.current()) != nullptr ) { ++it; int nextX = x + o->sizeHint().width() + spacing(); if ( nextX - spacing() > r.right() && h > 0 ) { @@ -126,7 +126,7 @@ TQSize SimpleFlow::minimumSize() const TQSize s(0,0); TQPtrListIterator it(list); TQLayoutItem *o; - while ( (o=it.current()) != 0 ) { + while ( (o=it.current()) != nullptr ) { ++it; s = s.expandedTo( o->minimumSize() ); } diff --git a/kworldwatch/flow.h b/kworldwatch/flow.h index 5657d30..e62d2c4 100644 --- a/kworldwatch/flow.h +++ b/kworldwatch/flow.h @@ -22,13 +22,13 @@ class SimpleFlow : public TQLayout { public: SimpleFlow( TQWidget *parent, int border=0, int space=-1, - const char *name=0 ) + const char *name=nullptr ) : TQLayout( parent, border, space, name ), cached_width(0), cached_hfw(0) {} - SimpleFlow( TQLayout* parent, int space=-1, const char *name=0 ) + SimpleFlow( TQLayout* parent, int space=-1, const char *name=nullptr ) : TQLayout( parent, space, name ), cached_width(0), cached_hfw(0) {} - SimpleFlow( int space=-1, const char *name=0 ) + SimpleFlow( int space=-1, const char *name=nullptr ) : TQLayout( space, name ), cached_width(0), cached_hfw(0) {} diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp index 78bd401..5d1c0f0 100644 --- a/kworldwatch/main.cpp +++ b/kworldwatch/main.cpp @@ -120,7 +120,7 @@ void WatchApplication::dumpMap() kdDebug() << "theme=" << themeName << " out=" << outName << " size=" << mapSize.width() << "x" << mapSize.height() << endl; - MapWidget *w = new MapWidget(false, true, 0); + MapWidget *w = new MapWidget(false, true, nullptr); w->setTheme(themeName); w->setSize(mapSize.width(), mapSize.height()); @@ -164,11 +164,11 @@ static void listThemes() static TDECmdLineOptions options[] = { - { "dump", I18N_NOOP("Write out a file containing the actual map"), 0 }, + { "dump", I18N_NOOP("Write out a file containing the actual map"), nullptr }, { "theme ", I18N_NOOP("The name of the theme to use"), "depths"}, - { "themes", I18N_NOOP("List available themes"), 0 }, + { "themes", I18N_NOOP("List available themes"), nullptr }, { "o ", I18N_NOOP("The name of the file to write to"), "dump.ppm" }, - { "size ", I18N_NOOP("The size of the map to dump"), 0 }, + { "size ", I18N_NOOP("The size of the map to dump"), nullptr }, TDECmdLineLastOption }; diff --git a/kworldwatch/main.h b/kworldwatch/main.h index 7ef2792..33b8f23 100644 --- a/kworldwatch/main.h +++ b/kworldwatch/main.h @@ -44,7 +44,7 @@ class WorldWideWatch : public TDEMainWindow public: - WorldWideWatch(bool restore=false, TQWidget *parent=0, const char *name=0); + WorldWideWatch(bool restore=false, TQWidget *parent=nullptr, const char *name=nullptr); void save(TDEConfig *config); void load(TDEConfig *load); diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp index 19b3518..268a01b 100644 --- a/kworldwatch/mapwidget.cpp +++ b/kworldwatch/mapwidget.cpp @@ -60,7 +60,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *name) - : TQWidget(parent, name), _loader(), _illumination(true), _cities(true), _flags(true), _cityList(0), + : TQWidget(parent, name), _loader(), _illumination(true), _cities(true), _flags(true), _cityList(nullptr), _applet(applet), _width(0), _height(0) { // this ugly construction is necessary so we don't load @@ -141,7 +141,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); timer->start(1000); - _cityIndicator = new TQLabel(0,0, WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); + _cityIndicator = new TQLabel(nullptr,nullptr, WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); _cityIndicator->setMargin(1); _cityIndicator->setIndent(0); _cityIndicator->setAutoMask(false); @@ -371,7 +371,7 @@ TQString MapWidget::cityTime(const TQString &city) dt.setTime_t(t); result.append(TQString("%1, %2").arg(TDEGlobal::locale()->formatTime(dt.time(), true)).arg(TDEGlobal::locale()->formatDate(dt.date(), true))); - if (initial_TZ != 0) + if (initial_TZ) setenv("TZ", initial_TZ, 1); else unsetenv("TZ"); @@ -395,7 +395,7 @@ void MapWidget::leaveEvent(TQEvent *) void MapWidget::about() { - AboutDialog dlg(this, 0, true); + AboutDialog dlg(this, nullptr, true); dlg.exec(); } diff --git a/kworldwatch/mapwidget.h b/kworldwatch/mapwidget.h index b7704a4..1e04731 100644 --- a/kworldwatch/mapwidget.h +++ b/kworldwatch/mapwidget.h @@ -60,7 +60,7 @@ class MapWidget : public TQWidget public: - MapWidget(bool applet=false, bool restore=false, TQWidget *parent=0, const char *name=0); + MapWidget(bool applet=false, bool restore=false, TQWidget *parent=nullptr, const char *name=nullptr); ~MapWidget(); void setTheme(const TQString &theme); diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp index e4fc6a9..f4d82be 100644 --- a/kworldwatch/zoneclock.cpp +++ b/kworldwatch/zoneclock.cpp @@ -105,7 +105,7 @@ void ZoneClock::slotAddClock() void ZoneClock::editClock() { - ClockDialog *_dlg = new ClockDialog(this, 0, true); + ClockDialog *_dlg = new ClockDialog(this, nullptr, true); CityList cities; TQStringList timezones = cities.timezones(); for (TQStringList::iterator it = timezones.begin(); it != timezones.end(); ++it) @@ -157,7 +157,7 @@ void ZoneClock::updateTime() dt.setTime_t(t); _timeLabel->setText(TQString("%1, %2").arg(TDEGlobal::locale()->formatTime(dt.time(), true)).arg(TDEGlobal::locale()->formatDate(dt.date(), true))); - if (initial_TZ != 0) + if (initial_TZ) setenv("TZ", initial_TZ, 1); else unsetenv("TZ"); @@ -166,7 +166,7 @@ void ZoneClock::updateTime() ZoneClockPanel::ZoneClockPanel(TQWidget *parent, const char *name) - : TQFrame(parent, name), _dlg(0) + : TQFrame(parent, name), _dlg(nullptr) { _flow = new SimpleFlow(this,1,1); @@ -183,7 +183,7 @@ void ZoneClockPanel::createDialog() { if (!_dlg) { - _dlg = new ClockDialog(this, 0, true); + _dlg = new ClockDialog(this, nullptr, true); CityList cities; TQStringList timezones = cities.timezones(); for (TQStringList::iterator it = timezones.begin(); it != timezones.end(); ++it) diff --git a/kworldwatch/zoneclock.h b/kworldwatch/zoneclock.h index 55af262..145a596 100644 --- a/kworldwatch/zoneclock.h +++ b/kworldwatch/zoneclock.h @@ -50,7 +50,7 @@ class ZoneClock : public TQFrame public: - ZoneClock(const TQString &zone, const TQString &name, TQWidget *parent=0, const char *n=0); + ZoneClock(const TQString &zone, const TQString &name, TQWidget *parent=nullptr, const char *n=nullptr); TQString zone() const { return _zone; }; @@ -102,7 +102,7 @@ class ZoneClockPanel : public TQFrame public: - ZoneClockPanel(TQWidget *parent=0, const char *name=0); + ZoneClockPanel(TQWidget *parent=nullptr, const char *name=nullptr); void addClock(const TQString &zone, const TQString &name); -- cgit v1.2.3