From d7860715765a66de372a1e9eee8e3829c38646ad Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 16:31:44 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- src/DragWidget.h | 2 +- src/MainWidget.cpp | 10 +++++----- src/MainWidget.h | 4 ++-- src/VButton.h | 2 +- src/main.cpp | 18 +++++++++--------- src/numpadvbutton.h | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/DragWidget.h b/src/DragWidget.h index 3d15832..13534ae 100644 --- a/src/DragWidget.h +++ b/src/DragWidget.h @@ -9,7 +9,7 @@ class DragWidget : public TQWidget TQ_OBJECT public: - DragWidget(TQWidget *parent=0, const char *name="", WFlags f=0); + DragWidget(TQWidget *parent=nullptr, const char *name="", WFlags f=0); virtual ~DragWidget(); private: diff --git a/src/MainWidget.cpp b/src/MainWidget.cpp index 4d5c6f9..1aba1c1 100644 --- a/src/MainWidget.cpp +++ b/src/MainWidget.cpp @@ -47,7 +47,7 @@ bool shutting=false; MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const char * name, WFlags f ) : ResizableDragWidget ( parent,name,f ), stand_alone(tren) { - tray=0; + tray=nullptr; nresize=false; display=tqt_xdisplay(); @@ -639,7 +639,7 @@ void MainWidget::restorePosition() int d_height=235; TQRect dflt_geom(screen_geom.width()-d_width-150,screen_geom.height()-d_height-50,d_width,d_height); - TDEConfig *cfg = 0; + TDEConfig *cfg = nullptr; cfg = tdeApp->config(); if (cfg){ TQRect geom = cfg->readRectEntry("geometry"); @@ -652,7 +652,7 @@ void MainWidget::restorePosition() void MainWidget::saveState() { - TDEConfig *cfg = 0; + TDEConfig *cfg = nullptr; cfg = tdeApp->config(); if (cfg){ cfg->writeEntry("visible",isShown()); @@ -662,7 +662,7 @@ void MainWidget::saveState() void MainWidget::hideEvent ( TQHideEvent * ) { - TDEConfig *cfg = 0; + TDEConfig *cfg = nullptr; cfg = tdeApp->config(); if (cfg){ cfg->writeEntry("geometry",geometry()); @@ -950,7 +950,7 @@ void MainWidget::mappingNotify(XMappingEvent *) } KbdDock::KbdDock ( MainWidget *m ) - : DragWidget ( 0, "Dock", WStyle_Customize | TQt::WX11BypassWM |WStyle_NormalBorder ), mainWidget ( m ) + : DragWidget ( nullptr, "Dock", WStyle_Customize | TQt::WX11BypassWM |WStyle_NormalBorder ), mainWidget ( m ) { setFocusPolicy ( TQWidget::NoFocus ); diff --git a/src/MainWidget.h b/src/MainWidget.h index a108a12..3b89654 100644 --- a/src/MainWidget.h +++ b/src/MainWidget.h @@ -43,7 +43,7 @@ class MainWidget : public ResizableDragWidget TQ_OBJECT public: - MainWidget(TDEAboutData *about=0, bool tren=false, TQWidget *parent=0,const char *name="", WFlags f=WStyle_Customize | TQt::WX11BypassWM |WStyle_NormalBorder); + MainWidget(TDEAboutData *about=nullptr, bool tren=false, TQWidget *parent=nullptr,const char *name="", WFlags f=WStyle_Customize | TQt::WX11BypassWM |WStyle_NormalBorder); void mappingNotify(XMappingEvent *e); void finishInit(); bool close ( bool alsoDelete ); @@ -155,7 +155,7 @@ class KbdTray : public KSystemTray { public: - KbdTray( TQWidget* parent = 0, const char* name = 0 ); + KbdTray( TQWidget* parent = nullptr, const char* name = nullptr ); protected: void mousePressEvent(TQMouseEvent *); diff --git a/src/VButton.h b/src/VButton.h index 454c4c2..a70b7d9 100644 --- a/src/VButton.h +++ b/src/VButton.h @@ -9,7 +9,7 @@ class VButton : public TQPushButton TQ_OBJECT public: - VButton(TQWidget *parent=0, const char *name=0); + VButton(TQWidget *parent=nullptr, const char *name=nullptr); ~VButton(); unsigned int getKeyCode(); diff --git a/src/main.cpp b/src/main.cpp index edb2328..d52ab44 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ static const char version[] = "0.4.8"; static TDECmdLineOptions options[] = { - { "loginhelper", I18N_NOOP("Stand alone version for use with TDM or XDM. \nYou should Add : HOME=/root kvkbd --loginhelper & to Xsetup to run in xdm/tdm"), 0 }, + { "loginhelper", I18N_NOOP("Stand alone version for use with TDM or XDM. \nYou should Add : HOME=/root kvkbd --loginhelper & to Xsetup to run in xdm/tdm"), nullptr }, }; @@ -47,13 +47,13 @@ void findAloneWindow() { unsigned int numkids, scrn; Window root_id, parent_id; - Window *kids=0; + Window *kids=nullptr; //XWindowAttributes attr; Window root; - Display *dipsy=0; - char *win_name=0; + Display *dipsy=nullptr; + char *win_name=nullptr; - dipsy = XOpenDisplay(0); + dipsy = XOpenDisplay(nullptr); if (!dipsy)return; scrn = DefaultScreen(dipsy); @@ -93,7 +93,7 @@ public: MainWidget *main = (MainWidget *)mainWidget(); if (!main) { - main = new MainWidget(const_cast(aboutData()),false, 0, "kvkbd"); + main = new MainWidget(const_cast(aboutData()),false, nullptr, "kvkbd"); setMainWidget(main); } @@ -184,8 +184,8 @@ int main(int argc, char **argv) { TDEAboutData about("kvkbd", I18N_NOOP("kvkbd"), version, description, - TDEAboutData::License_GPL, "(C) 2007 Todor Gyumyushev", 0, 0, "http://bugs.trinitydesktop.org"); - about.addAuthor( "Todor Gyumyushev", 0, "yodor@developer.bg" ); + TDEAboutData::License_GPL, "(C) 2007 Todor Gyumyushev", nullptr, nullptr, "http://bugs.trinitydesktop.org"); + about.addAuthor( "Todor Gyumyushev", nullptr, "yodor@developer.bg" ); int alone=0; @@ -204,7 +204,7 @@ int main(int argc, char **argv) argc++; if (alone==1){ KvkbdApp a(argc,argv,true); - MainWidget m( &about, true, 0, "kvkbdalone"); + MainWidget m( &about, true, nullptr, "kvkbdalone"); a.setMainWidget(&m); m.restorePosition(); m.show(); diff --git a/src/numpadvbutton.h b/src/numpadvbutton.h index 26bad61..31b91de 100644 --- a/src/numpadvbutton.h +++ b/src/numpadvbutton.h @@ -30,7 +30,7 @@ class NumpadVButton : public VButton TQ_OBJECT public: - NumpadVButton(TQWidget *parent = 0, const char *name = 0); + NumpadVButton(TQWidget *parent = nullptr, const char *name = nullptr); ~NumpadVButton(); void numlockPressed(bool press); -- cgit v1.2.3