From 1b971dd9b809fa3b4139281a8a93571888864cbe Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 16:44:47 -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/main.cpp | 24 ++++++++++++------------ src/tqtraylabel.cpp | 2 +- src/traylabelmgr.cpp | 4 ++-- src/util.h | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index ddb9136..9bb700e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -51,18 +51,18 @@ static void sighandler(int sig) static const TDECmdLineOptions options[] = { - { "b", I18N_NOOP("Dont warn about non-normal windows (blind mode)"), 0L }, - { "d", I18N_NOOP("Disable session management"), 0L }, - { "e", I18N_NOOP("Enable session management"), 0L }, - { "f", I18N_NOOP("Dock window that has the focus (active window)"), 0L }, - { "i icon", I18N_NOOP("Custom dock Icon"), 0L }, - { "m", I18N_NOOP("Keep application window mapped (don't hide on dock)"), 0L }, - { "o", I18N_NOOP("Dock when obscured"), 0L }, - { "p secs", I18N_NOOP("Set ballooning timeout (popup time)"), 0L }, - { "q", I18N_NOOP("Disable ballooning title changes (quiet)"), 0L }, - { "t", I18N_NOOP("Remove this application from the task bar"), 0L }, - { "w wid", I18N_NOOP("Window id of the application to dock"), 0L }, - { "!+[command ]", I18N_NOOP("Application to dock"), 0 }, + { "b", I18N_NOOP("Dont warn about non-normal windows (blind mode)"), nullptr }, + { "d", I18N_NOOP("Disable session management"), nullptr }, + { "e", I18N_NOOP("Enable session management"), nullptr }, + { "f", I18N_NOOP("Dock window that has the focus (active window)"), nullptr }, + { "i icon", I18N_NOOP("Custom dock Icon"), nullptr }, + { "m", I18N_NOOP("Keep application window mapped (don't hide on dock)"), nullptr }, + { "o", I18N_NOOP("Dock when obscured"), nullptr }, + { "p secs", I18N_NOOP("Set ballooning timeout (popup time)"), nullptr }, + { "q", I18N_NOOP("Disable ballooning title changes (quiet)"), nullptr }, + { "t", I18N_NOOP("Remove this application from the task bar"), nullptr }, + { "w wid", I18N_NOOP("Window id of the application to dock"), nullptr }, + { "!+[command ]", I18N_NOOP("Application to dock"), nullptr }, TDECmdLineLastOption }; diff --git a/src/tqtraylabel.cpp b/src/tqtraylabel.cpp index eeec5f2..26beb51 100644 --- a/src/tqtraylabel.cpp +++ b/src/tqtraylabel.cpp @@ -65,7 +65,7 @@ void TQTrayLabel::initialize(void) mDesktop = 666; // setDockedWindow would set it a saner value // Balloon's properties are set to match a TQt tool tip (see TQt source) - mBalloon = new TQLabel(0, "balloon", WType_TopLevel | WStyle_StaysOnTop | + mBalloon = new TQLabel(nullptr, "balloon", WType_TopLevel | WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM); mBalloon->setFont(TQToolTip::font()); diff --git a/src/traylabelmgr.cpp b/src/traylabelmgr.cpp index b676fa5..fa96e83 100644 --- a/src/traylabelmgr.cpp +++ b/src/traylabelmgr.cpp @@ -143,7 +143,7 @@ void TrayLabelMgr::quitAll() TRACE("quitAll: number of tray labels = %i", mTrayLabels.count()); TQPtrListIterator it(mTrayLabels); TQTrayLabel *t; - while ((t = it.current()) != 0) + while ((t = it.current()) != nullptr) { ++it; t->close(); @@ -156,7 +156,7 @@ void TrayLabelMgr::undockAll() TRACE("undockAll: number of tray labels = %i", mTrayLabels.count()); TQPtrListIterator it(mTrayLabels); TQTrayLabel *t; - while ((t = it.current()) != 0) + while ((t = it.current()) != nullptr) { ++it; t->undock(); diff --git a/src/util.h b/src/util.h index 9b9afb1..8685d20 100644 --- a/src/util.h +++ b/src/util.h @@ -34,14 +34,14 @@ extern void sendMessage(Display *display, Window to, Window w, char *type, extern bool analyzeWindow(Display *display, Window w, pid_t epid, const TQString &ename); extern Window activeWindow(Display *display); -extern Window selectWindow(Display *display, const char **err = 0); +extern Window selectWindow(Display *display, const char **err = nullptr); extern void subscribe(Display *display, Window w, long mask, bool set); extern bool getCardinalProperty(Display *display, Window w, Atom prop, long *data); typedef enum { SysTrayAbsent, SysTrayHidden, SysTrayPresent } SysTrayState; -extern SysTrayState sysTrayStatus(Display *display, Window *tray = 0); +extern SysTrayState sysTrayStatus(Display *display, Window *tray = nullptr); #endif -- cgit v1.2.3