From 5f6dae797602ecf924da746e3aa6e02c71eb5d20 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 17:49:58 -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 --- kbarcode/barcodecombo.h | 6 +++--- kbarcode/barcodedialog.cpp | 4 ++-- kbarcode/barcodedialog.h | 2 +- kbarcode/barcodedialogs.cpp | 2 +- kbarcode/barcodedialogs.h | 14 +++++++------- kbarcode/barcodeprinterdlg.h | 2 +- kbarcode/batchprinter.h | 2 +- kbarcode/commands.cpp | 6 +++--- kbarcode/configdialog.cpp | 6 +++--- kbarcode/confwizard.cpp | 6 +++--- kbarcode/confwizard.h | 2 +- kbarcode/csvimportdlg.cpp | 2 +- kbarcode/csvimportdlg.h | 2 +- kbarcode/databasebrowser.cpp | 2 +- kbarcode/databasebrowser.h | 2 +- kbarcode/definition.cpp | 18 +++++++++--------- kbarcode/definition.h | 8 ++++---- kbarcode/definitiondialog.cpp | 10 +++++----- kbarcode/definitiondialog.h | 4 ++-- kbarcode/documentitemdlg.cpp | 2 +- kbarcode/dsmainwindow.cpp | 6 +++--- kbarcode/dsmainwindow.h | 2 +- kbarcode/dstextedit.h | 2 +- kbarcode/kbarcode.cpp | 2 +- kbarcode/kbarcode.h | 2 +- kbarcode/kbarcodesettings.cpp | 2 +- kbarcode/labeleditor.cpp | 4 ++-- kbarcode/labeleditor.h | 2 +- kbarcode/main.cpp | 2 +- kbarcode/mimesources.h | 2 +- kbarcode/multilineeditdlg.h | 2 +- kbarcode/mycanvasitem.cpp | 4 ++-- kbarcode/mycanvasview.cpp | 8 ++++---- kbarcode/mycanvasview.h | 8 ++++---- kbarcode/mydatatable.h | 2 +- kbarcode/newlabel.cpp | 8 ++++---- kbarcode/newlabel.h | 2 +- kbarcode/pixmapbarcode.cpp | 2 +- kbarcode/previewdialog.cpp | 4 ++-- kbarcode/previewdialog.h | 2 +- kbarcode/printersettings.cpp | 4 ++-- kbarcode/printlabeldlg.h | 2 +- kbarcode/propertywidget.cpp | 2 +- kbarcode/rectsettingsdlg.h | 4 ++-- kbarcode/smalldialogs.h | 6 +++--- kbarcode/sqltables.cpp | 24 ++++++++++++------------ kbarcode/sqltables.h | 4 ++-- kbarcode/tbarcode2.cpp | 1 - kbarcode/textlineedit.h | 2 +- kbarcode/tokendialog.cpp | 6 +++--- kbarcode/tokendialog.h | 2 +- 51 files changed, 113 insertions(+), 114 deletions(-) diff --git a/kbarcode/barcodecombo.h b/kbarcode/barcodecombo.h index b7e606a..9bfd52b 100644 --- a/kbarcode/barcodecombo.h +++ b/kbarcode/barcodecombo.h @@ -29,7 +29,7 @@ */ class BarcodeValidator : public TQValidator { public: - BarcodeValidator( TQObject* parent = 0, const char* name = 0 ); + BarcodeValidator( TQObject* parent = nullptr, const char* name = nullptr ); TQValidator::State validate( TQString & input, int & pos ) const; @@ -57,7 +57,7 @@ class BarcodeCombo : public KComboBox { TQ_OBJECT public: - BarcodeCombo(TQWidget *parent=0, const char *name=0); + BarcodeCombo(TQWidget *parent=nullptr, const char *name=nullptr); ~BarcodeCombo(); const char* getEncodingType(); @@ -83,7 +83,7 @@ class BarcodeWidget : public TQWidget { TQ_OBJECT public: - BarcodeWidget(TQWidget *parent=0, const char *name=0); + BarcodeWidget(TQWidget *parent=nullptr, const char *name=nullptr); ~BarcodeWidget() { } void getData( Barkode & barkode ); diff --git a/kbarcode/barcodedialog.cpp b/kbarcode/barcodedialog.cpp index 2d1b284..2e694d7 100644 --- a/kbarcode/barcodedialog.cpp +++ b/kbarcode/barcodedialog.cpp @@ -46,8 +46,8 @@ BarCodeDialog::BarCodeDialog( TQWidget* parent, const char* name ) setCaption( i18n( "Barcode Generator" ) ); BarCodeDialogLayout = new TQHBoxLayout( this, 11, 6, "BarCodeDialogLayout"); - Layout5 = new TQVBoxLayout( 0, 0, 6, "Layout5"); - Layout6 = new TQVBoxLayout( 0, 0, 6, "Layout2"); + Layout5 = new TQVBoxLayout( nullptr, 0, 6, "Layout5"); + Layout6 = new TQVBoxLayout( nullptr, 0, 6, "Layout2"); widget = new BarcodeWidget( this, "widget" ); m_token = new TokenProvider( TDEApplication::desktop() ); diff --git a/kbarcode/barcodedialog.h b/kbarcode/barcodedialog.h index ea1e603..8eb5969 100644 --- a/kbarcode/barcodedialog.h +++ b/kbarcode/barcodedialog.h @@ -51,7 +51,7 @@ class BarCodeDialog : public TQDialog public: - BarCodeDialog( TQWidget* parent = 0, const char* name = 0 ); + BarCodeDialog( TQWidget* parent = nullptr, const char* name = nullptr ); ~BarCodeDialog(); private: diff --git a/kbarcode/barcodedialogs.cpp b/kbarcode/barcodedialogs.cpp index 89f6135..5bb581e 100644 --- a/kbarcode/barcodedialogs.cpp +++ b/kbarcode/barcodedialogs.cpp @@ -129,7 +129,7 @@ TBarcodeDlg::TBarcodeDlg(TQWidget *parent, const char *name ) TQLabel* label = new TQLabel( i18n("&Checksum calculation method:"), gb ); label->setBuddy( comboCheckSum ); - TQHBoxLayout * hbox = new TQHBoxLayout( 0, 6, 6 ); + TQHBoxLayout * hbox = new TQHBoxLayout( nullptr, 6, 6 ); hbox->addWidget( label ); hbox->addWidget( comboCheckSum ); diff --git a/kbarcode/barcodedialogs.h b/kbarcode/barcodedialogs.h index d914480..65aaffd 100644 --- a/kbarcode/barcodedialogs.h +++ b/kbarcode/barcodedialogs.h @@ -58,7 +58,7 @@ class AdvancedBarcodeDialog : public KDialogBase { TQ_OBJECT public: - AdvancedBarcodeDialog( TQString type, TQWidget* parent = 0, const char* name = 0 ); + AdvancedBarcodeDialog( TQString type, TQWidget* parent = nullptr, const char* name = nullptr ); ~AdvancedBarcodeDialog(); void setData( Barkode* b ); @@ -75,7 +75,7 @@ class TBarcodeDlg : public TQWidget, public BarcodeDlgBase { TQ_OBJECT public: - TBarcodeDlg(TQWidget *parent=0, const char *name=0); + TBarcodeDlg(TQWidget *parent=nullptr, const char *name=nullptr); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -98,7 +98,7 @@ class PDF417BarcodeDlg : public TQWidget, public BarcodeDlgBase { TQ_OBJECT public: - PDF417BarcodeDlg(TQWidget *parent=0, const char *name=0); + PDF417BarcodeDlg(TQWidget *parent=nullptr, const char *name=nullptr); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -116,7 +116,7 @@ class DataMatrixDlg : public TQWidget, public BarcodeDlgBase { TQ_OBJECT public: - DataMatrixDlg(TQWidget *parent=0, const char *name=0); + DataMatrixDlg(TQWidget *parent=nullptr, const char *name=nullptr); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -132,7 +132,7 @@ class SequenceDlg : public TQWidget, public BarcodeDlgBase { TQ_OBJECT public: - SequenceDlg(TQWidget *parent=0, const char *name=0); + SequenceDlg(TQWidget *parent=nullptr, const char *name=nullptr); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -157,7 +157,7 @@ class ColorDlg : public TQVBox, public BarcodeDlgBase { TQ_OBJECT public: - ColorDlg(TQWidget *parent=0, const char *name=0); + ColorDlg(TQWidget *parent=nullptr, const char *name=nullptr); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -175,7 +175,7 @@ class PurePostscriptDlg : public TQVBox, public BarcodeDlgBase { TQ_OBJECT public: - PurePostscriptDlg(TQWidget *parent=0, const char *name=0); + PurePostscriptDlg(TQWidget *parent=nullptr, const char *name=nullptr); void setData( Barkode* b ); void getData( Barkode* b ) const; diff --git a/kbarcode/barcodeprinterdlg.h b/kbarcode/barcodeprinterdlg.h index 61e08e0..4a85b1d 100644 --- a/kbarcode/barcodeprinterdlg.h +++ b/kbarcode/barcodeprinterdlg.h @@ -32,7 +32,7 @@ class BarcodePrinterDlg : public KDialogBase TQ_OBJECT public: - BarcodePrinterDlg(TQWidget *parent = 0, const char *name = 0); + BarcodePrinterDlg(TQWidget *parent = nullptr, const char *name = nullptr); ~BarcodePrinterDlg(); int outputFormat() const; diff --git a/kbarcode/batchprinter.h b/kbarcode/batchprinter.h index 758bf4b..cc257bf 100644 --- a/kbarcode/batchprinter.h +++ b/kbarcode/batchprinter.h @@ -134,7 +134,7 @@ class BatchPrinter * on the page. */ void changeLine(); - void proccessEvents( int lb, TQString value = TQString(), Label* label = 0 ); + void proccessEvents( int lb, TQString value = TQString(), Label* label = nullptr ); void printXLabel( int lb, Label* label, const TQString & value ); void moveLabels(); diff --git a/kbarcode/commands.cpp b/kbarcode/commands.cpp index d3b35fb..d4e8e1d 100644 --- a/kbarcode/commands.cpp +++ b/kbarcode/commands.cpp @@ -502,11 +502,11 @@ void NewBarcodeCommand::create() DeleteCommand::~DeleteCommand() { - if( m_canvas_item && canvasHasItem() && m_canvas_item->canvas() == 0 ) + if( m_canvas_item && canvasHasItem() && m_canvas_item->canvas() == nullptr ) { DocumentItem* item = m_canvas_item->item(); if( item ) - item->disconnect( item, TQ_SIGNAL( destroyed() ), this, 0 ); + item->disconnect( item, TQ_SIGNAL( destroyed() ), this, nullptr ); delete m_canvas_item; } } @@ -514,7 +514,7 @@ DeleteCommand::~DeleteCommand() void DeleteCommand::execute() { if( canvasHasItem() ) { - m_canvas_item->setCanvas( 0 ); + m_canvas_item->setCanvas( nullptr ); m_canvas_item->hide(); } } diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp index 4fdc7a7..86efb8a 100644 --- a/kbarcode/configdialog.cpp +++ b/kbarcode/configdialog.cpp @@ -80,8 +80,8 @@ void ConfigDialog::setupTab2() TQFrame* box = addPage( i18n("Print Settings"), "", BarIcon("document-print") ); TQVBoxLayout* tabLayout = new TQVBoxLayout( box, 11, 6 ); - TQHBoxLayout* Layout0 = new TQHBoxLayout( 0, 6, 6 ); - TQHBoxLayout* Layout1 = new TQHBoxLayout( 0, 6, 6 ); + TQHBoxLayout* Layout0 = new TQHBoxLayout( nullptr, 6, 6 ); + TQHBoxLayout* Layout1 = new TQHBoxLayout( nullptr, 6, 6 ); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding ); printerQuality = new KComboBox( false, box ); @@ -149,7 +149,7 @@ void ConfigDialog::setupTab3() grid->addMultiCellWidget( checkUseCustomNo, 3, 3, 0, 2 ); - TQHBoxLayout* Layout1 = new TQHBoxLayout( 0, 6, 6 ); + TQHBoxLayout* Layout1 = new TQHBoxLayout( nullptr, 6, 6 ); Layout1->addWidget( new TQLabel( i18n("File Format:"), box ) ); combo1 = new KComboBox( box ); diff --git a/kbarcode/confwizard.cpp b/kbarcode/confwizard.cpp index fb5356d..f234c11 100644 --- a/kbarcode/confwizard.cpp +++ b/kbarcode/confwizard.cpp @@ -86,9 +86,9 @@ void ConfWizard::setupPage1() page = new TQWidget( this, "page" ); pageLayout = new TQVBoxLayout( page, 11, 6, "pageLayout"); - Layout8 = new TQHBoxLayout( 0, 0, 6, "Layout8"); + Layout8 = new TQHBoxLayout( nullptr, 0, 6, "Layout8"); - Layout7 = new TQVBoxLayout( 0, 0, 6, "Layout7"); + Layout7 = new TQVBoxLayout( nullptr, 0, 6, "Layout7"); logo = new TQLabel( page, "logo" ); logo->setPixmap( locate("data", "kbarcode/logo.png") ); @@ -154,7 +154,7 @@ void ConfWizard::setupPage3() TextLabel1_2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); pageLayout_3->addWidget( TextLabel1_2 ); - Layout5_2 = new TQVBoxLayout( 0, 0, 6, "Layout5_2"); + Layout5_2 = new TQVBoxLayout( nullptr, 0, 6, "Layout5_2"); buttonCreate = new KPushButton( page_3, "buttonCreate" ); buttonCreate->setText( i18n( "&Create Tables" ) ); diff --git a/kbarcode/confwizard.h b/kbarcode/confwizard.h index c9eaffa..697b3c7 100644 --- a/kbarcode/confwizard.h +++ b/kbarcode/confwizard.h @@ -41,7 +41,7 @@ class ConfWizard : public KWizard public: - ConfWizard( TQWidget* parent = 0, const char* name = 0, bool modal = true ); + ConfWizard( TQWidget* parent = nullptr, const char* name = nullptr, bool modal = true ); ~ConfWizard(); void showPage( TQWidget* page ); diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp index 00e9b57..d927df7 100644 --- a/kbarcode/csvimportdlg.cpp +++ b/kbarcode/csvimportdlg.cpp @@ -214,7 +214,7 @@ void CSVImportDlg::createPage2() spinNumber->setValue( 1 ); spinNumber->setFocus(); - TQVBoxLayout* layout2 = new TQVBoxLayout( 0, 6, 6 ); + TQVBoxLayout* layout2 = new TQVBoxLayout( nullptr, 6, 6 ); layout2->addWidget( buttonAdd ); layout2->addWidget( buttonRemove ); layout2->addWidget( spinNumber ); diff --git a/kbarcode/csvimportdlg.h b/kbarcode/csvimportdlg.h index 1ad7857..d1c956a 100644 --- a/kbarcode/csvimportdlg.h +++ b/kbarcode/csvimportdlg.h @@ -48,7 +48,7 @@ class CSVImportDlg : public KDialogBase { TQ_OBJECT public: - CSVImportDlg(TQWidget *parent=0, const char *name=0); + CSVImportDlg(TQWidget *parent=nullptr, const char *name=nullptr); ~CSVImportDlg(); private slots: diff --git a/kbarcode/databasebrowser.cpp b/kbarcode/databasebrowser.cpp index 99fdd39..aa8aeb1 100644 --- a/kbarcode/databasebrowser.cpp +++ b/kbarcode/databasebrowser.cpp @@ -54,7 +54,7 @@ DatabaseBrowser::DatabaseBrowser( TQString _database, TQWidget *parent, const ch connect( this, TQ_SIGNAL( connectedSQL() ), this, TQ_SLOT( setupSql() ) ); - findDlg = 0; + findDlg = nullptr; setupActions(); show(); diff --git a/kbarcode/databasebrowser.h b/kbarcode/databasebrowser.h index 198ae26..b723f96 100644 --- a/kbarcode/databasebrowser.h +++ b/kbarcode/databasebrowser.h @@ -34,7 +34,7 @@ class DatabaseBrowser : public DSMainWindow{ TQ_OBJECT public: - DatabaseBrowser( TQString _database, TQWidget *parent=0, const char *name=0); + DatabaseBrowser( TQString _database, TQWidget *parent=nullptr, const char *name=nullptr); ~DatabaseBrowser(); private: diff --git a/kbarcode/definition.cpp b/kbarcode/definition.cpp index 1122d57..6ec4d94 100644 --- a/kbarcode/definition.cpp +++ b/kbarcode/definition.cpp @@ -182,11 +182,11 @@ Definition::~Definition() { } -TQFile* Definition::file = 0; -TQByteArray* Definition::array = 0; -TQStringList* Definition::listProducers = 0; +TQFile* Definition::file = nullptr; +TQByteArray* Definition::array = nullptr; +TQStringList* Definition::listProducers = nullptr; TQMap Definition::mapTypes; -TQProgressDialog* Definition::m_progress = 0; +TQProgressDialog* Definition::m_progress = nullptr; void Definition::initProgress() { @@ -313,7 +313,7 @@ bool Definition::openFile() file = new TQFile( f ); if( !file->open( IO_ReadOnly ) ) { delete file; - file = 0; + file = nullptr; return ( showFileError() ? openFile() : false ); } @@ -410,17 +410,17 @@ void Definition::updateProducer() // correct! w/ SQL and without if( listProducers ) { delete listProducers; - listProducers = 0; + listProducers = nullptr; if( array ) { delete array; - array = 0; + array = nullptr; } if( file ) { file->close(); delete file; - file = 0; + file = nullptr; } mapTypes.clear(); } @@ -543,7 +543,7 @@ bool Definition::nodefmsg = true; bool Definition::showFileError() { if( nodefmsg ) { - KMessageBox::information( 0, + KMessageBox::information( nullptr, i18n("KBarcode is unable to find its label definitions." "Please make sure that the file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql " "does exist. This file is part of the KBarcode distribution. " diff --git a/kbarcode/definition.h b/kbarcode/definition.h index b68a32c..8f1ec2c 100644 --- a/kbarcode/definition.h +++ b/kbarcode/definition.h @@ -46,10 +46,10 @@ class TQProgressDialog; */ class Definition : private LabelUtils { public: - Definition( TQWidget* parent = 0 ); - Definition( int label_def_id, TQWidget* parent = 0 ); - Definition( const TQString & label_def_id, TQWidget* parent = 0 ); - Definition( const TQString & producer, const TQString & type, TQWidget* parent = 0 ); + Definition( TQWidget* parent = nullptr ); + Definition( int label_def_id, TQWidget* parent = nullptr ); + Definition( const TQString & label_def_id, TQWidget* parent = nullptr ); + Definition( const TQString & producer, const TQString & type, TQWidget* parent = nullptr ); ~Definition(); void setId( const TQString & label_def_id ); diff --git a/kbarcode/definitiondialog.cpp b/kbarcode/definitiondialog.cpp index 7e637bd..ad54434 100644 --- a/kbarcode/definitiondialog.cpp +++ b/kbarcode/definitiondialog.cpp @@ -81,11 +81,11 @@ DefinitionDialog::DefinitionDialog( TQWidget* parent, const char* name, bool mo resize( 465, 345 ); setCaption( i18n( "Add Label Definition" ) ); TQHBoxLayout* layout = new TQHBoxLayout( this, 6, 6 ); - DefinitionDialogLayout = new TQVBoxLayout( 0, 11, 6, "DefinitionDialogLayout"); + DefinitionDialogLayout = new TQVBoxLayout( nullptr, 11, 6, "DefinitionDialogLayout"); - Layout17 = new TQHBoxLayout( 0, 0, 6, "Layout17"); + Layout17 = new TQHBoxLayout( nullptr, 0, 6, "Layout17"); - Layout13 = new TQVBoxLayout( 0, 0, 6, "Layout13"); + Layout13 = new TQVBoxLayout( nullptr, 0, 6, "Layout13"); TextLabel1 = new TQLabel( this, "TextLabel1" ); TextLabel1->setText( i18n( "Producer:" ) ); @@ -128,7 +128,7 @@ DefinitionDialog::DefinitionDialog( TQWidget* parent, const char* name, bool mo Layout13->addWidget( TextLabel10 ); Layout17->addLayout( Layout13 ); - Layout14 = new TQVBoxLayout( 0, 0, 6, "Layout14"); + Layout14 = new TQVBoxLayout( nullptr, 0, 6, "Layout14"); comboProducer = new KComboBox( false, this, "comboProducer" ); comboProducer->setEditable( true ); @@ -185,7 +185,7 @@ DefinitionDialog::DefinitionDialog( TQWidget* parent, const char* name, bool mo TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); DefinitionDialogLayout->addItem( spacer_2 ); - Layout16 = new TQHBoxLayout( 0, 0, 6, "Layout16"); + Layout16 = new TQHBoxLayout( nullptr, 0, 6, "Layout16"); buttonInfo = new KPushButton( i18n("More &Information"), this ); Layout16->addWidget( buttonInfo ); diff --git a/kbarcode/definitiondialog.h b/kbarcode/definitiondialog.h index cc94c0c..1d3e864 100644 --- a/kbarcode/definitiondialog.h +++ b/kbarcode/definitiondialog.h @@ -23,7 +23,7 @@ class LabelPreview : public TQWidget { TQ_OBJECT public: - LabelPreview( TQWidget* parent = 0, const char* name = 0 ); + LabelPreview( TQWidget* parent = nullptr, const char* name = nullptr ); ~LabelPreview(); void setRect( TQRect label ) { size = label; } @@ -48,7 +48,7 @@ class DefinitionDialog : public TQDialog public: - DefinitionDialog( TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 ); + DefinitionDialog( TQWidget* parent = nullptr, const char* name = nullptr, bool modal = true, WFlags fl = 0 ); ~DefinitionDialog(); private: const Measurements getCurrentMeasure(); diff --git a/kbarcode/documentitemdlg.cpp b/kbarcode/documentitemdlg.cpp index 0a3f245..36d7e1c 100644 --- a/kbarcode/documentitemdlg.cpp +++ b/kbarcode/documentitemdlg.cpp @@ -25,7 +25,7 @@ DocumentItemDlg::DocumentItemDlg( TokenProvider* token, DocumentItem* item, KCommandHistory* history, TQWidget* parent ) : KDialogBase( Tabbed, i18n("Properties"), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, parent, 0, true, true ) + KDialogBase::Ok, parent, nullptr, true, true ) { m_item = item; m_history = history; diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp index 3ef8473..7660496 100644 --- a/kbarcode/dsmainwindow.cpp +++ b/kbarcode/dsmainwindow.cpp @@ -45,7 +45,7 @@ bool DSMainWindow::startwizard = true; DSMainWindow::DSMainWindow(TQWidget *parent, const char *name, WFlags f) : TDEMainWindow(parent,name,f) { - connectAct = 0; + connectAct = nullptr; first = false; loadConfig(); @@ -157,7 +157,7 @@ void DSMainWindow::saveConfig() void DSMainWindow::wizard() { - ConfWizard* wiz = new ConfWizard( 0, "wiz", true ); + ConfWizard* wiz = new ConfWizard( nullptr, "wiz", true ); if( wiz->exec() == TQDialog::Accepted && wiz->checkDatabase->isChecked() ) SqlTables::getInstance()->connectMySQL(); @@ -185,7 +185,7 @@ void DSMainWindow::appHelpActivated() void DSMainWindow::showCheck() { - TQTextBrowser* b = new TQTextBrowser( 0, "b" ); + TQTextBrowser* b = new TQTextBrowser( nullptr, "b" ); b->setText( DSMainWindow::systemCheck() ); b->resize( 320, 240 ); b->show(); diff --git a/kbarcode/dsmainwindow.h b/kbarcode/dsmainwindow.h index df011b2..0e8775c 100644 --- a/kbarcode/dsmainwindow.h +++ b/kbarcode/dsmainwindow.h @@ -34,7 +34,7 @@ class DSMainWindow : public TDEMainWindow { TQ_OBJECT public: - DSMainWindow(TQWidget *parent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose ); + DSMainWindow(TQWidget *parent=nullptr, const char *name=nullptr, WFlags f = WType_TopLevel | WDestructiveClose ); ~DSMainWindow(); /** Is this the first start of KBarcode ? diff --git a/kbarcode/dstextedit.h b/kbarcode/dstextedit.h index e912c3c..98d68cf 100644 --- a/kbarcode/dstextedit.h +++ b/kbarcode/dstextedit.h @@ -30,7 +30,7 @@ class DSTextEdit : public KTextEdit { public: - DSTextEdit( TQWidget* parent, const char* name = 0 ); + DSTextEdit( TQWidget* parent, const char* name = nullptr ); //virtual void moveCursor( CursorAction action, bool select ); private slots: diff --git a/kbarcode/kbarcode.cpp b/kbarcode/kbarcode.cpp index 1f6d1a0..af5e7f8 100644 --- a/kbarcode/kbarcode.cpp +++ b/kbarcode/kbarcode.cpp @@ -234,7 +234,7 @@ bool KBarcode::parseCmdLine() } else { - pEdit = new LabelEditor( 0, args->url( i ).path() ); + pEdit = new LabelEditor( nullptr, args->url( i ).path() ); if( bPrintNow ) // TODO: use the printer set by the printer commandline option pEdit->print(); diff --git a/kbarcode/kbarcode.h b/kbarcode/kbarcode.h index 3c001ae..c469b8a 100644 --- a/kbarcode/kbarcode.h +++ b/kbarcode/kbarcode.h @@ -46,7 +46,7 @@ class KBarcode: public DSMainWindow, public KBarcodeIface { TQ_OBJECT public: - KBarcode( TQWidget *parent=0, const char *name="kbarcode", WFlags f = WType_TopLevel | WDestructiveClose ); + KBarcode( TQWidget *parent=nullptr, const char *name="kbarcode", WFlags f = WType_TopLevel | WDestructiveClose ); ~KBarcode(); /** Parse all commandline options and start batchprinting diff --git a/kbarcode/kbarcodesettings.cpp b/kbarcode/kbarcodesettings.cpp index 6ffbcc9..1fa2095 100644 --- a/kbarcode/kbarcodesettings.cpp +++ b/kbarcode/kbarcodesettings.cpp @@ -30,7 +30,7 @@ // TQt includes #include -KBarcodeSettings* KBarcodeSettings::m_instance = 0; +KBarcodeSettings* KBarcodeSettings::m_instance = nullptr; int KBarcodeSettings::gridsize = 30; bool KBarcodeSettings::newdlg = true; TQColor KBarcodeSettings::gridcolor = TQt::black; diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp index 85db747..0f9a566 100644 --- a/kbarcode/labeleditor.cpp +++ b/kbarcode/labeleditor.cpp @@ -1008,7 +1008,7 @@ void LabelEditor::startLoadRecentEditor( const KURL& url ) } if( isChanged() ) - new LabelEditor( 0, url.path(), "LabelEditorWindow" ); + new LabelEditor( nullptr, url.path(), "LabelEditorWindow" ); else openUrl( url.path() ); } @@ -1016,7 +1016,7 @@ void LabelEditor::startLoadRecentEditor( const KURL& url ) void LabelEditor::startLoadEditor() { if( isChanged() ) { - LabelEditor* lb = new LabelEditor( 0, TQString(), "LabelEditorWindow" ); + LabelEditor* lb = new LabelEditor( nullptr, TQString(), "LabelEditorWindow" ); lb->startupDlg( eLoadLabel, TQString() ); } else open(); diff --git a/kbarcode/labeleditor.h b/kbarcode/labeleditor.h index 4e131e6..2421fc8 100644 --- a/kbarcode/labeleditor.h +++ b/kbarcode/labeleditor.h @@ -88,7 +88,7 @@ class LabelEditor : public DSMainWindow, public EditorIface, private LabelUtils, eLoadLabel }; - LabelEditor( TQWidget *parent=0, TQString _filename = TQString(), + LabelEditor( TQWidget *parent=nullptr, TQString _filename = TQString(), const char *name="labeleditor", WFlags f = WType_TopLevel | WDestructiveClose ); ~LabelEditor(); bool startupDlg( ELabelEditorMode mode, TQString f = TQString() ); diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp index e29b0bf..1cc1ac6 100644 --- a/kbarcode/main.cpp +++ b/kbarcode/main.cpp @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) KImageIO::registerFormats(); a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit())); - KBarcode* kbc = new KBarcode( 0, "KBarcodeMainWindow" ); + KBarcode* kbc = new KBarcode( nullptr, "KBarcodeMainWindow" ); if( kbc->parseCmdLine() ) return 0; diff --git a/kbarcode/mimesources.h b/kbarcode/mimesources.h index 8e8f53f..dac366c 100644 --- a/kbarcode/mimesources.h +++ b/kbarcode/mimesources.h @@ -29,7 +29,7 @@ class DocumentItemDrag : public TQStoredDrag { TQ_OBJECT public: - DocumentItemDrag( TQWidget* dragSource = nullptr, const char* name = 0 ); + DocumentItemDrag( TQWidget* dragSource = nullptr, const char* name = nullptr ); static TQString mimeType(); diff --git a/kbarcode/multilineeditdlg.h b/kbarcode/multilineeditdlg.h index fd6597f..82713b5 100644 --- a/kbarcode/multilineeditdlg.h +++ b/kbarcode/multilineeditdlg.h @@ -35,7 +35,7 @@ class MultiLineEditor : public TQWidget { TQ_OBJECT public: - MultiLineEditor( TokenProvider* token, TQWidget *parent=0, const char *name=0); + MultiLineEditor( TokenProvider* token, TQWidget *parent=nullptr, const char *name=nullptr); ~MultiLineEditor(); TQString text(); void setText( const TQString & t ); diff --git a/kbarcode/mycanvasitem.cpp b/kbarcode/mycanvasitem.cpp index ea33068..610c5ec 100644 --- a/kbarcode/mycanvasitem.cpp +++ b/kbarcode/mycanvasitem.cpp @@ -41,8 +41,8 @@ SpotProvider::~SpotProvider() delete m_spot; } -SpotProvider* SpotProvider::instance = 0; -TQPixmap* SpotProvider::m_spot = 0; +SpotProvider* SpotProvider::instance = nullptr; +TQPixmap* SpotProvider::m_spot = nullptr; SpotProvider* SpotProvider::getInstance() { diff --git a/kbarcode/mycanvasview.cpp b/kbarcode/mycanvasview.cpp index 3dd98de..52fea6d 100644 --- a/kbarcode/mycanvasview.cpp +++ b/kbarcode/mycanvasview.cpp @@ -77,8 +77,8 @@ void MyCanvas::drawBackground( TQPainter & painter, const TQRect & clip ) MyCanvasView::MyCanvasView( Definition* d, MyCanvas* c, TQWidget* parent, const char* name, WFlags f) : TQCanvasView(c,parent,name,f) { - statusbar = 0; - m_commov = 0; + statusbar = nullptr; + m_commov = nullptr; canv = c; rulerv = new KRuler( TQt::Vertical, this ); @@ -269,7 +269,7 @@ void MyCanvasView::contentsMouseReleaseEvent(TQMouseEvent* e) if( m_commov ) { history->addCommand( getMoveCommand(), false ); - m_commov = 0; + m_commov = nullptr; } updateCursor( e->pos() ); @@ -507,7 +507,7 @@ TCanvasItem* MyCanvasView::getActive() if( list[i]->isActive() ) return (TCanvasItem*)list[i]; - return 0; + return nullptr; } void MyCanvasView::setActive( TQCanvasItem* item, bool control ) diff --git a/kbarcode/mycanvasview.h b/kbarcode/mycanvasview.h index cc2232c..fa7c644 100644 --- a/kbarcode/mycanvasview.h +++ b/kbarcode/mycanvasview.h @@ -34,7 +34,7 @@ class MyCanvas : public TQCanvas { public: - MyCanvas( TQObject* parent, const char* name = 0 ); + MyCanvas( TQObject* parent, const char* name = nullptr ); ~MyCanvas(); void setRect( TQRect r ) { @@ -87,7 +87,7 @@ class MyCanvasView : public TQCanvasView }; public: - MyCanvasView( Definition* d, MyCanvas *c, TQWidget* parent=0, const char* name=0, WFlags f=0); + MyCanvasView( Definition* d, MyCanvas *c, TQWidget* parent=nullptr, const char* name=nullptr, WFlags f=0); ~MyCanvasView(); /** return a list of all DocumentItems on the canvas @@ -97,7 +97,7 @@ class MyCanvasView : public TQCanvasView TCanvasItemList getSelected(); TCanvasItem* getActive(); - void setActive( TQCanvasItem* item = 0, bool control = false ); + void setActive( TQCanvasItem* item = nullptr, bool control = false ); void setCurrent( TQCanvasItem* item ); @@ -145,7 +145,7 @@ class MyCanvasView : public TQCanvasView void showContextMenu( TQPoint ); private: - void setSelected( TQCanvasItem* item = 0, bool control = false ); + void setSelected( TQCanvasItem* item = nullptr, bool control = false ); KMacroCommand* getMoveCommand(); Definition* def; diff --git a/kbarcode/mydatatable.h b/kbarcode/mydatatable.h index 5c313fa..1389754 100644 --- a/kbarcode/mydatatable.h +++ b/kbarcode/mydatatable.h @@ -27,7 +27,7 @@ class MyDataTable : public TQDataTable { TQ_OBJECT public: - MyDataTable(TQWidget *parent=0, const char *name=0); + MyDataTable(TQWidget *parent=nullptr, const char *name=nullptr); ~MyDataTable(); bool update(); diff --git a/kbarcode/newlabel.cpp b/kbarcode/newlabel.cpp index c8687db..2af271d 100644 --- a/kbarcode/newlabel.cpp +++ b/kbarcode/newlabel.cpp @@ -40,7 +40,7 @@ NewLabel::NewLabel( TQWidget* parent, const char* name, bool change, WFlags fl { setCaption( i18n( "New Label" ) ); curid = 0; - types = 0; + types = nullptr; NewLabelLayout = new TQVBoxLayout( this, 11, 6, "NewLabelLayout"); @@ -80,7 +80,7 @@ NewLabel::NewLabel( TQWidget* parent, const char* name, bool change, WFlags fl NewLabelLayout->addWidget( group1 ); - Layout2 = new TQHBoxLayout( 0, 0, 6, "Layout2"); + Layout2 = new TQHBoxLayout( nullptr, 0, 6, "Layout2"); TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); Layout2->addItem( spacer_2 ); @@ -89,14 +89,14 @@ NewLabel::NewLabel( TQWidget* parent, const char* name, bool change, WFlags fl TextLabel4 = new TQLabel( this, "TextLabel4" ); preview = new LabelPreview( this, "preview" ); - TQHBoxLayout* hlayout = new TQHBoxLayout( 0, 6, 6 ); + TQHBoxLayout* hlayout = new TQHBoxLayout( nullptr, 6, 6 ); hlayout->addWidget( TextLabel4 ); hlayout->addWidget( preview ); NewLabelLayout->addLayout( hlayout ); TQSpacerItem* spacer_3 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); NewLabelLayout->addItem( spacer_3 ); - Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); + Layout1 = new TQHBoxLayout( nullptr, 0, 6, "Layout1"); buttonOwnFormat = new KPushButton( this, "buttonOwnFormat" ); buttonOwnFormat->setText( i18n( "&Add own Label Definition" ) ); diff --git a/kbarcode/newlabel.h b/kbarcode/newlabel.h index bec2886..d3fe1f1 100644 --- a/kbarcode/newlabel.h +++ b/kbarcode/newlabel.h @@ -38,7 +38,7 @@ class NewLabel : public TQDialog TQ_OBJECT public: - NewLabel( TQWidget* parent = 0, const char* name = 0, bool change = false, WFlags fl = 0 ); + NewLabel( TQWidget* parent = nullptr, const char* name = nullptr, bool change = false, WFlags fl = 0 ); ~NewLabel(); int labelId() const { return curid; } diff --git a/kbarcode/pixmapbarcode.cpp b/kbarcode/pixmapbarcode.cpp index 37cf749..be7dc17 100644 --- a/kbarcode/pixmapbarcode.cpp +++ b/kbarcode/pixmapbarcode.cpp @@ -310,7 +310,7 @@ void PixmapBarcode::createBarcode( TQPixmap* target, const TQPaintDevice* device int resx = pdm.logicalDpiX(); int resy = pdm.logicalDpiY(); - TQPixmap* cached = 0;//BarcodeCache::instance()->read( barcode, resx, resy, value ); + TQPixmap* cached = nullptr;//BarcodeCache::instance()->read( barcode, resx, resy, value ); // no matching barcode found in cache if( !cached ) { diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp index 0c68457..6bb45b5 100644 --- a/kbarcode/previewdialog.cpp +++ b/kbarcode/previewdialog.cpp @@ -55,8 +55,8 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); TQHBoxLayout* Layout = new TQHBoxLayout( this, 6, 6 ); - TQVBoxLayout* vbox = new TQVBoxLayout( 0, 6, 6 ); - TQVBoxLayout* buttons = new TQVBoxLayout( 0, 6, 6 ); + TQVBoxLayout* vbox = new TQVBoxLayout( nullptr, 6, 6 ); + TQVBoxLayout* buttons = new TQVBoxLayout( nullptr, 6, 6 ); TQGridLayout* grid = new TQGridLayout( 0 ); customerName = new KComboBox( false, this ); diff --git a/kbarcode/previewdialog.h b/kbarcode/previewdialog.h index 6d9f7bd..6064a33 100644 --- a/kbarcode/previewdialog.h +++ b/kbarcode/previewdialog.h @@ -33,7 +33,7 @@ class PreviewDialog : public TQDialog { TQ_OBJECT public: - PreviewDialog( TQIODevice* device, Definition* d, TQString filename, TQWidget *parent=0, const char *name=0); + PreviewDialog( TQIODevice* device, Definition* d, TQString filename, TQWidget *parent=nullptr, const char *name=nullptr); ~PreviewDialog(); private slots: diff --git a/kbarcode/printersettings.cpp b/kbarcode/printersettings.cpp index 2cca43c..1fabbe7 100644 --- a/kbarcode/printersettings.cpp +++ b/kbarcode/printersettings.cpp @@ -68,7 +68,7 @@ const PageFormatInfo pageFormatInfo[]= }; // end stolen -PrinterSettings* PrinterSettings::printerInstance = 0; +PrinterSettings* PrinterSettings::printerInstance = nullptr; PrinterSettings::PrinterSettings() :TQObject( 0, "printersettings" ) @@ -168,7 +168,7 @@ KPrinter* PrinterSettings::setupPrinter( const KURL & url, TQWidget* parent, boo printer->setFullPage( true ); // don't use build in margin system if( !immediately && !printer->setup( parent ) ) - return 0; + return nullptr; if( immediately && !prn.isEmpty() ) printer->autoConfigure( prn ); diff --git a/kbarcode/printlabeldlg.h b/kbarcode/printlabeldlg.h index 582aceb..aaf26d0 100644 --- a/kbarcode/printlabeldlg.h +++ b/kbarcode/printlabeldlg.h @@ -35,7 +35,7 @@ class PrintLabelDlg : public KDialogBase { TQ_OBJECT public: - PrintLabelDlg(TQWidget *parent=0, const char *name=0); + PrintLabelDlg(TQWidget *parent=nullptr, const char *name=nullptr); ~PrintLabelDlg(); /** diff --git a/kbarcode/propertywidget.cpp b/kbarcode/propertywidget.cpp index 25dbd45..00be336 100644 --- a/kbarcode/propertywidget.cpp +++ b/kbarcode/propertywidget.cpp @@ -78,7 +78,7 @@ void FillLineCombo( KComboBox* box ) } PropertyWidget::PropertyWidget(TQWidget* parent ) - : TQWidget( parent, 0 ) + : TQWidget( parent, nullptr ) { grid = new TQGridLayout( this, 2, 2 ); } diff --git a/kbarcode/rectsettingsdlg.h b/kbarcode/rectsettingsdlg.h index 4d747ef..afbf7bf 100644 --- a/kbarcode/rectsettingsdlg.h +++ b/kbarcode/rectsettingsdlg.h @@ -28,7 +28,7 @@ class RectSettingsDlg : public KDialogBase { TQ_OBJECT public: - RectSettingsDlg(TQWidget *parent=0, const char *name=0); + RectSettingsDlg(TQWidget *parent=nullptr, const char *name=nullptr); ~RectSettingsDlg(); void setBorderColor( const TQColor & c ); @@ -59,7 +59,7 @@ class LineSettingsDlg : public KDialogBase { TQ_OBJECT public: - LineSettingsDlg(TQWidget *parent=0, const char *name=0); + LineSettingsDlg(TQWidget *parent=nullptr, const char *name=nullptr); ~LineSettingsDlg(); void setPen( const TQPen p ); diff --git a/kbarcode/smalldialogs.h b/kbarcode/smalldialogs.h index dc5c17b..bd88ed2 100644 --- a/kbarcode/smalldialogs.h +++ b/kbarcode/smalldialogs.h @@ -31,7 +31,7 @@ namespace DSSmallDialogs { TQ_OBJECT public: - AddAllDialog(TQWidget *parent=0, const char *name=0); + AddAllDialog(TQWidget *parent=nullptr, const char *name=nullptr); TQString groupName() const; int numberLabels() const; @@ -45,8 +45,8 @@ namespace DSSmallDialogs { TQ_OBJECT public: - AddItemsDialog( TQWidget* parent = 0, const char* name = 0 ); - AddItemsDialog( const TQString & a, const TQString & g, int c, TQWidget* parent = 0, const char* name = 0 ); + AddItemsDialog( TQWidget* parent = nullptr, const char* name = nullptr ); + AddItemsDialog( const TQString & a, const TQString & g, int c, TQWidget* parent = nullptr, const char* name = nullptr ); void setGroupCompletion( TDECompletion* c ); diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp index e1ec39a..00c9ebd 100644 --- a/kbarcode/sqltables.cpp +++ b/kbarcode/sqltables.cpp @@ -120,7 +120,7 @@ bool SqlTables::connectMySQL() db->setHostName( sqldata.hostname ); if( !db->open() ) - KMessageBox::error( 0, i18n("Unable to open database: ") + sqldata.database + "
" + + KMessageBox::error( nullptr, i18n("Unable to open database: ") + sqldata.database + "
" + db->lastError().databaseText() + ""); connected = db->open(); @@ -141,7 +141,7 @@ bool SqlTables::newTables() bool SqlTables::newTables( const TQString & username, const TQString & password, const TQString & hostname, const TQString & database, const TQString & driver ) { - if( KMessageBox::warningContinueCancel( 0, + if( KMessageBox::warningContinueCancel( nullptr, i18n("We are going to re-create the tables '") + TQString( TABLE_BASIC "', '" TABLE_CUSTOMER "', '" TABLE_CUSTOMER_TEXT) +i18n("' and '") + TQString(TABLE_LABEL_DEF "'")) == KMessageBox::Cancel ) @@ -166,7 +166,7 @@ bool SqlTables::newTables( const TQString & username, const TQString & password, TQSqlQuery firstquery( NULL, dbase ); if( !found && !firstquery.exec("CREATE DATABASE " + database + ";")) { - if( KMessageBox::warningContinueCancel( 0, i18n("Can't create database ") + database + i18n("
You can continue if the database exists already.") + if( KMessageBox::warningContinueCancel( nullptr, i18n("Can't create database ") + database + i18n("
You can continue if the database exists already.") + firstquery.lastError().databaseText() ) == KMessageBox::Cancel ) { dbase->close(); TQSqlDatabase::removeDatabase(drivers[driver]->initdb( database )); @@ -180,7 +180,7 @@ bool SqlTables::newTables( const TQString & username, const TQString & password, TQSqlError dbError = dbase->lastError(); dbase->close(); TQSqlDatabase::removeDatabase(drivers[driver]->initdb( database )); - if (KMessageBox::warningContinueCancel(0, i18n("Can't connect to database to create table.") + "

" + dbError.driverText() + "
" + dbError.databaseText() + i18n("
You can continue if the table exists already.")) == KMessageBox::Cancel) { + if (KMessageBox::warningContinueCancel(nullptr, i18n("Can't connect to database to create table.") + "

" + dbError.driverText() + "
" + dbError.databaseText() + i18n("
You can continue if the table exists already.")) == KMessageBox::Cancel) { return false; } } @@ -192,7 +192,7 @@ bool SqlTables::newTables( const TQString & username, const TQString & password, dbase->setPassword( password ); dbase->setHostName( hostname ); if(!dbase->open() || !dbase->isOpen()) { - KMessageBox::error( 0, i18n("KBarcode could not create the required database. Please create it manually.") + dbase->lastError().databaseText() ); + KMessageBox::error( nullptr, i18n("KBarcode could not create the required database. Please create it manually.") + dbase->lastError().databaseText() ); TQSqlDatabase::removeDatabase( database ); return false; } @@ -273,14 +273,14 @@ bool SqlTables::newTables( const TQString & username, const TQString & password, dbase->close(); TQSqlDatabase::removeDatabase( database ); - KMessageBox::information( 0, i18n("Created table ")+database+i18n(" successfully!") ); + KMessageBox::information( nullptr, i18n("Created table ")+database+i18n(" successfully!") ); return true; } void SqlTables::importLabelDef() { - if( KMessageBox::warningContinueCancel( 0, i18n("We are going to delete the complete table: " ) + TABLE_LABEL_DEF ) == + if( KMessageBox::warningContinueCancel( nullptr, i18n("We are going to delete the complete table: " ) + TABLE_LABEL_DEF ) == KMessageBox::Cancel ) return; @@ -301,7 +301,7 @@ void SqlTables::importLabelDef() void SqlTables::importExampleData() { - if( KMessageBox::warningContinueCancel( 0, + if( KMessageBox::warningContinueCancel( nullptr, i18n("We are going to delete the complete tables: " ) + TQString( TABLE_BASIC ", " TABLE_CUSTOMER ", " TABLE_CUSTOMER_TEXT ) ) == KMessageBox::Cancel ) return; @@ -435,7 +435,7 @@ void SqlTables::updateTables() } if( changed ) - KMessageBox::information( 0, i18n("The SQL tables of KBarcode have changed since the last version. " + KMessageBox::information( nullptr, i18n("The SQL tables of KBarcode have changed since the last version. " "KBarcode updated them without any loss of data." ) ); } @@ -456,7 +456,7 @@ bool SqlTables::testSettings( const TQString & username, const TQString & passwo } else { - KMessageBox::information( 0, i18n("Connected successfully to your database") ); + KMessageBox::information( nullptr, i18n("Connected successfully to your database") ); db->close(); TQSqlDatabase::removeDatabase( database ); return true; @@ -471,12 +471,12 @@ bool SqlTables::testSettings( const TQString & username, const TQString & passwo db->setHostName( hostname ); if( !db->open() ) { - KMessageBox::error( 0, i18n("Connection failed:
") + database + "
" + + KMessageBox::error( nullptr, i18n("Connection failed:
") + database + "
" + db->lastError().databaseText() + "" ); TQSqlDatabase::removeDatabase(drivers[driver]->initdb( database )); return false; } else { - KMessageBox::information( 0, i18n("Connected successfully to your database") ); + KMessageBox::information( nullptr, i18n("Connected successfully to your database") ); db->close(); TQSqlDatabase::removeDatabase(drivers[driver]->initdb( database )); return true; diff --git a/kbarcode/sqltables.h b/kbarcode/sqltables.h index d57adcf..decacae 100644 --- a/kbarcode/sqltables.h +++ b/kbarcode/sqltables.h @@ -144,7 +144,7 @@ class SqlTables : public TQObject { void connectedSQL(); private: - SqlTables( TQObject* parent = 0 ); + SqlTables( TQObject* parent = nullptr ); ~SqlTables(); void exec( TQSqlQuery* query, const TQString & text ); @@ -179,7 +179,7 @@ class SqlWidget : public TQWidget { TQ_OBJECT public: - SqlWidget( bool showlabel, TQWidget* parent = 0, const char* name = 0 ); + SqlWidget( bool showlabel, TQWidget* parent = nullptr, const char* name = nullptr ); ~SqlWidget(); const TQString username() const; diff --git a/kbarcode/tbarcode2.cpp b/kbarcode/tbarcode2.cpp index e6841c4..6bf6761 100644 --- a/kbarcode/tbarcode2.cpp +++ b/kbarcode/tbarcode2.cpp @@ -31,7 +31,6 @@ TBarcodeOptions::TBarcodeOptions() defaults(); } - void TBarcodeOptions::defaults() { m_escape = false; diff --git a/kbarcode/textlineedit.h b/kbarcode/textlineedit.h index 78638b4..d46c88a 100644 --- a/kbarcode/textlineedit.h +++ b/kbarcode/textlineedit.h @@ -32,7 +32,7 @@ class TextLineEditor : public TQWidget { TQ_OBJECT public: - TextLineEditor( TokenProvider* token, TQWidget *parent=0, const char *name=0); + TextLineEditor( TokenProvider* token, TQWidget *parent=nullptr, const char *name=nullptr); ~TextLineEditor(); TQString text(); KIntNumInput* mag_vert; diff --git a/kbarcode/tokendialog.cpp b/kbarcode/tokendialog.cpp index aa12ebe..94445a1 100644 --- a/kbarcode/tokendialog.cpp +++ b/kbarcode/tokendialog.cpp @@ -74,14 +74,14 @@ void TokenDialog::setupPage1() void TokenDialog::setupPage2() { - page2 = new TQWidgetStack(0); + page2 = new TQWidgetStack(nullptr); addPage( page2, i18n("Step 2 of 3") ); } void TokenDialog::setupPage3() { - page3 = new TQWidgetStack(0); + page3 = new TQWidgetStack(nullptr); addPage( page3, i18n("Step 3 of 3") ); } @@ -393,7 +393,7 @@ void TokenDialog::categoryChanged( TQListBoxItem* item ) allList->clear(); lineEdit->setEnabled( false ); - if( item->prev() == 0 ) + if( item->prev() == nullptr ) { for( i = 0; i < m_tokens.count(); i++ ) allList->insertItem( new TDEListViewItem( allList, TQString( "[%1]").arg( m_tokens[i].token ), diff --git a/kbarcode/tokendialog.h b/kbarcode/tokendialog.h index 9d35ada..bc1562c 100644 --- a/kbarcode/tokendialog.h +++ b/kbarcode/tokendialog.h @@ -43,7 +43,7 @@ class TokenDialog : public KWizard { public: - TokenDialog( TokenProvider* token, TQWidget *parent = 0, const char *name = 0 ); + TokenDialog( TokenProvider* token, TQWidget *parent = nullptr, const char *name = nullptr ); inline const TQString & token() const { return m_result; } -- cgit v1.2.3