From 4209305e735d8a86343067a297b549069857f3dd Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 20:02:51 -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 --- src/komposedesktopwidget.h | 2 +- src/komposefullscreenwidget.cpp | 6 +++--- src/komposefullscreenwidget.h | 2 +- src/komposegl/komposegldesktopwidget.cpp | 6 +++--- src/komposeglobal.cpp | 4 ++-- src/komposeglobal.h | 2 +- src/komposelayout.cpp | 24 ++++++++++++------------ src/komposelayout.h | 2 +- src/komposesettings.cpp | 6 +++--- src/komposesettings.h | 2 +- src/komposesystray.h | 2 +- src/komposetask.h | 2 +- src/komposetaskcontainerwidget.cpp | 6 +++--- src/komposetaskcontainerwidget.h | 2 +- src/komposetaskmanager.cpp | 16 ++++++++-------- src/komposetaskprefswidget.h | 2 +- src/komposetaskvisualizer.h | 2 +- src/komposetaskwidget.h | 2 +- src/komposeviewmanager.cpp | 2 +- src/komposewidget.cpp | 2 +- src/komposewidget.h | 2 +- src/main.cpp | 4 ++-- 22 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/komposedesktopwidget.h b/src/komposedesktopwidget.h index 26d54d8..85b1e78 100644 --- a/src/komposedesktopwidget.h +++ b/src/komposedesktopwidget.h @@ -32,7 +32,7 @@ class KomposeDesktopWidget : public KomposeTaskContainerWidget { TQ_OBJECT public: - KomposeDesktopWidget(int desktop, TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); + KomposeDesktopWidget(int desktop, TQWidget *parent = nullptr, KomposeLayout *l = nullptr, const char *name = nullptr); ~KomposeDesktopWidget(); diff --git a/src/komposefullscreenwidget.cpp b/src/komposefullscreenwidget.cpp index 712cc7c..f4dec82 100644 --- a/src/komposefullscreenwidget.cpp +++ b/src/komposefullscreenwidget.cpp @@ -34,7 +34,7 @@ #include KomposeFullscreenWidget::KomposeFullscreenWidget( int displayType, KomposeLayout *l ) - : KomposeTaskContainerWidget( -1, 0, l ), + : KomposeTaskContainerWidget( -1, nullptr, l ), type(displayType) { // Set Desktop background as our background @@ -102,7 +102,7 @@ void KomposeFullscreenWidget::destroyChildWidgets() setUpdatesEnabled( false ); KomposeWidget *child; TQPtrListIterator it( *(layout->getManagedWidgets())); - while ( (child = it.current()) != 0 ) + while ( (child = it.current()) != nullptr ) { ++it; layout->remove(child); @@ -257,7 +257,7 @@ bool KomposeFullscreenWidget::focusNeighbourDesk( int direction ) { bool successfull = false; KomposeWidget *widget; - if ( ( widget = layout->getNeighbour( dynamic_cast(current), direction, WLAYOUT_BOTH ) ) != 0 ) + if ( ( widget = layout->getNeighbour( dynamic_cast(current), direction, WLAYOUT_BOTH ) ) != nullptr ) { kdDebug() << "KomposeFullscreenWidget::keyReleaseEvent - Focussing " << widget->className() << endl; dynamic_cast(widget)->setActive(); diff --git a/src/komposefullscreenwidget.h b/src/komposefullscreenwidget.h index 4a480d7..ea672e7 100644 --- a/src/komposefullscreenwidget.h +++ b/src/komposefullscreenwidget.h @@ -28,7 +28,7 @@ class KomposeFullscreenWidget : public KomposeTaskContainerWidget { TQ_OBJECT public: - KomposeFullscreenWidget( int displayType = KOMPOSEDISPLAY_VIRTUALDESKS ,KomposeLayout *l = 0 ); + KomposeFullscreenWidget( int displayType = KOMPOSEDISPLAY_VIRTUALDESKS ,KomposeLayout *l = nullptr ); virtual ~KomposeFullscreenWidget(); diff --git a/src/komposegl/komposegldesktopwidget.cpp b/src/komposegl/komposegldesktopwidget.cpp index 42689a4..7df59f4 100644 --- a/src/komposegl/komposegldesktopwidget.cpp +++ b/src/komposegl/komposegldesktopwidget.cpp @@ -45,7 +45,7 @@ void KomposeGLDesktopWidget::createTaskWidgets() tqDebug("KomposeGLDesktopWidget::createTaskWidgets() on %d tasks", tl.count()); TQPtrListIterator it( tl ); KomposeTask *task; - while ( (task = it.current()) != 0 ) + while ( (task = it.current()) != nullptr ) { ++it; TQ_CHECK_PTR(task); @@ -59,7 +59,7 @@ void KomposeGLDesktopWidget::createTaskWidget( KomposeTask* task ) if (deskNum == task->onDesktop()-1 ) { tqDebug("KomposeGLDesktopWidget::createTaskWidget()" ); - KomposeGLTaskWidget *taskwidget = new KomposeGLTaskWidget( task, this, 0, "" ); + KomposeGLTaskWidget *taskwidget = new KomposeGLTaskWidget( task, this, nullptr, "" ); } } @@ -106,7 +106,7 @@ void KomposeGLDesktopWidget::draw() } KomposeGLWidget *widget; - while ( (widget = (KomposeGLWidget*)it.current()) != 0 ) + while ( (widget = (KomposeGLWidget*)it.current()) != nullptr ) { ++it; widget->draw(); diff --git a/src/komposeglobal.cpp b/src/komposeglobal.cpp index b530dc1..b56fa97 100644 --- a/src/komposeglobal.cpp +++ b/src/komposeglobal.cpp @@ -48,7 +48,7 @@ #include #endif -static KomposeGlobal* globalInstance = 0; +static KomposeGlobal* globalInstance = nullptr; Display *disp; static TQString wallpaperForDesktop(int desktop) @@ -151,7 +151,7 @@ void KomposeGlobal::initGui() */ void KomposeGlobal::initActions() { - actionCollection = new TDEActionCollection( (TQWidget*)0 ); + actionCollection = new TDEActionCollection( (TQWidget*)nullptr ); // Actions actQuit = KStdAction::quit( tdeApp, TQ_SLOT(quit()), actionCollection ); diff --git a/src/komposeglobal.h b/src/komposeglobal.h index c8e669a..2efd5a7 100644 --- a/src/komposeglobal.h +++ b/src/komposeglobal.h @@ -38,7 +38,7 @@ class KomposeGlobal : public TQObject { TQ_OBJECT protected: - KomposeGlobal(TQObject *parent = 0, const char *name = 0); + KomposeGlobal(TQObject *parent = nullptr, const char *name = nullptr); ~KomposeGlobal(); diff --git a/src/komposelayout.cpp b/src/komposelayout.cpp index 4e97232..04a363e 100644 --- a/src/komposelayout.cpp +++ b/src/komposelayout.cpp @@ -98,7 +98,7 @@ void KomposeLayout::rearrangeContents() // Check for empty containers TQPtrListIterator it( list ); KomposeWidget *task; - while ( (task = it.current()) != 0 ) + while ( (task = it.current()) != nullptr ) { ++it; KomposeTaskContainerWidget *containerTask = dynamic_cast(task); @@ -205,7 +205,7 @@ void KomposeLayout::rearrangeContents( const TQRect& availRect, const TQPtrList< KomposeWidget *task; // Check for end of List - if ( (task = it.current()) == 0) + if ( (task = it.current()) == nullptr) break; // Calculate width and height of widget @@ -287,7 +287,7 @@ void KomposeLayout::rearrangeContents( const TQRect& availRect, const TQPtrList< for ( int j=0; j (uint)(index) ) @@ -408,7 +408,7 @@ KomposeWidget* KomposeLayout::getNeighbour( } return neighbour; case DLAYOUT_BOTTOM: - if ( listToSearch.count() <= (uint)(index + currentColumns) || (neighbour = listToSearch.at( index + currentColumns )) == 0) + if ( listToSearch.count() <= (uint)(index + currentColumns) || (neighbour = listToSearch.at( index + currentColumns )) == nullptr) { if (wrap == WLAYOUT_VERTICAL || wrap == WLAYOUT_BOTH ) return listToSearch.at( index%currentColumns ); diff --git a/src/komposelayout.h b/src/komposelayout.h index b9131b6..146ad0e 100644 --- a/src/komposelayout.h +++ b/src/komposelayout.h @@ -45,7 +45,7 @@ class KomposeLayout : public TQObject { TQ_OBJECT public: - KomposeLayout( KomposeWidget *parent, int type = TLAYOUT_GENERIC, int dist = 10, const char *name = 0 ); + KomposeLayout( KomposeWidget *parent, int type = TLAYOUT_GENERIC, int dist = 10, const char *name = nullptr ); ~KomposeLayout(); diff --git a/src/komposesettings.cpp b/src/komposesettings.cpp index e3c066a..a2583e9 100644 --- a/src/komposesettings.cpp +++ b/src/komposesettings.cpp @@ -24,7 +24,7 @@ #include #include -static KomposeSettings* settingsInstance = 0; +static KomposeSettings* settingsInstance = nullptr; /* @@ -44,7 +44,7 @@ KomposeSettings* KomposeSettings::instance() KomposeSettings::KomposeSettings(TQObject *parent, const char *name) : TQObject(parent, name), dialogOpen(0), - windowTitleFontMetrics(0) + windowTitleFontMetrics(nullptr) { // Init global shortcut object @@ -241,7 +241,7 @@ int KomposeSettings::getIconSizePixels() void KomposeSettings::calcFontMetrics() { - if (windowTitleFontMetrics != 0) + if (windowTitleFontMetrics != nullptr) delete windowTitleFontMetrics; windowTitleFontMetrics = new TQFontMetrics( windowTitleFont ); windowTitleFontAscent = windowTitleFontMetrics->ascent(); diff --git a/src/komposesettings.h b/src/komposesettings.h index 796afca..3760717 100644 --- a/src/komposesettings.h +++ b/src/komposesettings.h @@ -31,7 +31,7 @@ class KomposeSettings : public TQObject { TQ_OBJECT protected: - KomposeSettings(TQObject *parent = 0, const char *name = 0); + KomposeSettings(TQObject *parent = nullptr, const char *name = nullptr); ~KomposeSettings(); diff --git a/src/komposesystray.h b/src/komposesystray.h index 905e095..4046477 100644 --- a/src/komposesystray.h +++ b/src/komposesystray.h @@ -27,7 +27,7 @@ class KomposeSysTray : public KSystemTray { TQ_OBJECT public: - KomposeSysTray(TQWidget *parent = 0, const char *name = 0); + KomposeSysTray(TQWidget *parent = nullptr, const char *name = nullptr); ~KomposeSysTray(); void currentDesktopChanged(int desktop); diff --git a/src/komposetask.h b/src/komposetask.h index 5b1f261..3877a9e 100644 --- a/src/komposetask.h +++ b/src/komposetask.h @@ -34,7 +34,7 @@ class KomposeTask : public TQObject { TQ_OBJECT public: - KomposeTask(WId win, TWinModule *twinmod, TQObject *parent = 0, const char *name = 0); + KomposeTask(WId win, TWinModule *twinmod, TQObject *parent = nullptr, const char *name = nullptr); ~KomposeTask(); diff --git a/src/komposetaskcontainerwidget.cpp b/src/komposetaskcontainerwidget.cpp index ade9b5d..d1f56ce 100644 --- a/src/komposetaskcontainerwidget.cpp +++ b/src/komposetaskcontainerwidget.cpp @@ -48,7 +48,7 @@ void KomposeTaskContainerWidget::reparentTaskWidget( KomposeTask* task, int from { KomposeTaskWidget *child; TQPtrListIterator it( *(layout->getManagedWidgets())); - while ( (child = dynamic_cast(it.current()) ) != 0 ) + while ( (child = dynamic_cast(it.current()) ) != nullptr ) { ++it; if (child->getTask() == task) @@ -165,7 +165,7 @@ bool KomposeTaskContainerWidget::focusNeighbourChild( int direction ) else { KomposeWidget *widget; - if ( ( widget = layout->getNeighbour( dynamic_cast(focusWidget()), direction, WLAYOUT_BOTH ) ) != 0 ) + if ( ( widget = layout->getNeighbour( dynamic_cast(focusWidget()), direction, WLAYOUT_BOTH ) ) != nullptr ) { kdDebug() << "KomposeTaskContainerWidget::keyReleaseEvent - Focussing " << widget->className() << endl; widget->setFocus(); @@ -182,7 +182,7 @@ void KomposeTaskContainerWidget::createTaskWidgets() TaskList tl = KomposeTaskManager::instance()->getTasks(); TQPtrListIterator it( tl ); KomposeTask *task; - while ( (task = it.current()) != 0 ) + while ( (task = it.current()) != nullptr ) { ++it; TQ_CHECK_PTR(task); diff --git a/src/komposetaskcontainerwidget.h b/src/komposetaskcontainerwidget.h index 17cecd5..a41b305 100644 --- a/src/komposetaskcontainerwidget.h +++ b/src/komposetaskcontainerwidget.h @@ -27,7 +27,7 @@ class KomposeTaskContainerWidget : public KomposeWidget { TQ_OBJECT public: - KomposeTaskContainerWidget( int desk = 0, TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); + KomposeTaskContainerWidget( int desk = 0, TQWidget *parent = nullptr, KomposeLayout *l = nullptr, const char *name = nullptr); virtual ~KomposeTaskContainerWidget(); diff --git a/src/komposetaskmanager.cpp b/src/komposetaskmanager.cpp index 8809a97..75eb59d 100644 --- a/src/komposetaskmanager.cpp +++ b/src/komposetaskmanager.cpp @@ -48,7 +48,7 @@ #include #endif -static KomposeTaskManager* taskManagerInstance = 0; +static KomposeTaskManager* taskManagerInstance = nullptr; /** @@ -129,10 +129,10 @@ void KomposeTaskManager::callCompositeRedirect() */ KomposeTask* KomposeTaskManager::findTask(WId w, bool wmFrameIds ) { - for (KomposeTask* t = tasklist.first(); t != 0; t = tasklist.next()) + for (KomposeTask* t = tasklist.first(); t != nullptr; t = tasklist.next()) if ((!wmFrameIds && t->window() == w) || (wmFrameIds && t->wmFrame() == w) ) return t; - return 0; + return nullptr; } void KomposeTaskManager::slotStartWindowListeners() @@ -194,7 +194,7 @@ void KomposeTaskManager::slotWindowRemoved(WId w ) void KomposeTaskManager::slotWindowAdded(WId w ) { // ignore myself - if ( TQWidget::find(w) != 0 ) + if ( TQWidget::find(w) != nullptr ) return; // if ( KomposeViewManager::instance()->hasActiveView() && w == KomposeViewManager::instance()->getViewWidget()->winId() ) // { @@ -245,7 +245,7 @@ void KomposeTaskManager::slotUpdateScreenshots( bool switchDesktops ) continue; it.toFirst(); - while ( (task = it.current()) != 0 ) + while ( (task = it.current()) != nullptr ) { ++it; if ( task->onDesktop() == desk ) @@ -272,7 +272,7 @@ void KomposeTaskManager::slotTaskActivated(WId winId) kdDebug() << "KomposeTaskManager::slotTaskActivated ( " << winId << " )" << endl; TQPtrListIterator it( tasklist ); KomposeTask *task; - while ( (task = it.current()) != 0 ) + while ( (task = it.current()) != nullptr ) { ++it; if ( winId == task->window() ) @@ -296,7 +296,7 @@ bool KomposeTaskManager::isOnTop(const KomposeTask* task) for (TQValueList::ConstIterator it = twin_module->stackingOrder().fromLast(); it != twin_module->stackingOrder().end(); --it ) { - for (KomposeTask* t = tasklist.first(); t != 0; t = tasklist.next() ) + for (KomposeTask* t = tasklist.first(); t != nullptr; t = tasklist.next() ) { if ( (*it) == t->window() ) { @@ -372,7 +372,7 @@ void KomposeTaskManager::slotCurrentDesktopChanged(int d) // and not when I cahnge the desktop, although the windows get mapped at this point. // Is this a X bug? However the following hack helps: // Do as if we received a ConfigureNotify event to update all backing pixmaps - for (KomposeTask* t = tasklist.first(); t != 0; t = tasklist.next()) + for (KomposeTask* t = tasklist.first(); t != nullptr; t = tasklist.next()) if ( t->onDesktop() == d ) t->slotX11ConfigureNotify(); } diff --git a/src/komposetaskprefswidget.h b/src/komposetaskprefswidget.h index 97db114..0250650 100644 --- a/src/komposetaskprefswidget.h +++ b/src/komposetaskprefswidget.h @@ -23,7 +23,7 @@ class KomposeTaskPrefsWidget : public TQDockArea { TQ_OBJECT public: - KomposeTaskPrefsWidget(KomposeTaskWidget *parent = 0, const char *name = 0); + KomposeTaskPrefsWidget(KomposeTaskWidget *parent = nullptr, const char *name = nullptr); ~KomposeTaskPrefsWidget(); diff --git a/src/komposetaskvisualizer.h b/src/komposetaskvisualizer.h index 2370948..2e73bb1 100644 --- a/src/komposetaskvisualizer.h +++ b/src/komposetaskvisualizer.h @@ -39,7 +39,7 @@ class KomposeTaskVisualizer : public TQObject { TQ_OBJECT public: - KomposeTaskVisualizer(KomposeTask *parent, const char *name = 0); + KomposeTaskVisualizer(KomposeTask *parent, const char *name = nullptr); ~KomposeTaskVisualizer(); void renderOnPixmap( TQPixmap* pix, int effect ); diff --git a/src/komposetaskwidget.h b/src/komposetaskwidget.h index 542fbfe..095f880 100644 --- a/src/komposetaskwidget.h +++ b/src/komposetaskwidget.h @@ -40,7 +40,7 @@ class KomposeTaskWidget : public KomposeWidget { TQ_OBJECT public: - KomposeTaskWidget(KomposeTask *t, TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); + KomposeTaskWidget(KomposeTask *t, TQWidget *parent = nullptr, KomposeLayout *l = nullptr, const char *name = nullptr); ~KomposeTaskWidget(); diff --git a/src/komposeviewmanager.cpp b/src/komposeviewmanager.cpp index 3883ffd..514bbb2 100644 --- a/src/komposeviewmanager.cpp +++ b/src/komposeviewmanager.cpp @@ -28,7 +28,7 @@ #include -static KomposeViewManager* viewManagerInstance = 0; +static KomposeViewManager* viewManagerInstance = nullptr; /** * Viewmanager is a singleton diff --git a/src/komposewidget.cpp b/src/komposewidget.cpp index 4caa78c..35b4976 100644 --- a/src/komposewidget.cpp +++ b/src/komposewidget.cpp @@ -47,7 +47,7 @@ KomposeWidget::~KomposeWidget() */ void KomposeWidget::childEvent ( TQChildEvent * ce) { - KomposeWidget* kwChild = 0; + KomposeWidget* kwChild = nullptr; kwChild = ::tqt_cast(ce->child()); if ( !kwChild ) return; diff --git a/src/komposewidget.h b/src/komposewidget.h index 39443e2..7d9fe4d 100644 --- a/src/komposewidget.h +++ b/src/komposewidget.h @@ -32,7 +32,7 @@ class KomposeWidget : public TQWidget { TQ_OBJECT public: - KomposeWidget( TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); + KomposeWidget( TQWidget *parent = nullptr, KomposeLayout *l = nullptr, const char *name = nullptr); virtual ~KomposeWidget(); diff --git a/src/main.cpp b/src/main.cpp index 0a8929f..1dd385f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,8 +35,8 @@ static const char version[] = "0.5.4"; static TDECmdLineOptions options[] = { - { "nosystray", I18N_NOOP( "Do not show the systray icon" ), 0 }, - { "singleshot", I18N_NOOP( "Display the default view and exit (non daemon mode)" ), 0 }, + { "nosystray", I18N_NOOP( "Do not show the systray icon" ), nullptr }, + { "singleshot", I18N_NOOP( "Display the default view and exit (non daemon mode)" ), nullptr }, TDECmdLineLastOption }; -- cgit v1.2.3