From 5a59554427f44fea483f50d112216dd9c554284f Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Thu, 12 Nov 2026 20:49:59 -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 --- tdeiconedit/kcolorgrid.h | 2 +- tdeiconedit/knew.cpp | 6 +++--- tdeiconedit/main.cpp | 10 +++++----- tdeiconedit/palettetoolbar.h | 2 +- tdeiconedit/properties.cpp | 4 ++-- tdeiconedit/tdeicon.cpp | 2 +- tdeiconedit/tdeiconcolors.cpp | 2 +- tdeiconedit/tdeiconconfig.cpp | 6 +++--- tdeiconedit/tdeiconedit.cpp | 10 +++++----- tdeiconedit/tdeiconedit.h | 2 +- tdeiconedit/tdeiconeditslots.cpp | 2 +- tdeiconedit/tdeicongrid.cpp | 18 +++++++++--------- tdeiconedit/tdeicongrid.h | 4 ++-- tdeiconedit/utils.cpp | 4 ++-- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/tdeiconedit/kcolorgrid.h b/tdeiconedit/kcolorgrid.h index b311d157..45f23090 100644 --- a/tdeiconedit/kcolorgrid.h +++ b/tdeiconedit/kcolorgrid.h @@ -43,7 +43,7 @@ private: TQ_OBJECT public: - KColorGrid( TQWidget * parent = 0, const char *name = 0, int spacing = 0); + KColorGrid( TQWidget * parent = nullptr, const char *name = nullptr, int spacing = 0); virtual ~KColorGrid() {}; enum GridState { Plain, Shaded }; diff --git a/tdeiconedit/knew.cpp b/tdeiconedit/knew.cpp index 40609e99..7a465ca0 100644 --- a/tdeiconedit/knew.cpp +++ b/tdeiconedit/knew.cpp @@ -33,7 +33,7 @@ #include "knew.h" -TDEIconTemplateContainer* TDEIconTemplateContainer::instance = 0; +TDEIconTemplateContainer* TDEIconTemplateContainer::instance = nullptr; void createStandardTemplates(TDEIconTemplateContainer *list) { @@ -224,7 +224,7 @@ void NewFromTemplate::checkSelection( int ) } KNewIcon::KNewIcon( TQWidget* parent ) - : KWizard( parent, 0, true ) + : KWizard( parent, nullptr, true ) { //kdDebug(4640) << "KNewIcon" << endl; setCaption( i18n( "Create New Icon" ) ); @@ -239,7 +239,7 @@ KNewIcon::KNewIcon( TQWidget* parent ) select = new NewSelect( this ); connect( select, TQ_SIGNAL( iconopenstyle( int ) ), TQ_SLOT( iconOpenStyle( int ) ) ); - scratch = new KResizeWidget( this, 0, TQSize( 32, 32 ) ); + scratch = new KResizeWidget( this, nullptr, TQSize( 32, 32 ) ); // this doesn't accept default valid size, besides spin buttons won't allow // an invalid size to be set by the user - forces user to change valid default // size to create the new icon object - diff --git a/tdeiconedit/main.cpp b/tdeiconedit/main.cpp index 5b28bcd8..06b315d9 100644 --- a/tdeiconedit/main.cpp +++ b/tdeiconedit/main.cpp @@ -36,7 +36,7 @@ static const char description[] = static TDECmdLineOptions options[] = { - { "+[file(s)]" , I18N_NOOP("Icon file(s) to open"), 0 }, + { "+[file(s)]" , I18N_NOOP("Icon file(s) to open"), nullptr }, TDECmdLineLastOption }; @@ -46,10 +46,10 @@ int main(int argc, char **argv) VERSION, description, TDEAboutData::License_GPL, "(c) 1998, Thomas Tanghus"); - aboutData.addAuthor("Thomas Tanghus",0, "tanghus@kde.org"); - aboutData.addAuthor("John Califf",0, "jcaliff@compuzone.net"); - aboutData.addAuthor("Laurent Montel",0, "lmontel@mandrakesoft.com"); - aboutData.addAuthor("Aaron J. Seigo",0, "aseigo@olympusproject.org"); + aboutData.addAuthor("Thomas Tanghus",nullptr, "tanghus@kde.org"); + aboutData.addAuthor("John Califf",nullptr, "jcaliff@compuzone.net"); + aboutData.addAuthor("Laurent Montel",nullptr, "lmontel@mandrakesoft.com"); + aboutData.addAuthor("Aaron J. Seigo",nullptr, "aseigo@olympusproject.org"); aboutData.addCredit( "Nadeem Hasan", "Rewrote UI to use XMLGUI\n" "Lots of fixes and cleanup", "nhasan@nadmm.com" ); aboutData.addCredit( "Adrian Page", I18N_NOOP("Bug fixes and GUI tidy up"), diff --git a/tdeiconedit/palettetoolbar.h b/tdeiconedit/palettetoolbar.h index 254d49d0..23414f5b 100644 --- a/tdeiconedit/palettetoolbar.h +++ b/tdeiconedit/palettetoolbar.h @@ -35,7 +35,7 @@ class PaletteToolBar : public TDEToolBar public: - PaletteToolBar( TQWidget *parent, const char *name = 0L ); + PaletteToolBar( TQWidget *parent, const char *name = nullptr ); signals: void newColor( uint c ); diff --git a/tdeiconedit/properties.cpp b/tdeiconedit/properties.cpp index 4bd6b125..7d8710c0 100644 --- a/tdeiconedit/properties.cpp +++ b/tdeiconedit/properties.cpp @@ -24,7 +24,7 @@ #include "properties.h" -TDEIconEditProperties* TDEIconEditProperties::m_self = 0; +TDEIconEditProperties* TDEIconEditProperties::m_self = nullptr; TDEIconEditProperties* TDEIconEditProperties::self() { @@ -87,7 +87,7 @@ TDEIconEditProperties::TDEIconEditProperties() : TQObject() TDEIconEditProperties::~TDEIconEditProperties() { kdDebug(4640) << "TDEIconEditProperties: Deleting properties" << endl; - m_self = 0; + m_self = nullptr; } void TDEIconEditProperties::save() diff --git a/tdeiconedit/tdeicon.cpp b/tdeiconedit/tdeicon.cpp index 7a1eb3d9..32ad27e6 100644 --- a/tdeiconedit/tdeicon.cpp +++ b/tdeiconedit/tdeicon.cpp @@ -35,7 +35,7 @@ TDEIconEditIcon::TDEIconEditIcon(TQObject *parent, const TQImage *img, KURL url) : TQObject(parent) { - f = 0; + f = nullptr; _lastdir = "/"; //checkUnNamedBackup(img); diff --git a/tdeiconedit/tdeiconcolors.cpp b/tdeiconedit/tdeiconcolors.cpp index 16b6d687..6390c404 100644 --- a/tdeiconedit/tdeiconcolors.cpp +++ b/tdeiconedit/tdeiconcolors.cpp @@ -25,7 +25,7 @@ #include "tdeiconcolors.h" -KDrawColors::KDrawColors(TQWidget *parent) : KColorGrid(parent, 0, 3) +KDrawColors::KDrawColors(TQWidget *parent) : KColorGrid(parent, nullptr, 3) { kdDebug(4640) << "KDrawColors - constructor" << endl; setCellSize(17); diff --git a/tdeiconedit/tdeiconconfig.cpp b/tdeiconedit/tdeiconconfig.cpp index cceeb519..bf6db470 100644 --- a/tdeiconedit/tdeiconconfig.cpp +++ b/tdeiconedit/tdeiconconfig.cpp @@ -116,7 +116,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent) { kdDebug(4640) << "KTemplateConfig constructor" << endl; - btadd = btremove = btedit = 0L; + btadd = btremove = btedit = nullptr; TQGroupBox* grp = new TQGroupBox( i18n( "Templates" ), this ); grp->setColumnLayout( 0, TQt::Horizontal ); @@ -229,7 +229,7 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent ) { kdDebug(4640) << "KBackgroundConfig - constructor" << endl; - lb_ex = 0L; + lb_ex = nullptr; TDEIconEditProperties *props = TDEIconEditProperties::self(); @@ -360,7 +360,7 @@ void KBackgroundConfig::selectPixmap() if( !url.isLocalFile() ) { - KMessageBox::sorry( 0L, i18n( "Only local files are supported yet." ) ); + KMessageBox::sorry( nullptr, i18n( "Only local files are supported yet." ) ); return; } diff --git a/tdeiconedit/tdeiconedit.cpp b/tdeiconedit/tdeiconedit.cpp index af5dcf12..5228caab 100644 --- a/tdeiconedit/tdeiconedit.cpp +++ b/tdeiconedit/tdeiconedit.cpp @@ -34,7 +34,7 @@ WindowList TDEIconEdit::windowList; TDEIconEdit::TDEIconEdit(const TQImage image, const char *name) - : TDEMainWindow(0, name) + : TDEMainWindow(nullptr, name) { init(); img = image; @@ -44,7 +44,7 @@ TDEIconEdit::TDEIconEdit(const TQImage image, const char *name) } TDEIconEdit::TDEIconEdit(KURL url, const char *name) - : TDEMainWindow(0, name) + : TDEMainWindow(nullptr, name) { init(); icon->open(&img, url); @@ -57,8 +57,8 @@ void TDEIconEdit::init() windowList.append(this); setCaption(tdeApp->caption()); - m_paletteToolBar = 0L; - statusbar = 0L; + m_paletteToolBar = nullptr; + statusbar = nullptr; history = new KCommandHistory( actionCollection(), true ); @@ -135,7 +135,7 @@ void TDEIconEdit::init() slotUpdateCopy(false); - uint *c = 0, n = 0; + uint *c = nullptr, n = 0; n = grid->getColors(c); slotUpdateStatusColors(n, c); diff --git a/tdeiconedit/tdeiconedit.h b/tdeiconedit/tdeiconedit.h index 42c3e35a..4effe711 100644 --- a/tdeiconedit/tdeiconedit.h +++ b/tdeiconedit/tdeiconedit.h @@ -77,7 +77,7 @@ public slots: void updateProperties(); protected slots: - void slotNewWin(const TQString & url = 0); + void slotNewWin(const TQString & url = nullptr); void slotNew(); void slotOpen(); void slotClose(); diff --git a/tdeiconedit/tdeiconeditslots.cpp b/tdeiconedit/tdeiconeditslots.cpp index 913c4037..086617d7 100644 --- a/tdeiconedit/tdeiconeditslots.cpp +++ b/tdeiconedit/tdeiconeditslots.cpp @@ -323,7 +323,7 @@ void TDEIconEdit::slotConfigureKeys() { KKeyDialog::configure(actionCollection()); - TDEIconEdit *ki = 0L; + TDEIconEdit *ki = nullptr; for (ki = windowList.first(); ki; ki = windowList.next()) { if (ki != this) diff --git a/tdeiconedit/tdeicongrid.cpp b/tdeiconedit/tdeicongrid.cpp index 85a81751..8ef7d5d0 100644 --- a/tdeiconedit/tdeicongrid.cpp +++ b/tdeiconedit/tdeicongrid.cpp @@ -70,9 +70,9 @@ void RepaintCommand::execute() KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent, const char *name) : TQFrame(parent, name) { - _corner = 0L; - _hruler = _vruler = 0L; - _grid = 0L; + _corner = nullptr; + _hruler = _vruler = nullptr; + _grid = nullptr; acceptdrop = false; @@ -296,7 +296,7 @@ TDEIconEditGrid::TDEIconEditGrid(TQImage *image, KCommandHistory* h, TQWidget *p img = image; history = h; selected = 0; - m_command = 0; + m_command = nullptr; // the 42 normal kde colors - there can be an additional // 18 custom colors in the custom colors palette @@ -601,7 +601,7 @@ void TDEIconEditGrid::paintEvent(TQPaintEvent *e) delete [] color2ScanLine; } - TQImage image((uchar *)(imageBuffer), paintCellsRect.width(), paintCellsRect.height(), 32, 0, 0, + TQImage image((uchar *)(imageBuffer), paintCellsRect.width(), paintCellsRect.height(), 32, nullptr, 0, #if X_BYTE_ORDER == X_LITTLE_ENDIAN TQImage::LittleEndian); #else @@ -924,7 +924,7 @@ void TDEIconEditGrid::mouseReleaseEvent( TQMouseEvent *e ) if( m_command ) { history->addCommand( m_command, false ); - m_command = 0; + m_command = nullptr; } break; @@ -1015,7 +1015,7 @@ void TDEIconEditGrid::load( TQImage *image) setUpdatesEnabled(false); - if(image == 0L) + if(image == nullptr) { TQString msg = i18n("There was an error loading a blank image.\n"); KMessageBox::error(this, msg); @@ -1400,7 +1400,7 @@ void TDEIconEditGrid::editPasteAsNew() void TDEIconEditGrid::editResize() { kdDebug(4640) << "TDEIconGrid::editResize" << endl; - KResizeDialog *rs = new KResizeDialog(this, 0, TQSize(numCols(), numRows())); + KResizeDialog *rs = new KResizeDialog(this, nullptr, TQSize(numCols(), numRows())); if(rs->exec()) { const TQSize s = rs->getSize(); @@ -1891,7 +1891,7 @@ void TDEIconEditGrid::drawPointArray(TQPointArray a, DrawAction action) TQRect area( a.boundingRect().x()*cellSize()-1, a.boundingRect().y()*cellSize()-1, a.boundingRect().width()*cellSize()+1, a.boundingRect().height()*cellSize()+1 ); - KMacroCommand* macro = 0; + KMacroCommand* macro = nullptr; bool doupdate = false; if( a.size() > 0 && action == Draw ) { diff --git a/tdeiconedit/tdeicongrid.h b/tdeiconedit/tdeicongrid.h index 170edad1..15364ebc 100644 --- a/tdeiconedit/tdeicongrid.h +++ b/tdeiconedit/tdeicongrid.h @@ -92,7 +92,7 @@ class KGridView : public TQFrame TQ_OBJECT public: - KGridView( TQImage *image, KCommandHistory* history, TQWidget * parent = 0, const char *name = 0); + KGridView( TQImage *image, KCommandHistory* history, TQWidget * parent = nullptr, const char *name = nullptr); KRuler *hruler() { return _hruler;} KRuler *vruler() { return _vruler;} @@ -134,7 +134,7 @@ class TDEIconEditGrid : public KColorGrid TQ_OBJECT public: - TDEIconEditGrid( TQImage *image, KCommandHistory* h, TQWidget * parent = 0, const char *name = 0); + TDEIconEditGrid( TQImage *image, KCommandHistory* h, TQWidget * parent = nullptr, const char *name = nullptr); virtual ~TDEIconEditGrid(); enum DrawTool { Line, Freehand, FloodFill, Spray, Rect, FilledRect, Circle, diff --git a/tdeiconedit/utils.cpp b/tdeiconedit/utils.cpp index efd50d88..e61064f2 100644 --- a/tdeiconedit/utils.cpp +++ b/tdeiconedit/utils.cpp @@ -26,11 +26,11 @@ #include "utils.h" #include "config.h" -imageFormats *formats = 0L; +imageFormats *formats = nullptr; void setupImageHandlers() { - if(formats != 0L) + if(formats != nullptr) return; KImageIO::registerFormats(); -- cgit v1.2.3