From c656e69ee4ce87f585527afd67566c6d2181136a Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:36:18 -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 --- styles/dotnet/dotnet.cpp | 14 +++--- styles/dotnet/dotnet.h | 20 ++++---- styles/phase/phasestyle.cpp | 28 +++++------ styles/phase/phasestyle.h | 20 ++++---- tdescreensaver/kdesavers/Euphoria.cpp | 6 +-- tdescreensaver/kdesavers/Euphoria.h | 4 +- tdescreensaver/kdesavers/Flux.cpp | 4 +- tdescreensaver/kdesavers/Flux.h | 4 +- tdescreensaver/kdesavers/SolarWinds.cpp | 4 +- tdescreensaver/kdesavers/SolarWinds.h | 4 +- tdescreensaver/kdesavers/banner.cpp | 6 +-- tdescreensaver/kdesavers/blob.cpp | 4 +- tdescreensaver/kdesavers/firesaver.cpp | 2 +- tdescreensaver/kdesavers/firesaver.h | 2 +- tdescreensaver/kdesavers/fountain.h | 2 +- tdescreensaver/kdesavers/gravity.h | 2 +- tdescreensaver/kdesavers/kclock.cpp | 2 +- tdescreensaver/kdesavers/kclock.h | 2 +- tdescreensaver/kdesavers/kvm.cpp | 2 +- tdescreensaver/kdesavers/lines.cpp | 2 +- tdescreensaver/kdesavers/lorenz.cpp | 2 +- tdescreensaver/kdesavers/lorenz.h | 2 +- tdescreensaver/kdesavers/pendulum.cpp | 12 ++--- tdescreensaver/kdesavers/pendulum.h | 4 +- tdescreensaver/kdesavers/polygon.cpp | 2 +- tdescreensaver/kdesavers/polygon.h | 2 +- tdescreensaver/kdesavers/rotation.cpp | 12 ++--- tdescreensaver/kdesavers/science.cpp | 36 +++++++------- tdescreensaver/kdesavers/science.h | 4 +- tdescreensaver/kdesavers/slideshow.cpp | 10 ++-- .../kdesavers/tdeasciiquarium/screen.cpp | 2 +- tdescreensaver/kdesavers/wave.cpp | 2 +- tdescreensaver/kdesavers/wave.h | 2 +- tdescreensaver/kxsconfig/kxsconfig.cpp | 14 +++--- tdescreensaver/kxsconfig/kxscontrol.cpp | 4 +- tdescreensaver/kxsconfig/kxsrun.cpp | 4 +- tdescreensaver/kxsconfig/kxsxml.cpp | 10 ++-- tdescreensaver/tdepartsaver/tdepartsaver.cpp | 8 ++-- tdescreensaver/tdepartsaver/tdepartsaver.h | 2 +- tdescreensaver/xsavers/main.cpp | 2 +- tdescreensaver/xsavers/space.cpp | 4 +- twin-styles/cde/cdeclient.cpp | 4 +- twin-styles/cde/cdeclient.h | 2 +- twin-styles/glow/config/glowconfigdialog.cpp | 2 +- twin-styles/glow/glowbutton.cpp | 4 +- twin-styles/glow/glowclient.cpp | 20 ++++---- twin-styles/icewm/icewm.cpp | 2 +- twin-styles/icewm/icewm.h | 4 +- twin-styles/kde1/kde1client.cpp | 56 +++++++++++----------- twin-styles/kde1/kde1client.h | 2 +- twin-styles/kstep/nextclient.cpp | 2 +- twin-styles/kstep/nextclient.h | 2 +- twin-styles/openlook/OpenLook.cpp | 4 +- twin-styles/riscos/Button.cpp | 2 +- twin-styles/riscos/Manager.cpp | 4 +- twin-styles/riscos/Static.h | 2 +- twin-styles/smooth-blend/client/buttons.h | 36 +++++++------- .../client/config/smoothblendconfig.cpp | 2 +- twin-styles/smooth-blend/client/smoothblend.cpp | 32 ++++++------- twin-styles/smooth-blend/client/smoothblend.h | 2 +- twin-styles/system/systemclient.cpp | 18 +++---- twin-styles/system/systemclient.h | 2 +- 62 files changed, 239 insertions(+), 239 deletions(-) diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index dd9b54d7..e4f6fac8 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -66,7 +66,7 @@ class dotNETstylePlugin : public TQStylePlugin TQStyle* create( const TQString& key ) { if (key == "dotnet") return new dotNETstyle; - return 0; + return nullptr; } }; @@ -76,9 +76,9 @@ TDE_EXPORT_PLUGIN( dotNETstylePlugin ) dotNETstyle::dotNETstyle() : TDEStyle( AllowMenuTransparency ), kickerMode(false) { - winstyle = 0L; + winstyle = nullptr; winstyle = TQStyleFactory::create("Windows"); - if (winstyle == 0L) { + if(!winstyle) { // We don't have the Windows style, neither builtin nor as a plugin. // Use any style rather than crashing. winstyle = TQStyleFactory::create("B3"); @@ -2017,10 +2017,10 @@ TQSize dotNETstyle::sizeFromContents(ContentsType t, void dotNETstyle::paletteChanged() { - TQComboBox *combo = 0L; - TQMenuBar *menuBar = 0L; - TQToolBar *toolBar = 0L; - TQWidget *widget = 0L; + TQComboBox *combo = nullptr; + TQMenuBar *menuBar = nullptr; + TQToolBar *toolBar = nullptr; + TQWidget *widget = nullptr; TQValueListIterator it = m_widgets.begin(); for ( ; it != m_widgets.end(); ++it ) { diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h index 0123811d..5a1c382e 100644 --- a/styles/dotnet/dotnet.h +++ b/styles/dotnet/dotnet.h @@ -55,7 +55,7 @@ public: const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default, - const TQWidget* widget = 0 ) const; + const TQWidget* widget = nullptr ) const; void drawPrimitive( PrimitiveElement pe, TQPainter *p, @@ -74,9 +74,9 @@ public: const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; - void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; + void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = nullptr) const; void drawComplexControl( ComplexControl control, TQPainter *p, @@ -88,20 +88,20 @@ public: SCFlags controls = SC_All, SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption &opt = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; void drawComplexControlMask(TQStyle::ComplexControl c, TQPainter *p, @@ -109,18 +109,18 @@ public: const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &o=TQStyleOption::Default, - const TQWidget *w = 0) const; + const TQWidget *w = nullptr) const; TQSize sizeFromContents(TQStyle::ContentsType t, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &s, const TQStyleOption &o, - const TQWidget *w = 0) const; + const TQWidget *w = nullptr) const; int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, - TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; + TQStyleHintReturn * = nullptr, const TQWidget * = nullptr ) const; protected: void renderButton(TQPainter *p, diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index cfdc5f63..683d748b 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -124,7 +124,7 @@ PhaseStyle::PhaseStyle() PhaseStyle::~PhaseStyle() { delete gradients; - gradients = 0; + gradients = nullptr; } ////////////////////////////////////////////////////////////////////////////// @@ -723,12 +723,12 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, if (horiz && (w >=20)) { for (n = -5; n <= 5; n += 5) { kColorBitmaps(painter, group, cx+n, cy, - 0, &doodad_mid, &doodad_light, 0, 0, 0); + nullptr, &doodad_mid, &doodad_light, nullptr, nullptr, nullptr); } } else if (!horiz && (h >= 20)) { for (n = -5; n <= 5; n += 5) { kColorBitmaps(painter, group, cx, cy+n, - 0, &doodad_mid, &doodad_light, 0, 0, 0); + nullptr, &doodad_mid, &doodad_light, nullptr, nullptr, nullptr); } } break; @@ -825,12 +825,12 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, if (!horiz && (w >=20)) { for (n = -5; n <= 5; n += 5) { kColorBitmaps(painter, group, cx+n, cy, - 0, &doodad_mid, &doodad_light, 0, 0, 0); + nullptr, &doodad_mid, &doodad_light, nullptr, nullptr, nullptr); } } else if (horiz && (h >= 20)) { for (n = -5; n <= 5; n += 5) { kColorBitmaps(painter, group, cx, cy+n, - 0, &doodad_mid, &doodad_light, 0, 0, 0); + nullptr, &doodad_mid, &doodad_light, nullptr, nullptr, nullptr); } } break; @@ -1061,14 +1061,14 @@ void PhaseStyle::drawTDEStylePrimitive(TDEStylePrimitive element, if (horiz) { for (n = -5; n <= 5; n += 5) { kColorBitmaps(painter, group, cx, cy+n, - 0, &doodad_mid, &doodad_light, 0, 0, 0); + nullptr, &doodad_mid, &doodad_light, nullptr, nullptr, nullptr); } painter->setPen(group.mid()); painter->drawLine(x, y2, x2, y2); } else { for (n = -5; n <= 5; n += 5) { kColorBitmaps(painter, group, cx+n, cy, - 0, &doodad_mid, &doodad_light, 0, 0, 0); + nullptr, &doodad_mid, &doodad_light, nullptr, nullptr, nullptr); } painter->setPen(group.mid()); painter->drawLine(x2, y, x2, y2); @@ -1083,12 +1083,12 @@ void PhaseStyle::drawTDEStylePrimitive(TDEStylePrimitive element, if (horiz) { for (n = -5; n <= 5; n += 5) { kColorBitmaps(painter, group, cx, cy+n, - 0, &doodad_mid, &doodad_light, 0, 0, 0); + nullptr, &doodad_mid, &doodad_light, nullptr, nullptr, nullptr); } } else { for (n = -5; n <= 5; n += 5) { kColorBitmaps(painter, group, cx+n, cy, - 0, &doodad_mid, &doodad_light, 0, 0, 0); + nullptr, &doodad_mid, &doodad_light, nullptr, nullptr, nullptr); } } break; @@ -2280,7 +2280,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co // TDE Toolbar Widget // patch by Daniel Brownlees if (object->parent() && !qstrcmp(object->name(), KTOOLBARWIDGET)) { - if (0 == (widget = ::tqt_cast(object))) return false; + if (!(widget = ::tqt_cast(object))) return false; TQWidget *parent = ::tqt_cast(object->parent()); int px = ceData.rect.x(), py = ceData.rect.y(); // find the toolbar @@ -2319,7 +2319,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co // TQToolBarExtensionWidget else if (object && object->isWidgetType() && object->parent() && (toolbar = ::tqt_cast(object->parent()))) { - if (0 == (widget = ::tqt_cast(object))) return false; + if (!(widget = ::tqt_cast(object))) return false; horiz = (toolbar->orientation() == TQt::Horizontal); TQPainter painter(widget); ceData.rect.rect(&x, &y, &w, &h); @@ -2349,7 +2349,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co } // TQFrame lines (do this guy last) - else if (0 != (frame = ::tqt_cast(object))) { + else if ((frame = ::tqt_cast(object))) { TQFrame::Shape shape = frame->frameShape(); switch (shape) { case TQFrame::HLine: @@ -2388,7 +2388,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co GradientSet::GradientSet(const TQColor &color, int size) : color_(color), size_(size) { - for (int n=0; naddLayout(tl1); - TQVBoxLayout *tl11 = new TQVBoxLayout( 0, 0, spacingHint() ); + TQVBoxLayout *tl11 = new TQVBoxLayout( nullptr, 0, spacingHint() ); tl1->addLayout(tl11); TQGroupBox *group = new TQGroupBox( 0,TQt::Vertical, i18n("Font"), main ); diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp index 8d4638dd..87b2a77b 100644 --- a/tdescreensaver/kdesavers/blob.cpp +++ b/tdescreensaver/kdesavers/blob.cpp @@ -62,7 +62,7 @@ extern "C" } } -static KRandomSequence *rnd = 0; +static KRandomSequence *rnd = nullptr; TQString alg_str[5]; void initAlg() @@ -178,7 +178,7 @@ KBlobSaver::~KBlobSaver() TQColor::leaveAllocContext(); TQColor::destroyAllocContext(colorContext); - delete rnd; rnd = 0; + delete rnd; rnd = nullptr; } void KBlobSaver::setAlgorithm(int a) diff --git a/tdescreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp index 53108781..9351a0b5 100644 --- a/tdescreensaver/kdesavers/firesaver.cpp +++ b/tdescreensaver/kdesavers/firesaver.cpp @@ -70,7 +70,7 @@ class KFireSaverKSS : public KScreenSaver class KFireSaverSetupKDB : public KDialogBase { public: - KFireSaverSetupKDB( TQWidget* parent = 0, const char* name = 0 ) + KFireSaverSetupKDB( TQWidget* parent = nullptr, const char* name = nullptr ) : KDialogBase( parent, name, true, i18n("Setup Screen Saver"), Ok | Cancel | Help, Ok, true ) { diff --git a/tdescreensaver/kdesavers/firesaver.h b/tdescreensaver/kdesavers/firesaver.h index 8a34c5e9..298454e3 100644 --- a/tdescreensaver/kdesavers/firesaver.h +++ b/tdescreensaver/kdesavers/firesaver.h @@ -46,7 +46,7 @@ class Writer; class KFireSaver : public TQGLWidget { public: - KFireSaver( TQWidget *parent=0, const char *name=0 ); + KFireSaver( TQWidget *parent=nullptr, const char *name=nullptr ); ~KFireSaver(); protected: diff --git a/tdescreensaver/kdesavers/fountain.h b/tdescreensaver/kdesavers/fountain.h index 30b51c42..3ba7dc0f 100644 --- a/tdescreensaver/kdesavers/fountain.h +++ b/tdescreensaver/kdesavers/fountain.h @@ -60,7 +60,7 @@ TQ_OBJECT }; public: - Fountain( TQWidget * parent=0, const char * name=0 ); + Fountain( TQWidget * parent=nullptr, const char * name=nullptr ); ~Fountain(); void setSize( float newSize ); void setStars( bool doStars ); diff --git a/tdescreensaver/kdesavers/gravity.h b/tdescreensaver/kdesavers/gravity.h index c8d25e6c..5f1f8226 100644 --- a/tdescreensaver/kdesavers/gravity.h +++ b/tdescreensaver/kdesavers/gravity.h @@ -59,7 +59,7 @@ TQ_OBJECT }; public: - Gravity( TQWidget * parent=0, const char * name=0 ); + Gravity( TQWidget * parent=nullptr, const char * name=nullptr ); ~Gravity(); void setSize( float newSize ); void setStars( bool doStars ); diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp index 84db6b4f..ec5c0ca8 100644 --- a/tdescreensaver/kdesavers/kclock.cpp +++ b/tdescreensaver/kdesavers/kclock.cpp @@ -71,7 +71,7 @@ extern "C" { KClockSetup::KClockSetup(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n( "Setup Clock Screen Saver" ), Ok|Cancel|Help, Ok, true), - m_saver(0) + m_saver(nullptr) { readSettings(); diff --git a/tdescreensaver/kdesavers/kclock.h b/tdescreensaver/kdesavers/kclock.h index af0846da..a7fc0f93 100644 --- a/tdescreensaver/kdesavers/kclock.h +++ b/tdescreensaver/kdesavers/kclock.h @@ -97,7 +97,7 @@ class KClockSetup : public KDialogBase TQ_OBJECT public: - KClockSetup(TQWidget *parent = 0, const char *name = 0); + KClockSetup(TQWidget *parent = nullptr, const char *name = nullptr); ~KClockSetup(); protected: void readSettings(); diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp index 90155b3d..4a4e365f 100644 --- a/tdescreensaver/kdesavers/kvm.cpp +++ b/tdescreensaver/kdesavers/kvm.cpp @@ -193,7 +193,7 @@ kVmSaver::kVmSaver( WId id ) : KScreenSaver( id ) refreshStep = 0; pool_state = init_pool( this ); - vm_default_initstate( time(0), &(pool_state->pool->vm_random_data) ); + vm_default_initstate( time(nullptr), &(pool_state->pool->vm_random_data) ); connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) ); timer.start( 100 - speed ); } diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp index de09e8c4..e6e3f720 100644 --- a/tdescreensaver/kdesavers/lines.cpp +++ b/tdescreensaver/kdesavers/lines.cpp @@ -114,7 +114,7 @@ void Lines::turn(const int& w, const int& h){ // kLinesSetup::kLinesSetup(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n( "Setup Lines Screen Saver" ), - Ok|Cancel|Help, Ok, true ), saver( 0 ), length( 10 ), speed( 50 ) + Ok|Cancel|Help, Ok, true ), saver( nullptr ), length( 10 ), speed( 50 ) { readSettings(); diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp index 926aad82..4c110774 100644 --- a/tdescreensaver/kdesavers/lorenz.cpp +++ b/tdescreensaver/kdesavers/lorenz.cpp @@ -452,7 +452,7 @@ KLorenzSaver::KLorenzSaver( WId id ) : KScreenSaver( id ) KLorenzSaver::~KLorenzSaver() { delete mat; - mat=0; + mat=nullptr; timer.stop(); TQColor::leaveAllocContext(); TQColor::destroyAllocContext( colorContext ); diff --git a/tdescreensaver/kdesavers/lorenz.h b/tdescreensaver/kdesavers/lorenz.h index 07b00798..8f07cd73 100644 --- a/tdescreensaver/kdesavers/lorenz.h +++ b/tdescreensaver/kdesavers/lorenz.h @@ -59,7 +59,7 @@ class KLorenzSetup : public KDialogBase TQ_OBJECT public: - KLorenzSetup(TQWidget *parent = 0, const char *name = 0 ); + KLorenzSetup(TQWidget *parent = nullptr, const char *name = nullptr ); ~KLorenzSetup(); protected: diff --git a/tdescreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp index 82aa8c49..32a74323 100644 --- a/tdescreensaver/kdesavers/pendulum.cpp +++ b/tdescreensaver/kdesavers/pendulum.cpp @@ -358,7 +358,7 @@ void PendulumGLWidget::resizeGL(int w, int h) KPendulumSaver::KPendulumSaver(WId id) : KScreenSaver(id), - solver(0), + solver(nullptr), m_massRatio(massRatioDefault), m_lengthRatio(lengthRatioDefault), m_g(gDefault), @@ -450,7 +450,7 @@ void KPendulumSaver::initData() y[3] = m2*l2*l2*qp + 0.5*m2*l1*l2*qp; // p2 // delete old solver - if (solver!=0) delete solver; + if(solver) delete solver; // init new solver solver = new PendulumOdeSolver( 0.0, // t @@ -509,7 +509,7 @@ void KPendulumSaver::setMassRatio(const double& massRatio) && m_massRatio != massRatio) { m_massRatio = massRatio; - if (timer!=0) + if(timer) { initData(); } @@ -527,7 +527,7 @@ void KPendulumSaver::setLengthRatio(const double& lengthRatio) && m_lengthRatio != lengthRatio) { m_lengthRatio = lengthRatio; - if (timer!=0) + if(timer) { initData(); } @@ -545,7 +545,7 @@ void KPendulumSaver::setG(const double& g) && m_g != g) { m_g = g; - if (timer!=0) + if(timer) { initData(); } @@ -563,7 +563,7 @@ void KPendulumSaver::setE(const double& E) && m_E != E) { m_E = E; - if (timer!=0) + if(timer) { initData(); } diff --git a/tdescreensaver/kdesavers/pendulum.h b/tdescreensaver/kdesavers/pendulum.h index 753aff09..f4dd7c0b 100644 --- a/tdescreensaver/kdesavers/pendulum.h +++ b/tdescreensaver/kdesavers/pendulum.h @@ -88,7 +88,7 @@ class PendulumGLWidget : public TQGLWidget /** @brief Constructor of KPendulum's GL widget * @param parent parent widget, passed to TQGLWidget's constructor * @param name name of widget, passed to TQGLWidget's constructor */ - PendulumGLWidget(TQWidget* parent=0, const char* name=0); + PendulumGLWidget(TQWidget* parent=nullptr, const char* name=nullptr); /** @brief Destructor of KPendulum's GL widget */ ~PendulumGLWidget(void); @@ -343,7 +343,7 @@ class KPendulumSetup : public KPendulumSetupUi * * The dialog box is set up and the screen saver object KPendulumSetup::saver * is instantiated. */ - KPendulumSetup(TQWidget* parent = 0, const char* name = 0); + KPendulumSetup(TQWidget* parent = nullptr, const char* name = nullptr); /** @brief Destructor of the KPendulum screen saver setup dialog * * Only KPendulumSetup::saver is deleted. */ diff --git a/tdescreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp index a6c08a76..0f6243a1 100644 --- a/tdescreensaver/kdesavers/polygon.cpp +++ b/tdescreensaver/kdesavers/polygon.cpp @@ -51,7 +51,7 @@ extern "C" // kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Setup Polygon Screen Saver" ), - Ok|Cancel|Help, Ok, true ), saver( 0 ), length( 10 ), vertices( 3 ), + Ok|Cancel|Help, Ok, true ), saver( nullptr ), length( 10 ), vertices( 3 ), speed( 50 ) { readSettings(); diff --git a/tdescreensaver/kdesavers/polygon.h b/tdescreensaver/kdesavers/polygon.h index f3a50c17..2991d974 100644 --- a/tdescreensaver/kdesavers/polygon.h +++ b/tdescreensaver/kdesavers/polygon.h @@ -55,7 +55,7 @@ class kPolygonSetup : public KDialogBase TQ_OBJECT public: - kPolygonSetup( TQWidget *parent = 0, const char *name = 0 ); + kPolygonSetup( TQWidget *parent = nullptr, const char *name = nullptr ); ~kPolygonSetup(); protected: diff --git a/tdescreensaver/kdesavers/rotation.cpp b/tdescreensaver/kdesavers/rotation.cpp index b7dc691a..7cf7eed6 100644 --- a/tdescreensaver/kdesavers/rotation.cpp +++ b/tdescreensaver/kdesavers/rotation.cpp @@ -472,9 +472,9 @@ KRotationSaver::KRotationSaver(WId id) J(4,2,3), // fixed box sizes! initEulerPhi(0), initEulerPsi(0), - solver(0), - glArea(0), - timer(0), + solver(nullptr), + glArea(nullptr), + timer(nullptr), m_traceLengthSeconds(traceLengthSecondsDefault), m_Lz(LzDefault), m_initEulerTheta(initEulerThetaDefault) @@ -547,7 +547,7 @@ void KRotationSaver::initData() + omega_body[1]*e2t + omega_body[2]*e3t; - if (solver!=0) delete solver; + if(solver) delete solver; // init solver solver = new EulerOdeSolver( 0.0, // t @@ -818,10 +818,10 @@ void KRotationSetup::lengthEnteredSlot(const TQString& s) void KRotationSetup::LzEnteredSlot(const TQString& s) { saver->setLz(s.toDouble()); - if (saver!=0) saver->initData(); + if(saver) saver->initData(); } void KRotationSetup::thetaEnteredSlot(const TQString& s) { saver->setInitEulerTheta(s.toDouble()); - if (saver!=0) saver->initData(); + if(saver) saver->initData(); } diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp index b78c7e1d..fbf5377c 100644 --- a/tdescreensaver/kdesavers/science.cpp +++ b/tdescreensaver/kdesavers/science.cpp @@ -106,7 +106,7 @@ KPreviewWidget::KPreviewWidget( TQWidget *parent ) : void KPreviewWidget::paintEvent( TQPaintEvent *event ) { - if( saver != 0 ) + if(saver) saver->do_refresh( event->rect() ); } @@ -131,9 +131,9 @@ KScienceSaver::KScienceSaver( WId id, bool s, bool gP ) : KScreenSaver( id ) { d = new KScienceData; - d->gc = XCreateGC(tqt_xdisplay(), id, 0, 0); - d->xRootWin = 0; - d->buffer = 0; + d->gc = XCreateGC(tqt_xdisplay(), id, 0, nullptr); + d->xRootWin = nullptr; + d->buffer = nullptr; moveOn = true; grabPixmap = gP; @@ -209,7 +209,7 @@ void KScienceSaver::initWhirlLens() { dy = y - origin; off = d->offset[y] = (T32bit *) malloc(sizeof(T32bit) * side); - myAssert( off != 0, "too few memory" ); + myAssert( off != nullptr, "too few memory" ); for(int x = side-1; x >= 0; x--) { dx = x - origin; @@ -250,7 +250,7 @@ void KScienceSaver::initSphereLens() { dy = y - origin; off = d->offset[y] = (T32bit *) malloc(sizeof(T32bit) * side); - myAssert( off != 0, "too few memory" ); + myAssert( off != nullptr, "too few memory" ); for(int x = side-1; x >= 0; x--) { dx = x - origin; @@ -290,7 +290,7 @@ void KScienceSaver::initExponentialLens() { dy = y - origin; off = d->offset[y] = (T32bit *) malloc(sizeof(T32bit) * side); - myAssert( off != 0, "too few memory" ); + myAssert( off != nullptr, "too few memory" ); for(int x = side-1; x >= 0; x--) { dx = x - origin; @@ -331,7 +331,7 @@ void KScienceSaver::initCurvatureLens() { dy = y - origin; off = d->offset[y] = (T32bit *) malloc(sizeof(T32bit) * side); - myAssert( off != 0, "too few memory" ); + myAssert( off != nullptr, "too few memory" ); for(int x = side-1; x >= 0; x--) { dx = x - origin; @@ -369,7 +369,7 @@ void KScienceSaver::initWaveLens() { dy = y - origin; off = d->offset[y] = (T32bit *) malloc(sizeof(T32bit) * side); - myAssert( off != 0, "too few memory" ); + myAssert( off != nullptr, "too few memory" ); for(int x = side-1; x >= 0; x--) { dx = x - origin; @@ -410,10 +410,10 @@ void KScienceSaver::initLens() side = origin << 1; d->buffer = XSubImage( d->xRootWin, 0, 0, side, side ); - myAssert( d->buffer != 0, "can't allocate pixmap" ); + myAssert( d->buffer != nullptr, "can't allocate pixmap" ); d->offset = (T32bit **) malloc( sizeof(T32bit *) * side ); - myAssert( d->offset != 0, "too few memory" ); + myAssert( d->offset != nullptr, "too few memory" ); switch( mode ) { case MODE_WHIRL: initWhirlLens(); break; @@ -428,15 +428,15 @@ void KScienceSaver::initLens() void KScienceSaver::releaseLens() { - if( d->offset != 0 ) { + if(d->offset) { for(int i=0; ioffset[i] != 0 ) free( d->offset[i] ); + if(d->offset[i]) free( d->offset[i] ); free( d->offset ); - d->offset = 0; + d->offset = nullptr; } - if( d->buffer != 0 ) { + if(d->buffer) { XDestroyImage( d->buffer ); - d->buffer = 0; + d->buffer = nullptr; } } @@ -598,7 +598,7 @@ void KScienceSaver::do_refresh( const TQRect & rect ) } else { - myAssert( d->xRootWin != 0, "root window not grabbed" ); + myAssert( d->xRootWin != nullptr, "root window not grabbed" ); XPutImage( tqt_xdisplay(), winId(), d->gc, d->xRootWin, rect.left(), rect.top(), rect.left(), rect.top(), @@ -848,7 +848,7 @@ void KScienceSaver::applyLens32bpp(int xs, int ys, int xd, int yd, int w, int h) KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Setup Science Screen Saver" ), - Ok|Cancel|Help, Ok, true ), saver( 0 ) + Ok|Cancel|Help, Ok, true ), saver( nullptr ) { readSettings(); initModeInfo(); diff --git a/tdescreensaver/kdesavers/science.h b/tdescreensaver/kdesavers/science.h index 887230b7..869a7f7a 100644 --- a/tdescreensaver/kdesavers/science.h +++ b/tdescreensaver/kdesavers/science.h @@ -29,7 +29,7 @@ class KPreviewWidget : public TQWidget public: KPreviewWidget( TQWidget *parent ); void paintEvent( TQPaintEvent *event ); - void notifySaver( KScienceSaver *s = 0 ); + void notifySaver( KScienceSaver *s = nullptr ); private: KScienceSaver *saver; }; @@ -110,7 +110,7 @@ class KScienceSetup : public KDialogBase TQ_OBJECT public: - KScienceSetup(TQWidget *parent=0, const char *name=0); + KScienceSetup(TQWidget *parent=nullptr, const char *name=nullptr); ~KScienceSetup(); protected: void updateSettings(); diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp index 723606a1..c1d91553 100644 --- a/tdescreensaver/kdesavers/slideshow.cpp +++ b/tdescreensaver/kdesavers/slideshow.cpp @@ -735,7 +735,7 @@ void kSlideShowSaver::createNextScreen() p.begin(&mNextScreen); - mScreenGeo *geoptr = 0; + mScreenGeo *geoptr = nullptr; for(geoptr = mGeoList.first(); geoptr; geoptr = mGeoList.next()) { loadNextImage(); @@ -1013,10 +1013,10 @@ void kSlideShowSetup::slotHelp() TDEAboutData aboutData( "kslideshow.kss", I18N_NOOP("SlideShow"), version, description, TDEAboutData::License_GPL, "(c) 1999-2003, The TDE Team" ); - aboutData.addAuthor("Stefan Taferner", 0, "taferner@kde.org"); - aboutData.addAuthor("Chris Howells", 0, "howells@kde.org"); - aboutData.addAuthor("Sven Leiber", 0, "s.leiber@web.de"); + aboutData.addAuthor("Stefan Taferner", nullptr, "taferner@kde.org"); + aboutData.addAuthor("Chris Howells", nullptr, "howells@kde.org"); + aboutData.addAuthor("Sven Leiber", nullptr, "s.leiber@web.de"); - TDEAboutApplication mAbout(&aboutData, this, 0); + TDEAboutApplication mAbout(&aboutData, this, nullptr); mAbout.exec(); } diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp b/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp index f14e5c63..5afb462f 100644 --- a/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp +++ b/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp @@ -96,7 +96,7 @@ struct ZKey Sprite* addr; - ZKey(): z(0), addr(0) + ZKey(): z(0), addr(nullptr) {} ZKey(Sprite* spr): z(1000 - spr->depth()), addr(spr) diff --git a/tdescreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp index 672ab726..604d2401 100644 --- a/tdescreensaver/kdesavers/wave.cpp +++ b/tdescreensaver/kdesavers/wave.cpp @@ -149,7 +149,7 @@ void KWaveSaver::blank() } Wave::Wave( TQWidget * parent, const char * name) : TQGLWidget (parent,name) { - pNurb = 0; + pNurb = nullptr; nNumPoints = 4; index = 0; diff --git a/tdescreensaver/kdesavers/wave.h b/tdescreensaver/kdesavers/wave.h index 3368f053..4122a868 100644 --- a/tdescreensaver/kdesavers/wave.h +++ b/tdescreensaver/kdesavers/wave.h @@ -35,7 +35,7 @@ TQ_OBJECT public: - Wave( TQWidget * parent=0, const char * name=0 ); + Wave( TQWidget * parent=nullptr, const char * name=nullptr ); ~Wave(); protected: diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp index 17a528f1..279dc277 100644 --- a/tdescreensaver/kxsconfig/kxsconfig.cpp +++ b/tdescreensaver/kxsconfig/kxsconfig.cpp @@ -77,7 +77,7 @@ const uint widgetEventMask = // X event mask KXSConfigDialog::KXSConfigDialog(const TQString &filename, const TQString &name) : KDialogBase(Plain, name, Ok| Cancel, Ok, 0, 0, false), - mFilename(filename), mPreviewProc(0), mKilled(true) + mFilename(filename), mPreviewProc(nullptr), mKilled(true) { int slash = filename.findRev('/'); if (slash >= 0) @@ -193,7 +193,7 @@ bool KXSConfigDialog::create() // So that hacks can XSelectInput ButtonPressMask XSelectInput(tqt_xdisplay(), mPreview->winId(), widgetEventMask ); - slotPreviewExited(0); + slotPreviewExited(nullptr); return true; } @@ -203,7 +203,7 @@ KXSConfigDialog::~KXSConfigDialog() if (mPreviewProc && mPreviewProc->isRunning()) { int pid = mPreviewProc->pid(); mPreviewProc->kill(); - waitpid(pid, (int *)0, 0); + waitpid(pid, nullptr, 0); delete mPreviewProc; } } @@ -214,7 +214,7 @@ TQString KXSConfigDialog::command() TQString cmd; KXSConfigItem *item; - for (item = mConfigItemList.first(); item != 0; item = mConfigItemList.next()) + for (item = mConfigItemList.first(); item; item = mConfigItemList.next()) { cmd += " " + item->command(); } @@ -299,7 +299,7 @@ void KXSConfigDialog::slotNewPreview() mKilled = true; mPreviewProc->kill(); // restarted in slotPreviewExited() } else { - slotPreviewExited(0); + slotPreviewExited(nullptr); } } @@ -318,7 +318,7 @@ void KXSConfigDialog::slotOk() KXSConfigItem *item; TDEConfig config(mConfigFile); - for (item = mConfigItemList.first(); item != 0; item = mConfigItemList.next()) + for (item = mConfigItemList.first(); item; item = mConfigItemList.next()) { item->save(config); } @@ -353,7 +353,7 @@ static const char *defaults[] = { 0 }; -const char *progname = 0; +const char *progname = nullptr; const char *progclass = "XScreenSaver"; XrmDatabase db; diff --git a/tdescreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp index 0e9d502b..c4380d9d 100644 --- a/tdescreensaver/kxsconfig/kxscontrol.cpp +++ b/tdescreensaver/kxsconfig/kxscontrol.cpp @@ -34,7 +34,7 @@ //=========================================================================== KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name, TDEConfig &config) - : TQWidget(parent), KXSRangeItem(name, config), mSlider(0), mSpinBox(0) + : TQWidget(parent), KXSRangeItem(name, config), mSlider(nullptr), mSpinBox(nullptr) { TQVBoxLayout *l = new TQVBoxLayout(this); TQLabel *label = new TQLabel(mLabel, this); @@ -46,7 +46,7 @@ KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name, KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ) - : TQWidget(parent), KXSRangeItem(name, attr), mSlider(0), mSpinBox(0) + : TQWidget(parent), KXSRangeItem(name, attr), mSlider(nullptr), mSpinBox(nullptr) { if (attr.value("type") == "spinbutton" ) { TQHBoxLayout *hb = new TQHBoxLayout(this); diff --git a/tdescreensaver/kxsconfig/kxsrun.cpp b/tdescreensaver/kxsconfig/kxsrun.cpp index 7144a860..68b76a2f 100644 --- a/tdescreensaver/kxsconfig/kxsrun.cpp +++ b/tdescreensaver/kxsconfig/kxsrun.cpp @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) #endif if ( TQFile::exists( xmlFile ) ) { // We can use the xscreensaver xml config files. - KXSXml xmlParser(0); + KXSXml xmlParser(nullptr); xmlParser.parse(xmlFile); configItemList = *xmlParser.items(); TQPtrListIterator it( configItemList ); @@ -178,7 +178,7 @@ int main(int argc, char *argv[]) // add the config options KXSConfigItem *item; - for (item = configItemList.first(); item != 0; item = configItemList.next()) { + for (item = configItemList.first(); item; item = configItemList.next()) { cmd += " " + item->command(); } diff --git a/tdescreensaver/kxsconfig/kxsxml.cpp b/tdescreensaver/kxsconfig/kxsxml.cpp index 3e0eafc0..881f32c8 100644 --- a/tdescreensaver/kxsconfig/kxsxml.cpp +++ b/tdescreensaver/kxsconfig/kxsxml.cpp @@ -28,7 +28,7 @@ #include KXSXml::KXSXml( TQWidget *p ) - : parent(p), handler(0) + : parent(p), handler(nullptr) { } @@ -49,7 +49,7 @@ const TQPtrList *KXSXml::items() const { if ( handler ) return handler->items(); - return 0; + return nullptr; } TQString KXSXml::description() const @@ -62,7 +62,7 @@ TQString KXSXml::description() const //=========================================================================== KXSXmlHandler::KXSXmlHandler( TQWidget *p ) - : TQXmlDefaultHandler(), parent(p), selItem(0), inDesc(false) + : TQXmlDefaultHandler(), parent(p), selItem(nullptr), inDesc(false) { mParentStack.push( p ); } @@ -76,7 +76,7 @@ bool KXSXmlHandler::startElement( const TQString&, const TQString&, const TQString& qName, const TQXmlAttributes &atts ) { - KXSConfigItem *i = 0; + KXSConfigItem *i = nullptr; TQString id = atts.value("id"); if ( qName == "number" ) { TQString sLow = atts.value( "low" ); @@ -136,7 +136,7 @@ bool KXSXmlHandler::startElement( const TQString&, const TQString&, bool KXSXmlHandler::endElement( const TQString&, const TQString&, const TQString &qName ) { if ( qName == "select" ) { - selItem = 0; + selItem = nullptr; } else if ( qName == "_description" ) { inDesc = false; } else if ( (qName == "hgroup" || qName == "vgroup") && parent ) { diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp index 8a312d8e..70d621f0 100644 --- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp +++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp @@ -87,7 +87,7 @@ void exitHandler( int ) KPartSaver::KPartSaver( WId id ) - : KScreenSaver( id ), m_timer(), m_part(0), m_current(-1), m_back(0) + : KScreenSaver( id ), m_timer(), m_part(nullptr), m_current(-1), m_back(nullptr) { // install signal handlers to make sure that nspluginviewer is shutdown correctly // move this into the nspluginviewer kpart code @@ -95,7 +95,7 @@ KPartSaver::KPartSaver( WId id ) g_inited = true; g_savers.setAutoDelete( true ); - srand( time(0) ); + srand( time(nullptr) ); // install signal handler signal( SIGINT, exitHandler ); // Ctrl-C will cause a clean exit... @@ -158,7 +158,7 @@ void KPartSaver::closeURL() if( m_part ) { m_part->closeURL(); delete m_part; - m_part = 0; + m_part = nullptr; } } @@ -196,7 +196,7 @@ bool KPartSaver::openURL( KURL url ) // show kpart delete m_back; - m_back = 0; + m_back = nullptr; show(); m_part->widget()->show(); diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.h b/tdescreensaver/tdepartsaver/tdepartsaver.h index 0e71f483..7a6e1d27 100644 --- a/tdescreensaver/tdepartsaver/tdepartsaver.h +++ b/tdescreensaver/tdepartsaver/tdepartsaver.h @@ -53,7 +53,7 @@ TQ_OBJECT public: - SaverConfig( TQWidget* parent = 0, const char* name = 0 ); + SaverConfig( TQWidget* parent = nullptr, const char* name = nullptr ); ~SaverConfig(); protected slots: diff --git a/tdescreensaver/xsavers/main.cpp b/tdescreensaver/xsavers/main.cpp index cdf2051d..e5ced303 100644 --- a/tdescreensaver/xsavers/main.cpp +++ b/tdescreensaver/xsavers/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) TDECrash::setCrashHandler( crashHandler ); - DemoWindow *demoWidget = 0; + DemoWindow *demoWidget = nullptr; Window saveWin = 0; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tdescreensaver/xsavers/space.cpp b/tdescreensaver/xsavers/space.cpp index fb5b53ae..6bb04a98 100644 --- a/tdescreensaver/xsavers/space.cpp +++ b/tdescreensaver/xsavers/space.cpp @@ -122,7 +122,7 @@ starRec stars[MAXSTARS]; float sinTable[MAXANGLES]; static GLXContext glx_context; -static KRandomSequence *rnd = 0; +static KRandomSequence *rnd = nullptr; float Sin(float angle) { @@ -518,7 +518,7 @@ kSpaceSaver::~kSpaceSaver() release_Space(); TQColor::leaveAllocContext(); TQColor::destroyAllocContext( colorContext ); - delete rnd; rnd = 0; + delete rnd; rnd = nullptr; } void kSpaceSaver::setSpeed( int spd ) diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index 097d8e90..e7e391ed 100644 --- a/twin-styles/cde/cdeclient.cpp +++ b/twin-styles/cde/cdeclient.cpp @@ -275,8 +275,8 @@ void CdeClient::init() widget()->setBackgroundMode(NoBackground); mainLayout = new TQVBoxLayout(widget()); - TQBoxLayout* windowLayout = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); - titleLayout = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); + TQBoxLayout* windowLayout = new TQBoxLayout(nullptr, TQBoxLayout::LeftToRight, 0, 0, nullptr); + titleLayout = new TQBoxLayout(nullptr, TQBoxLayout::LeftToRight, 0, 0, nullptr); // TODO Check if this stuff can be simplified. // Border sizes are from a fixed set now. diff --git a/twin-styles/cde/cdeclient.h b/twin-styles/cde/cdeclient.h index ef4256bd..a3fcb9c1 100644 --- a/twin-styles/cde/cdeclient.h +++ b/twin-styles/cde/cdeclient.h @@ -38,7 +38,7 @@ enum Buttons { BtnMenu=0, BtnHelp, BtnIconify, BtnMax, BtnClose, BtnCount }; class CdeButton : public TQButton { public: - CdeButton( CdeClient* parent=0, const char* name=0, int btnType=0, + CdeButton( CdeClient* parent=nullptr, const char* name=nullptr, int btnType=0, const TQString& tip=nullptr, int realize_btns = TQt::LeftButton ); void reset(); ButtonState lastButton() { return last_button; } diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp index 6b834644..145eb9c1 100644 --- a/twin-styles/glow/config/glowconfigdialog.cpp +++ b/twin-styles/glow/config/glowconfigdialog.cpp @@ -360,7 +360,7 @@ void GlowConfigDialog::slotColorButtonChanged(const TQColor& glowColor) void GlowConfigDialog::slotThemeListViewSelectionChanged () { - if( _theme_list_view->selectedItem() != 0 ) { + if(_theme_list_view->selectedItem()) { _theme_name = _theme_list_view->selectedItem()->text (0); emit changed(); diff --git a/twin-styles/glow/glowbutton.cpp b/twin-styles/glow/glowbutton.cpp index a3f70741..bb09d9b6 100644 --- a/twin-styles/glow/glowbutton.cpp +++ b/twin-styles/glow/glowbutton.cpp @@ -46,7 +46,7 @@ const TQPixmap* PixmapCache::find(const TQString& key) if( it != m_pixmapMap.end() ) return *it; else - return 0; + return nullptr; } void PixmapCache::insert(const TQString& key, const TQPixmap *pixmap) @@ -139,7 +139,7 @@ void GlowButton::paintEvent( TQPaintEvent *e ) { TQWidget::paintEvent(e); const TQPixmap *pixmap = PixmapCache::find(m_pixmapName); - if( pixmap != 0 ) + if(pixmap) { int pos = m_pos>=0?m_pos:-m_pos; TQPainter p; diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp index 5f146913..9b7b2bbb 100644 --- a/twin-styles/glow/glowclient.cpp +++ b/twin-styles/glow/glowclient.cpp @@ -120,7 +120,7 @@ void GlowClientConfig::load(KDecorationFactory *factory) GlowClientGlobals::~GlowClientGlobals() { deletePixmaps(); - m_instance = 0; + m_instance = nullptr; } TQString GlowClientGlobals::getPixmapName(PixmapType type, bool isActive) @@ -369,7 +369,7 @@ bool GlowClientGlobals::createPixmap(PixmapType type, bool isActive) return true; } -GlowClientGlobals *GlowClientGlobals::m_instance = 0; +GlowClientGlobals *GlowClientGlobals::m_instance = nullptr; GlowClientGlobals *GlowClientGlobals::instance() { @@ -384,9 +384,9 @@ GlowClientGlobals *GlowClientGlobals::instance() GlowClient::GlowClient( KDecorationBridge* b, KDecorationFactory* f ) : KDecoration( b, f ), - m_stickyButton(0), m_helpButton(0), m_minimizeButton(0), - m_maximizeButton(0), m_closeButton(0), - m_leftButtonLayout(0), m_rightButtonLayout(0), _main_layout(0) + m_stickyButton(nullptr), m_helpButton(nullptr), m_minimizeButton(nullptr), + m_maximizeButton(nullptr), m_closeButton(nullptr), + m_leftButtonLayout(nullptr), m_rightButtonLayout(nullptr), _main_layout(nullptr) { } @@ -692,7 +692,7 @@ void GlowClient::resetLayout() updateButtonPixmaps(); TQBoxLayout * topLayout = new TQBoxLayout(_main_layout, - TQBoxLayout::LeftToRight, 0, 0); + TQBoxLayout::LeftToRight, 0, nullptr); topLayout->setMargin(0); topLayout->setSpacing(TITLE_SPACING); topLayout->addSpacing(SIDE_MARGIN); @@ -714,7 +714,7 @@ void GlowClient::resetLayout() topLayout->addSpacing(SIDE_MARGIN); TQBoxLayout *midLayout = new TQBoxLayout( - _main_layout, TQBoxLayout::LeftToRight, 0, 0); + _main_layout, TQBoxLayout::LeftToRight, 0, nullptr); midLayout->addSpacing(SIDE_MARGIN); if(isPreview()) midLayout->addWidget( @@ -752,19 +752,19 @@ void GlowClient::updateButtonPositions() // reset left and right button layout if(m_leftButtonLayout) delete m_leftButtonLayout; - m_leftButtonLayout = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); + m_leftButtonLayout = new TQBoxLayout(nullptr, TQBoxLayout::LeftToRight, 0, 0, nullptr); m_leftButtonLayout->setMargin(0); m_leftButtonLayout->setSpacing(TITLE_SPACING); if(m_rightButtonLayout) delete m_rightButtonLayout; - m_rightButtonLayout = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); + m_rightButtonLayout = new TQBoxLayout(nullptr, TQBoxLayout::LeftToRight, 0, 0, nullptr); m_rightButtonLayout->setMargin(0); m_rightButtonLayout->setSpacing(TITLE_SPACING); for( unsigned int i=0; iaddColSpacing(2, borderSizeX); // Pack the titlebar with spacers and buttons - hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); + hb = new TQBoxLayout(nullptr, TQBoxLayout::LeftToRight, 0, 0, nullptr); hb->setResizeMode( TQLayout::FreeResize ); titleSpacerJ = addPixmapSpacer( titleJ ); diff --git a/twin-styles/icewm/icewm.h b/twin-styles/icewm/icewm.h index 6b84aaad..82a67706 100644 --- a/twin-styles/icewm/icewm.h +++ b/twin-styles/icewm/icewm.h @@ -99,8 +99,8 @@ class ThemeHandler: public KDecorationFactory class IceWMButton : public TQButton { public: - IceWMButton( IceWMClient *parent=0, const char *name=0, - TQPixmap* (*p)[2]=0L, bool isToggle=false, + IceWMButton( IceWMClient *parent=nullptr, const char *name=nullptr, + TQPixmap* (*p)[2]=nullptr, bool isToggle=false, const TQString& tip=nullptr, const int realizeBtns = TQt::LeftButton ); void setTipText(const TQString &tip); void usePixmap( TQPixmap* (*p)[2] ); diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp index 613dec15..5b0816a4 100644 --- a/twin-styles/kde1/kde1client.cpp +++ b/twin-styles/kde1/kde1client.cpp @@ -27,25 +27,25 @@ const char default_right[] = "H_IAX"; namespace TDE1 { -TQPixmap* close_pix = 0; -TQPixmap* maximize_pix = 0; -TQPixmap* minimize_pix = 0; -TQPixmap* normalize_pix = 0; -TQPixmap* pinup_pix = 0; -TQPixmap* pindown_pix = 0; -TQPixmap* menu_pix = 0; -TQPixmap* question_mark_pix = 0; - -TQPixmap* dis_close_pix = 0; -TQPixmap* dis_maximize_pix = 0; -TQPixmap* dis_minimize_pix = 0; -TQPixmap* dis_normalize_pix = 0; -TQPixmap* dis_pinup_pix = 0; -TQPixmap* dis_pindown_pix = 0; -TQPixmap* dis_menu_pix = 0; -TQPixmap* dis_question_mark_pix = 0; - -TQPixmap* titleBuffer = 0; +TQPixmap* close_pix = nullptr; +TQPixmap* maximize_pix = nullptr; +TQPixmap* minimize_pix = nullptr; +TQPixmap* normalize_pix = nullptr; +TQPixmap* pinup_pix = nullptr; +TQPixmap* pindown_pix = nullptr; +TQPixmap* menu_pix = nullptr; +TQPixmap* question_mark_pix = nullptr; + +TQPixmap* dis_close_pix = nullptr; +TQPixmap* dis_maximize_pix = nullptr; +TQPixmap* dis_minimize_pix = nullptr; +TQPixmap* dis_normalize_pix = nullptr; +TQPixmap* dis_pinup_pix = nullptr; +TQPixmap* dis_pindown_pix = nullptr; +TQPixmap* dis_menu_pix = nullptr; +TQPixmap* dis_question_mark_pix = nullptr; + +TQPixmap* titleBuffer = nullptr; bool pixmaps_created = false; @@ -268,11 +268,11 @@ void StdClient::init() titlebar = new TQSpacerItem(10, fh, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); + TQBoxLayout* hb = new TQBoxLayout(nullptr, TQBoxLayout::LeftToRight, 0, 0, nullptr); g->addLayout( hb, 0, 1 ); // setup titlebar buttons - for (int n=0; ncustomButtonPositions() ? options()->titleButtonsLeft() : TQString(default_left)); hb->addItem(titlebar); addButtons(hb, options()->customButtonPositions() ? options()->titleButtonsRight() : TQString(default_right)); @@ -305,7 +305,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s) switch (s[n]) { case 'M': // Menu button if (!button[ButtonMenu]) { - button[ButtonMenu] = new TQToolButton( widget(), 0 ); + button[ButtonMenu] = new TQToolButton( widget(), nullptr ); TQToolTip::add( button[ButtonMenu], i18n("Menu") ); button[ButtonMenu]->setCursor(ArrowCursor); if( icon().pixmap( TQIconSet::Small, TQIconSet::Normal ).isNull()) @@ -319,7 +319,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s) case 'S': // Sticky button if (!button[ButtonSticky]) { - button[ButtonSticky] = new TQToolButton( widget(), 0 ); + button[ButtonSticky] = new TQToolButton( widget(), nullptr ); button[ButtonSticky]->setIconSet( isOnAllDesktops()?*pindown_pix:*pinup_pix ); TQToolTip::add( button[ButtonSticky], isOnAllDesktops()?i18n("Not On All Desktops"):i18n("On All Desktops") ); button[ButtonSticky]->setCursor(ArrowCursor); @@ -332,7 +332,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s) case 'H': // Help button if ((!button[ButtonHelp]) && providesContextHelp()) { - button[ButtonHelp] = new TQToolButton( widget(), 0 ); + button[ButtonHelp] = new TQToolButton( widget(), nullptr ); TQToolTip::add( button[ButtonHelp], i18n("Help") ); button[ButtonHelp]->setIconSet( isActive() ? *question_mark_pix : *dis_question_mark_pix); connect( button[ButtonHelp], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( showContextHelp() ) ) ); @@ -343,7 +343,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s) case 'I': // Minimize button if ((!button[ButtonMinimize]) && isMinimizable()) { - button[ButtonMinimize] = new TQToolButton( widget(), 0 ); + button[ButtonMinimize] = new TQToolButton( widget(), nullptr ); TQToolTip::add( button[ButtonMinimize], i18n("Minimize") ); button[ButtonMinimize]->setCursor(ArrowCursor); button[ButtonMinimize]->setIconSet(isActive() ? *minimize_pix : *dis_minimize_pix); @@ -355,7 +355,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s) case 'A': // Maximize button if ((!button[ButtonMaximize]) && isMaximizable()) { const bool max = maximizeMode()!=MaximizeRestore; - button[ButtonMaximize] = new ThreeButtonButton( widget(), 0 ); + button[ButtonMaximize] = new ThreeButtonButton( widget(), nullptr ); TQToolTip::add( button[ButtonMaximize], max?i18n("Restore"):i18n("Maximize") ); button[ButtonMaximize]->setCursor(ArrowCursor); button[ButtonMaximize]->setIconSet( max?(isActive() ? *normalize_pix : *dis_normalize_pix):(isActive() ? *maximize_pix : *dis_maximize_pix) ); @@ -367,7 +367,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s) case 'X': // Close button if ((!button[ButtonClose]) && isCloseable()) { - button[ButtonClose] = new TQToolButton( widget(), 0 ); + button[ButtonClose] = new TQToolButton( widget(), nullptr ); TQToolTip::add( button[ButtonClose], i18n("Close") ); button[ButtonClose]->setCursor(ArrowCursor); button[ButtonClose]->setIconSet(isActive() ? *close_pix : *dis_close_pix); @@ -613,7 +613,7 @@ void StdToolClient::init() g->addColSpacing(2, 1); g->addRowSpacing(2, 1); - closeBtn = new TQToolButton( widget(), 0 ); + closeBtn = new TQToolButton( widget(), nullptr ); TQToolTip::add( closeBtn, i18n("Close") ); connect( closeBtn, TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( closeWindow() ) ) ); closeBtn->setFixedSize( 13, 13); diff --git a/twin-styles/kde1/kde1client.h b/twin-styles/kde1/kde1client.h index be0a8bfa..a2c036f7 100644 --- a/twin-styles/kde1/kde1client.h +++ b/twin-styles/kde1/kde1client.h @@ -107,7 +107,7 @@ class ThreeButtonButton: public TQToolButton TQ_OBJECT public: - ThreeButtonButton ( TQWidget *parent = 0, const char* name = 0 ) + ThreeButtonButton ( TQWidget *parent = nullptr, const char* name = nullptr ) : TQToolButton( parent, name ) { connect( this, TQ_SIGNAL( clicked() ), this, TQ_SLOT( handleClicked() ) ); diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp index 483c0aff..a7614f76 100644 --- a/twin-styles/kstep/nextclient.cpp +++ b/twin-styles/kstep/nextclient.cpp @@ -404,7 +404,7 @@ void NextClient::init() widget()->setBackgroundMode( NoBackground ); TQVBoxLayout *mainLayout = new TQVBoxLayout(widget()); - TQBoxLayout *titleLayout = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); + TQBoxLayout *titleLayout = new TQBoxLayout(nullptr, TQBoxLayout::LeftToRight, 0, 0, nullptr); TQHBoxLayout *windowLayout = new TQHBoxLayout(); mainLayout->addLayout(titleLayout); mainLayout->addLayout(windowLayout, 1); diff --git a/twin-styles/kstep/nextclient.h b/twin-styles/kstep/nextclient.h index 0b9818db..5c41a291 100644 --- a/twin-styles/kstep/nextclient.h +++ b/twin-styles/kstep/nextclient.h @@ -19,7 +19,7 @@ class NextClient; class NextButton : public TQButton { public: - NextButton(NextClient *parent=0, const char *name=0, + NextButton(NextClient *parent=nullptr, const char *name=nullptr, 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); diff --git a/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp index a76ba8bc..5ead758c 100644 --- a/twin-styles/openlook/OpenLook.cpp +++ b/twin-styles/openlook/OpenLook.cpp @@ -109,7 +109,7 @@ static inline const KDecorationOptions* options() OpenLook::OpenLook(KDecorationBridge *b, KDecorationFactory *f) : KDecoration(b, f), - titleSpacer_ (0), + titleSpacer_ (nullptr), mousePressPoint_(0, 0), // Anywhere outside button rect. buttonDown_ (false) { @@ -358,7 +358,7 @@ OpenLook::doLayout() layout->addSpacing(2); TQBoxLayout * midLayout = - new TQBoxLayout(layout, TQBoxLayout::LeftToRight, 0, 0); + new TQBoxLayout(layout, TQBoxLayout::LeftToRight, 0, nullptr); if (isPreview()) { midLayout->addWidget(new TQLabel( diff --git a/twin-styles/riscos/Button.cpp b/twin-styles/riscos/Button.cpp index 26e19579..cd822c55 100644 --- a/twin-styles/riscos/Button.cpp +++ b/twin-styles/riscos/Button.cpp @@ -127,7 +127,7 @@ void Button::setPixmap(const TQPixmap &p) aPixmap_.convertFromImage(aTx); iPixmap_.convertFromImage(iTx); - if (0 != p.mask()) + if (p.mask()) { aPixmap_.setMask(*p.mask()); iPixmap_.setMask(*p.mask()); diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp index 7318f6c1..30edaad8 100644 --- a/twin-styles/riscos/Manager.cpp +++ b/twin-styles/riscos/Manager.cpp @@ -681,13 +681,13 @@ void Manager::resetLayout() topLayout_ = new TQVBoxLayout(widget(), 0, 0); topLayout_->setResizeMode(TQLayout::FreeResize); - titleLayout_ = new TQBoxLayout(topLayout_, TQBoxLayout::LeftToRight, 0, 0); + titleLayout_ = new TQBoxLayout(topLayout_, TQBoxLayout::LeftToRight, 0, nullptr); titleLayout_->setResizeMode(TQLayout::FreeResize); createTitle(); TQBoxLayout *midLayout = new TQBoxLayout(topLayout_, TQBoxLayout::LeftToRight, - 0, 0); + 0, nullptr); midLayout->setResizeMode(TQLayout::FreeResize); midLayout->addSpacing(1); if (isPreview()) diff --git a/twin-styles/riscos/Static.h b/twin-styles/riscos/Static.h index 8e2012ca..944e89c1 100644 --- a/twin-styles/riscos/Static.h +++ b/twin-styles/riscos/Static.h @@ -45,7 +45,7 @@ class Static static Static* instance() { - if (instance_ == 0) + if(!instance_) new Static; return instance_; diff --git a/twin-styles/smooth-blend/client/buttons.h b/twin-styles/smooth-blend/client/buttons.h index 282a85c1..36b8f208 100644 --- a/twin-styles/smooth-blend/client/buttons.h +++ b/twin-styles/smooth-blend/client/buttons.h @@ -1708,22 +1708,22 @@ static struct EmbedImage { bool alpha; const char *name; } embed_image_vec[] = { - { 41, 41, 32, (const unsigned char*)image_0_data, 1781, 0, 0, true, "circle.png" }, - { 41, 41, 32, (const unsigned char*)image_1_data, 1724, 0, 0, true, "close.png" }, - { 41, 41, 32, (const unsigned char*)image_2_data, 1555, 0, 0, true, "help.png" }, - { 42, 41, 32, (const unsigned char*)image_3_data, 1879, 0, 0, true, "keep_above_lit.png" }, - { 41, 41, 32, (const unsigned char*)image_4_data, 1734, 0, 0, true, "keep_above.png" }, - { 41, 41, 32, (const unsigned char*)image_5_data, 1750, 0, 0, true, "keep_below_lit.png" }, - { 41, 41, 32, (const unsigned char*)image_6_data, 1848, 0, 0, true, "keep_below.png" }, - { 42, 41, 32, (const unsigned char*)image_7_data, 1343, 0, 0, true, "maximize.png" }, - { 42, 41, 32, (const unsigned char*)image_8_data, 1141, 0, 0, true, "minimize.png" }, - { 41, 41, 32, (const unsigned char*)image_9_data, 1529, 0, 0, true, "restore.png" }, - { 45, 45, 32, (const unsigned char*)image_10_data, 885, 0, 0, true, "shade.png" }, - { 42, 41, 32, (const unsigned char*)image_11_data, 2017, 0, 0, true, "splat.png" }, - { 1, 30, 32, (const unsigned char*)image_12_data, 72, 0, 0, true, "titlealpha.png" }, - { 42, 41, 32, (const unsigned char*)image_13_data, 1609, 0, 0, true, "window_background.png" }, - { 41, 41, 32, (const unsigned char*)image_14_data, 1566, 0, 0, true, "window_foreground.png" }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0 } + { 41, 41, 32, (const unsigned char*)image_0_data, 1781, 0, nullptr, true, "circle.png" }, + { 41, 41, 32, (const unsigned char*)image_1_data, 1724, 0, nullptr, true, "close.png" }, + { 41, 41, 32, (const unsigned char*)image_2_data, 1555, 0, nullptr, true, "help.png" }, + { 42, 41, 32, (const unsigned char*)image_3_data, 1879, 0, nullptr, true, "keep_above_lit.png" }, + { 41, 41, 32, (const unsigned char*)image_4_data, 1734, 0, nullptr, true, "keep_above.png" }, + { 41, 41, 32, (const unsigned char*)image_5_data, 1750, 0, nullptr, true, "keep_below_lit.png" }, + { 41, 41, 32, (const unsigned char*)image_6_data, 1848, 0, nullptr, true, "keep_below.png" }, + { 42, 41, 32, (const unsigned char*)image_7_data, 1343, 0, nullptr, true, "maximize.png" }, + { 42, 41, 32, (const unsigned char*)image_8_data, 1141, 0, nullptr, true, "minimize.png" }, + { 41, 41, 32, (const unsigned char*)image_9_data, 1529, 0, nullptr, true, "restore.png" }, + { 45, 45, 32, (const unsigned char*)image_10_data, 885, 0, nullptr, true, "shade.png" }, + { 42, 41, 32, (const unsigned char*)image_11_data, 2017, 0, nullptr, true, "splat.png" }, + { 1, 30, 32, (const unsigned char*)image_12_data, 72, 0, nullptr, true, "titlealpha.png" }, + { 42, 41, 32, (const unsigned char*)image_13_data, 1609, 0, nullptr, true, "window_background.png" }, + { 41, 41, 32, (const unsigned char*)image_14_data, 1566, 0, nullptr, true, "window_foreground.png" }, + { 0, 0, 0, nullptr, 0, 0, nullptr, 0, nullptr } }; static TQImage uic_findImage( const TQString& name ) @@ -1765,7 +1765,7 @@ public: }; }; -static TQMimeSourceFactory* bfactory = 0; +static TQMimeSourceFactory* bfactory = nullptr; void qInitImages_smoothblend() { @@ -1780,7 +1780,7 @@ void qCleanupImages_smoothblend() if ( bfactory ) { TQMimeSourceFactory::defaultFactory()->removeFactory( bfactory ); delete bfactory; - bfactory = 0; + bfactory = nullptr; } } diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp index 159ef9cf..62f483ee 100644 --- a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp +++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp @@ -27,7 +27,7 @@ // Constructor smoothblendConfig::smoothblendConfig(TDEConfig* config, TQWidget* parent) - : TQObject(parent), config_(0), dialog_(0) { + : TQObject(parent), config_(nullptr), dialog_(nullptr) { // create the configuration object config_ = new TDEConfig("twinsmoothblendrc"); TDEGlobal::locale()->insertCatalogue("twin_clients"); diff --git a/twin-styles/smooth-blend/client/smoothblend.cpp b/twin-styles/smooth-blend/client/smoothblend.cpp index 1d0d1390..345c0e5e 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cpp +++ b/twin-styles/smooth-blend/client/smoothblend.cpp @@ -166,7 +166,7 @@ smoothblendButton::smoothblendButton(smoothblendClient *parent, const char *name client_(parent), type_(type), size_(button_size), - deco_(0), + deco_(nullptr), lastmouse_(TQt::NoButton), hover_(false) { @@ -475,16 +475,16 @@ void smoothblendButton::drawButton( TQPainter *painter ) { smoothblendClient::smoothblendClient(KDecorationBridge *b, KDecorationFactory *f) : KDecoration(b, f), - mainLayout_(0), - titleLayout_(0), - topSpacer_(0), - titleSpacer_(0), - leftTitleSpacer_(0), rightTitleSpacer_(0), - decoSpacer_(0), - leftSpacer_(0), rightSpacer_(0), - bottomSpacer_(0), windowSpacer_(0), - aCaptionBuffer(0), iCaptionBuffer(0), - aTitleBarTile(0), iTitleBarTile(0), aTitleBarTopTile(0), iTitleBarTopTile(0), + mainLayout_(nullptr), + titleLayout_(nullptr), + topSpacer_(nullptr), + titleSpacer_(nullptr), + leftTitleSpacer_(nullptr), rightTitleSpacer_(nullptr), + decoSpacer_(nullptr), + leftSpacer_(nullptr), rightSpacer_(nullptr), + bottomSpacer_(nullptr), windowSpacer_(nullptr), + aCaptionBuffer(nullptr), iCaptionBuffer(nullptr), + aTitleBarTile(nullptr), iTitleBarTile(nullptr), aTitleBarTopTile(nullptr), iTitleBarTopTile(nullptr), pixmaps_created(false), //captionBufferDirty(true), s_titleHeight(0), @@ -575,16 +575,16 @@ void smoothblendClient::create_pixmaps() { void smoothblendClient::delete_pixmaps() { delete aTitleBarTopTile; - aTitleBarTopTile = 0; + aTitleBarTopTile = nullptr; delete iTitleBarTopTile; - iTitleBarTopTile = 0; + iTitleBarTopTile = nullptr; delete aTitleBarTile; - aTitleBarTile = 0; + aTitleBarTile = nullptr; delete iTitleBarTile; - iTitleBarTile = 0; + iTitleBarTile = nullptr; pixmaps_created = false; } @@ -670,7 +670,7 @@ void smoothblendClient::_resetLayout() // setup titlebar buttons for (int n=0; naddItem(leftTitleSpacer_); addButtons(titleLayout_, diff --git a/twin-styles/smooth-blend/client/smoothblend.h b/twin-styles/smooth-blend/client/smoothblend.h index fdf30bbd..3e3bb620 100644 --- a/twin-styles/smooth-blend/client/smoothblend.h +++ b/twin-styles/smooth-blend/client/smoothblend.h @@ -126,7 +126,7 @@ class smoothblendButton : public TQButton { TQ_OBJECT public: - smoothblendButton(smoothblendClient *parent=0, const char *name=0, + smoothblendButton(smoothblendClient *parent=nullptr, const char *name=nullptr, const TQString &tip=nullptr, ButtonType type=ButtonHelp, int button_size=18, diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index 6ed9ac74..c9ba5bcb 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -41,13 +41,13 @@ static unsigned char sticky_bits[] = { static unsigned char question_bits[] = { 0x3c, 0x66, 0x60, 0x30, 0x18, 0x00, 0x18, 0x18}; -static KPixmap *aUpperGradient=0; -static KPixmap *iUpperGradient=0; +static KPixmap *aUpperGradient=nullptr; +static KPixmap *iUpperGradient=nullptr; -static KPixmap *btnPix=0; -static KPixmap *btnPixDown=0; -static KPixmap *iBtnPix=0; -static KPixmap *iBtnPixDown=0; +static KPixmap *btnPix=nullptr; +static KPixmap *btnPixDown=nullptr; +static KPixmap *iBtnPix=nullptr; +static KPixmap *iBtnPixDown=nullptr; static TQColor *btnForeground; static bool pixmaps_created = false; @@ -183,7 +183,7 @@ static void delete_pixmaps() delete btnPixDown; delete iBtnPix; delete iBtnPixDown; - aUpperGradient = 0; + aUpperGradient = nullptr; } delete btnForeground; pixmaps_created = false; @@ -318,7 +318,7 @@ void SystemClient::init() g->addColSpacing(2, 2); g->addRowSpacing(2, 6); - TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); + TQBoxLayout* hb = new TQBoxLayout(nullptr, TQBoxLayout::LeftToRight, 0, 0, nullptr); hb->setResizeMode(TQLayout::FreeResize); g->addLayout( hb, 0, 1 ); hb->addSpacing(3); @@ -327,7 +327,7 @@ void SystemClient::init() TQSizePolicy::Minimum); // setup titlebar buttons - for (int n=0; ncustomButtonPositions() ? KDecoration::options()->titleButtonsLeft() : TQString(default_left)); hb->addSpacing(2); diff --git a/twin-styles/system/systemclient.h b/twin-styles/system/systemclient.h index 237f03b4..7ae6a03c 100644 --- a/twin-styles/system/systemclient.h +++ b/twin-styles/system/systemclient.h @@ -71,7 +71,7 @@ class SystemClient : public KDecoration class SystemButton : public TQButton { public: - SystemButton(SystemClient *parent=0, const char *name=0, + SystemButton(SystemClient *parent=nullptr, const char *name=nullptr, const unsigned char *bitmap=nullptr, const TQString& tip=nullptr); void setBitmap(const unsigned char *bitmap); void reset(); -- cgit v1.2.3