From 5398c001db19efa619ee972ce19040f3d414386b Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:36:18 -0300 Subject: Replace NULL 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 --- styles/dotnet/dotnet.cpp | 2 +- styles/phase/phasestyle.cpp | 6 +-- styles/phase/phasestyle.h | 2 +- tdescreensaver/kdesavers/Euphoria.cpp | 4 +- tdescreensaver/kdesavers/Flux.cpp | 4 +- tdescreensaver/kdesavers/SolarWinds.cpp | 4 +- tdescreensaver/kdesavers/banner.h | 2 +- tdescreensaver/kdesavers/blob.cpp | 6 +-- tdescreensaver/kdesavers/blob.h | 2 +- tdescreensaver/kdesavers/firesaver.cpp | 10 ++-- tdescreensaver/kdesavers/firesaversetup.ui.h | 2 +- tdescreensaver/kdesavers/fountain.h | 2 +- tdescreensaver/kdesavers/gravity.h | 2 +- tdescreensaver/kdesavers/kvm.h | 2 +- tdescreensaver/kdesavers/lines.h | 2 +- tdescreensaver/kdesavers/rotation.h | 2 +- tdescreensaver/kdesavers/slideshow.cpp | 8 +-- tdescreensaver/kdesavers/slideshow.h | 2 +- tdescreensaver/kdesavers/sspreviewarea.h | 2 +- tdescreensaver/kdesavers/wave.h | 2 +- tdescreensaver/xsavers/space.cpp | 6 +-- tdescreensaver/xsavers/space.h | 2 +- tdescreensaver/xsavers/swarm.cpp | 4 +- tdescreensaver/xsavers/swarm.h | 2 +- tdescreensaver/xsavers/xlock.cpp | 2 +- twin-styles/cde/cdeclient.cpp | 8 +-- twin-styles/cde/cdeclient.h | 2 +- twin-styles/icewm/icewm.cpp | 72 ++++++++++++------------- twin-styles/icewm/icewm.h | 2 +- twin-styles/kde1/kde1client.cpp | 32 +++++------ twin-styles/kstep/nextclient.cpp | 14 ++--- twin-styles/kstep/nextclient.h | 4 +- twin-styles/riscos/Button.cpp | 2 +- twin-styles/riscos/Manager.cpp | 10 ++-- twin-styles/riscos/Static.cpp | 4 +- twin-styles/smooth-blend/client/smoothblend.cpp | 8 +-- twin-styles/smooth-blend/client/smoothblend.h | 2 +- twin-styles/system/systemclient.cpp | 4 +- twin-styles/system/systemclient.h | 2 +- 39 files changed, 125 insertions(+), 125 deletions(-) diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 51070690..dd9b54d7 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -1144,7 +1144,7 @@ void dotNETstyle::drawControl(ControlElement element, if ((!ceData.fgPixmap.isNull()) && !ceData.text) { TQRect pr(0, 0, ceData.fgPixmap.width(), ceData.fgPixmap.height()); pr.moveCenter(r.center()); - p->drawPixmap(pr.topLeft(), (ceData.fgPixmap.isNull())?NULL:ceData.fgPixmap); + p->drawPixmap(pr.topLeft(), (ceData.fgPixmap.isNull())?nullptr:ceData.fgPixmap); } if (useTextShadows && !ceData.text.isEmpty() && enabled) { diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index a00e08fe..cfdc5f63 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -1014,7 +1014,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, break; } case PE_MenuItemIndicatorCheck: { - int checkwidth = styleHint(SH_MenuIndicatorColumnWidth, ceData, elementFlags, option, NULL, NULL); + int checkwidth = styleHint(SH_MenuIndicatorColumnWidth, ceData, elementFlags, option, nullptr, nullptr); int cx = reverse_ ? x+w - checkwidth : x; drawPrimitive(PE_CheckMark, painter, ceData, elementFlags, TQRect(cx + ITEMFRAME, y + ITEMFRAME, @@ -1788,7 +1788,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, // draw frame if (controls & SC_SpinWidgetFrame) { - drawPhasePanel(painter, x, y, w, h, group, true, NULL); + drawPhasePanel(painter, x, y, w, h, group, true, nullptr); } // draw button field @@ -1848,7 +1848,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, // check for TQToolBar parent if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) { - toolbar = (btn)?::tqt_cast(btn->parent()):NULL; + toolbar = (btn)?::tqt_cast(btn->parent()):nullptr; horiz = (ceData.toolBarData.orientation == TQt::Horizontal); if (normal) { // draw background if (toolbar && flatToolbar(ceData, elementFlags, toolbar)) { diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h index bba45997..07e8f2e1 100644 --- a/styles/phase/phasestyle.h +++ b/styles/phase/phasestyle.h @@ -169,7 +169,7 @@ class PhaseStyle : public TDEStyle int x, int y, int w, int h, const TQColorGroup &group, bool sunken=false, - const TQBrush *fill=NULL) const; + const TQBrush *fill=nullptr) const; void drawPhaseTab(TQPainter *painter, int x, int y, int w, int h, diff --git a/tdescreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp index 4bc3c50b..f43be46e 100644 --- a/tdescreensaver/kdesavers/Euphoria.cpp +++ b/tdescreensaver/kdesavers/Euphoria.cpp @@ -660,7 +660,7 @@ void EuphoriaWidget::nextFrame() void EuphoriaWidget::updateParameters() { - srand((unsigned)time(NULL)); + srand((unsigned)time(nullptr)); rand(); rand(); rand(); rand(); rand(); elapsedTime = 0.0f; @@ -935,7 +935,7 @@ static int filterRandom( int n ) { if( (n < 0) || (n >= EuphoriaWidget::DefaultModes) ) { - srand((unsigned)time(NULL)); + srand((unsigned)time(nullptr)); n = rand() % EuphoriaWidget::DefaultModes; } return n; diff --git a/tdescreensaver/kdesavers/Flux.cpp b/tdescreensaver/kdesavers/Flux.cpp index 91cf91b4..b136868b 100644 --- a/tdescreensaver/kdesavers/Flux.cpp +++ b/tdescreensaver/kdesavers/Flux.cpp @@ -668,7 +668,7 @@ void FluxWidget::updateParameters() int i, j; float x, y, temp; - srand((unsigned)time(NULL)); + srand((unsigned)time(nullptr)); rand(); rand(); rand(); rand(); rand(); cameraAngle = 0.0f; @@ -819,7 +819,7 @@ static int filterRandom( int n ) { if( (n < 0) || (n >= FluxWidget::DefaultModes) ) { - srand((unsigned)time(NULL)); + srand((unsigned)time(nullptr)); n = rand() % FluxWidget::DefaultModes; } return n; diff --git a/tdescreensaver/kdesavers/SolarWinds.cpp b/tdescreensaver/kdesavers/SolarWinds.cpp index 01a0aa01..99d97dbd 100644 --- a/tdescreensaver/kdesavers/SolarWinds.cpp +++ b/tdescreensaver/kdesavers/SolarWinds.cpp @@ -421,7 +421,7 @@ void SWindsWidget::updateParameters() int i, j; float x, y, temp; - srand((unsigned)time(NULL)); + srand((unsigned)time(nullptr)); rand(); rand(); rand(); rand(); rand(); glClearColor(0.0f, 0.0f, 0.0f, 1.0f); @@ -633,7 +633,7 @@ static int filterRandom( int n ) { if( (n < 0) || (n >= SWindsWidget::DefaultModes) ) { - srand((unsigned)time(NULL)); + srand((unsigned)time(nullptr)); n = rand() % SWindsWidget::DefaultModes; } return n; diff --git a/tdescreensaver/kdesavers/banner.h b/tdescreensaver/kdesavers/banner.h index 04212c7e..bca7ca40 100644 --- a/tdescreensaver/kdesavers/banner.h +++ b/tdescreensaver/kdesavers/banner.h @@ -71,7 +71,7 @@ class KBannerSetup : public KDialogBase TQ_OBJECT public: - KBannerSetup( TQWidget *parent = NULL, const char *name = NULL ); + KBannerSetup( TQWidget *parent = nullptr, const char *name = nullptr ); protected: void readSettings(); diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp index e6fb6c23..8d4638dd 100644 --- a/tdescreensaver/kdesavers/blob.cpp +++ b/tdescreensaver/kdesavers/blob.cpp @@ -138,7 +138,7 @@ KBlobSaver::KBlobSaver ( WId id) dim = height()/70+1; // record starting time to know when to change frames - start = time(NULL); + start = time(nullptr); // init some parameters used by all algorithms xhalf = width()/2; @@ -229,7 +229,7 @@ void KBlobSaver::pcSetup() // render next frame ( or change algorithms ) void KBlobSaver::slotTimeout() { - time_t now = time(NULL); + time_t now = time(nullptr); // should algorithm be changed if (now-start > showlen) @@ -243,7 +243,7 @@ void KBlobSaver::slotTimeout() alg = SMALLRAND(ALG_LAST)-1; (this->*Algs[alg].Init)(); newalg = 0; - start = time(NULL); + start = time(nullptr); } // gen next fram for current algorithm diff --git a/tdescreensaver/kdesavers/blob.h b/tdescreensaver/kdesavers/blob.h index b28a3275..2b99dca8 100644 --- a/tdescreensaver/kdesavers/blob.h +++ b/tdescreensaver/kdesavers/blob.h @@ -102,7 +102,7 @@ class KBlobSetup : public KDialogBase KIntNumInput *stime; public: - KBlobSetup( TQWidget *parent = NULL, const char *name = NULL ); + KBlobSetup( TQWidget *parent = nullptr, const char *name = nullptr ); protected: void readSettings(); diff --git a/tdescreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp index a3fd6c4c..53108781 100644 --- a/tdescreensaver/kdesavers/firesaver.cpp +++ b/tdescreensaver/kdesavers/firesaver.cpp @@ -120,7 +120,7 @@ KFireSaver :: KFireSaver( TQWidget *parent, const char *name ) { // set random seed to initialize drand48() calls timeval tv; - gettimeofday(&tv,NULL); + gettimeofday(&tv,nullptr); srand48( (long)tv.tv_usec ); readConfig(); @@ -198,7 +198,7 @@ KFireSaver :: KFireSaver( TQWidget *parent, const char *name ) startTimer(MSECPERIOD); //force initialization of "show" variables for the first time - timerEvent(NULL); + timerEvent(nullptr); } @@ -249,7 +249,7 @@ void KFireSaver :: resizeGL( int width, int height ) } timeval tv; - gettimeofday(&tv,NULL); + gettimeofday(&tv,nullptr); timeStampFrame = (double)tv.tv_sec + (double)tv.tv_usec/1000000.0; firstGLFrame = true; @@ -273,7 +273,7 @@ void KFireSaver :: paintGL () /* calculate TIME ELAPSED between current and previous frame */ timeval tv; - gettimeofday(&tv,NULL); + gettimeofday(&tv,nullptr); double timeCurrent = (double)tv.tv_sec + (double)tv.tv_usec/1000000.0; double timeDiff = (MSECPERIOD / 1000.0); if (parameters.enableRealtime) @@ -805,7 +805,7 @@ void KFireSaver :: explodeFirework(Particle* leaderParticle) void KFireSaver :: timerEvent(TQTimerEvent*) { timeval tv; - gettimeofday(&tv,NULL); + gettimeofday(&tv,nullptr); double currentTime = (double)tv.tv_sec + (double)tv.tv_usec/1000000.0; bool chooseType = false, diff --git a/tdescreensaver/kdesavers/firesaversetup.ui.h b/tdescreensaver/kdesavers/firesaversetup.ui.h index 490543c4..b62d46e1 100644 --- a/tdescreensaver/kdesavers/firesaversetup.ui.h +++ b/tdescreensaver/kdesavers/firesaversetup.ui.h @@ -19,7 +19,7 @@ void KFireSaverSetup::init() { readConfig(); - fireSaverWidget = NULL; + fireSaverWidget = nullptr; updatePreview(); } diff --git a/tdescreensaver/kdesavers/fountain.h b/tdescreensaver/kdesavers/fountain.h index 4dedfc46..30b51c42 100644 --- a/tdescreensaver/kdesavers/fountain.h +++ b/tdescreensaver/kdesavers/fountain.h @@ -124,7 +124,7 @@ class KFountainSetup : public SetupUi TQ_OBJECT public: - KFountainSetup( TQWidget *parent = NULL, const char *name = NULL ); + KFountainSetup( TQWidget *parent = nullptr, const char *name = nullptr ); protected: void readSettings(); diff --git a/tdescreensaver/kdesavers/gravity.h b/tdescreensaver/kdesavers/gravity.h index 901d2c3e..c8d25e6c 100644 --- a/tdescreensaver/kdesavers/gravity.h +++ b/tdescreensaver/kdesavers/gravity.h @@ -122,7 +122,7 @@ class KGravitySetup : public SetupUi TQ_OBJECT public: - KGravitySetup( TQWidget *parent = NULL, const char *name = NULL ); + KGravitySetup( TQWidget *parent = nullptr, const char *name = nullptr ); ~KGravitySetup(); protected: diff --git a/tdescreensaver/kdesavers/kvm.h b/tdescreensaver/kdesavers/kvm.h index cc293eab..af1af3a0 100644 --- a/tdescreensaver/kdesavers/kvm.h +++ b/tdescreensaver/kdesavers/kvm.h @@ -77,7 +77,7 @@ class kVmSetup : public KDialogBase TQ_OBJECT public: - kVmSetup( TQWidget *parent = NULL, const char *name = NULL ); + kVmSetup( TQWidget *parent = nullptr, const char *name = nullptr ); ~kVmSetup(); protected: void readSettings(); diff --git a/tdescreensaver/kdesavers/lines.h b/tdescreensaver/kdesavers/lines.h index 3f9da6a2..065251d2 100644 --- a/tdescreensaver/kdesavers/lines.h +++ b/tdescreensaver/kdesavers/lines.h @@ -71,7 +71,7 @@ class kLinesSetup : public KDialogBase{ TQ_OBJECT public: - kLinesSetup(TQWidget *parent=NULL, const char *name=NULL); + kLinesSetup(TQWidget *parent=nullptr, const char *name=nullptr); ~kLinesSetup(); protected: diff --git a/tdescreensaver/kdesavers/rotation.h b/tdescreensaver/kdesavers/rotation.h index c1546d29..26a6503c 100644 --- a/tdescreensaver/kdesavers/rotation.h +++ b/tdescreensaver/kdesavers/rotation.h @@ -304,7 +304,7 @@ class KRotationSetup : public KRotationSetupUi public: - KRotationSetup(TQWidget* parent = NULL, const char* name = NULL); + KRotationSetup(TQWidget* parent = nullptr, const char* name = nullptr); ~KRotationSetup(); public slots: diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp index 5cad5b01..723606a1 100644 --- a/tdescreensaver/kdesavers/slideshow.cpp +++ b/tdescreensaver/kdesavers/slideshow.cpp @@ -78,9 +78,9 @@ kSlideShowSaver::kSlideShowSaver( WId id ): KScreenSaver(id) blank(); - mEffect = NULL; + mEffect = nullptr; mNumEffects = 0; - mIntArray = NULL; + mIntArray = nullptr; registerEffects(); readConfig(); @@ -329,7 +329,7 @@ int kSlideShowSaver::effectMeltdown(bool aInit) if (done) { delete [] mIntArray; - mIntArray = NULL; + mIntArray = nullptr; return -1; } @@ -676,7 +676,7 @@ void kSlideShowSaver::startPainter(TQt::PenStyle aPen) void kSlideShowSaver::restart() { mEffectRunning = false; - mEffect = NULL; + mEffect = nullptr; blank(); slotTimeout(); } diff --git a/tdescreensaver/kdesavers/slideshow.h b/tdescreensaver/kdesavers/slideshow.h index ee76cbfb..4f1c6425 100644 --- a/tdescreensaver/kdesavers/slideshow.h +++ b/tdescreensaver/kdesavers/slideshow.h @@ -131,7 +131,7 @@ class kSlideShowSetup : public KDialogBase TQ_OBJECT public: - kSlideShowSetup(TQWidget *parent=NULL, const char *name=NULL); + kSlideShowSetup(TQWidget *parent=nullptr, const char *name=nullptr); ~kSlideShowSetup(); protected: diff --git a/tdescreensaver/kdesavers/sspreviewarea.h b/tdescreensaver/kdesavers/sspreviewarea.h index 339d54d5..bec7d175 100644 --- a/tdescreensaver/kdesavers/sspreviewarea.h +++ b/tdescreensaver/kdesavers/sspreviewarea.h @@ -38,7 +38,7 @@ class SsPreviewArea : public TQWidget * * The constructor just calls TQWidget::TQWidget() with the given arguments. */ - SsPreviewArea(TQWidget* parent = NULL, const char* name = NULL); + SsPreviewArea(TQWidget* parent = nullptr, const char* name = nullptr); protected: /** @brief Called if widget gets resized. diff --git a/tdescreensaver/kdesavers/wave.h b/tdescreensaver/kdesavers/wave.h index 3e3073db..3368f053 100644 --- a/tdescreensaver/kdesavers/wave.h +++ b/tdescreensaver/kdesavers/wave.h @@ -81,7 +81,7 @@ class KWaveSetup : public SetupUi TQ_OBJECT public: - KWaveSetup( TQWidget *parent = NULL, const char *name = NULL ); + KWaveSetup( TQWidget *parent = nullptr, const char *name = nullptr ); ~KWaveSetup( ); protected: void readSettings(); diff --git a/tdescreensaver/xsavers/space.cpp b/tdescreensaver/xsavers/space.cpp index 01d4cddf..fb5b53ae 100644 --- a/tdescreensaver/xsavers/space.cpp +++ b/tdescreensaver/xsavers/space.cpp @@ -352,7 +352,7 @@ getVisual(XVisualInfo * wantVis, int visual_count) if (first) { for (screen = 0; screen < MAXSCREENS; screen++) - glVis[screen] = NULL; + glVis[screen] = nullptr; } if (!glVis[screen]) { @@ -472,7 +472,7 @@ initSpace(Window window) #undef Below -static kSpaceSaver *saver = NULL; +static kSpaceSaver *saver = nullptr; void startScreenSaver( Drawable d ) { @@ -485,7 +485,7 @@ void stopScreenSaver() { if ( saver ) delete saver; - saver = NULL; + saver = nullptr; } int setupScreenSaver() diff --git a/tdescreensaver/xsavers/space.h b/tdescreensaver/xsavers/space.h index c2c53631..42e07db5 100644 --- a/tdescreensaver/xsavers/space.h +++ b/tdescreensaver/xsavers/space.h @@ -41,7 +41,7 @@ class kSpaceSetup : public KDialogBase TQ_OBJECT public: - kSpaceSetup( TQWidget *parent = NULL, const char *name = NULL ); + kSpaceSetup( TQWidget *parent = nullptr, const char *name = nullptr ); protected: void readSettings(); diff --git a/tdescreensaver/xsavers/swarm.cpp b/tdescreensaver/xsavers/swarm.cpp index 2983a948..70e60ea6 100644 --- a/tdescreensaver/xsavers/swarm.cpp +++ b/tdescreensaver/xsavers/swarm.cpp @@ -231,7 +231,7 @@ drawswarm(Window win, KRandomSequence &rnd) #undef Below -static kSwarmSaver *saver = NULL; +static kSwarmSaver *saver = nullptr; void startScreenSaver( Drawable d ) { @@ -244,7 +244,7 @@ void stopScreenSaver() { if ( saver ) delete saver; - saver = NULL; + saver = nullptr; } int setupScreenSaver() diff --git a/tdescreensaver/xsavers/swarm.h b/tdescreensaver/xsavers/swarm.h index 510f2d58..da9b7333 100644 --- a/tdescreensaver/xsavers/swarm.h +++ b/tdescreensaver/xsavers/swarm.h @@ -43,7 +43,7 @@ class kSwarmSetup : public KDialogBase TQ_OBJECT public: - kSwarmSetup( TQWidget *parent = NULL, const char *name = NULL ); + kSwarmSetup( TQWidget *parent = nullptr, const char *name = nullptr ); protected: void readSettings(); diff --git a/tdescreensaver/xsavers/xlock.cpp b/tdescreensaver/xsavers/xlock.cpp index 7b826158..9692a01d 100644 --- a/tdescreensaver/xsavers/xlock.cpp +++ b/tdescreensaver/xsavers/xlock.cpp @@ -60,7 +60,7 @@ allocpixel(Colormap cmap, const char *name, const char *def) void initXLock( GC gc ) { - SetRNG( time(NULL) ); + SetRNG( time(nullptr) ); dsp = tqt_xdisplay(); screen = tqt_xscreen(); diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index 621e9ac1..097d8e90 100644 --- a/twin-styles/cde/cdeclient.cpp +++ b/twin-styles/cde/cdeclient.cpp @@ -304,7 +304,7 @@ void CdeClient::init() windowLayout->addItem( new TQSpacerItem( 0, 0 )); for ( int i=0; i < BtnCount; i++ ) - button[i] = NULL; + button[i] = nullptr; addClientButtons( options()->titleButtonsLeft() ); @@ -443,9 +443,9 @@ void CdeClient::maximizeButtonClicked() void CdeClient::menuButtonPressed() { - static TQTime* t = NULL; - static CdeClient* lastClient = NULL; - if( t == NULL ) + static TQTime* t = nullptr; + static CdeClient* lastClient = nullptr; + if(!t) t = new TQTime; bool dbl = ( lastClient == this && t->elapsed() <= TQApplication::doubleClickInterval()); lastClient = this; diff --git a/twin-styles/cde/cdeclient.h b/twin-styles/cde/cdeclient.h index be4a9752..ef4256bd 100644 --- a/twin-styles/cde/cdeclient.h +++ b/twin-styles/cde/cdeclient.h @@ -39,7 +39,7 @@ class CdeButton : public TQButton { public: CdeButton( CdeClient* parent=0, const char* name=0, int btnType=0, - const TQString& tip=NULL, int realize_btns = TQt::LeftButton ); + const TQString& tip=nullptr, int realize_btns = TQt::LeftButton ); void reset(); ButtonState lastButton() { return last_button; } diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp index 84b11c78..684bc64f 100644 --- a/twin-styles/icewm/icewm.cpp +++ b/twin-styles/icewm/icewm.cpp @@ -63,36 +63,36 @@ namespace IceWM { //////////////////////////////////////////////////////////////////////////////////////////// // IceWM frame pixmaps -TQPixmap* frameTL[] = {NULL, NULL}; -TQPixmap* frameT [] = {NULL, NULL}; -TQPixmap* frameTR[] = {NULL, NULL}; -TQPixmap* frameL [] = {NULL, NULL}; -TQPixmap* frameR [] = {NULL, NULL}; -TQPixmap* frameBL[] = {NULL, NULL}; -TQPixmap* frameB [] = {NULL, NULL}; -TQPixmap* frameBR[] = {NULL, NULL}; +TQPixmap* frameTL[] = {nullptr, nullptr}; +TQPixmap* frameT [] = {nullptr, nullptr}; +TQPixmap* frameTR[] = {nullptr, nullptr}; +TQPixmap* frameL [] = {nullptr, nullptr}; +TQPixmap* frameR [] = {nullptr, nullptr}; +TQPixmap* frameBL[] = {nullptr, nullptr}; +TQPixmap* frameB [] = {nullptr, nullptr}; +TQPixmap* frameBR[] = {nullptr, nullptr}; // Button pixmaps -TQPixmap* closePix[] = {NULL, NULL}; -TQPixmap* depthPix[] = {NULL, NULL}; -TQPixmap* maximizePix[] = {NULL, NULL}; -TQPixmap* minimizePix[] = {NULL, NULL}; -TQPixmap* restorePix[] = {NULL, NULL}; -TQPixmap* hidePix[] = {NULL, NULL}; -TQPixmap* rollupPix[] = {NULL, NULL}; -TQPixmap* rolldownPix[] = {NULL, NULL}; -TQPixmap* menuButtonPix[] = {NULL, NULL}; +TQPixmap* closePix[] = {nullptr, nullptr}; +TQPixmap* depthPix[] = {nullptr, nullptr}; +TQPixmap* maximizePix[] = {nullptr, nullptr}; +TQPixmap* minimizePix[] = {nullptr, nullptr}; +TQPixmap* restorePix[] = {nullptr, nullptr}; +TQPixmap* hidePix[] = {nullptr, nullptr}; +TQPixmap* rollupPix[] = {nullptr, nullptr}; +TQPixmap* rolldownPix[] = {nullptr, nullptr}; +TQPixmap* menuButtonPix[] = {nullptr, nullptr}; // Titlebar pixmaps -TQPixmap* titleJ[] = {NULL, NULL}; -TQPixmap* titleL[] = {NULL, NULL}; -TQPixmap* titleS[] = {NULL, NULL}; -TQPixmap* titleP[] = {NULL, NULL}; -TQPixmap* titleT[] = {NULL, NULL}; -TQPixmap* titleM[] = {NULL, NULL}; -TQPixmap* titleB[] = {NULL, NULL}; -TQPixmap* titleR[] = {NULL, NULL}; -TQPixmap* titleQ[] = {NULL, NULL}; +TQPixmap* titleJ[] = {nullptr, nullptr}; +TQPixmap* titleL[] = {nullptr, nullptr}; +TQPixmap* titleS[] = {nullptr, nullptr}; +TQPixmap* titleP[] = {nullptr, nullptr}; +TQPixmap* titleT[] = {nullptr, nullptr}; +TQPixmap* titleM[] = {nullptr, nullptr}; +TQPixmap* titleB[] = {nullptr, nullptr}; +TQPixmap* titleR[] = {nullptr, nullptr}; +TQPixmap* titleQ[] = {nullptr, nullptr}; ThemeHandler* clientHandler; @@ -438,7 +438,7 @@ void ThemeHandler::initTheme() TQPixmap* ThemeHandler::duplicateValidPixmap( bool act, int size ) { - TQPixmap* p1 = NULL; + TQPixmap* p1 = nullptr; // Use the stretch or title pixmaps instead if ( titleS[act] ) p1 = new TQPixmap( *titleS[act] ); @@ -496,8 +496,8 @@ void ThemeHandler::freePixmapGroup( TQPixmap* p[] ) { if (p[Active]) delete p[Active]; if (p[InActive]) delete p[InActive]; - p[Active] = NULL; - p[InActive] = NULL; + p[Active] = nullptr; + p[InActive] = nullptr; } else tqWarning("twin-icewm: freePixmapGroup - invalid TQPixmap** 'p'\n"); } @@ -529,8 +529,8 @@ TQColor ThemeHandler::decodeColor( TQString& s ) // repetition in patterns, so as not to make them mismatched TQPixmap* ThemeHandler::stretchPixmap( TQPixmap* src, bool stretchHoriz, int stretchSize ) { - if (!src) return NULL; - if (src->isNull()) return NULL; + if (!src) return nullptr; + if (src->isNull()) return nullptr; int s_inc, size; @@ -807,7 +807,7 @@ void IceWMButton::usePixmap( TQPixmap* (*p)[2] ) setFixedSize( (*pix)[Active]->width(), titleBarHeight ); repaint( false ); } else - pix = NULL; + pix = nullptr; } @@ -886,11 +886,11 @@ void IceWMClient::init() // Set button pointers to null so we can track things for(int i= IceWMClient::BtnSysMenu; i < IceWMClient::BtnCount; i++) - button[i] = NULL; + button[i] = nullptr; // Make sure we can track the menu pixmaps too. - menuButtonWithIconPix[Active] = NULL; - menuButtonWithIconPix[InActive] = NULL; + menuButtonWithIconPix[Active] = nullptr; + menuButtonWithIconPix[InActive] = nullptr; // No flicker thanks widget()->setBackgroundMode( NoBackground ); @@ -1633,7 +1633,7 @@ IceWMClient::Position IceWMClient::mousePosition( const TQPoint& p ) const void IceWMClient::menuButtonPressed() { static TQTime t; - static IceWMClient* lastClient = NULL; + static IceWMClient* lastClient = nullptr; bool dbl = ( lastClient == this && t.elapsed() <= TQApplication::doubleClickInterval()); lastClient = this; t.start(); diff --git a/twin-styles/icewm/icewm.h b/twin-styles/icewm/icewm.h index ef667f1e..6b84aaad 100644 --- a/twin-styles/icewm/icewm.h +++ b/twin-styles/icewm/icewm.h @@ -101,7 +101,7 @@ class IceWMButton : public TQButton public: IceWMButton( IceWMClient *parent=0, const char *name=0, TQPixmap* (*p)[2]=0L, bool isToggle=false, - const TQString& tip=NULL, const int realizeBtns = TQt::LeftButton ); + const TQString& tip=nullptr, const int realizeBtns = TQt::LeftButton ); void setTipText(const TQString &tip); void usePixmap( TQPixmap* (*p)[2] ); TQSize sizeHint() const; diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp index 44e15d88..613dec15 100644 --- a/twin-styles/kde1/kde1client.cpp +++ b/twin-styles/kde1/kde1client.cpp @@ -64,9 +64,9 @@ void create_pixmaps() dis_close_pix = new TQPixmap(16, 16); aPainter.begin(close_pix); iPainter.begin(dis_close_pix); kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, close_white_bits, - NULL, NULL, close_dgray_bits, NULL, NULL); + nullptr, nullptr, close_dgray_bits, nullptr, nullptr); kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, close_white_bits, - NULL, NULL, close_dgray_bits, NULL, NULL); + nullptr, nullptr, close_dgray_bits, nullptr, nullptr); aPainter.end(); iPainter.end(); close_pix->setMask(TQBitmap(16, 16, close_mask_bits, true)); dis_close_pix->setMask(*close_pix->mask()); @@ -75,9 +75,9 @@ void create_pixmaps() dis_minimize_pix = new TQPixmap(16, 16); aPainter.begin(minimize_pix); iPainter.begin(dis_minimize_pix); kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, iconify_white_bits, - NULL, NULL, iconify_dgray_bits, NULL, NULL); + nullptr, nullptr, iconify_dgray_bits, nullptr, nullptr); kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, iconify_white_bits, - NULL, NULL, iconify_dgray_bits, NULL, NULL); + nullptr, nullptr, iconify_dgray_bits, nullptr, nullptr); aPainter.end(); iPainter.end(); minimize_pix->setMask(TQBitmap(16, 16, iconify_mask_bits, true)); dis_minimize_pix->setMask(*minimize_pix->mask()); @@ -86,9 +86,9 @@ void create_pixmaps() dis_maximize_pix = new TQPixmap(16, 16); aPainter.begin(maximize_pix); iPainter.begin(dis_maximize_pix); kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, maximize_white_bits, - NULL, NULL, maximize_dgray_bits, NULL, NULL); + nullptr, nullptr, maximize_dgray_bits, nullptr, nullptr); kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, maximize_white_bits, - NULL, NULL, maximize_dgray_bits, NULL, NULL); + nullptr, nullptr, maximize_dgray_bits, nullptr, nullptr); aPainter.end(); iPainter.end(); maximize_pix->setMask(TQBitmap(16, 16, maximize_mask_bits, true)); dis_maximize_pix->setMask(*maximize_pix->mask()); @@ -97,9 +97,9 @@ void create_pixmaps() dis_normalize_pix = new TQPixmap(16, 16); aPainter.begin(normalize_pix); iPainter.begin(dis_normalize_pix); kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, maximizedown_white_bits, - NULL, NULL, maximizedown_dgray_bits, NULL, NULL); + nullptr, nullptr, maximizedown_dgray_bits, nullptr, nullptr); kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, maximizedown_white_bits, - NULL, NULL, maximizedown_dgray_bits, NULL, NULL); + nullptr, nullptr, maximizedown_dgray_bits, nullptr, nullptr); aPainter.end(); iPainter.end(); normalize_pix->setMask(TQBitmap(16, 16, maximizedown_mask_bits, true)); dis_normalize_pix->setMask(*normalize_pix->mask()); @@ -108,9 +108,9 @@ void create_pixmaps() dis_menu_pix = new TQPixmap(16, 16); aPainter.begin(menu_pix); iPainter.begin(dis_menu_pix); kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, menu_white_bits, - NULL, NULL, menu_dgray_bits, NULL, NULL); + nullptr, nullptr, menu_dgray_bits, nullptr, nullptr); kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, menu_white_bits, - NULL, NULL, menu_dgray_bits, NULL, NULL); + nullptr, nullptr, menu_dgray_bits, nullptr, nullptr); aPainter.end(); iPainter.end(); menu_pix->setMask(TQBitmap(16, 16, menu_mask_bits, true)); dis_menu_pix->setMask(*menu_pix->mask()); @@ -119,9 +119,9 @@ void create_pixmaps() dis_pinup_pix = new TQPixmap(16, 16); aPainter.begin(pinup_pix); iPainter.begin(dis_pinup_pix); kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, pinup_white_bits, - pinup_gray_bits, NULL, pinup_dgray_bits, NULL, NULL); + pinup_gray_bits, nullptr, pinup_dgray_bits, nullptr, nullptr); kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, pinup_white_bits, - pinup_gray_bits, NULL, pinup_dgray_bits, NULL, NULL); + pinup_gray_bits, nullptr, pinup_dgray_bits, nullptr, nullptr); aPainter.end(); iPainter.end(); pinup_pix->setMask(TQBitmap(16, 16, pinup_mask_bits, true)); dis_pinup_pix->setMask(*pinup_pix->mask()); @@ -130,9 +130,9 @@ void create_pixmaps() dis_pindown_pix = new TQPixmap(16, 16); aPainter.begin(pindown_pix); iPainter.begin(dis_pindown_pix); kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, pindown_white_bits, - pindown_gray_bits, NULL, pindown_dgray_bits, NULL, NULL); + pindown_gray_bits, nullptr, pindown_dgray_bits, nullptr, nullptr); kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, pindown_white_bits, - pindown_gray_bits, NULL, pindown_dgray_bits, NULL, NULL); + pindown_gray_bits, nullptr, pindown_dgray_bits, nullptr, nullptr); aPainter.end(); iPainter.end(); pindown_pix->setMask(TQBitmap(16, 16, pindown_mask_bits, true)); dis_pindown_pix->setMask(*pindown_pix->mask()); @@ -141,9 +141,9 @@ void create_pixmaps() dis_question_mark_pix = new TQPixmap(16, 16); aPainter.begin(question_mark_pix); iPainter.begin(dis_question_mark_pix); kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, help_light_bits, - NULL, NULL, help_dark_bits, NULL, NULL); + nullptr, nullptr, help_dark_bits, nullptr, nullptr); kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, help_light_bits, - NULL, NULL, help_dark_bits, NULL, NULL); + nullptr, nullptr, help_dark_bits, nullptr, nullptr); aPainter.end(); iPainter.end(); question_mark_pix->setMask(TQBitmap(16, 16, help_mask_bits, true)); dis_question_mark_pix->setMask(*question_mark_pix->mask()); diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp index 97a9fd91..483c0aff 100644 --- a/twin-styles/kstep/nextclient.cpp +++ b/twin-styles/kstep/nextclient.cpp @@ -325,7 +325,7 @@ NextButton::NextButton(NextClient *parent, const char *name, const unsigned char *bitmap, int bw, int bh, const TQString& tip, const int realizeBtns) : TQButton(parent->widget(), name), - deco(NULL), client(parent), last_button(TQt::NoButton) + deco(nullptr), client(parent), last_button(TQt::NoButton) { realizeButtons = realizeBtns; @@ -437,7 +437,7 @@ void NextClient::initializeButtonsAndTitlebar(TQBoxLayout* titleLayout) { // Null the buttons to begin with (they are not guaranteed to be null). for (int i=0; iaddWidget( button[MENU_IDX] ); // NOTE DIFFERENCE: capture pressed(), not clicked() connect( button[MENU_IDX], TQ_SIGNAL(pressed()), @@ -518,7 +518,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) case 'L': button[SHADE_IDX] = - new NextButton(this, "shade", NULL, 0, 0, i18n("Shade")); + new NextButton(this, "shade", nullptr, 0, 0, i18n("Shade")); titleLayout->addWidget( button[SHADE_IDX] ); connect( button[SHADE_IDX], TQ_SIGNAL(clicked()), this, TQ_SLOT(shadeClicked()) ); @@ -528,7 +528,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) case 'S': button[STICKY_IDX] = - new NextButton(this, "sticky", NULL, 0, 0, i18n("On all desktops")); + new NextButton(this, "sticky", nullptr, 0, 0, i18n("On all desktops")); titleLayout->addWidget( button[STICKY_IDX] ); connect( button[STICKY_IDX], TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleOnAllDesktops()) ); @@ -537,7 +537,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) break; case 'F': - button[ABOVE_IDX] = new NextButton(this, "above", NULL, 0, 0, ""); + button[ABOVE_IDX] = new NextButton(this, "above", nullptr, 0, 0, ""); titleLayout->addWidget( button[ABOVE_IDX] ); connect( button[ABOVE_IDX], TQ_SIGNAL(clicked()), this, TQ_SLOT(aboveClicked()) ); @@ -547,7 +547,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) break; case 'B': - button[BELOW_IDX] = new NextButton(this, "below", NULL, 0, 0, ""); + button[BELOW_IDX] = new NextButton(this, "below", nullptr, 0, 0, ""); titleLayout->addWidget( button[BELOW_IDX] ); connect( button[BELOW_IDX], TQ_SIGNAL(clicked()), this, TQ_SLOT(belowClicked()) ); diff --git a/twin-styles/kstep/nextclient.h b/twin-styles/kstep/nextclient.h index 34f74b4d..0b9818db 100644 --- a/twin-styles/kstep/nextclient.h +++ b/twin-styles/kstep/nextclient.h @@ -20,8 +20,8 @@ class NextButton : public TQButton { public: NextButton(NextClient *parent=0, const char *name=0, - const unsigned char *bitmap=NULL, int bw=0, int bh=0, - const TQString& tip=NULL, const int realizeBtns = TQt::LeftButton); + const unsigned char *bitmap=nullptr, int bw=0, int bh=0, + const TQString& tip=nullptr, const int realizeBtns = TQt::LeftButton); void setBitmap(const unsigned char *bitmap, int bw, int bh); void reset(); ButtonState lastButton() { return last_button; } diff --git a/twin-styles/riscos/Button.cpp b/twin-styles/riscos/Button.cpp index 4d11e0c7..26e19579 100644 --- a/twin-styles/riscos/Button.cpp +++ b/twin-styles/riscos/Button.cpp @@ -95,7 +95,7 @@ void Button::setPixmap(const TQPixmap &p) else { TQRgb light; - TQRgb* data = NULL; + TQRgb* data = nullptr; TQRgb w = tqRgb(255, 255, 255); TQImage aTx(p.convertToImage()); diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp index 9f540bed..7318f6c1 100644 --- a/twin-styles/riscos/Manager.cpp +++ b/twin-styles/riscos/Manager.cpp @@ -57,9 +57,9 @@ namespace RiscOS Manager::Manager(KDecorationBridge *bridge, KDecorationFactory *factory) : KDecoration(bridge, factory), - topLayout_ (NULL), - titleLayout_ (NULL), - titleSpacer_ (NULL) + topLayout_ (nullptr), + titleLayout_ (nullptr), + titleSpacer_ (nullptr) { } @@ -587,7 +587,7 @@ void Manager::createTitle() for (unsigned int i = 0; i < buttons.length(); ++i) { - Button * tb = NULL; + Button * tb = nullptr; switch (buttons[i].latin1()) { @@ -650,7 +650,7 @@ void Manager::createTitle() break; } - if (tb != NULL) + if(tb) { connect(this, TQ_SIGNAL(activeChanged(bool)), tb, TQ_SLOT(setActive(bool))); buttonList->append(tb); diff --git a/twin-styles/riscos/Static.cpp b/twin-styles/riscos/Static.cpp index a973ccb9..46912c9e 100644 --- a/twin-styles/riscos/Static.cpp +++ b/twin-styles/riscos/Static.cpp @@ -58,7 +58,7 @@ static const char * const texture_xpm[] = { " a a aab b b aa aab a b ", " b a b b aaa a b bb b b b b"}; -Static* Static::instance_ = NULL; +Static* Static::instance_ = nullptr; Static::Static() { @@ -70,7 +70,7 @@ Static::Static() Static::~Static() { - instance_ = NULL; + instance_ = nullptr; } const TQPixmap& Static::titleTextLeft(bool active) const diff --git a/twin-styles/smooth-blend/client/smoothblend.cpp b/twin-styles/smooth-blend/client/smoothblend.cpp index 6f327735..1d0d1390 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cpp +++ b/twin-styles/smooth-blend/client/smoothblend.cpp @@ -33,7 +33,7 @@ using namespace smoothblend; ////////////////////////////////////////////////////////////////////////////// // smoothblendFactory Class ////////////////////////////////////////////////////////////////////////////// -smoothblendFactory* factory=NULL; +smoothblendFactory* factory=nullptr; bool smoothblendFactory::initialized_ = false; TQt::AlignmentFlags smoothblendFactory::titlealign_ = TQt::AlignHCenter; @@ -1352,9 +1352,9 @@ void smoothblendClient::belowButtonPressed() { // Menu button was pressed (popup the menu) void smoothblendClient::menuButtonPressed() { - static TQTime* t = NULL; - static smoothblendClient* lastClient = NULL; - if (t == NULL) + static TQTime* t = nullptr; + static smoothblendClient* lastClient = nullptr; + if(!t) t = new TQTime; bool dbl = (lastClient==this && t->elapsed() <= TQApplication::doubleClickInterval()); lastClient = this; diff --git a/twin-styles/smooth-blend/client/smoothblend.h b/twin-styles/smooth-blend/client/smoothblend.h index c2aff207..fdf30bbd 100644 --- a/twin-styles/smooth-blend/client/smoothblend.h +++ b/twin-styles/smooth-blend/client/smoothblend.h @@ -127,7 +127,7 @@ class smoothblendButton : public TQButton { public: smoothblendButton(smoothblendClient *parent=0, const char *name=0, - const TQString &tip=NULL, + const TQString &tip=nullptr, ButtonType type=ButtonHelp, int button_size=18, bool toggle=false); diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index c6e755b6..6ed9ac74 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -350,7 +350,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s) switch (s[n]) { case 'X': // Close button if ((!button[ButtonClose]) && isCloseable()) { - button[ButtonClose] = new SystemButton(this, "close", NULL, i18n("Close")); + button[ButtonClose] = new SystemButton(this, "close", nullptr, i18n("Close")); connect( button[ButtonClose], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( closeWindow() ) ) ); hb->addWidget(button[ButtonClose]); hb->addSpacing(1); @@ -359,7 +359,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s) case 'S': // Sticky button if (!button[ButtonSticky]) { - button[ButtonSticky] = new SystemButton(this, "sticky", NULL, i18n("On all desktops")); + button[ButtonSticky] = new SystemButton(this, "sticky", nullptr, i18n("On all desktops")); if(isOnAllDesktops()) button[ButtonSticky]->setBitmap(unsticky_bits); else diff --git a/twin-styles/system/systemclient.h b/twin-styles/system/systemclient.h index 2b95779f..237f03b4 100644 --- a/twin-styles/system/systemclient.h +++ b/twin-styles/system/systemclient.h @@ -72,7 +72,7 @@ class SystemButton : public TQButton { public: SystemButton(SystemClient *parent=0, const char *name=0, - const unsigned char *bitmap=NULL, const TQString& tip=NULL); + const unsigned char *bitmap=nullptr, const TQString& tip=nullptr); void setBitmap(const unsigned char *bitmap); void reset(); TQSize sizeHint() const; -- cgit v1.2.3