From a431a25df33010b2df0cff24f9226d0fde287802 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:43:49 -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 --- atlantikdesigner/designer/boardinfo.cpp | 6 +- atlantikdesigner/designer/boardinfo.h | 4 +- atlantikdesigner/designer/designer.cpp | 36 +++---- atlantikdesigner/designer/designer.h | 2 +- atlantikdesigner/designer/editor.cpp | 26 ++--- atlantikdesigner/designer/editor.h | 16 +-- atlantikdesigner/designer/group.cpp | 4 +- atlantikdesigner/designer/group.h | 2 +- atlantikdesigner/designer/main.cpp | 2 +- kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp | 2 +- kaddressbook-plugins/xxports/gmx/gmx_xxport.h | 2 +- .../xxports/kworldclock/geo_xxport.h | 2 +- kate/cppsymbolviewer/plugin_katesymbolviewer.cpp | 6 +- kate/cppsymbolviewer/plugin_katesymbolviewer.h | 8 +- kate/filelistloader/katefll_plugin.cpp | 10 +- kate/filelistloader/katefll_plugin.h | 2 +- kate/filetemplates/plugin/filetemplates.cpp | 20 ++-- kate/filetemplates/plugin/filetemplates.h | 8 +- kate/helloworld/plugin_katehelloworld.h | 2 +- kate/htmltools/plugin_katehtmltools.h | 2 +- kate/insertcommand/plugin_kateinsertcommand.cpp | 20 ++-- kate/insertcommand/plugin_kateinsertcommand.h | 12 +-- kate/katesort/plugin_sort.cpp | 2 +- kate/katesort/plugin_sort.h | 4 +- kate/katesort/sortdialog.h | 2 +- kate/kjswrapper/bindings.cpp | 2 +- kate/kjswrapper/plugin_katekjswrapper.cpp | 2 +- kate/kjswrapper/plugin_katekjswrapper.h | 4 +- kate/kpybrowser/kpybrowser.h | 2 +- kate/kpybrowser/pybrowse_part.cpp | 2 +- kate/kpybrowser/pybrowse_part.h | 2 +- kate/make/plugin_katemake.cpp | 18 ++-- kate/make/plugin_katemake.h | 2 +- kate/modeline/ModelinePlugin.h | 2 +- kate/openheader/plugin_kateopenheader.h | 2 +- kate/snippets/csnippet.h | 2 +- kate/snippets/cwidgetsnippets.h | 2 +- kate/snippets/plugin_katesnippets.h | 2 +- .../tabbarextension/plugin_katetabbarextension.cpp | 10 +- kate/tabbarextension/plugin_katetabbarextension.h | 16 +-- kate/textfilter/plugin_katetextfilter.cpp | 2 +- kate/textfilter/plugin_katetextfilter.h | 2 +- kate/xmlcheck/plugin_katexmlcheck.cpp | 12 +-- kate/xmlcheck/plugin_katexmlcheck.h | 2 +- kate/xmltools/plugin_katexmltools.cpp | 20 ++-- kate/xmltools/plugin_katexmltools.h | 2 +- kate/xmltools/pseudo_dtd.cpp | 6 +- kicker-applets/kbinaryclock/datepicker.cpp | 2 +- kicker-applets/kbinaryclock/kbinaryclock.cpp | 4 +- kicker-applets/kbinaryclock/kbinaryclock.h | 6 +- kicker-applets/kolourpicker/kolourpicker.h | 2 +- kicker-applets/kolourpicker/simplebutton.h | 4 +- kicker-applets/ktimemon/confdlg.cpp | 2 +- kicker-applets/ktimemon/sample.cpp | 28 +++--- kicker-applets/ktimemon/timemon.cpp | 10 +- kicker-applets/ktimemon/timemon.h | 2 +- kicker-applets/math/mathapplet.cpp | 4 +- kicker-applets/math/mathapplet.h | 2 +- kicker-applets/math/parser.cpp | 24 ++--- kicker-applets/mediacontrol/amarokInterface.cpp | 2 +- kicker-applets/mediacontrol/configfrontend.cpp | 4 +- kicker-applets/mediacontrol/jukInterface.cpp | 6 +- kicker-applets/mediacontrol/kscdInterface.cpp | 2 +- kicker-applets/mediacontrol/mcslider.h | 2 +- kicker-applets/mediacontrol/mediacontrol.cpp | 26 ++--- kicker-applets/mediacontrol/mediacontrol.h | 2 +- kicker-applets/mediacontrol/mediacontrolconfig.cpp | 4 +- kicker-applets/mediacontrol/mediacontrolconfig.h | 2 +- kicker-applets/mediacontrol/mpdInterface.cpp | 4 +- kicker-applets/mediacontrol/noatunInterface.cpp | 2 +- kicker-applets/mediacontrol/playerInterface.cpp | 4 +- kicker-applets/mediacontrol/simplebutton.h | 4 +- konq-plugins/adblock/adblock.cpp | 6 +- konq-plugins/akregator/akregatorplugin.cpp | 6 +- konq-plugins/akregator/konqfeedicon.cpp | 10 +- konq-plugins/arkplugin/arkplugin.cpp | 8 +- konq-plugins/autorefresh/autorefresh.cpp | 2 +- konq-plugins/autorefresh/autorefresh.h | 2 +- konq-plugins/babelfish/plugin_babelfish.cpp | 6 +- konq-plugins/crashes/crashesplugin.cpp | 2 +- konq-plugins/dirfilter/dirfilterplugin.cpp | 8 +- konq-plugins/domtreeviewer/domtreecommands.cpp | 2 +- konq-plugins/domtreeviewer/domtreeview.cpp | 18 ++-- konq-plugins/domtreeviewer/domtreewindow.cpp | 8 +- .../domtreeviewer/plugin_domtreeviewer.cpp | 4 +- konq-plugins/domtreeviewer/signalreceiver.h | 2 +- konq-plugins/fsview/fsview.cpp | 4 +- konq-plugins/fsview/fsview.h | 2 +- konq-plugins/fsview/fsview_part.cpp | 8 +- konq-plugins/fsview/fsview_part.h | 2 +- konq-plugins/fsview/inode.cpp | 26 ++--- konq-plugins/fsview/inode.h | 2 +- konq-plugins/fsview/main.cpp | 2 +- konq-plugins/fsview/scan.cpp | 32 +++--- konq-plugins/fsview/scan.h | 4 +- konq-plugins/fsview/treemap.cpp | 108 ++++++++++----------- konq-plugins/fsview/treemap.h | 12 +-- konq-plugins/kimgalleryplugin/imgallerydialog.h | 2 +- konq-plugins/kimgalleryplugin/imgalleryplugin.cpp | 6 +- konq-plugins/kuick/kcmkuick/kcmkuick.cpp | 4 +- konq-plugins/kuick/kdirmenu.cpp | 6 +- konq-plugins/kuick/kmetamenu.cpp | 2 +- konq-plugins/kuick/kmetamenu.h | 2 +- konq-plugins/kuick/kuick_plugin.cpp | 4 +- konq-plugins/microformat/konqmficon.cpp | 8 +- konq-plugins/minitools/minitoolsplugin.cpp | 4 +- konq-plugins/rellinks/plugin_rellinks.cpp | 8 +- konq-plugins/rsync/rsyncplugin.cpp | 4 +- konq-plugins/searchbar/searchbar.cpp | 16 +-- konq-plugins/sidebar/delicious/plugin.cpp | 2 +- konq-plugins/sidebar/delicious/plugin.h | 2 +- konq-plugins/sidebar/mediaplayer/controls.h | 6 +- konq-plugins/sidebar/mediaplayer/engine.cpp | 2 +- konq-plugins/sidebar/mediaplayer/engine.h | 2 +- konq-plugins/sidebar/mediaplayer/mediaplayer.h | 2 +- konq-plugins/sidebar/mediaplayer/player.h | 2 +- konq-plugins/sidebar/metabar/src/configdialog.cpp | 12 +-- konq-plugins/sidebar/metabar/src/configdialog.h | 2 +- konq-plugins/sidebar/metabar/src/defaultplugin.cpp | 6 +- konq-plugins/sidebar/metabar/src/defaultplugin.h | 2 +- konq-plugins/sidebar/metabar/src/httpplugin.h | 2 +- konq-plugins/sidebar/metabar/src/metabar.h | 4 +- .../sidebar/metabar/src/metabarfunctions.h | 2 +- konq-plugins/sidebar/metabar/src/metabarwidget.cpp | 8 +- konq-plugins/sidebar/metabar/src/metabarwidget.h | 2 +- .../sidebar/metabar/src/protocolplugin.cpp | 2 +- konq-plugins/sidebar/metabar/src/protocolplugin.h | 2 +- konq-plugins/sidebar/metabar/src/remoteplugin.h | 2 +- konq-plugins/sidebar/metabar/src/serviceloader.h | 2 +- .../sidebar/metabar/src/settingsplugin.cpp | 6 +- konq-plugins/sidebar/metabar/src/settingsplugin.h | 2 +- konq-plugins/sidebar/newsticker/configfeeds.h | 2 +- konq-plugins/sidebar/newsticker/norsswidget.cpp | 2 +- konq-plugins/sidebar/newsticker/norsswidget.h | 2 +- konq-plugins/sidebar/newsticker/nspanel.h | 2 +- .../sidebar/newsticker/nsstacktabwidget.cpp | 6 +- konq-plugins/sidebar/newsticker/nsstacktabwidget.h | 2 +- konq-plugins/sidebar/newsticker/sidebar_news.cpp | 2 +- konq-plugins/sidebar/newsticker/sidebar_news.h | 2 +- .../tdehtmlsettingsplugin/settingsplugin.cpp | 4 +- konq-plugins/uachanger/uachangerplugin.cpp | 4 +- konq-plugins/validators/plugin_validators.cpp | 8 +- konq-plugins/validators/validatorsdialog.h | 2 +- konq-plugins/webarchiver/archivedialog.cpp | 10 +- konq-plugins/webarchiver/plugin_webarchiver.cpp | 2 +- konq-plugins/webarchiver/webarchivecreator.cpp | 2 +- ksig/ksig.cpp | 10 +- ksig/ksig.h | 2 +- ksig/main.cpp | 8 +- ksig/siglistview.cpp | 2 +- ksig/siglistview.h | 4 +- ksig/standardtext.h | 2 +- noatun-plugins/alarm/kminutespinbox.h | 2 +- noatun-plugins/alarm/kpercentspinbox.h | 2 +- noatun-plugins/alarm/wakeup.cpp | 2 +- noatun-plugins/alsaplayer/seeker.h | 2 +- noatun-plugins/charlatan/userinterface.cpp | 24 ++--- noatun-plugins/dub/dub/dub.cpp | 18 ++-- noatun-plugins/dub/dub/dub.h | 2 +- noatun-plugins/dub/dub/dubplaylist.cpp | 10 +- noatun-plugins/dub/dub/dubplaylistitem.cpp | 2 +- noatun-plugins/dub/dub/dubplaylistitem.h | 2 +- noatun-plugins/dub/dub/dubview.h | 2 +- noatun-plugins/dub/dub/random.h | 2 +- noatun-plugins/ffrs/ffrs.cpp | 4 +- noatun-plugins/lyrics/lyrics.cpp | 2 +- noatun-plugins/nexscope/bitmappool.cpp | 2 +- noatun-plugins/nexscope/gui.cpp | 2 +- noatun-plugins/nexscope/nex.cpp | 8 +- noatun-plugins/nexscope/output.cpp | 2 +- noatun-plugins/oblique/cmodule.cpp | 6 +- noatun-plugins/oblique/file.cpp | 2 +- noatun-plugins/oblique/menu.cpp | 4 +- noatun-plugins/oblique/menu.h | 2 +- noatun-plugins/oblique/oblique.cpp | 10 +- noatun-plugins/oblique/query.cpp | 20 ++-- noatun-plugins/oblique/query.h | 2 +- noatun-plugins/oblique/selector.cpp | 2 +- noatun-plugins/oblique/tree.cpp | 12 +-- noatun-plugins/oblique/tree.h | 12 +-- noatun-plugins/oblique/view.cpp | 4 +- noatun-plugins/synaescope/ui.cpp | 4 +- noatun-plugins/tippercanoe/ui.cpp | 4 +- noatun-plugins/wavecapture/wavecapture.cpp | 4 +- renamedlgplugins/audio/audiopreview.cpp | 6 +- renamedlgplugins/images/imagevisualizer.cpp | 4 +- tdefile-plugins/cert/tdefile_cert.cpp | 2 +- tdefile-plugins/folder/tdefile_folder.cpp | 4 +- tdefile-plugins/html/tdefile_html.cpp | 2 +- tdefile-plugins/lnk/lnkforward.cpp | 4 +- tdefile-plugins/lnk/read_lnk.cpp | 6 +- tdefile-plugins/lnk/tdefile_lnk.cpp | 2 +- tdefile-plugins/mhtml/tdefile_mhtml.cpp | 2 +- 193 files changed, 594 insertions(+), 594 deletions(-) diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp index f578092..49d7d28 100644 --- a/atlantikdesigner/designer/boardinfo.cpp +++ b/atlantikdesigner/designer/boardinfo.cpp @@ -35,7 +35,7 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, TQWidget *parent, con else { aboutLayout->addWidget(new TQLabel(info->name, about)); - name = 0; + name = nullptr; } TQHBoxLayout *versionLayout = new TQHBoxLayout(aboutLayout, spacingHint()); @@ -74,7 +74,7 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, TQWidget *parent, con bgLayout->addWidget(bgColor); } else - bgColor = 0; + bgColor = nullptr; TQFrame *authorsFrame = addPage(i18n("&Authors")); TQVBoxLayout *authorsLayout = new TQVBoxLayout(authorsFrame, spacingHint()); @@ -173,7 +173,7 @@ TQStringList LotsaEdits::save() { TQStringList ret; - TQWidget *edit = 0; + TQWidget *edit = nullptr; for (edit = list.first(); edit; edit = list.next()) if (editable) ret.append(static_cast(edit)->text()); diff --git a/atlantikdesigner/designer/boardinfo.h b/atlantikdesigner/designer/boardinfo.h index 9f3153b..281bb2f 100644 --- a/atlantikdesigner/designer/boardinfo.h +++ b/atlantikdesigner/designer/boardinfo.h @@ -33,7 +33,7 @@ class LotsaEdits : public TQWidget public: - LotsaEdits(bool, TQStringList=TQStringList(), TQWidget *parent=0, const char *name=0); + LotsaEdits(bool, TQStringList=TQStringList(), TQWidget *parent=nullptr, const char *name=nullptr); public slots: TQStringList save(); @@ -54,7 +54,7 @@ class BoardInfoDlg : public KDialogBase public: - BoardInfoDlg(bool editable, BoardInfo *, TQWidget *parent=0, const char *_name=0, bool = true); + BoardInfoDlg(bool editable, BoardInfo *, TQWidget *parent=nullptr, const char *_name=nullptr, bool = true); protected slots: void slotOk(); diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index cfe175d..49d7318 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -42,11 +42,11 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) estates.setAutoDelete(true); isMod = false; - m_player = 0; - copiedEstate = 0; - editor = 0; - board = 0; - layout = 0; + m_player = nullptr; + copiedEstate = nullptr; + editor = nullptr; + board = nullptr; + layout = nullptr; (void) KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); (void) KStdAction::open(this, TQ_SLOT(open()), actionCollection()); @@ -65,11 +65,11 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) (void) new TDEAction(i18n("&Left"), Key_Left, this, TQ_SLOT(left()), actionCollection(), "left"); (void) new TDEAction(i18n("&Right"), Key_Right, this, TQ_SLOT(right()), actionCollection(), "right"); - recentAct = KStdAction::openRecent(0, 0, actionCollection()); + recentAct = KStdAction::openRecent(nullptr, nullptr, actionCollection()); connect(recentAct, TQ_SIGNAL(urlSelected(const KURL &)), this, TQ_SLOT(openRecent(const KURL &))); recentAct->loadEntries(TDEGlobal::config(), "Designer recent files"); - estateAct = new TDEListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); + estateAct = new TDEListAction(i18n("Change Estate"), 0, nullptr, nullptr, actionCollection(), "estate_num"); connect(estateAct, TQ_SIGNAL(activated(int)), TQ_SLOT(changeEstate(int))); createGUI("atlantikdesignerui.rc"); @@ -132,7 +132,7 @@ void AtlanticDesigner::initBoard() delete board; delete layout; - board = new AtlantikBoard(0, max, AtlantikBoard::Edit, this, "Board"); + board = new AtlantikBoard(nullptr, max, AtlantikBoard::Edit, this, "Board"); setCentralWidget(board); layout = new TQVBoxLayout(board->centerWidget()); @@ -155,7 +155,7 @@ void AtlanticDesigner::initToken() if (!m_player) m_player = new Player(0); else - m_player->setLocation(0); + m_player->setLocation(nullptr); board->addToken(m_player); @@ -269,7 +269,7 @@ void AtlanticDesigner::openFile(const TQString &filename) TQString s = t.readLine(); int parseMode = Parse_Nothing; - CardStack *curCardStack = 0; + CardStack *curCardStack = nullptr; int goEstate = 0; int i; @@ -534,7 +534,7 @@ void AtlanticDesigner::openFile(const TQString &filename) max = i; initBoard(); - ConfigEstate *estate = 0; + ConfigEstate *estate = nullptr; for (estate = estates.first(); estate; estate = estates.next()) board->addEstateView(estate); @@ -559,7 +559,7 @@ void AtlanticDesigner::updateJumpMenu() void AtlanticDesigner::setPlayerAtBeginning() { - ConfigEstate *go = 0; + ConfigEstate *go = nullptr; for (go = estates.first(); go; go = estates.next()) if (go->go()) break; @@ -632,7 +632,7 @@ void AtlanticDesigner::save() t << endl; t << "" << endl << endl; - ConfigEstate *estate = 0; + ConfigEstate *estate = nullptr; bool hasGo = false; for (estate = estates.first(); estate; estate = estates.next()) { @@ -877,7 +877,7 @@ void AtlanticDesigner::larger() initBoard(); - ConfigEstate *estate = 0; + ConfigEstate *estate = nullptr; for (int i = 0; i < max; ++i) { estate = estates.at(i); @@ -911,7 +911,7 @@ void AtlanticDesigner::smaller() bool remove = true; - ConfigEstate *estate = 0; + ConfigEstate *estate = nullptr; for (int i = 0; i < max; ++i) { // remove estate @@ -967,7 +967,7 @@ void AtlanticDesigner::editGroups() void AtlanticDesigner::goChanged(int id) { - ConfigEstate *curEstate = 0; + ConfigEstate *curEstate = nullptr; for (curEstate = estates.first(); curEstate; curEstate = estates.next()) if (curEstate->go() && curEstate->id() != id) curEstate->setGo(false); @@ -975,7 +975,7 @@ void AtlanticDesigner::goChanged(int id) void AtlanticDesigner::groupsChanged() { - ConfigEstate *curEstate = 0; + ConfigEstate *curEstate = nullptr; for (curEstate = estates.first(); curEstate; curEstate = estates.next()) { for (ConfigEstateGroupList::Iterator it = groups.begin(); it != groups.end(); ++it) @@ -993,7 +993,7 @@ void AtlanticDesigner::groupsChanged() void AtlanticDesigner::updateBackground() { - ConfigEstate *curEstate = 0; + ConfigEstate *curEstate = nullptr; for (curEstate = estates.first(); curEstate; curEstate = estates.next()) { if (curEstate->type() != Street || (curEstate->type() == Street && curEstate->group().isNull())) diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h index 525b6ad..7f6f365 100644 --- a/atlantikdesigner/designer/designer.h +++ b/atlantikdesigner/designer/designer.h @@ -28,7 +28,7 @@ class AtlanticDesigner : public TDEMainWindow public: - AtlanticDesigner(TQWidget *parent = 0, const char *name = 0); + AtlanticDesigner(TQWidget *parent = nullptr, const char *name = nullptr); ~AtlanticDesigner(); protected: diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index 1f031fc..0aa6b2e 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -164,7 +164,7 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ types.append("payhotel"); oldType = -1; - estate = 0; + estate = nullptr; this->cards = cards; this->estates = estates; ready = false; @@ -177,7 +177,7 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ layout->addWidget(nameEdit, 0, 0); connect(nameEdit, TQ_SIGNAL(returnPressed()), this, TQ_SIGNAL(somethingChanged())); - confDlg = 0; + confDlg = nullptr; layout->setRowStretch(2, 2); @@ -219,7 +219,7 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ void EstateEdit::aboutToDie() { delete confDlg; - confDlg = 0; + confDlg = nullptr; } void EstateEdit::setReady(bool ready) @@ -258,7 +258,7 @@ void EstateEdit::setEstate(ConfigEstate *_estate) ConfigEstate *EstateEdit::saveEstate(bool superficial) { if (!estate || !ready) - return 0; + return nullptr; locked = true; @@ -435,7 +435,7 @@ CardsDlg::CardsDlg(EstateList *newEstates, TQValueList *newCards, TQW estates = newEstates; stacks = newCards; - view = 0; + view = nullptr; vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -483,7 +483,7 @@ void CardsDlg::addStack() void CardsDlg::updateView(const TQString &curName) { - CardStack *curStack = 0; + CardStack *curStack = nullptr; for (TQValueList::Iterator it = stacks->begin(); it != stacks->end(); ++it) if ((*it).name() == curName) curStack = &(*it); @@ -522,13 +522,13 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa this->card = card; this->estates = estates; - value = 0; - estate = 0; + value = nullptr; + estate = nullptr; number = true; prevNumber = true; init = true; - value = 0; + value = nullptr; hlayout = new TQHBoxLayout(this, KDialog::spacingHint()); typeCombo = new KComboBox(this); @@ -584,7 +584,7 @@ void ChooseWidget::typeChanged(int i) if (number) { delete estate; - estate = 0; + estate = nullptr; value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this); @@ -596,9 +596,9 @@ void ChooseWidget::typeChanged(int i) else { delete value; - value = 0; + value = nullptr; estate = new KComboBox(this); - ConfigEstate *curestate = 0; + ConfigEstate *curestate = nullptr; TQStringList estateStrings; for (curestate = estates->first(); curestate; curestate = estates->next()) estateStrings.append(curestate->name()); @@ -642,7 +642,7 @@ Skipped: CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char *name) : TQWidget(parent, name) { - card = 0; + card = nullptr; this->stack = stack; this->estates = estates; diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h index 2f60201..83c506a 100644 --- a/atlantikdesigner/designer/editor.h +++ b/atlantikdesigner/designer/editor.h @@ -90,7 +90,7 @@ class EstateDlg : public TQWidget public: - EstateDlg(TQWidget *parent = 0, char *name = 0) : TQWidget(parent, name) { estate = 0; } + EstateDlg(TQWidget *parent = nullptr, char *name = nullptr) : TQWidget(parent, name) { estate = nullptr; } signals: void updateBackground(); @@ -113,7 +113,7 @@ class EstateEdit : public TQWidget public: - EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList *, TQWidget *parent = 0, const char *name = 0); + EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList *, TQWidget *parent = nullptr, const char *name = nullptr); ConfigEstate *theEstate() { return estate; } bool upArrow()const; bool downArrow()const; @@ -169,7 +169,7 @@ class ChooseWidget : public TQWidget public: - ChooseWidget(EstateList *, int id, Card *, TQWidget *parent = 0, char *name = 0); + ChooseWidget(EstateList *, int id, Card *, TQWidget *parent = nullptr, char *name = nullptr); public slots: void typeChanged(int); @@ -197,7 +197,7 @@ class CardView : public TQWidget public: - CardView(EstateList *, CardStack *, TQWidget *parent = 0, char *name = 0); + CardView(EstateList *, CardStack *, TQWidget *parent = nullptr, char *name = nullptr); private slots: void selected(int); @@ -232,7 +232,7 @@ class TaxDlg : public EstateDlg public: - TaxDlg(TQWidget *parent = 0, char *name = 0); + TaxDlg(TQWidget *parent = nullptr, char *name = nullptr); protected: virtual void save(); @@ -249,7 +249,7 @@ class GenericDlg : public EstateDlg public: - GenericDlg(TQWidget *parent = 0, char *name = 0); + GenericDlg(TQWidget *parent = nullptr, char *name = nullptr); protected: virtual void save(); @@ -265,7 +265,7 @@ class CardsDlg : public EstateDlg public: - CardsDlg(EstateList *, TQValueList *, TQWidget *parent = 0, char *name = 0); + CardsDlg(EstateList *, TQValueList *, TQWidget *parent = nullptr, char *name = nullptr); protected: virtual void save(); @@ -290,7 +290,7 @@ class StreetDlg : public EstateDlg public: - StreetDlg(ConfigEstateGroupList *, TQWidget *parent = 0, char *name = 0); + StreetDlg(ConfigEstateGroupList *, TQWidget *parent = nullptr, char *name = nullptr); protected: virtual void save(); diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index 5f7668a..4eebef8 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -168,13 +168,13 @@ ConfigEstateGroup *GroupEditor::currentGroup() { TQListBoxItem *item = groups->item(groups->currentItem()); if (!item) - return 0; + return nullptr; for (ConfigEstateGroupList::Iterator it = mylist.begin(); it != mylist.end(); ++it) if ((*it).name() == item->text()) return &(*it); - return 0; + return nullptr; } void GroupEditor::fgChanged(const TQColor &color) diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h index d8e8cd2..bfef181 100644 --- a/atlantikdesigner/designer/group.h +++ b/atlantikdesigner/designer/group.h @@ -56,7 +56,7 @@ class GroupEditor : public KDialogBase public: - GroupEditor(ConfigEstateGroupList *, TQWidget *parent=0); + GroupEditor(ConfigEstateGroupList *, TQWidget *parent=nullptr); signals: void changed(); diff --git a/atlantikdesigner/designer/main.cpp b/atlantikdesigner/designer/main.cpp index 31ebf27..f76d25b 100644 --- a/atlantikdesigner/designer/main.cpp +++ b/atlantikdesigner/designer/main.cpp @@ -13,7 +13,7 @@ int main(int argc, char *argv[]) I18N_NOOP("Atlantik gameboard designer"), TDEAboutData::License_GPL, I18N_NOOP("(c) 2002 Jason Katz-Brown"), - 0, + nullptr, "http://www.unixcode.org/atlantik/" ); diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp index 833c8d9..02ca855 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp @@ -73,7 +73,7 @@ TDEABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const TDEABC::AddresseeList addrList; TQString fileName = KFileDialog::getOpenFileName( ":xxport_gmx", - GMX_FILESELECTION_STRING, 0 ); + GMX_FILESELECTION_STRING, nullptr ); if ( fileName.isEmpty() ) return addrList; diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.h b/kaddressbook-plugins/xxports/gmx/gmx_xxport.h index e1367ce..6cf736c 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.h +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.h @@ -33,7 +33,7 @@ class GMXXXPort : public KAB::XXPort public: - GMXXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + GMXXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = nullptr ); TQString identifier() const { return "gmx"; } diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h index 747f556..83d503f 100644 --- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h +++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h @@ -32,7 +32,7 @@ class GeoXXPort : public KAB::XXPort public: - GeoXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + GeoXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = nullptr ); TQString identifier() const { return "geo"; } diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index 71931a4..5d0439a 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -62,7 +62,7 @@ KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w) setXMLFile("plugins/katecppsymbolviewer/ui.rc"); w->guiFactory()->addClient (this); win = w; - symbols = 0; + symbols = nullptr; m_Active = false; popup = new TQPopupMenu(); @@ -149,8 +149,8 @@ void KatePluginSymbolViewerView::slotInsertSymbol() else { delete dock; - dock = 0; - symbols = 0; + dock = nullptr; + symbols = nullptr; m_Active = false; } } diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h index 8fbe3cd..1df1dcf 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h @@ -94,7 +94,7 @@ class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage friend class KatePluginSymbolViewer; public: - KatePluginSymbolViewerConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); + KatePluginSymbolViewerConfigPage (TQObject* parent = nullptr, TQWidget *parentWidget = nullptr); ~KatePluginSymbolViewerConfigPage (); /** @@ -128,17 +128,17 @@ class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, K public: - KatePluginSymbolViewer( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSymbolViewer( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~KatePluginSymbolViewer(); void addView (Kate::MainWindow *win); void removeView (Kate::MainWindow *win); uint configPages () const { return 1; } - Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=nullptr); TQString configPageName(uint) const { return i18n("Symbol Viewer"); } TQString configPageFullName(uint) const { return i18n("Symbol Viewer Configuration Page"); } - TQPixmap configPagePixmap (uint , int ) const { return 0L; } + TQPixmap configPagePixmap (uint , int ) const { return nullptr; } public slots: void applyConfig( KatePluginSymbolViewerConfigPage* ); diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index 916e73a..fe36ead 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -141,10 +141,10 @@ void PluginKateFileListLoader::slotOpenList() void PluginKateFileListLoader::slotOpenList(const KURL& url) { - if ( url.isValid() && TDEIO::NetAccess::exists(url, false, 0) ) + if ( url.isValid() && TDEIO::NetAccess::exists(url, false, nullptr) ) { addURLToList( url ); - if ( KMessageBox::questionYesNo (0, + if ( KMessageBox::questionYesNo (nullptr, i18n("Do you want to close all other files first?"), i18n("Kate Filelist Loader"), KStdGuiItem::close(), i18n("Do Not Close"), @@ -152,7 +152,7 @@ void PluginKateFileListLoader::slotOpenList(const KURL& url) application()->documentManager()->closeAllDocuments(); TQString tmpFile; - if( TDEIO::NetAccess::download( url, tmpFile, 0 ) ) + if( TDEIO::NetAccess::download( url, tmpFile, nullptr ) ) { TQFile file(tmpFile); file.open(IO_ReadOnly); @@ -176,7 +176,7 @@ void PluginKateFileListLoader::slotOpenList(const KURL& url) } else { - KMessageBox::error(0, i18n("The selected filelist does not exist or is invalid.")); + KMessageBox::error(nullptr, i18n("The selected filelist does not exist or is invalid.")); // url not valid -> remove from list removeURLFromList(url); } @@ -223,7 +223,7 @@ void PluginKateFileListLoader::save() *file.textStream()<documentManager()->document(i)->url().url()<insertTemplateText(0,0,str,TQMap()); @@ -724,7 +724,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft addPage( page, i18n("Choose Template Origin") ); kdDebug()<<"=== Adding template origin page at "<templates().at( selectedTemplateIdx )->filename ); TQString tmpfile, tmp; - if ( TDEIO::NetAccess::download( u, tmpfile, 0L ) ) + if ( TDEIO::NetAccess::download( u, tmpfile, nullptr ) ) { TQFile file(tmpfile); if ( ! file.open( IO_ReadOnly ) ) @@ -1045,7 +1045,7 @@ void KateTemplateWizard::accept() stream << str; tmp.close(); - succes = TDEIO::NetAccess::upload( fn, templateUrl, 0 ); + succes = TDEIO::NetAccess::upload( fn, templateUrl, nullptr ); TDEIO::NetAccess::removeTempFile( fn ); } } @@ -1082,7 +1082,7 @@ class KateTemplateItem : public TDEListViewItem //BEGIN KFTNewStuff class KFTNewStuff : public TDENewStuff { public: - KFTNewStuff( const TQString &type, TQWidget *parent=0 ) : TDENewStuff( type, parent ), m_win( parent ) {} + KFTNewStuff( const TQString &type, TQWidget *parent=nullptr ) : TDENewStuff( type, parent ), m_win( parent ) {} ~KFTNewStuff() {} bool install( const TQString &/*filename*/ ) { return true; } bool createUploadFile( const TQString &/*filename*/ ) { return false; } diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index 38b34d4..04c6cbf 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -45,7 +45,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = nullptr, const char* pname = nullptr, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static TDEInstance* s_instance; @@ -77,7 +77,7 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface public: - KateFileTemplates( TQObject* parent = 0, const char* name = 0 ); + KateFileTemplates( TQObject* parent = nullptr, const char* name = nullptr ); virtual ~KateFileTemplates(); void addView (Kate::MainWindow *win); @@ -161,7 +161,7 @@ class KateTemplateInfoWidget : public TQWidget TQ_OBJECT public: - KateTemplateInfoWidget( TQWidget *parent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); + KateTemplateInfoWidget( TQWidget *parent=nullptr, TemplateInfo *info=nullptr, KateFileTemplates *kft=nullptr ); ~KateTemplateInfoWidget() {} TemplateInfo *info; @@ -236,7 +236,7 @@ class KateTemplateManager : public TQWidget TQ_OBJECT public: - KateTemplateManager( KateFileTemplates *kft=0, TQWidget *parent=0, const char *name=0 ); + KateTemplateManager( KateFileTemplates *kft=nullptr, TQWidget *parent=nullptr, const char *name=nullptr ); ~KateTemplateManager() {} public slots: diff --git a/kate/helloworld/plugin_katehelloworld.h b/kate/helloworld/plugin_katehelloworld.h index c544492..2803ce7 100644 --- a/kate/helloworld/plugin_katehelloworld.h +++ b/kate/helloworld/plugin_katehelloworld.h @@ -15,7 +15,7 @@ class KatePluginHelloWorld : public Kate::Plugin, Kate::PluginViewInterface public: - KatePluginHelloWorld( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginHelloWorld( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~KatePluginHelloWorld(); void addView (Kate::MainWindow *win); diff --git a/kate/htmltools/plugin_katehtmltools.h b/kate/htmltools/plugin_katehtmltools.h index 0eb4a8c..1305cd8 100644 --- a/kate/htmltools/plugin_katehtmltools.h +++ b/kate/htmltools/plugin_katehtmltools.h @@ -34,7 +34,7 @@ class PluginKateHtmlTools : public Kate::Plugin, Kate::PluginViewInterface public: - PluginKateHtmlTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateHtmlTools( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~PluginKateHtmlTools(); void addView (Kate::MainWindow *win); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index 112c1c0..82d3b87 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -59,12 +59,12 @@ class PluginView : public KXMLGUIClient //BEGIN PluginKateInsertCommand PluginKateInsertCommand::PluginKateInsertCommand( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application *)parent, name ), - kv ( 0 ), - sh ( 0 ) + kv ( nullptr ), + sh ( nullptr ) { config = new TDEConfig("kateinsertcommandpluginrc"); cmdhist = config->readListEntry("Command History"); - wdlg = 0; + wdlg = nullptr; workingdir = TQDir::currentDirPath(); } @@ -110,11 +110,11 @@ void PluginKateInsertCommand::removeView(Kate::MainWindow *win) void PluginKateInsertCommand::slotInsertCommand() { if (!tdeApp->authorize("shell_access")) { - KMessageBox::sorry(0,i18n("You are not allowed to execute arbitrary external applications. If you want to be able to do this, contact your system administrator."),i18n("Access Restrictions")); + KMessageBox::sorry(nullptr,i18n("You are not allowed to execute arbitrary external applications. If you want to be able to do this, contact your system administrator."),i18n("Access Restrictions")); return; } if ( sh && sh->isRunning() ) { - KMessageBox::sorry (0, i18n("A process is currently being executed."), + KMessageBox::sorry (nullptr, i18n("A process is currently being executed."), i18n("Error")); return; } @@ -142,7 +142,7 @@ void PluginKateInsertCommand::slotInsertCommand() break; } dialogSettings = config->readNumEntry("Dialog Settings", 0); - CmdPrompt *d = new CmdPrompt((TQWidget*)kv, 0, cmdhist, dir, + CmdPrompt *d = new CmdPrompt((TQWidget*)kv, nullptr, cmdhist, dir, docdir, dialogSettings); if ( d->exec() && ! d->command().isEmpty() ) { if ( ! sh ) { @@ -201,7 +201,7 @@ void PluginKateInsertCommand::slotAbort() { if ( sh->isRunning() ) if (! sh->kill() ) - KMessageBox::sorry(0, i18n("Could not kill command."), i18n("Kill Failed")); + KMessageBox::sorry(nullptr, i18n("Could not kill command."), i18n("Kill Failed")); } void PluginKateInsertCommand::slotShowWaitDlg() @@ -215,7 +215,7 @@ void PluginKateInsertCommand::slotShowWaitDlg() wdlg->show(); else if (wdlg) { // process may have exited before the WaitDlg constructor returned. delete wdlg; - wdlg = 0; + wdlg = nullptr; } } @@ -239,10 +239,10 @@ void PluginKateInsertCommand::slotProcessExited( TDEProcess* p ) if (wdlg) { wdlg->hide(); delete wdlg; - wdlg = 0; + wdlg = nullptr; } if ( ! p->normalExit() ) - KMessageBox::sorry(0, i18n("Command exited with status %1"). + KMessageBox::sorry(nullptr, i18n("Command exited with status %1"). arg( p->exitStatus()), i18n("Oops!")); kv->setFocus(); } diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h index 5e808a6..d7ffe2f 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.h +++ b/kate/insertcommand/plugin_kateinsertcommand.h @@ -58,7 +58,7 @@ class PluginKateInsertCommand : public Kate::Plugin, public: - PluginKateInsertCommand( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateInsertCommand( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~PluginKateInsertCommand(); void addView (Kate::MainWindow *win); @@ -70,13 +70,13 @@ class PluginKateInsertCommand : public Kate::Plugin, TQPtrList m_views; uint configPages () const { return 1; } - Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=nullptr); TQString configPageName(uint) const { return i18n("Insert Command"); } TQString configPageFullName(uint) const { return i18n("Configure Insert Command Plugin"); } TQPixmap configPagePixmap (uint /*number = 0*/, int /*size = TDEIcon::SizeSmall*/) const - { return 0L; } + { return nullptr; } private: void initConfigPage( InsertCommandConfigPage* ); @@ -106,8 +106,8 @@ class CmdPrompt : public KDialogBase TQ_OBJECT public: - CmdPrompt(TQWidget* parent=0, - const char* name=0, + CmdPrompt(TQWidget* parent=nullptr, + const char* name=nullptr, const TQStringList& cmdhist=TQStringList(), const TQString& dir=TQString(), const TQString& docdir=TQString(), @@ -146,7 +146,7 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage friend class PluginKateInsertCommand; public: - InsertCommandConfigPage(TQObject* parent = 0L, TQWidget *parentWidget = 0L); + InsertCommandConfigPage(TQObject* parent = nullptr, TQWidget *parentWidget = nullptr); ~InsertCommandConfigPage() {} /** Reimplemented from Kate::PluginConfigPage diff --git a/kate/katesort/plugin_sort.cpp b/kate/katesort/plugin_sort.cpp index c44c263..8aefb6e 100644 --- a/kate/katesort/plugin_sort.cpp +++ b/kate/katesort/plugin_sort.cpp @@ -60,7 +60,7 @@ TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, c return new KatePluginSort( parent, name ); } -TDEInstance* KatePluginFactory::s_instance = 0L; +TDEInstance* KatePluginFactory::s_instance = nullptr; KatePluginSort::KatePluginSort( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ) diff --git a/kate/katesort/plugin_sort.h b/kate/katesort/plugin_sort.h index 217b631..9051eca 100644 --- a/kate/katesort/plugin_sort.h +++ b/kate/katesort/plugin_sort.h @@ -44,7 +44,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = nullptr, const char* pname = nullptr, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static TDEInstance* s_instance; @@ -55,7 +55,7 @@ class KatePluginSort : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - KatePluginSort( TQObject* parent = 0, const char* name = 0 ); + KatePluginSort( TQObject* parent = nullptr, const char* name = nullptr ); virtual ~KatePluginSort(); void addView (Kate::MainWindow *win); diff --git a/kate/katesort/sortdialog.h b/kate/katesort/sortdialog.h index d1d7f99..7064245 100644 --- a/kate/katesort/sortdialog.h +++ b/kate/katesort/sortdialog.h @@ -38,7 +38,7 @@ class SortDialog : public sortdialoglayout TQ_OBJECT public: - SortDialog ( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); + SortDialog ( TQWidget* parent = nullptr, const char* name = nullptr, bool modal = false, WFlags fl = 0 ); ~SortDialog(); // TQCheckBox* m_checkBoxUnique; /*$PUBLIC_FUNCTIONS$*/ diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index be8a1ae..6597636 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -391,7 +391,7 @@ void Kate::JS::RefCountedObjectDict::decRef() { KJS::Object Kate::JS::RefCountedObjectDict::jsObject(KJS::ExecState *exec, TQObject *obj, KJSEmbed::JSObjectProxy *proxy) { ObjectEntry *oe=find(obj); - if (oe==0) { + if (!oe) { oe=new ObjectEntry; oe->obj=proxy->part()->factory()->createProxy(exec,obj,proxy); connect(obj,TQ_SIGNAL(destroyed()),this,TQ_SLOT(removeSender())); diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index 9a82e55..4c18028 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.cpp +++ b/kate/kjswrapper/plugin_katekjswrapper.cpp @@ -93,7 +93,7 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, PluginKateKJSWrapper::~PluginKateKJSWrapper() { delete m_part; - m_part=0; + m_part=nullptr; } diff --git a/kate/kjswrapper/plugin_katekjswrapper.h b/kate/kjswrapper/plugin_katekjswrapper.h index 96cfd2e..b1d8753 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.h +++ b/kate/kjswrapper/plugin_katekjswrapper.h @@ -76,7 +76,7 @@ class PluginKateKJSWrapper : public Kate::Plugin, public: - PluginKateKJSWrapper( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateKJSWrapper( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~PluginKateKJSWrapper(); void addView (Kate::MainWindow *win); @@ -87,7 +87,7 @@ class PluginKateKJSWrapper : public Kate::Plugin, TQPtrDict m_views; uint configPages () const; - Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=nullptr); TQString configPageName(uint) const; TQString configPageFullName(uint) const; TQPixmap configPagePixmap (uint /*number = 0*/, diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h index 1b17b02..8957cb2 100644 --- a/kate/kpybrowser/kpybrowser.h +++ b/kate/kpybrowser/kpybrowser.h @@ -38,7 +38,7 @@ class KPyBrowser : public TDEListView public: /** construtor */ - KPyBrowser(TQWidget* parent=0, const char *name=0); + KPyBrowser(TQWidget* parent=nullptr, const char *name=nullptr); /** destructor */ ~KPyBrowser(); void parseText(TQString &pytext); diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index f541def..592e6e5 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -103,7 +103,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) } if (apiline == -1) { - KMessageBox::information(0, + KMessageBox::information(nullptr, i18n("Could not find method/class %1.").arg(name), i18n("Selection")); } else diff --git a/kate/kpybrowser/pybrowse_part.h b/kate/kpybrowser/pybrowse_part.h index 15c4266..4eb1dce 100644 --- a/kate/kpybrowser/pybrowse_part.h +++ b/kate/kpybrowser/pybrowse_part.h @@ -61,7 +61,7 @@ class KatePluginPyBrowse : public Kate::Plugin, public Kate::PluginViewInterface public: - KatePluginPyBrowse( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginPyBrowse( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); ~KatePluginPyBrowse(); void addView(Kate::MainWindow *win); diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index 1ddcc4f..855517c 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -261,7 +261,7 @@ TQString ErrorMessage::fancyMessage() const class LinePopup : public KPassivePopup { protected: - LinePopup( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + LinePopup( TQWidget *parent=nullptr, const char *name=nullptr, WFlags f=0 ); virtual ~LinePopup(); public: @@ -277,7 +277,7 @@ protected: static LinePopup *one; } ; -/* static */ LinePopup *LinePopup::one = 0L; +/* static */ LinePopup *LinePopup::one = nullptr; LinePopup::LinePopup(TQWidget *p,const char *n,WFlags f) : KPassivePopup(p,n,f), @@ -289,7 +289,7 @@ LinePopup::LinePopup(TQWidget *p,const char *n,WFlags f) : LinePopup::~LinePopup() { - one=0L; + one=nullptr; } /* static */ LinePopup *LinePopup::message(TQWidget *parent, @@ -327,12 +327,12 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, TQListView(parent,name), KXMLGUIClient(), win(mainwin), - filenameDetector(0L), - running_indicator(0L) + filenameDetector(nullptr), + running_indicator(nullptr) { FUNCTIONSETUP; - m_proc=0; + m_proc=nullptr; (void) new TDEAction ( i18n("Next Error"), TDEShortcut(ALT+CTRL+Key_Right), this, TQ_SLOT( slotNext() ), actionCollection(), "make_right" ); @@ -465,7 +465,7 @@ void PluginKateMakeView::slotProcExited(TDEProcess *p) FUNCTIONSETUP; delete running_indicator; - running_indicator=0L; + running_indicator=nullptr; if (!output_line.isEmpty()) { @@ -641,7 +641,7 @@ bool PluginKateMakeView::slotValidate() if (!url.isLocalFile()) { - KMessageBox::sorry(0, + KMessageBox::sorry(nullptr, i18n("The file %1 is not a local file. " "Non-local files cannot be compiled.") .arg(url.path())); @@ -662,7 +662,7 @@ bool PluginKateMakeView::slotValidate() make = TDEStandardDirs::findExe("make"); *m_proc << make; if( make.isEmpty() || ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) { - KMessageBox::error(0, i18n("Error: Failed to run %1.").arg(make.isEmpty() ? + KMessageBox::error(nullptr, i18n("Error: Failed to run %1.").arg(make.isEmpty() ? "make" : make)); return false; } diff --git a/kate/make/plugin_katemake.h b/kate/make/plugin_katemake.h index d406174..0aa987e 100644 --- a/kate/make/plugin_katemake.h +++ b/kate/make/plugin_katemake.h @@ -96,7 +96,7 @@ class PluginKateMake : public Kate::Plugin, Kate::PluginViewInterface public: - PluginKateMake( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateMake( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~PluginKateMake(); void addView (Kate::MainWindow *win); diff --git a/kate/modeline/ModelinePlugin.h b/kate/modeline/ModelinePlugin.h index c98e8bc..ef8c268 100644 --- a/kate/modeline/ModelinePlugin.h +++ b/kate/modeline/ModelinePlugin.h @@ -26,7 +26,7 @@ class ModelinePlugin : public Kate::Plugin, Kate::PluginViewInterface public: - ModelinePlugin( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); + ModelinePlugin( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList &args = TQStringList() ); virtual ~ModelinePlugin(); void addView (Kate::MainWindow *win); diff --git a/kate/openheader/plugin_kateopenheader.h b/kate/openheader/plugin_kateopenheader.h index 980b5bc..35f0cc6 100644 --- a/kate/openheader/plugin_kateopenheader.h +++ b/kate/openheader/plugin_kateopenheader.h @@ -34,7 +34,7 @@ class PluginKateOpenHeader : public Kate::Plugin, Kate::PluginViewInterface public: - PluginKateOpenHeader( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateOpenHeader( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~PluginKateOpenHeader(); void addView (Kate::MainWindow *win); diff --git a/kate/snippets/csnippet.h b/kate/snippets/csnippet.h index 8f336b8..6f11fc6 100644 --- a/kate/snippets/csnippet.h +++ b/kate/snippets/csnippet.h @@ -23,7 +23,7 @@ class CSnippet : public TQObject { TQ_OBJECT public: - CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent = 0, const char *name = 0); + CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent = nullptr, const char *name = nullptr); ~CSnippet(); TQString getKey() { return _sKey; } TQString getValue() { return _sValue; } diff --git a/kate/snippets/cwidgetsnippets.h b/kate/snippets/cwidgetsnippets.h index 831f335..5a54a96 100644 --- a/kate/snippets/cwidgetsnippets.h +++ b/kate/snippets/cwidgetsnippets.h @@ -17,7 +17,7 @@ */ class CWidgetSnippets : public CWidgetSnippetsBase { public: - CWidgetSnippets( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CWidgetSnippets( TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); ~CWidgetSnippets(); diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h index 154104b..4b191a0 100644 --- a/kate/snippets/plugin_katesnippets.h +++ b/kate/snippets/plugin_katesnippets.h @@ -66,7 +66,7 @@ class KatePluginSnippets : public Kate::Plugin, Kate::PluginViewInterface { public: - KatePluginSnippets( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSnippets( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~KatePluginSnippets(); void addView (Kate::MainWindow *win); diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index 0ca327d..e6f8711 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -68,7 +68,7 @@ TQObject* KatePluginFactory::createObject(TQObject *parent, return new KatePluginTabBarExtension(parent, name); } -TDEInstance* KatePluginFactory::s_instance = 0L; +TDEInstance* KatePluginFactory::s_instance = nullptr; // BEGIN KatePluginTabBarExtension KatePluginTabBarExtension::KatePluginTabBarExtension(TQObject *parent, const char *name) @@ -97,10 +97,10 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win) bool bCloseOnMiddleClick = pConfig->readBoolEntry("closeOnMiddleClick", false); view->tabbar = new KateTabBarExtension(application()->documentManager(), - win, bHoriz, bSort, bCloseOnMiddleClick, 0, "tabs_hbox"); + win, bHoriz, bSort, bCloseOnMiddleClick, nullptr, "tabs_hbox"); new KWidgetAction(view->tabbar, "tab_bar_widget", - TDEShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget"); + TDEShortcut::null(), nullptr, nullptr, view->actionCollection(), "tabbar_widget"); view->setInstance (new TDEInstance("kate")); view->setXMLFile("plugins/katetabbarextension/ui.rc"); @@ -266,7 +266,7 @@ KateTabBarExtension::KateTabBarExtension(Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, bool bCloseOnMiddleClick, TQWidget* parent, const char* name, WFlags f) : TQWidget(parent, name, f), - pCurrentTab(0), m_win(win), m_docManager(pDocManager), m_sort(false) + pCurrentTab(nullptr), m_win(win), m_docManager(pDocManager), m_sort(false) { if (bHorizOrientation) { top = new TQBoxLayout(this, TQBoxLayout::LeftToRight); @@ -375,7 +375,7 @@ void KateTabBarExtension::slotDocumentDeleted (uint documentNumber) top->remove(tab); m_tabs.removeRef(tab); delete tab; - tab = 0; + tab = nullptr; break; } } diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h index f991c42..208d0f9 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.h +++ b/kate/tabbarextension/plugin_katetabbarextension.h @@ -67,7 +67,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory() { s_instance = new TDEInstance( "kate" ); } virtual ~KatePluginFactory() { delete s_instance; } - virtual TQObject* createObject(TQObject *parent = 0, const char *pname = 0, + virtual TQObject* createObject(TQObject *parent = nullptr, const char *pname = nullptr, const char *name = "TQObject", const TQStringList &args = TQStringList()); private: @@ -92,7 +92,7 @@ class KateTabBarButton: public TQPushButton * @param name name of the tab button */ KateTabBarButton(Kate::ViewManager* pViewManager, Kate::Document *pDoc, - TQWidget* parent = 0, const char * name = 0); + TQWidget* parent = nullptr, const char * name = nullptr); /** * standard destructor (emtpy) @@ -187,8 +187,8 @@ class KateTabBarExtension : public TQWidget */ KateTabBarExtension(Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - bool bCloseOnMiddleClick, TQWidget *parent = 0, - const char *name = 0, WFlags f = 0); + bool bCloseOnMiddleClick, TQWidget *parent = nullptr, + const char *name = nullptr, WFlags f = 0); /** standard destructor */ ~KateTabBarExtension() {} @@ -304,7 +304,7 @@ class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage friend class KatePluginTabBarExtension; public: - KateTabBarExtensionConfigPage(TQObject* parent = 0L, TQWidget *parentWidget = 0L); + KateTabBarExtensionConfigPage(TQObject* parent = nullptr, TQWidget *parentWidget = nullptr); ~KateTabBarExtensionConfigPage() {} /** @@ -337,17 +337,17 @@ class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface public: - KatePluginTabBarExtension(TQObject* parent = 0, const char* name = 0); + KatePluginTabBarExtension(TQObject* parent = nullptr, const char* name = nullptr); virtual ~KatePluginTabBarExtension(); void addView (Kate::MainWindow *win); void removeView (Kate::MainWindow *win); uint configPages () const { return 1; } - Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=nullptr); TQString configPageName(uint) const { return i18n("Tab Bar Extension"); } TQString configPageFullName(uint) const { return i18n("Configure Tab Bar Extension"); } - TQPixmap configPagePixmap (uint = 0, int = TDEIcon::SizeSmall) const { return 0L; } + TQPixmap configPagePixmap (uint = 0, int = TDEIcon::SizeSmall) const { return nullptr; } public slots: void applyConfig( KateTabBarExtensionConfigPage* ); diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index 67349e9..7c28519 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -253,7 +253,7 @@ PluginKateTextFilter::slotFilterCloseStdin (TDEProcess * pProcess) PluginKateTextFilter::slotEditFilter () // PCP { if (!tdeApp->authorize("shell_access")) { - KMessageBox::sorry(0,i18n( + KMessageBox::sorry(nullptr,i18n( "You are not allowed to execute arbitrary external applications. If " "you want to be able to do this, contact your system administrator."), i18n("Access Restrictions")); diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h index 87a6050..b265938 100644 --- a/kate/textfilter/plugin_katetextfilter.h +++ b/kate/textfilter/plugin_katetextfilter.h @@ -36,7 +36,7 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa public: - PluginKateTextFilter( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateTextFilter( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~PluginKateTextFilter(); void addView (Kate::MainWindow *win); diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 9fa439e..563c8ee 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -97,8 +97,8 @@ void PluginKateXMLCheck::removeView(Kate::MainWindow *win) PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name) :TQListView(parent,name),KXMLGUIClient(),win(mainwin) { - m_tmp_file=0; - m_proc=0; + m_tmp_file=nullptr; + m_proc=nullptr; (void) new TDEAction ( i18n("Validate XML"), 0, this, TQ_SLOT( slotValidate() ), actionCollection(), "xml_check" ); // TODO?: @@ -183,7 +183,7 @@ void PluginKateXMLCheckView::slotProcExited(TDEProcess*) } if( ! m_proc_stderr.isEmpty() ) { TQStringList lines = TQStringList::split("\n", m_proc_stderr); - TQListViewItem *item = 0; + TQListViewItem *item = nullptr; TQString linenumber, msg; uint line_count = 0; for(TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { @@ -279,10 +279,10 @@ bool PluginKateXMLCheckView::slotValidate() m_tmp_file = new KTempFile(); if( m_tmp_file->status() != 0 ) { kdDebug() << "Error (slotValidate()): could not create '" << m_tmp_file->name() << "': " << m_tmp_file->status() << endl; - KMessageBox::error(0, i18n("Error: Could not create " + KMessageBox::error(nullptr, i18n("Error: Could not create " "temporary file '%1'.").arg(m_tmp_file->name())); delete m_tmp_file; - m_tmp_file=0L; + m_tmp_file=nullptr; return false; } TQTextStream *s = m_tmp_file->textStream(); @@ -344,7 +344,7 @@ bool PluginKateXMLCheckView::slotValidate() *m_proc << m_tmp_file->name(); if( ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) { - KMessageBox::error(0, i18n("Error: Failed to execute xmllint. Please make " + KMessageBox::error(nullptr, i18n("Error: Failed to execute xmllint. Please make " "sure that xmllint is installed. It is part of libxml2.")); return false; } diff --git a/kate/xmlcheck/plugin_katexmlcheck.h b/kate/xmlcheck/plugin_katexmlcheck.h index 52a4f74..d8aa18d 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.h +++ b/kate/xmlcheck/plugin_katexmlcheck.h @@ -76,7 +76,7 @@ class PluginKateXMLCheck : public Kate::Plugin, Kate::PluginViewInterface public: - PluginKateXMLCheck( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLCheck( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLCheck(); void addView (Kate::MainWindow *win); diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index 99cb9b6..7dab848 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -120,7 +120,7 @@ PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, cons m_dtdString = TQString(); m_urlString = TQString(); - m_docToAssignTo = 0L; + m_docToAssignTo = nullptr; m_mode = none; m_correctPos = 0; @@ -361,9 +361,9 @@ PluginKateXMLTools::stringListToCompletionEntryList( TQStringList list ) */ void PluginKateXMLTools::disconnectSlots( Kate::View *kv ) { - disconnect( kv, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), this, 0 ); - disconnect( kv, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), this, 0 ); - disconnect( kv, TQ_SIGNAL(completionAborted()), this, 0 ); + disconnect( kv, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), this, nullptr ); + disconnect( kv, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), this, nullptr ); + disconnect( kv, TQ_SIGNAL(completionAborted()), this, nullptr ); } /** @@ -459,12 +459,12 @@ void PluginKateXMLTools::getDTD() { // no meta dtd found for this file url = KFileDialog::getOpenURL(m_urlString, "*.xml", - 0, i18n( "Assign Meta DTD in XML Format") ); + nullptr, i18n( "Assign Meta DTD in XML Format") ); } else { url.setFileName( defaultDir + filename ); - KMessageBox::information(0, i18n("The current file has been identified " + KMessageBox::information(nullptr, i18n("The current file has been identified " "as a document of type \"%1\". The meta DTD for this document type " "will now be loaded.").arg( doctype ), i18n( "Loading XML Meta DTD" ), @@ -497,12 +497,12 @@ void PluginKateXMLTools::slotFinished( TDEIO::Job *job ) if( job->error() ) { //kdDebug() << "XML Plugin error: DTD in XML format (" << filename << " ) could not be loaded" << endl; - job->showErrorDialog( 0 ); + job->showErrorDialog( nullptr ); } else if ( static_cast(job)->isErrorPage() ) { // catch failed loading loading via http: - KMessageBox::error(0, i18n("The file '%1' could not be opened. " + KMessageBox::error(nullptr, i18n("The file '%1' could not be opened. " "The server returned an error.").arg( m_urlString ), i18n( "XML Plugin Error") ); } @@ -515,7 +515,7 @@ void PluginKateXMLTools::slotFinished( TDEIO::Job *job ) assignDTD( dtd, m_docToAssignTo ); // clean up a bit - m_docToAssignTo = 0; + m_docToAssignTo = nullptr; m_dtdString = ""; } TQApplication::restoreOverrideCursor(); @@ -532,7 +532,7 @@ void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc ) connect( doc, TQ_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ), this, TQ_SLOT(keyEvent(int,int,const TQString&)) ); - disconnect( doc, TQ_SIGNAL(backspacePressed()), this, 0 ); + disconnect( doc, TQ_SIGNAL(backspacePressed()), this, nullptr ); connect( doc, TQ_SIGNAL(backspacePressed() ), this, TQ_SLOT(backspacePressed()) ); } diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index 16c74e6..d0f787b 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -53,7 +53,7 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface public: - PluginKateXMLTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLTools( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLTools(); void addView ( Kate::MainWindow *win ); void removeView( Kate::MainWindow *win ); diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index 60ab986..1953737 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -45,7 +45,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) TQDomDocument doc( "dtdIn_xml" ); if ( ! doc.setContent( metaDtd) ) { - KMessageBox::error(0, i18n("The file '%1' could not be parsed. " + KMessageBox::error(nullptr, i18n("The file '%1' could not be parsed. " "Please check that the file is well-formed XML.").arg( metaDtdUrl ), i18n( "XML Plugin Error") ); return; @@ -53,7 +53,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) if ( doc.doctype().name() != "dtd" ) { - KMessageBox::error(0, i18n("The file '%1' is not in the expected format. " + KMessageBox::error(nullptr, i18n("The file '%1' is not in the expected format. " "Please check that the file is of this type:\n" "-//Norman Walsh//DTD DTDParse V2.0//EN\n" "You can produce such files with dtdparse. " @@ -69,7 +69,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) listLength += doc.elementsByTagName( "attlist" ).count() * 2; TQProgressDialog progress( i18n("Analyzing meta DTD..."), i18n("Cancel"), listLength, - 0, "progress", true ); + nullptr, "progress", true ); progress.setMinimumDuration( 400 ); progress.setProgress(0); diff --git a/kicker-applets/kbinaryclock/datepicker.cpp b/kicker-applets/kbinaryclock/datepicker.cpp index 1b66b04..1ed6347 100644 --- a/kicker-applets/kbinaryclock/datepicker.cpp +++ b/kicker-applets/kbinaryclock/datepicker.cpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include DatePicker::DatePicker(TQWidget *parent, const TQDate& date) - : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose | + : TQVBox( parent, nullptr, WType_TopLevel | WDestructiveClose | WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder ) { setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 5eba656..b87994c 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -56,7 +56,7 @@ TDEConfigDialogImp::TDEConfigDialogImp( TQWidget *parent, const char *name, TDEC setPlainCaption(i18n("Configure - KBinaryClock")); setIcon(SmallIcon("date")); - settings = new SettingsImp(0, "General"); + settings = new SettingsImp(nullptr, "General"); addPage(settings, i18n("General"), "package_settings"); connect(this, TQ_SIGNAL(widgetModified()), settings, TQ_SLOT(updatePreview())); } @@ -390,7 +390,7 @@ void KBinaryClock::toggleCalendar() void KBinaryClock::slotCalendarDeleted() { - _calendar = 0L; + _calendar = nullptr; // don't reopen the calendar immediately ... _disableCalendar = true; TQTimer::singleShot(100, this, TQ_SLOT(slotEnableCalendar())); diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h index f42ad9e..a6cd725 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.h +++ b/kicker-applets/kbinaryclock/kbinaryclock.h @@ -40,8 +40,8 @@ class SettingsImp : public Settings { TQ_OBJECT public: - SettingsImp(TQWidget* parent=0, - const char* name=0, + SettingsImp(TQWidget* parent=nullptr, + const char* name=nullptr, WFlags fl=0); public slots: void updatePreview(); @@ -74,7 +74,7 @@ class KBinaryClock : public KPanelApplet { TQ_OBJECT public: - KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = 0, const char *name = 0); + KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = nullptr, const char *name = nullptr); ~KBinaryClock(); virtual int widthForHeight (int height) const; diff --git a/kicker-applets/kolourpicker/kolourpicker.h b/kicker-applets/kolourpicker/kolourpicker.h index 04b9fb9..47b1833 100644 --- a/kicker-applets/kolourpicker/kolourpicker.h +++ b/kicker-applets/kolourpicker/kolourpicker.h @@ -37,7 +37,7 @@ class KolourPicker : public KPanelApplet public: KolourPicker(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); ~KolourPicker(); virtual int heightForWidth(int) const; virtual int widthForHeight(int) const; diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h index ce06d21..b10c68b 100644 --- a/kicker-applets/kolourpicker/simplebutton.h +++ b/kicker-applets/kolourpicker/simplebutton.h @@ -32,7 +32,7 @@ class TDE_EXPORT SimpleButton : public TQButton public: - SimpleButton(TQWidget *parent, const char *name = 0); + SimpleButton(TQWidget *parent, const char *name = nullptr); void setPixmap(const TQPixmap &pix); void setOrientation(TQt::Orientation orientaton); TQSize sizeHint() const; @@ -67,7 +67,7 @@ class TDE_EXPORT SimpleArrowButton: public SimpleButton public: - SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *parent = nullptr, TQt::ArrowType arrow = TQt::UpArrow, const char *name = nullptr); virtual ~SimpleArrowButton() {}; TQSize sizeHint() const; diff --git a/kicker-applets/ktimemon/confdlg.cpp b/kicker-applets/ktimemon/confdlg.cpp index a186b88..7e029e2 100644 --- a/kicker-applets/ktimemon/confdlg.cpp +++ b/kicker-applets/ktimemon/confdlg.cpp @@ -33,7 +33,7 @@ KConfDialog::KConfDialog(KTimeMon *t) : KDialogBase( Tabbed, i18n("Configuration" ), - Ok|Cancel|Apply, Ok, t, 0, false ), + Ok|Cancel|Apply, Ok, t, nullptr, false ), timemon(t) { TQFrame *page; diff --git a/kicker-applets/ktimemon/sample.cpp b/kicker-applets/ktimemon/sample.cpp index 57ec079..e351329 100644 --- a/kicker-applets/ktimemon/sample.cpp +++ b/kicker-applets/ktimemon/sample.cpp @@ -81,7 +81,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) : #ifdef Q_OS_LINUX memFD(-1), statFD(-1), #elif defined (Q_OS_SOLARIS) - kc(0), warned(false), + kc(nullptr), warned(false), #endif pageScale(p), swapScale(s), cxScale(c), autoscale(a) { @@ -98,8 +98,8 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) : memstats[4].stat = &sample.cached; memstats[5].name = "SwapFree:"; memstats[5].stat = &sample.sfree; - memstats[6].name = 0; - memstats[6].stat = 0; + memstats[6].name = nullptr; + memstats[6].stat = nullptr; if ((memFD = open(MEMINFO_NAME, O_RDONLY)) == -1) { KMessageBox::error(timemon, @@ -122,7 +122,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) : fcntl( statFD,F_SETFD, FD_CLOEXEC ); #elif defined (Q_OS_SOLARIS) - if ((kc = kstat_open()) == 0) { + if (!(kc = kstat_open())) { KMessageBox::error(timemon, i18n("Unable to initialize the 'kstat' library. " "This library is used for accessing kernel information. " "The diagnostics are:\n%1.\n" @@ -149,7 +149,7 @@ KSample::~KSample() close(memFD); close(statFD); #elif defined (Q_OS_SOLARIS) - if (kc != 0) kstat_close(kc); + if (kc) kstat_close(kc); #endif } @@ -218,9 +218,9 @@ void KSample::readSample() buffer[l] = '\0'; l = 0; char *p; - while (memstats[l].name != 0) { + while (memstats[l].name) { p = strstr(buffer, memstats[l].name); - if (p == 0 || + if (!p || sscanf(p + strlen(memstats[l].name), "%lu kB", memstats[l].stat) < 1) fatal(i18n("The memory usage file '%1' seems to use a " "different file format than expected.\n" @@ -268,7 +268,7 @@ void KSample::readSample() kstat_t *ksp; sample.cpus = 0; - for (ksp = kc->kc_chain; ksp != 0; ksp = ksp->ks_next) { + for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { if (strncmp(ksp->ks_name, "cpu_stat", 8) != 0) continue; sample.cpus++; } @@ -283,12 +283,12 @@ void KSample::readSample() sample.stotal = sample.sfree = 0; int cpus = 0; - for (ksp = kc->kc_chain; ksp != 0; ksp = ksp->ks_next) { + for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { if (strncmp(ksp->ks_name, "cpu_stat", 8) != 0) continue; cpus++; cpu_stat_t cstat; - if (kstat_read(kc, ksp, 0) == -1 || // update from kernel + if (kstat_read(kc, ksp, nullptr) == -1 || // update from kernel kstat_read(kc, ksp, &cstat) == -1) // and read into buffer fatal(i18n("Unable to read the CPU statistics entry " "from the 'kstat' library. The diagnostics are '%1'.\n" @@ -313,8 +313,8 @@ void KSample::readSample() // physmem == total mem in 4KB blocks errno = 0; - if ((ksp = kstat_lookup(kc, "unix", -1, "system_pages")) == 0 || - kstat_read(kc, ksp, 0) == -1) + if (!(ksp = kstat_lookup(kc, "unix", -1, "system_pages")) || + kstat_read(kc, ksp, nullptr) == -1) fatal(i18n("Unable to read the memory statistics entry " "from the 'kstat' library. The diagnostics are '%1'\n" "You might want to contact the maintainer at " @@ -343,7 +343,7 @@ void KSample::readSample() sample.cached = physmem - availrmem; // memory used by the kernel int swapentries; - if ((swapentries = swapctl(SC_GETNSWP, 0)) == -1) + if ((swapentries = swapctl(SC_GETNSWP, nullptr)) == -1) fatal(i18n("Unable to determine the number of " "swap spaces. The diagnostics are '%1'.\n" "Please contact the maintainer at http://bugs.trinitydesktop.org/ who will try to sort this out.").arg(strerror(errno))); @@ -352,7 +352,7 @@ void KSample::readSample() // 2* to get some space for padding?? swaptbl_t *stbl = (swaptbl_t *) malloc(2*sizeof(int) + swapentries * sizeof(struct swapent)); - if (stbl == 0) + if (!stbl) fatal(i18n("KTimeMon ran out of memory while " "trying to determine the swap usage.\n" "Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n" diff --git a/kicker-applets/ktimemon/timemon.cpp b/kicker-applets/ktimemon/timemon.cpp index ccd092f..e40659c 100644 --- a/kicker-applets/ktimemon/timemon.cpp +++ b/kicker-applets/ktimemon/timemon.cpp @@ -98,7 +98,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) KSample::Sample s; - if (sample != 0) + if (sample) s = sample->getSample(h); else s.fill(h); @@ -163,7 +163,7 @@ void KTimeMon::paintRect(int x, int y, int w, int h, TQColor c, TQPainter *p) // Show a tool-tip with some status information. void KTimeMon::maybeTip(const TQPoint& p) { - if (sample == 0) return; // no associated sample... + if (!sample) return; // no associated sample... if(!rect().contains(p)) return; KSample::Sample s = sample->getSample(100); // scale to 100(%) @@ -187,7 +187,7 @@ void KTimeMon::maybeTip(const TQPoint& p) KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name, WRepaintNoErase), TQToolTip(this), - configDialog(0), bgProcess(0), + configDialog(nullptr), bgProcess(nullptr), kernelColour("red1"), userColour("blue"), niceColour("yellow"), iowaitColour("darkgreen"), usedColour("blue1"), buffersColour("yellow"), @@ -357,7 +357,7 @@ void KTimeMon::save() void KTimeMon::configure() { - if (configDialog == 0) configDialog = new KConfDialog(this); + if (!configDialog) configDialog = new KConfDialog(this); configDialog->update(); configDialog->show(); } @@ -382,7 +382,7 @@ void KTimeMon::orientation() // Pop up the menu when the appropriate button has been pressed. void KTimeMon::mousePressEvent(TQMouseEvent *event) { - if (event == 0) return; + if (!event) return; int index = -1; if (event->button() == TQt::LeftButton) index = 0; diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h index 8e74c19..3d7d4e5 100644 --- a/kicker-applets/ktimemon/timemon.h +++ b/kicker-applets/ktimemon/timemon.h @@ -49,7 +49,7 @@ public: enum MouseAction { NOTHING, SWITCH, MENU, COMMAND }; KTimeMon(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); virtual ~KTimeMon(); void writeConfiguration(); // write back the configuration data diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index ee0fb4e..b5ae632 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -102,7 +102,7 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions, int mode = c->readNumEntry( "CompletionMode", TDEGlobalSettings::completionMode() ); _input->setCompletionMode( (TDEGlobalSettings::Completion) mode ); - _hbox = new TQHBox( 0, 0, WStyle_Customize | WType_Popup ); + _hbox = new TQHBox( nullptr, nullptr, WStyle_Customize | WType_Popup ); _hbox->setFixedSize(120, 22); @@ -255,7 +255,7 @@ void MathApplet::evaluate(const TQString& command) // Nothing interesting. Quit! if ( cmd.isEmpty() ){ - KMessageBox::sorry(0L, i18n("You have to enter an expression to be evaluated first.")); + KMessageBox::sorry(nullptr, i18n("You have to enter an expression to be evaluated first.")); needsFocus(true); } else { double answer = evaluator.eval(command); diff --git a/kicker-applets/math/mathapplet.h b/kicker-applets/math/mathapplet.h index f4845df..2273c03 100644 --- a/kicker-applets/math/mathapplet.h +++ b/kicker-applets/math/mathapplet.h @@ -42,7 +42,7 @@ class MathApplet : public KPanelApplet public: MathApplet(const TQString& configFile, Type t = Stretch, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); virtual ~MathApplet(); int widthForHeight(int height) const; diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp index 6b65b53..5c25c63 100644 --- a/kicker-applets/math/parser.cpp +++ b/kicker-applets/math/parser.cpp @@ -239,7 +239,7 @@ int Parser::addfkt(TQString str) { int ix; - stkptr=stack=0; + stkptr=stack=nullptr; err=0; errpos=1; str.remove(" " ); @@ -655,45 +655,45 @@ int Parser::getfix(TQString name) int Parser::errmsg() { switch(err) - { case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n" + { case 1: KMessageBox::error(nullptr, i18n("Parser error at position %1:\n" "Syntax error").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n" + case 2: KMessageBox::error(nullptr, i18n("Parser error at position %1:\n" "Missing parenthesis").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n" + case 3: KMessageBox::error(nullptr, i18n("Parser error at position %1:\n" "Function name unknown").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n" + case 4: KMessageBox::error(nullptr, i18n("Parser error at position %1:\n" "Void function variable").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n" + case 5: KMessageBox::error(nullptr, i18n("Parser error at position %1:\n" "Too many functions").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n" + case 6: KMessageBox::error(nullptr, i18n("Parser error at position %1:\n" "Token-memory overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n" + case 7: KMessageBox::error(nullptr, i18n("Parser error at position %1:\n" "Stack overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n" + case 8: KMessageBox::error(nullptr, i18n("Parser error at position %1:\n" "Name of function not free").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n" + case 9: KMessageBox::error(nullptr, i18n("Parser error at position %1:\n" "recursive function not allowed").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)), + case 10: KMessageBox::error(nullptr, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 11: KMessageBox::error(0, i18n("Empty function"), i18n("Math Expression Evaluator")); + case 11: KMessageBox::error(nullptr, i18n("Empty function"), i18n("Math Expression Evaluator")); break; } diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp index dbf14f6..e95a754 100644 --- a/kicker-applets/mediacontrol/amarokInterface.cpp +++ b/kicker-applets/mediacontrol/amarokInterface.cpp @@ -119,7 +119,7 @@ void AmarokInterface::updateSlider ( ) data = 0; replyData = 0; - replyType = 0; + replyType = nullptr; if (!tdeApp->dcopClient()->call(mAppId, "player", "trackCurrentTime()",data, replyType, replyData)) { diff --git a/kicker-applets/mediacontrol/configfrontend.cpp b/kicker-applets/mediacontrol/configfrontend.cpp index 7bebd50..f766154 100644 --- a/kicker-applets/mediacontrol/configfrontend.cpp +++ b/kicker-applets/mediacontrol/configfrontend.cpp @@ -21,7 +21,7 @@ #include "configfrontend.h" // #include -ConfigFrontend::ConfigFrontend() : TQObject(0, 0) +ConfigFrontend::ConfigFrontend() : TQObject(nullptr, nullptr) { _config = new TDEConfig(TQString(), true, false); _ownConfig = true; @@ -35,7 +35,7 @@ ConfigFrontend::~ConfigFrontend() } } -ConfigFrontend::ConfigFrontend(TDEConfig *config) : TQObject(0, 0) +ConfigFrontend::ConfigFrontend(TDEConfig *config) : TQObject(nullptr, nullptr) { _config = config; _config->setGroup("MediaControl"); diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp index a240fdd..c23df68 100644 --- a/kicker-applets/mediacontrol/jukInterface.cpp +++ b/kicker-applets/mediacontrol/jukInterface.cpp @@ -27,7 +27,7 @@ #define TIMER_FAST 250 -JuKInterface::JuKInterface() : PlayerInterface(), mProc(0) +JuKInterface::JuKInterface() : PlayerInterface(), mProc(nullptr) { mTimerValue = TIMER_FAST; mJuKTimer = new TQTimer ( this, "mJukTimer" ); @@ -111,7 +111,7 @@ void JuKInterface::jukIsReady() mJuKTimer->start(mTimerValue); mProc->deleteLater(); - mProc = 0; + mProc = nullptr; } void JuKInterface::updateSlider () @@ -132,7 +132,7 @@ void JuKInterface::updateSlider () data = 0; replyData = 0; - replyType = 0; + replyType = nullptr; if (tdeApp->dcopClient()->call(mAppId, "Player", "currentTime()", data, replyType, replyData)) diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp index 0717489..d40f871 100644 --- a/kicker-applets/mediacontrol/kscdInterface.cpp +++ b/kicker-applets/mediacontrol/kscdInterface.cpp @@ -110,7 +110,7 @@ void KsCDInterface::updateSlider() data = 0; replyData = 0; - replyType = 0; + replyType = nullptr; if (tdeApp->dcopClient()->call(mAppId, "CDPlayer", "currentPosition()", data, replyType, replyData)) diff --git a/kicker-applets/mediacontrol/mcslider.h b/kicker-applets/mediacontrol/mcslider.h index 6e67ae0..e917f4d 100644 --- a/kicker-applets/mediacontrol/mcslider.h +++ b/kicker-applets/mediacontrol/mcslider.h @@ -26,7 +26,7 @@ class MCSlider : public TQSlider public: - MCSlider( TQt::Orientation orientation, TQWidget *parent, const char *name = 0 ); + MCSlider( TQt::Orientation orientation, TQWidget *parent, const char *name = nullptr ); ~MCSlider(); void setBackground(); private: diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index 6f13511..a53ff4f 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -101,12 +101,12 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions, I18N_NOOP("A small control-applet for various media players"), TDEAboutData::License_GPL_V2, "(c) 2001-2004 Stefan Gehn", - 0, + nullptr, "http://metz.gehn.net")) { setBackgroundOrigin(AncestorOrigin); - _player = 0L; - _prefsDialog = 0L; + _player = nullptr; + _prefsDialog = nullptr; _configFrontend = new ConfigFrontend(config()); // My own dcopclient @@ -119,19 +119,19 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions, "wardy@robbieward.co.uk", "http://www.robbieward.co.uk"); mAboutData->addCredit("Sascha Hoffman", I18N_NOOP("Button-Pixmaps"), - "tisch.sush@gmx.de", 0); + "tisch.sush@gmx.de", nullptr); mAboutData->addCredit("Christian Hoffman", I18N_NOOP("Button-Pixmaps"), "tisch.crix@gmx.de", "http://www.crixensgfxcorner.de.vu/"); mAboutData->addCredit("Ulrik Mikaelsson", I18N_NOOP("Fix for Noatun-Support"), - "rawler@rsn.bth.se", 0); + "rawler@rsn.bth.se", nullptr); mAboutData->addCredit("Anthony J Moulen", I18N_NOOP("Fix for Vertical Slider"), - "ajmoulen@moulen.org", 0); + "ajmoulen@moulen.org", nullptr); mAboutData->addCredit("Teemu Rytilahti", I18N_NOOP("Volume Control Implementation"), - "teemu.rytilahti@kde-fi.org", 0); + "teemu.rytilahti@kde-fi.org", nullptr); mAboutData->addCredit("Jan Spitalnik", I18N_NOOP("Fix for JuK-Support"), - "honza@spitalnik.net", 0); + "honza@spitalnik.net", nullptr); mAboutData->addCredit("William Robinson", I18N_NOOP("mpd-Support"), - "airbaggins@yahoo.co.uk", 0); + "airbaggins@yahoo.co.uk", nullptr); setAcceptDrops(true); @@ -297,7 +297,7 @@ void MediaControl::slotClosePrefsDialog() void MediaControl::slotPrefsDialogClosing() { if ( _prefsDialog ) - _prefsDialog = 0L; + _prefsDialog = nullptr; } @@ -331,7 +331,7 @@ void MediaControl::reparseConfig() // kdDebug(90200) << "reparseConfig();" << endl; _configFrontend->reparseConfiguration(); - if (_player != 0L) // make sure there is no player-object + if (_player) // make sure there is no player-object { _player->disconnect(); // disconnect from all things @@ -342,10 +342,10 @@ void MediaControl::reparseConfig() next_button->disconnect(); delete slider_tooltip; // tooltip depends on _player : delete it before _player gets deleted - slider_tooltip = 0L; + slider_tooltip = nullptr; delete _player; - _player = 0L; + _player = nullptr; } mLastLen = -1; diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h index d03f97e..4677d30 100644 --- a/kicker-applets/mediacontrol/mediacontrol.h +++ b/kicker-applets/mediacontrol/mediacontrol.h @@ -69,7 +69,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface public: - MediaControl(const TQString&, Type, int ,TQWidget * = 0, const char * = 0); + MediaControl(const TQString&, Type, int ,TQWidget * = nullptr, const char * = nullptr); virtual ~MediaControl(); int widthForHeight(int height) const; diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 48ef8ee..19c2d3b 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -104,7 +104,7 @@ void MediaControlConfig::readSkinDir( const TQString &dir ) void MediaControlConfig::load() { // find the playerstring from config in the playerlist and select it if found - TQListBoxItem *item = 0; + TQListBoxItem *item = nullptr; item = _child->playerListBox->findItem( _configFrontend->player() ); if ( item ) @@ -113,7 +113,7 @@ void MediaControlConfig::load() _child->playerListBox->setCurrentItem( 0 ); // reset item to a proper state - item=0; + item=nullptr; _child->mWheelScrollAmount->setValue( _configFrontend->mouseWheelSpeed() ); diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.h b/kicker-applets/mediacontrol/mediacontrolconfig.h index e1130b5..52d332b 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.h +++ b/kicker-applets/mediacontrol/mediacontrolconfig.h @@ -30,7 +30,7 @@ class MediaControlConfig: public KDialogBase TQ_OBJECT public: - MediaControlConfig(ConfigFrontend *cfg, TQWidget *parent = 0, const char* name = "MediaControlConfig"); + MediaControlConfig(ConfigFrontend *cfg, TQWidget *parent = nullptr, const char* name = "MediaControlConfig"); void readSkinDir(const TQString &dir); void load(); diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp index 42ab99f..e5f554e 100644 --- a/kicker-applets/mediacontrol/mpdInterface.cpp +++ b/kicker-applets/mediacontrol/mpdInterface.cpp @@ -150,7 +150,7 @@ void MpdInterface::connectionError(int e) break; } // :TODO: TDESimpleConfig to prompt for hostname/port values ? - if (KMessageBox::warningContinueCancel( 0, message, + if (KMessageBox::warningContinueCancel( nullptr, message, i18n("MediaControl MPD Error"), i18n("Reconnect"))==KMessageBox::Continue) { @@ -206,7 +206,7 @@ bool MpdInterface::fetchLine(TQString& res) const && dispatch("clearerror\n") && fetchOk() && messagebox_mutex.tryLock()) { - KMessageBox::error(0,errormessage,i18n("MediaControl MPD Error")); + KMessageBox::error(nullptr,errormessage,i18n("MediaControl MPD Error")); messagebox_mutex.unlock(); } return false; diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp index 99f22c5..8febaf7 100644 --- a/kicker-applets/mediacontrol/noatunInterface.cpp +++ b/kicker-applets/mediacontrol/noatunInterface.cpp @@ -117,7 +117,7 @@ void NoatunInterface::updateSlider() data = 0; replyData = 0; - replyType = 0; + replyType = nullptr; if (!tdeApp->dcopClient()->call(mAppId, "Noatun", "position()", data, replyType, replyData, false, 200)) diff --git a/kicker-applets/mediacontrol/playerInterface.cpp b/kicker-applets/mediacontrol/playerInterface.cpp index 9ada948..1a347f9 100644 --- a/kicker-applets/mediacontrol/playerInterface.cpp +++ b/kicker-applets/mediacontrol/playerInterface.cpp @@ -27,8 +27,8 @@ PlayerInterface::~PlayerInterface() { } // Destructor void PlayerInterface::startPlayer(const TQString &desktopname) { if (TDEApplication::startServiceByDesktopName(desktopname, TQStringList(), - 0, 0, 0, "", false) > 0) + nullptr, nullptr, nullptr, "", false) > 0) { - KMessageBox::error(0, i18n("Could not start media player.")); + KMessageBox::error(nullptr, i18n("Could not start media player.")); } } diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h index ce06d21..b10c68b 100644 --- a/kicker-applets/mediacontrol/simplebutton.h +++ b/kicker-applets/mediacontrol/simplebutton.h @@ -32,7 +32,7 @@ class TDE_EXPORT SimpleButton : public TQButton public: - SimpleButton(TQWidget *parent, const char *name = 0); + SimpleButton(TQWidget *parent, const char *name = nullptr); void setPixmap(const TQPixmap &pix); void setOrientation(TQt::Orientation orientaton); TQSize sizeHint() const; @@ -67,7 +67,7 @@ class TDE_EXPORT SimpleArrowButton: public SimpleButton public: - SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *parent = nullptr, TQt::ArrowType arrow = TQt::UpArrow, const char *name = nullptr); virtual ~SimpleArrowButton() {}; TQSize sizeHint() const; diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index a609d13..4364921 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libadblock, AdBlockFactory( "adblock" ) ) AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), - m_label(0), m_menu(0) + m_label(nullptr), m_menu(nullptr) { m_part = dynamic_cast(parent); if(!m_part) { kdDebug() << "couldn't get TDEHTMLPart" << endl; return; } @@ -108,7 +108,7 @@ void AdBlock::showDialogue() { if (!m_part->settings()->isAdFilterEnabled()) { - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Please enable Konqueror's Adblock"), i18n("Adblock disabled")); @@ -218,7 +218,7 @@ void AdBlock::addAdFilter(const TQString &url) // ---------------------------------------------------------------------------- AdElement::AdElement() : - m_url(0), m_category(0), m_type(0), m_blocked(false) {} + m_url(nullptr), m_category(nullptr), m_type(nullptr), m_blocked(false) {} AdElement::AdElement(const TQString &url, const TQString &category, const TQString &type, bool blocked) : diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index d43b6a4..c526efe 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -49,7 +49,7 @@ typedef KGenericFactory AkregatorMenuFactory; K_EXPORT_COMPONENT_FACTORY( libakregatorkonqplugin, AkregatorMenuFactory("akregatorkonqplugin") ) AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringList& /* list */ ) - : KonqPopupMenuPlugin( popupmenu, name), PluginBase(), m_conf(0), m_part(0) + : KonqPopupMenuPlugin( popupmenu, name), PluginBase(), m_conf(nullptr), m_part(nullptr) { kdDebug() << "AkregatorMenu::AkregatorMenu()" << endl; if ( TQCString( tdeApp->name() ) == "kdesktop" && !tdeApp->authorize("editable_desktop_icons" ) ) @@ -63,7 +63,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const return; */ - TDEHTMLView* view = 0L; + TDEHTMLView* view = nullptr; if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("TDEHTMLView")) view = static_cast(popupmenu->parent()); @@ -79,7 +79,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const KFileItemList list = popupmenu->fileItemList(); KFileItem* it = list.first(); - while (it != 0) + while (it) { if (isFeedUrl(it)) { diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index e61a13c..15b7855 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -56,7 +56,7 @@ K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon, KonqFeedIconFactory("akregatorkonqfeedicon")) KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &) - : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) + : KParts::Plugin(parent, name), PluginBase(), m_part(nullptr), m_feedIcon(nullptr), m_statusBarEx(nullptr), m_menu(nullptr) { TDEGlobal::locale()->insertCatalogue("akregator_konqplugin"); @@ -87,10 +87,10 @@ KonqFeedIcon::~KonqFeedIcon() delete m_feedIcon; } // the icon is deleted in every case - m_feedIcon = 0L; + m_feedIcon = nullptr; delete m_menu; - m_menu = 0L; + m_menu = nullptr; } bool KonqFeedIcon::feedFound() @@ -176,12 +176,12 @@ void KonqFeedIcon::removeFeedIcon() { m_statusBarEx->removeStatusBarItem(m_feedIcon); delete m_feedIcon; - m_feedIcon = 0L; + m_feedIcon = nullptr; } // Close the popup if it's open, otherwise we crash delete m_menu; - m_menu = 0L; + m_menu = nullptr; } void KonqFeedIcon::addFeed(int id) diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index a28f7b0..4eaa6c8 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -43,7 +43,7 @@ K_EXPORT_COMPONENT_FACTORY( libarkplugin, ArkMenuFactory("arkplugin") ) ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringList& /* list */ ) : KonqPopupMenuPlugin( popupmenu, name), - m_compAsMapper( 0 ), m_addToMapper( 0 ), m_conf( 0 ) + m_compAsMapper( nullptr ), m_addToMapper( nullptr ), m_conf( nullptr ) { if ( ( TQCString( tdeApp->name() ) == "kdesktop" && !tdeApp->authorize("editable_desktop_icons" ) ) || ( TDEStandardDirs::findExe( "ark" ).isNull() ) ) @@ -70,7 +70,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis KFileItem * item; bool hasArchives = false; bool hasOther = false; - while ( ( item = it.current() ) != 0 ) + while ( ( item = it.current() ) != nullptr ) { ++it; if ( m_extractMimeTypes.contains( item->mimetype() ) ) @@ -484,7 +484,7 @@ void ArkMenu::slotCompressAs( int pos ) { target = m_dir + i18n("Archive") + m_extensionList[ pos ]; int i=1; - while ( TDEIO::NetAccess::exists(target, true, 0 ) ) + while ( TDEIO::NetAccess::exists(target, true, nullptr ) ) { target = m_dir + i18n("Archive %1").arg(i) + m_extensionList[ pos ]; i++; @@ -528,7 +528,7 @@ void ArkMenu::slotCompressAsDefault() { name = m_dir + i18n("Archive") + m_ext; int i=1; - while ( TDEIO::NetAccess::exists(name, true, 0 ) ) + while ( TDEIO::NetAccess::exists(name, true, nullptr ) ) { name = m_dir + i18n("Archive %1").arg(i) + m_ext; i++; diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index 7ad51f4..5a50a86 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -87,7 +87,7 @@ void AutoRefresh::slotRefresh() TQString title = i18n( "Cannot Refresh Source" ); TQString text = i18n( "This plugin cannot auto-refresh the current part." ); - TQMessageBox::warning( 0, title, text ); + TQMessageBox::warning( nullptr, title, text ); } else { diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h index 1cd0c5c..41cb8cb 100644 --- a/konq-plugins/autorefresh/autorefresh.h +++ b/konq-plugins/autorefresh/autorefresh.h @@ -35,7 +35,7 @@ public: /** * Construct a new KParts plugin. */ - AutoRefresh( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); + AutoRefresh( TQObject* parent = nullptr, const char* name = nullptr, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index 0d6512e..c204936 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -218,7 +218,7 @@ void PluginBabelFish::translateURL() TQString text = i18n( "Only web pages can be translated using " "this plugin." ); - KMessageBox::sorry( 0L, text, title ); + KMessageBox::sorry( nullptr, text, title ); return; } @@ -238,7 +238,7 @@ void PluginBabelFish::translateURL() { if( engine == "reverso" || engine == "tsail" ) { - KMessageBox::sorry( 0L, + KMessageBox::sorry( nullptr, i18n( "Only full webpages can be translated for this language pair." ),i18n( "Translation Error" ) ); return; } @@ -251,7 +251,7 @@ void PluginBabelFish::translateURL() TQString title = i18n( "Malformed URL" ); TQString text = i18n( "The URL you entered is not valid, please " "correct it and try again." ); - KMessageBox::sorry( 0L, text, title ); + KMessageBox::sorry( nullptr, text, title ); return; } totrans = KURL::encode_string( url.url() ); diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index d71d769..0fc0a99 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libcrashesplugin, CrashesPluginFactory( "crashesplug CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQStringList & ) : KParts::Plugin( parent, name ) { - m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast(parent) : 0L; + m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast(parent) : nullptr; m_pCrashesMenu = new TDEActionMenu( i18n("&Crashes"), "application-x-core", actionCollection(), "crashes" ); diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index decd6f0..9c8f010 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -48,7 +48,7 @@ #include "dirfilterplugin.h" -SessionManager* SessionManager::m_self = 0; +SessionManager* SessionManager::m_self = nullptr; static KStaticDeleter dirfiltersd; SessionManager *SessionManager::self () @@ -68,7 +68,7 @@ SessionManager::SessionManager() SessionManager::~SessionManager() { saveSettings(); - m_self = 0; + m_self = nullptr; } TQString SessionManager::generateKey (const KURL& url) const @@ -175,7 +175,7 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, TDEAction *clear = new TDEAction(i18n("Clear Filter Field"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", - 0, 0, 0, actionCollection(), "clear_filter"); + 0, nullptr, nullptr, actionCollection(), "clear_filter"); clear->setWhatsThis(i18n("Clear filter field

Clears the content of the filter field.")); @@ -202,7 +202,7 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, } KWidgetAction *filterAction = new KWidgetAction(hbox, i18n("Filter Field"), - 0, 0, 0, actionCollection(), "toolbar_filter_field"); + 0, nullptr, nullptr, actionCollection(), "toolbar_filter_field"); filterAction->setShortcutConfigurable(false); // FIXME: This causes crashes for an unknown reason on certain systems diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp index 0ee3d33..d8f53b3 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.cpp +++ b/konq-plugins/domtreeviewer/domtreecommands.cpp @@ -99,7 +99,7 @@ class ChangedNodeSet : public TQMap // == ManipulationCommand =========================================== -ManipulationCommand::ManipulationCommand() : _exception(0), changedNodes(0) +ManipulationCommand::ManipulationCommand() : _exception(0), changedNodes(nullptr) , _reapplied(false) , allow_signals(true) { } diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index 362e5c7..5221799 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -67,9 +67,9 @@ using namespace domtreeviewer; DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*/) : DOMTreeViewBase(parent, name), m_expansionDepth(5), m_maxDepth(0), m_bPure(true), m_bShowAttributes(true), m_bHighlightHTML(true), - m_findDialog(0), focused_child(0) + m_findDialog(nullptr), focused_child(nullptr) { - part = 0; + part = nullptr; const TQFont font(TDEGlobalSettings::generalFont()); m_listView->setFont( font ); @@ -163,7 +163,7 @@ bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e) kdDebug(90180) << " focusout o " << o->name() << endl; if (o != this) { - focused_child = 0; + focused_child = nullptr; } } @@ -203,7 +203,7 @@ void DOMTreeView::slotShowTree(const DOM::Node &pNode) } while(!child.isNull()) { - showRecursive(0, child, 0); + showRecursive(nullptr, child, 0); child = child.nextSibling(); } @@ -434,7 +434,7 @@ void DOMTreeView::slotItemClicked(TQListViewItem *cur_item) void DOMTreeView::slotFindClicked() { - if (m_findDialog == 0) { + if (!m_findDialog) { m_findDialog = new KEdFind(this); connect(m_findDialog, TQ_SIGNAL(search()), this, TQ_SLOT(slotSearch())); } @@ -697,7 +697,7 @@ void DOMTreeView::adjustDepth() void DOMTreeView::adjustDepthRecursively(TQListViewItem *cur_item, uint currDepth) { - if (!(cur_item == 0)) { + if (cur_item) { while( cur_item ) { cur_item->setOpen( (m_expansionDepth > currDepth) ); adjustDepthRecursively(cur_item->firstChild(), currDepth+1); @@ -886,7 +886,7 @@ void DOMTreeView::slotAddElementDlg() try { DOM::Node parent = addBefore() ? curNode.parentNode() : curNode; - DOM::Node after = addBefore() ? curNode : 0; + DOM::Node after = addBefore() ? curNode : nullptr; // ### take namespace into account DOM::Node newNode = curNode.ownerDocument().createElement(qname); @@ -922,7 +922,7 @@ void DOMTreeView::slotAddTextDlg() try { DOM::Node parent = addBefore() ? curNode.parentNode() : curNode; - DOM::Node after = addBefore() ? curNode : 0; + DOM::Node after = addBefore() ? curNode : nullptr; DOM::Node newNode = curNode.ownerDocument().createTextNode(text); @@ -1070,7 +1070,7 @@ void DOMTreeView::initializeOptionsFromListItem(TQListViewItem *item) void DOMTreeView::initializeOptionsFromElement(const DOM::Element &element) { - TQListViewItem *last = 0; + TQListViewItem *last = nullptr; nodeAttributes->clear(); DOM::NamedNodeMap attrs = element.attributes(); diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index a783308..72ced54 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -55,10 +55,10 @@ using domtreeviewer::ManipulationCommand; DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) - : TDEMainWindow( 0, "DOMTreeWindow" ), + : TDEMainWindow( nullptr, "DOMTreeWindow" ), m_plugin(plugin), m_view(new DOMTreeView(this, "DOMTreeView", false)) { - part_manager = 0; + part_manager = nullptr; // set configuration object _config = new TDEConfig("domtreeviewerrc"); @@ -70,7 +70,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) setCentralWidget(m_view); // message window dialog - msgdlg = new MessageDialog(0, "MessageDialog"); + msgdlg = new MessageDialog(nullptr, "MessageDialog"); msgdlg->messagePane->setPaletteBackgroundColor(palette().active().base()); // msgdlg->show(); @@ -361,7 +361,7 @@ void DOMTreeWindow::slotPartRemoved(KParts::Part *p) m_commandHistory->clear(); view()->disconnectFromTornDownPart(); - view()->setHtmlPart(0); + view()->setHtmlPart(nullptr); } void DOMTreeWindow::slotClosePart() diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index 2319ab6..a547a71 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -17,7 +17,7 @@ K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtr PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( parent, name ), m_dialog( 0 ) + : Plugin( parent, name ), m_dialog( nullptr ) { (void) new TDEAction( i18n("Show &DOM Tree"), "domtreeviewer", 0, @@ -50,7 +50,7 @@ void PluginDomtreeviewer::slotShowDOMTree() void PluginDomtreeviewer::slotDestroyed() { kdDebug(90180) << k_funcinfo << endl; - m_dialog = 0; + m_dialog = nullptr; } #include diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h index d550cc0..3a87d7a 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.h +++ b/konq-plugins/domtreeviewer/signalreceiver.h @@ -48,7 +48,7 @@ class SignalReceiver : public TQObject public: - SignalReceiver(TQObject *parent = 0, const char *name = 0); + SignalReceiver(TQObject *parent = nullptr, const char *name = nullptr); virtual ~SignalReceiver(); /** returns true if any signal has been received */ diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index 14a61a0..6a89912 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -76,7 +76,7 @@ FSView::FSView(Inode* base, TQWidget* parent, const char* name) _progressSize = 0; _progress = 0; _dirsFinished = 0; - _lastDir = 0; + _lastDir = nullptr; _config = new TDEConfig("fsviewrc"); @@ -219,7 +219,7 @@ void FSView::requestUpdate(Inode* i) _progressSize = 0; _progress = 0; _dirsFinished = 0; - _lastDir = 0; + _lastDir = nullptr; emit started(); } diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h index 325c6f7..48e3743 100644 --- a/konq-plugins/fsview/fsview.h +++ b/konq-plugins/fsview/fsview.h @@ -63,7 +63,7 @@ class FSView : public TreeMapWidget, public ScanListener public: enum ColorMode { None = 0, Depth, Name, Owner, Group, Mime }; - FSView(Inode*, TQWidget* parent=0, const char* name=0); + FSView(Inode*, TQWidget* parent=nullptr, const char* name=nullptr); ~FSView(); TDEConfig* config() { return _config; } diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 30b100c..2ee1e45 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -116,7 +116,7 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, setWidget(_view); _ext = new FSViewBrowserExtension(this); - _job = 0; + _job = nullptr; _areaMenu = new TDEActionMenu (i18n("Stop at Area"), actionCollection(), "treemap_areadir"); @@ -221,7 +221,7 @@ void FSViewPart::completedSlot(int dirs) if (_job) { _job->progressSlot(100, dirs, TQString()); delete _job; - _job = 0; + _job = nullptr; } TDEConfigGroup cconfig(_view->config(), TQCString("MetricCache")); @@ -239,13 +239,13 @@ void FSViewPart::slotShowVisMenu() void FSViewPart::slotShowAreaMenu() { _areaMenu->popupMenu()->clear(); - _view->addAreaStopItems(_areaMenu->popupMenu(), 1001, 0); + _view->addAreaStopItems(_areaMenu->popupMenu(), 1001, nullptr); } void FSViewPart::slotShowDepthMenu() { _depthMenu->popupMenu()->clear(); - _view->addDepthStopItems(_depthMenu->popupMenu(), 1501, 0); + _view->addDepthStopItems(_depthMenu->popupMenu(), 1501, nullptr); } void FSViewPart::slotShowColorMenu() diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h index 75ccdbb..378a8fa 100644 --- a/konq-plugins/fsview/fsview_part.h +++ b/konq-plugins/fsview/fsview_part.h @@ -40,7 +40,7 @@ class FSViewBrowserExtension : public KParts::BrowserExtension public: - FSViewBrowserExtension(FSViewPart *viewPart, const char *name=0L); + FSViewBrowserExtension(FSViewPart *viewPart, const char *name=nullptr); ~FSViewBrowserExtension(); protected slots: diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index b26917c..a5668f8 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -35,8 +35,8 @@ Inode::Inode() { - _dirPeer = 0; - _filePeer = 0; + _dirPeer = nullptr; + _filePeer = nullptr; init(""); } @@ -51,7 +51,7 @@ Inode::Inode(ScanDir* d, Inode* parent) absPath += d->name(); _dirPeer = d; - _filePeer = 0; + _filePeer = nullptr; init(absPath); } @@ -64,7 +64,7 @@ Inode::Inode(ScanFile* f, Inode* parent) absPath = parent->path() + "/"; absPath += f->name(); - _dirPeer = 0; + _dirPeer = nullptr; _filePeer = f; init(absPath); @@ -77,21 +77,21 @@ Inode::~Inode() /* reset Listener of old Peer */ if (_dirPeer) - _dirPeer->setListener(0); + _dirPeer->setListener(nullptr); if (_filePeer) - _filePeer->setListener(0); + _filePeer->setListener(nullptr); } void Inode::setPeer(ScanDir* d) { /* reset Listener of old Peer */ if (_dirPeer) - _dirPeer->setListener(0); + _dirPeer->setListener(nullptr); if (_filePeer) - _filePeer->setListener(0); + _filePeer->setListener(nullptr); _dirPeer = d; - _filePeer = 0; + _filePeer = nullptr; init(d->name()); } @@ -166,7 +166,7 @@ void Inode::scanFinished(ScanDir* d) void Inode::destroyed(ScanDir* d) { - if (_dirPeer == d) _dirPeer = 0; + if (_dirPeer == d) _dirPeer = nullptr; // remove children clear(); @@ -174,17 +174,17 @@ void Inode::destroyed(ScanDir* d) void Inode::destroyed(ScanFile* f) { - if (_filePeer == f) _filePeer = 0; + if (_filePeer == f) _filePeer = nullptr; } TreeMapItemList* Inode::children() { - if (!_dirPeer) return 0; + if (!_dirPeer) return nullptr; if (!_children) { - if (!_dirPeer->scanStarted()) return 0; + if (!_dirPeer->scanStarted()) return nullptr; _children = new TreeMapItemList; _children->setAutoDelete(true); diff --git a/konq-plugins/fsview/inode.h b/konq-plugins/fsview/inode.h index eb1e3dd..cc8a462 100644 --- a/konq-plugins/fsview/inode.h +++ b/konq-plugins/fsview/inode.h @@ -68,7 +68,7 @@ public: const TQFileInfo& fileInfo() const { return _info; } ScanDir* dirPeer() { return _dirPeer; } ScanFile* filePeer() { return _filePeer; } - bool isDir() { return (_dirPeer != 0); } + bool isDir() { return (_dirPeer != nullptr); } void sizeChanged(ScanDir*); void scanFinished(ScanDir*); diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index 3beb941..bc79153 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -16,7 +16,7 @@ static TDECmdLineOptions options[] = { - { "+[folder]", I18N_NOOP("View filesystem starting from this folder"), 0 }, + { "+[folder]", I18N_NOOP("View filesystem starting from this folder"), nullptr }, TDECmdLineLastOption // End of options. }; diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp index 2114bd3..e1723c6 100644 --- a/konq-plugins/fsview/scan.cpp +++ b/konq-plugins/fsview/scan.cpp @@ -30,14 +30,14 @@ ScanManager::ScanManager() { - _topDir = 0; - _listener = 0; + _topDir = nullptr; + _listener = nullptr; } ScanManager::ScanManager(const TQString& path) { - _topDir = 0; - _listener = 0; + _topDir = nullptr; + _listener = nullptr; setTop(path); } @@ -57,10 +57,10 @@ ScanDir* ScanManager::setTop(const TQString& path, int data) stopScan(); if (_topDir) { delete _topDir; - _topDir = 0; + _topDir = nullptr; } if (!path.isEmpty()) { - _topDir = new ScanDir(path, this, 0, data); + _topDir = new ScanDir(path, this, nullptr, data); } return _topDir; } @@ -94,7 +94,7 @@ void ScanManager::stopScan() << _list.count() << endl; ScanItem* si; - while( (si=_list.take(0))!=0 ) { + while( (si=_list.take(0)) != nullptr ) { si->dir->finish(); delete si; } @@ -117,14 +117,14 @@ int ScanManager::scan(int data) ScanFile::ScanFile() { _size = 0; - _listener = 0; + _listener = nullptr; } ScanFile::ScanFile(const TQString& n, TDEIO::fileoffset_t s) { _name = n; _size = s; - _listener = 0; + _listener = nullptr; } ScanFile::~ScanFile() @@ -139,9 +139,9 @@ ScanDir::ScanDir() _dirty = true; _dirsFinished = -1; /* scan not started */ - _parent = 0; - _manager = 0; - _listener = 0; + _parent = nullptr; + _manager = nullptr; + _listener = nullptr; _data = 0; } @@ -154,7 +154,7 @@ ScanDir::ScanDir(const TQString& n, ScanManager* m, _parent = p; _manager = m; - _listener = 0; + _listener = nullptr; _data = data; } @@ -328,7 +328,7 @@ void ScanDir::callScanStarted() if (0) kdDebug(90100) << "ScanDir:Started [" << path() << "]: size " << size() << ", files " << fileCount() << endl; - ScanListener* mListener = _manager ? _manager->listener() : 0; + ScanListener* mListener = _manager ? _manager->listener() : nullptr; if (_listener) _listener->scanStarted(this); if (mListener) mListener->scanStarted(this); @@ -343,7 +343,7 @@ void ScanDir::callSizeChanged() if (_parent) _parent->callSizeChanged(); - ScanListener* mListener = _manager ? _manager->listener() : 0; + ScanListener* mListener = _manager ? _manager->listener() : nullptr; if (_listener) _listener->sizeChanged(this); if (mListener) mListener->sizeChanged(this); @@ -354,7 +354,7 @@ void ScanDir::callScanFinished() if (0) kdDebug(90100) << "ScanDir:Finished [" << path() << "]: size " << size() << ", files " << fileCount() << endl; - ScanListener* mListener = _manager ? _manager->listener() : 0; + ScanListener* mListener = _manager ? _manager->listener() : nullptr; if (_listener) _listener->scanFinished(this); if (mListener) mListener->scanFinished(this); diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h index 9062fb1..3695a3d 100644 --- a/konq-plugins/fsview/scan.h +++ b/konq-plugins/fsview/scan.h @@ -103,7 +103,7 @@ class ScanManager * If from !=0, restart scan at given position; from must * be from the previous scan of this manager. */ - void startScan(ScanDir* from = 0); + void startScan(ScanDir* from = nullptr); /** Stop a current running scan. * Make all directories to finish their scan. @@ -160,7 +160,7 @@ class ScanDir public: ScanDir(); ScanDir(const TQString& n, ScanManager* m, - ScanDir* p = 0, int data = 0); + ScanDir* p = nullptr, int data = 0); ~ScanDir(); /* Get items of this directory diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index bff8641..e28ffd0 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -103,7 +103,7 @@ int StoredDrawParams::maxLines(int f) const const TQFont& StoredDrawParams::font() const { - static TQFont* f = 0; + static TQFont* f = nullptr; if (!f) f = new TQFont(TQApplication::font()); return *f; @@ -111,7 +111,7 @@ const TQFont& StoredDrawParams::font() const void StoredDrawParams::ensureField(int f) { - static Field* def = 0; + static Field* def = nullptr; if (!def) { def = new Field(); def->pos = Default; @@ -176,8 +176,8 @@ void StoredDrawParams::setMaxLines(int f, int m) RectDrawing::RectDrawing(TQRect r) { - _fm = 0; - _dp = 0; + _fm = nullptr; + _dp = nullptr; setRect(r); } @@ -373,7 +373,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) bool isBottom = false; bool isCenter = false; bool isRight = false; - int* used = 0; + int* used = nullptr; switch(pos) { case DrawParams::TopLeft: used = &_usedTopLeft; @@ -741,7 +741,7 @@ TreeMapItem* TreeMapItemList::commonParent() TreeMapItem* parent, *item; parent = first(); if (parent) - while( (item = next()) != 0) + while( (item = next()) != nullptr ) parent = parent->commonParent(item); return parent; @@ -756,12 +756,12 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) _parent = parent; _sum = 0; - _children = 0; - _widget = 0; + _children = nullptr; + _widget = nullptr; _index = -1; _depth = -1; // not set _unused_self = 0; - _freeRects = 0; + _freeRects = nullptr; if (_parent) { // take sorting from parent @@ -789,12 +789,12 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, setText(0, text1); _sum = 0; - _children = 0; - _widget = 0; + _children = nullptr; + _widget = nullptr; _index = -1; _depth = -1; // not set _unused_self = 0; - _freeRects = 0; + _freeRects = nullptr; if (_parent) _parent->addItem(this); } @@ -847,7 +847,7 @@ void TreeMapItem::clear() if (_widget) _widget->clearSelection(this); delete _children; - _children = 0; + _children = nullptr; } } @@ -905,7 +905,7 @@ void TreeMapItem::addItem(TreeMapItem* i) } i->setParent(this); - if (sorting(0) == -1) + if (sorting(nullptr) == -1) _children->append(i); // preserve insertion order else _children->inSort(i); @@ -1089,7 +1089,7 @@ void TreeMapTip::maybeTip( const TQPoint& pos ) TreeMapWidget* p = (TreeMapWidget*)parentWidget(); TreeMapItem* i; i = p->item(pos.x(), pos.y()); - TQPtrList* rList = i ? i->freeRects() : 0; + TQPtrList* rList = i ? i->freeRects() : nullptr; if (rList) { TQRect* r; for(r=rList->first();r;r=rList->next()) @@ -1133,10 +1133,10 @@ TreeMapWidget::TreeMapWidget(TreeMapItem* base, // _forceText will be false on resizing (per default) // start state: _selection is an empty list - _current = 0; - _oldCurrent = 0; - _pressed = 0; - _lastOver = 0; + _current = nullptr; + _oldCurrent = nullptr; + _pressed = nullptr; + _lastOver = nullptr; _needsRefresh = _base; setBackgroundMode(TQt::NoBackground); @@ -1439,10 +1439,10 @@ void TreeMapWidget::deletingItem(TreeMapItem* i) while(_tmpSelection.findRef(i) > -1) _tmpSelection.remove(); - if (_current == i) _current = 0; - if (_oldCurrent == i) _oldCurrent = 0; - if (_pressed == i) _pressed = 0; - if (_lastOver == i) _lastOver = 0; + if (_current == i) _current = nullptr; + if (_oldCurrent == i) _oldCurrent = nullptr; + if (_pressed == i) _pressed = nullptr; + if (_lastOver == i) _lastOver = nullptr; // don't redraw a deleted item if (_needsRefresh == i) { @@ -1478,13 +1478,13 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const TreeMapItem* p = _base; TreeMapItem* i; - if (!rect().contains(x, y)) return 0; + if (!rect().contains(x, y)) return nullptr; if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl; while (1) { TreeMapItemList* list = p->children(); if (!list) - i = 0; + i = nullptr; else { int idx=0; for (i=list->first();i;i=list->next(),idx++) { @@ -1506,7 +1506,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const } if (!i) { - static TreeMapItem* last = 0; + static TreeMapItem* last = nullptr; if (p != last) { last = p; @@ -1521,7 +1521,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const } p = i; } - return 0; + return nullptr; } TreeMapItem* TreeMapWidget::possibleSelection(TreeMapItem* i) const @@ -1594,12 +1594,12 @@ TreeMapItemList TreeMapWidget::diff(TreeMapItemList& l1, TreeMapItemListIterator it1(l1), it2(l2); TreeMapItem* item; - while ( (item = it1.current()) != 0 ) { + while ( (item = it1.current()) != nullptr ) { ++it1; if (l2.containsRef(item) > 0) continue; l.append(item); } - while ( (item = it2.current()) != 0 ) { + while ( (item = it2.current()) != nullptr ) { ++it2; if (l1.containsRef(item) > 0) continue; l.append(item); @@ -1614,8 +1614,8 @@ TreeMapItemList TreeMapWidget::diff(TreeMapItemList& l1, */ TreeMapItem* TreeMapWidget::setTmpSelected(TreeMapItem* item, bool selected) { - if (!item) return 0; - if (_selectionMode == NoSelection) return 0; + if (!item) return nullptr; + if (_selectionMode == NoSelection) return nullptr; TreeMapItemList old = _tmpSelection; @@ -1663,7 +1663,7 @@ bool TreeMapWidget::clearSelection(TreeMapItem* parent) changed->redraw(); emit selectionChanged(); } - return (changed != 0); + return (changed != nullptr); } bool TreeMapWidget::isSelected(TreeMapItem* i) const @@ -1727,9 +1727,9 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, TreeMapItem* i2, bool selected) { - if ((i1 == 0) && (i2 == 0)) return 0; - if ((i1 == 0) || i1->isChildOf(i2)) return setTmpSelected(i2, selected); - if ((i2 == 0) || i2->isChildOf(i1)) return setTmpSelected(i1, selected); + if (!i1 && !i2) return nullptr; + if (!i1 || i1->isChildOf(i2)) return setTmpSelected(i2, selected); + if (!i2 || i2->isChildOf(i1)) return setTmpSelected(i1, selected); TreeMapItem* changed = setTmpSelected(i1, selected); TreeMapItem* changed2 = setTmpSelected(i2, selected); @@ -1797,7 +1797,7 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e ) _inControlDrag = e->state() & ControlButton; _lastOver = _pressed; - TreeMapItem* changed = 0; + TreeMapItem* changed = nullptr; TreeMapItem* item = possibleSelection(_pressed); switch(_selectionMode) { @@ -1845,8 +1845,8 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e ) emit selectionChanged(_lastOver); emit selectionChanged(); } - _pressed = 0; - _lastOver = 0; + _pressed = nullptr; + _lastOver = nullptr; emit rightButtonPressed(i, e->pos()); } } @@ -1860,12 +1860,12 @@ void TreeMapWidget::mouseMoveEvent( TQMouseEvent* e ) if (_lastOver == over) return; setCurrent(over); - if (over == 0) { - _lastOver = 0; + if (!over) { + _lastOver = nullptr; return; } - TreeMapItem* changed = 0; + TreeMapItem* changed = nullptr; TreeMapItem* item = possibleSelection(over); switch(_selectionMode) { @@ -1919,8 +1919,8 @@ void TreeMapWidget::mouseReleaseEvent( TQMouseEvent* ) emit clicked(_lastOver); } - _pressed = 0; - _lastOver = 0; + _pressed = nullptr; + _lastOver = nullptr; } @@ -1984,8 +1984,8 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) if (changed) redraw(changed); } - _pressed = 0; - _lastOver = 0; + _pressed = nullptr; + _lastOver = nullptr; } if ((e->key() == Key_Space) || @@ -2144,7 +2144,7 @@ void TreeMapWidget::drawTreeMap() _fontHeight = fontMetrics().height(); drawItems(&p, _needsRefresh); - _needsRefresh = 0; + _needsRefresh = nullptr; } bitBlt( this, 0, 0, &_pixmap, 0, 0, @@ -2187,13 +2187,13 @@ void TreeMapWidget::drawItem(TQPainter* p, for(i = item;i;i=i->parent()) if (i->isMarked(_markNo)) break; - isSelected = (i!=0); + isSelected = (i!=nullptr); } else { for (i=_tmpSelection.first();i;i=_tmpSelection.next()) if (item->isChildOf(i)) break; - isSelected = (i!=0); + isSelected = (i!=nullptr); } bool isCurrent = _current && item->isChildOf(_current); @@ -2453,7 +2453,7 @@ void TreeMapWidget::drawItems(TQPainter* p, TQRect firstRect = TQRect(r.x(), r.y(), nextPos, r.height()); if (nextPos < _visibleWidth) { - if (item->sorting(0) == -1) { + if (item->sorting(nullptr) == -1) { // fill current rect with hash pattern drawFill(item, p, firstRect); } @@ -2472,7 +2472,7 @@ void TreeMapWidget::drawItems(TQPainter* p, len = lenLeft; if (!drawDetails) { - if (item->sorting(0) == -1) + if (item->sorting(nullptr) == -1) drawDetails = true; else { drawFill(item, p, r, it, len, goBack); @@ -2504,7 +2504,7 @@ void TreeMapWidget::drawItems(TQPainter* p, TQRect firstRect = TQRect(r.x(), r.y(), r.width(), nextPos); if (nextPos < _visibleWidth) { - if (item->sorting(0) == -1) { + if (item->sorting(nullptr) == -1) { drawFill(item, p, firstRect); } else { @@ -2521,7 +2521,7 @@ void TreeMapWidget::drawItems(TQPainter* p, len = lenLeft; if (!drawDetails) { - if (item->sorting(0) == -1) + if (item->sorting(nullptr) == -1) drawDetails = true; else { drawFill(item, p, r, it, len, goBack); @@ -2632,7 +2632,7 @@ bool TreeMapWidget::drawItemArray(TQPainter* p, TreeMapItem* item, } // if no sorting, don't stop drawing - if (item->sorting(0) == -1) drawOn = true; + if (item->sorting(nullptr) == -1) drawOn = true; // second half if (drawOn) @@ -2686,7 +2686,7 @@ bool TreeMapWidget::drawItemArray(TQPainter* p, TreeMapItem* item, int nextPos = (user_sum <= 0.0) ? 0: (int)(lastPos * val / user_sum +.5); if (nextPos>lastPos) nextPos = lastPos; - if ((item->sorting(0) != -1) && (nextPos < _visibleWidth)) { + if ((item->sorting(nullptr) != -1) && (nextPos < _visibleWidth)) { drawFill(item, p, r, it, len, goBack); if (DEBUG_DRAWING) kdDebug(90100) << " -drawItemArray(" << item->path(0).join("/") diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index 8f12228..03d0906 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -169,18 +169,18 @@ public: void setDrawParams(DrawParams*); // draw on a given TQPainter, use this class as info provider per default - void drawBack(TQPainter*, DrawParams* dp = 0); + void drawBack(TQPainter*, DrawParams* dp = nullptr); /* Draw field at position() from pixmap()/text() with maxLines(). * Returns true if something was drawn */ - bool drawField(TQPainter*, int f, DrawParams* dp = 0); + bool drawField(TQPainter*, int f, DrawParams* dp = nullptr); // resets rectangle for free space void setRect(TQRect); // Returns the rectangle area still free of text/pixmaps after // a number of drawText() calls. - TQRect remainingRect(DrawParams* dp = 0); + TQRect remainingRect(DrawParams* dp = nullptr); private: int _usedTopLeft, _usedTopCenter, _usedTopRight; @@ -237,7 +237,7 @@ public: HAlternate, VAlternate, Horizontal, Vertical }; - TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 ); + TreeMapItem(TreeMapItem* parent = nullptr, double value = 1.0 ); TreeMapItem(TreeMapItem* parent, double value, TQString text1, TQString text2 = TQString(), TQString text3 = TQString(), TQString text4 = TQString()); @@ -401,7 +401,7 @@ public: */ enum SelectionMode { Single, Multi, Extended, NoSelection }; - TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0); + TreeMapWidget(TreeMapItem* base, TQWidget* parent=nullptr, const char* name=nullptr); ~TreeMapWidget(); /** @@ -456,7 +456,7 @@ public: * parent. When parent == 0, clears whole selection * Returns true if selection changed. */ - bool clearSelection(TreeMapItem* parent = 0); + bool clearSelection(TreeMapItem* parent = nullptr); /** * Selects or unselects items in a range. diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h index da48a1d..358fc21 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.h +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h @@ -42,7 +42,7 @@ class KIGPDialog : public KDialogBase public: - KIGPDialog(TQWidget *parent=0, const TQString& path=0, const char *name=0 ); + KIGPDialog(TQWidget *parent=nullptr, const TQString& path=nullptr, const char *name=nullptr ); ~KIGPDialog(); bool isDialogOk() const; diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 270eba0..1f5a5df 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -50,7 +50,7 @@ typedef KGenericFactory KImGalleryPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgalleryplugin" ) ) KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ) - : KParts::Plugin( parent, name ), m_commentMap(0) + : KParts::Plugin( parent, name ), m_commentMap(nullptr) { new TDEAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, TQ_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); @@ -58,10 +58,10 @@ KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQ void KImGalleryPlugin::slotExecute() { - m_progressDlg=0L; + m_progressDlg=nullptr; if ( !parent() || !parent()->inherits("KonqDirPart")) { - KMessageBox::sorry( 0L, i18n("Could not create the plugin, please report a bug.")); + KMessageBox::sorry( nullptr, i18n("Could not create the plugin, please report a bug.")); return; } m_part = static_cast(parent()); diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index 2f14f5b..83fe71b 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -38,8 +38,8 @@ KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) { TDEAboutData *ab=new TDEAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"), "0.2",I18N_NOOP("KControl module for Kuick's configuration"), TDEAboutData::License_GPL, - "(c) 2001, Holger Freyther", 0, 0, "freyther@kde.org"); - ab->addAuthor("Holger Freyther",0, "freyther@kde.org"); + "(c) 2001, Holger Freyther", nullptr, nullptr, "freyther@kde.org"); + ab->addAuthor("Holger Freyther",nullptr, "freyther@kde.org"); setAboutData( ab ); TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0); diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 7ac7335..5263941 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -32,7 +32,7 @@ #define CICON(a) (*_icons)[a] -TQMap *KDirMenu::_icons = 0; +TQMap *KDirMenu::_icons = nullptr; KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, const TQString &_path, const TQString &_name, bool /*showfile*/ ) @@ -40,7 +40,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, path(_path), name(_name), src( _src ), - action( 0 ) + action( nullptr ) { children.setAutoDelete( true ); initIconMap( ); @@ -73,7 +73,7 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { TQPixmap icon; icon = TDEGlobal::iconLoader()->loadIcon(iconPath, TDEIcon::Small, TDEIcon::SizeSmall, - TDEIcon::DefaultState, 0, true); + TDEIcon::DefaultState, nullptr, true); if(icon.isNull()) icon = CICON("folder"); insertItem( icon, escapedPath.replace( "&", "&&" ), submenu ); diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index e70cc99..94398b2 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -39,7 +39,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, const TQString &key, KIMProxy *imProxy ) : TQPopupMenu( parent), - m_root( 0 ), m_home( 0 ), m_etc( 0 ), m_current( 0 ), m_browse( 0 ) { + m_root( nullptr ), m_home( nullptr ), m_etc( nullptr ), m_current( nullptr ), m_browse( nullptr ) { int recent_no; group = key; actions.setAutoDelete( true ); diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h index 3c6695f..62845c0 100644 --- a/konq-plugins/kuick/kmetamenu.h +++ b/konq-plugins/kuick/kmetamenu.h @@ -39,7 +39,7 @@ class KMetaMenu : public TQPopupMenu { public: KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, - const TQString &key, KIMProxy * imProxy = 0L ); + const TQString &key, KIMProxy * imProxy = nullptr ); KMetaMenu(); ~KMetaMenu(); void writeConfig( const TQString &path ); diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 34c3685..6a2f472 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -40,8 +40,8 @@ K_EXPORT_COMPONENT_FACTORY( libkuickplugin, KTestMenuFactory("kuick_plugin") ) KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQStringList& /*list*/ ) : KonqPopupMenuPlugin( popupmenu, name) { popup= popupmenu ; - meta_copy_mmu = 0L; - meta_move_mmu = 0L; + meta_copy_mmu = nullptr; + meta_move_mmu = nullptr; my_action = new TDEAction( "kuick_plugin", 0, this, TQ_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); addAction( my_action ); addSeparator(); diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index a20561f..5e440d1 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -42,7 +42,7 @@ K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon, KonqMFIconFactory("mfkonqmficon")) KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) -: KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { +: KParts::Plugin(parent, name), PluginBase(), m_part(nullptr), m_mfIcon(nullptr), m_statusBarEx(nullptr), m_menu(nullptr) { TDEGlobal::locale()->insertCatalogue("mf_konqplugin"); m_part = dynamic_cast(parent); @@ -64,7 +64,7 @@ void KonqMFIcon::waitPartToLoad() { KonqMFIcon::~KonqMFIcon() { TDEGlobal::locale()->removeCatalogue("mf_konqplugin"); delete m_menu; - m_menu = 0L; + m_menu = nullptr; } @@ -295,12 +295,12 @@ void KonqMFIcon::removeMFIcon() { if (m_mfIcon) { m_statusBarEx->removeStatusBarItem(m_mfIcon); delete m_mfIcon; - m_mfIcon = 0; + m_mfIcon = nullptr; } // Close the popup if it's open, otherwise we crash delete m_menu; - m_menu = 0L; + m_menu = nullptr; } diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 9f5d090..ecdb074 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( libminitoolsplugin, MinitoolsPluginFactory("minitool MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStringList &) : KParts::Plugin(parent, name) { - m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast(parent) : 0L; + m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast(parent) : nullptr; m_pMinitoolsMenu = new TDEActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools"); @@ -150,7 +150,7 @@ void MinitoolsPlugin::slotItemSelected(int id) { connect(this, TQ_SIGNAL( executeScript(const TQString &) ), m_part, TQ_SLOT( executeScript(const TQString &) )); emit executeScript(script); - disconnect(this, TQ_SIGNAL( executeScript(const TQString &) ), 0, 0); + disconnect(this, TQ_SIGNAL( executeScript(const TQString &) ), nullptr, nullptr); } #include "minitoolsplugin.moc" diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 20f2f00..4a96150 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -59,7 +59,7 @@ K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory(&aboutdata) ) /** Constructor of the plugin. */ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin( parent, name ), - m_part(0), + m_part(nullptr), m_viewVisible(false) { @@ -191,9 +191,9 @@ RelLinksPlugin::~RelLinksPlugin() { } bool RelLinksPlugin::eventFilter(TQObject *watched, TQEvent* event) { - if (m_part == 0) return false; + if (!m_part) return false; - if (watched == 0 || event == 0) return false; + if (!watched || !event) return false; if (watched == m_view) { @@ -225,7 +225,7 @@ bool RelLinksPlugin::eventFilter(TQObject *watched, TQEvent* event) { void RelLinksPlugin::delayedSetup() { - if (m_part == 0) return; + if (!m_part) return; m_view = m_part->view(); m_view->installEventFilter(this); diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index e307e61..1cf3e62 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -70,8 +70,8 @@ K_EXPORT_COMPONENT_FACTORY(librsyncplugin, RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name, const TQStringList&) :KParts::Plugin (parent, name), - m_pSyncNow(0), - m_pSyncSetup(0) + m_pSyncNow(nullptr), + m_pSyncSetup(nullptr) { m_part = ::tqt_cast(parent); diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index a5b894c..80a4cbd 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -60,13 +60,13 @@ K_EXPORT_COMPONENT_FACTORY(libsearchbarplugin, SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), - m_searchCombo(0), + m_searchCombo(nullptr), m_searchMode(UseSearchProvider), m_urlEnterLock(false), m_gsTimer(this), m_googleMode(GoogleOnly) { - m_searchCombo = new SearchBarCombo(0L, "search combo"); + m_searchCombo = new SearchBarCombo(nullptr, "search combo"); m_searchCombo->setDuplicatesEnabled(false); m_searchCombo->setMaxCount(5); m_searchCombo->setFixedWidth(180); @@ -74,11 +74,11 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, m_searchCombo->lineEdit()->installEventFilter(this); m_searchCombo->listBox()->setFocusProxy(m_searchCombo); - m_popupMenu = 0; - m_googleMenu = 0; + m_popupMenu = nullptr; + m_googleMenu = nullptr; m_searchComboAction = new KWidgetAction(m_searchCombo, i18n("Search Bar"), 0, - 0, 0, actionCollection(), "toolbar_search_bar"); + nullptr, nullptr, actionCollection(), "toolbar_search_bar"); m_searchComboAction->setShortcutConfigurable(false); connect(m_searchCombo, TQ_SIGNAL(activated(const TQString &)), @@ -97,7 +97,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, KParts::MainWindow *mainWin = static_cast(parent); //Grab the part manager. Don't know of any other way, and neither does Tronical, so.. - KParts::PartManager *partMan = static_cast(mainWin->child(0, "KParts::PartManager")); + KParts::PartManager *partMan = static_cast(mainWin->child(nullptr, "KParts::PartManager")); if (partMan) { connect(partMan, TQ_SIGNAL(activePartChanged(KParts::Part*)), @@ -120,7 +120,7 @@ SearchBarPlugin::~SearchBarPlugin() config->writeEntry("GoogleSuggestMode", m_googleMode); delete m_searchCombo; - m_searchCombo = 0L; + m_searchCombo = nullptr; } TQChar delimiter() @@ -483,7 +483,7 @@ void SearchBarPlugin::configurationChanged() favoriteEngines = config->readListEntry("FavoriteSearchEngines", favoriteEngines); delete m_popupMenu; - m_popupMenu = 0; + m_popupMenu = nullptr; m_searchEngines.clear(); m_searchEngines << engine; for (TQStringList::ConstIterator it = favoriteEngines.begin(); it != favoriteEngines.end(); ++it ) diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index 38211b2..dda595f 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -48,7 +48,7 @@ KonqSidebarDelicious::~KonqSidebarDelicious() void * KonqSidebarDelicious::provides( const TQString & ) { - return 0; + return nullptr; } TQWidget * KonqSidebarDelicious::getWidget() diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h index 8f6e1c4..09a36aa 100644 --- a/konq-plugins/sidebar/delicious/plugin.h +++ b/konq-plugins/sidebar/delicious/plugin.h @@ -44,7 +44,7 @@ class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject K_DCOP public: KonqSidebarDelicious( TDEInstance * instance, TQObject * parent, TQWidget * widgetParent, - TQString & desktopName_, const char * name = 0 ); + TQString & desktopName_, const char * name = nullptr ); ~KonqSidebarDelicious(); virtual void * provides( const TQString & ); /** diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index c50201e..d5fa7e4 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -43,10 +43,10 @@ class L33tSlider : public TQSlider TQ_OBJECT public: - L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(TQt::Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=nullptr); + L33tSlider(TQt::Orientation, TQWidget * parent, const char * name=nullptr); L33tSlider(int minValue, int maxValue, int pageStep, int value, - TQt::Orientation, TQWidget * parent, const char * name=0); + TQt::Orientation, TQWidget * parent, const char * name=nullptr); bool currentlyPressed() const; signals: diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index 6344e75..cb1884e 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -97,7 +97,7 @@ bool Engine::reload(void) { // Only You can prevent memory leaks delete d->playobj; - d->playobj = 0; + d->playobj = nullptr; KDE::PlayObjectFactory factory(d->server.server()); d->playobj = factory.createPlayObject(d->file, true); diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h index 8ca30f0..f5cf658 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.h +++ b/konq-plugins/sidebar/mediaplayer/engine.h @@ -46,7 +46,7 @@ TQ_OBJECT public: - Engine(TQObject *parent=0); + Engine(TQObject *parent=nullptr); ~Engine(); Arts::PlayObject playObject() const; diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h index ee66555..7364af5 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h @@ -29,7 +29,7 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin TQ_OBJECT public: - KonqSidebar_MediaPlayer(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); + KonqSidebar_MediaPlayer(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=nullptr); ~KonqSidebar_MediaPlayer(); virtual void *provides(const TQString &); void emitStatusBarText (const TQString &); diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h index fb022ec..63eadb1 100644 --- a/konq-plugins/sidebar/mediaplayer/player.h +++ b/konq-plugins/sidebar/mediaplayer/player.h @@ -40,7 +40,7 @@ TQ_OBJECT friend class KaboodlePart; public: - Player(TQObject *parent = 0); + Player(TQObject *parent = nullptr); ~Player(); /** diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index b6d3cb4..ae82de1 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -169,7 +169,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent general_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding), 2, 0); //general_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding), 0, 2); - TQVBoxLayout *link_button_layout = new TQVBoxLayout(0, 0, 5); + TQVBoxLayout *link_button_layout = new TQVBoxLayout(nullptr, 0, 5); link_button_layout->addWidget(link_create); link_button_layout->addWidget(link_edit); link_button_layout->addWidget(link_delete); @@ -184,7 +184,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent TQHBoxLayout *action_layout = new TQHBoxLayout(actionPage, 5, 5); action_layout->addWidget(actionSelector); - TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 5, 5); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(nullptr, 5, 5); bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); @@ -325,12 +325,12 @@ void ConfigDialog::createLink() icon->setStrictIconSize(true); icon->setIcon("folder"); - TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 0, 5); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(nullptr, 0, 5); bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); + TQGridLayout *layout = new TQGridLayout(nullptr, 2, 3, 0, 5); layout->addMultiCellWidget(icon, 0, 1, 0, 0); layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); layout->addWidget(name, 0, 2); @@ -408,12 +408,12 @@ void ConfigDialog::editLink(TQListViewItem *item) icon->setStrictIconSize(true); icon->setIcon(linkList[item]->icon); - TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 0, 5); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(nullptr, 0, 5); bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); + TQGridLayout *layout = new TQGridLayout(nullptr, 2, 3, 0, 5); layout->addMultiCellWidget(icon, 0, 1, 0, 0); layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); layout->addWidget(name, 0, 2); diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h index eb22196..8cf1793 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.h +++ b/konq-plugins/sidebar/metabar/src/configdialog.h @@ -48,7 +48,7 @@ class ConfigDialog : public TQDialog public: - ConfigDialog(TQWidget *parent = 0, const char *name = 0); + ConfigDialog(TQWidget *parent = nullptr, const char *name = nullptr); ~ConfigDialog(); protected: diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index e8cf2be..8cc2fd2 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -57,7 +57,7 @@ DefaultPlugin::DefaultPlugin(TDEHTMLPart* html, MetabarFunctions *functions, con { services = new ServiceLoader(m_html->view(), "serviceloader"); - preview_job = 0; + preview_job = nullptr; } DefaultPlugin::~DefaultPlugin() @@ -67,7 +67,7 @@ DefaultPlugin::~DefaultPlugin() void DefaultPlugin::killJobs(){ if(preview_job){ preview_job->kill(); - preview_job = 0; + preview_job = nullptr; } } @@ -407,7 +407,7 @@ void DefaultPlugin::slotPreviewFailed(const KFileItem *item) void DefaultPlugin::slotJobFinished(TDEIO::Job *job) { if(preview_job && job == preview_job){ - preview_job = 0; + preview_job = nullptr; } } diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h index a56343d..4421879 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.h +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h @@ -35,7 +35,7 @@ class DefaultPlugin : public ProtocolPlugin public: - DefaultPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0); + DefaultPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = nullptr); ~DefaultPlugin(); void deactivate(); diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.h b/konq-plugins/sidebar/metabar/src/httpplugin.h index 8068064..28bee61 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.h +++ b/konq-plugins/sidebar/metabar/src/httpplugin.h @@ -34,7 +34,7 @@ class HTTPPlugin : public ProtocolPlugin public: - HTTPPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0); + HTTPPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = nullptr); ~HTTPPlugin(); bool handleRequest(const KURL &url); diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h index 69d0ebd..80f0550 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.h +++ b/konq-plugins/sidebar/metabar/src/metabar.h @@ -16,11 +16,11 @@ class Metabar : public KonqSidebarPlugin public: - Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=nullptr); ~Metabar(); virtual TQWidget *getWidget(){ return widget; } - virtual void *provides(const TQString &) { return 0; } + virtual void *provides(const TQString &) { return nullptr; } protected: MetabarWidget *widget; diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h index 10fa8da..39c00b5 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h @@ -35,7 +35,7 @@ class MetabarFunctions : public TQObject public: - MetabarFunctions(TDEHTMLPart *html, TQObject *parent = 0, const char* name=0); + MetabarFunctions(TDEHTMLPart *html, TQObject *parent = nullptr, const char* name=nullptr); ~MetabarFunctions(); void toggle(DOM::DOMString item); diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 3a5826b..60dbc16 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -103,7 +103,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare functions = new MetabarFunctions(html, this); - currentPlugin = 0; + currentPlugin = nullptr; defaultPlugin = new DefaultPlugin(html, functions); HTTPPlugin *httpPlugin = new HTTPPlugin(html, functions); @@ -117,7 +117,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare TQVBoxLayout *layout = new TQVBoxLayout(this); layout->addWidget(html->view()); - popup = new TDEPopupMenu(0); + popup = new TDEPopupMenu(nullptr); TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), this, TQ_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); @@ -221,7 +221,7 @@ TQString MetabarWidget::getCurrentURL() return url; } } - return 0; + return nullptr; } void MetabarWidget::openURL(const TQString &url) @@ -481,7 +481,7 @@ TQString MetabarWidget::getIconPath(const TQString &name) void MetabarWidget::slotShowSharingDialog() { if(currentItems && currentItems->count() == 1){ - KPropertiesDialog *dialog = new KPropertiesDialog(currentItems->first(), 0, 0, true); + KPropertiesDialog *dialog = new KPropertiesDialog(currentItems->first(), nullptr, nullptr, true); dialog->showFileSharingPage(); } } diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index b8a8e32..f5f018a 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -41,7 +41,7 @@ class MetabarWidget : public TQWidget public: - MetabarWidget(TQWidget *parent = 0, const char* name=0); + MetabarWidget(TQWidget *parent = nullptr, const char* name=nullptr); ~MetabarWidget(); void setFileItems(const KFileItemList &items, bool check = true); diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp index e63eb0a..1a4b0f8 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp @@ -30,7 +30,7 @@ #include #include -ProtocolPlugin* ProtocolPlugin::activePlugin = 0; +ProtocolPlugin* ProtocolPlugin::activePlugin = nullptr; ProtocolPlugin::ProtocolPlugin(TDEHTMLPart *html, MetabarFunctions *functions, const char* name) : TQObject(html, name), m_html(html), m_functions(functions) { diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h index 4cf2d5a..57273ab 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.h +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h @@ -35,7 +35,7 @@ class ProtocolPlugin : public TQObject{ public: static ProtocolPlugin* activePlugin; - ProtocolPlugin(TDEHTMLPart *html, MetabarFunctions *functions, const char* name = 0); + ProtocolPlugin(TDEHTMLPart *html, MetabarFunctions *functions, const char* name = nullptr); ~ProtocolPlugin(); void setFileItems(const KFileItemList &items); diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.h b/konq-plugins/sidebar/metabar/src/remoteplugin.h index 467928e..cdc931d 100644 --- a/konq-plugins/sidebar/metabar/src/remoteplugin.h +++ b/konq-plugins/sidebar/metabar/src/remoteplugin.h @@ -29,7 +29,7 @@ class RemotePlugin : public DefaultPlugin public: - RemotePlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0); + RemotePlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = nullptr); ~RemotePlugin(); void loadActions(DOM::HTMLElement node); diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h index f296bbe..7874d23 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.h +++ b/konq-plugins/sidebar/metabar/src/serviceloader.h @@ -41,7 +41,7 @@ class ServiceLoader : public TQObject public: - ServiceLoader(TQWidget *parent, const char *name = 0); + ServiceLoader(TQWidget *parent, const char *name = nullptr); ~ServiceLoader(); void loadServices(const KFileItem item, DOM::DOMString &html, int &count); diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp index 771668f..da63933 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp @@ -31,7 +31,7 @@ SettingsPlugin::SettingsPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name) { - list_job = 0; + list_job = nullptr; } SettingsPlugin::~SettingsPlugin() @@ -42,7 +42,7 @@ void SettingsPlugin::killJobs() { if(list_job){ list_job->kill(); - list_job = 0; + list_job = nullptr; } } @@ -192,7 +192,7 @@ void SettingsPlugin::slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList & void SettingsPlugin::slotJobFinished(TDEIO::Job *job) { if(list_job && job == list_job){ - list_job = 0; + list_job = nullptr; m_functions->adjustSize("actions"); } diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h index 246ae2b..e5da4a8 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.h +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h @@ -32,7 +32,7 @@ class SettingsPlugin : public ProtocolPlugin public: - SettingsPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0); + SettingsPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = nullptr); ~SettingsPlugin(); void deactivate(); diff --git a/konq-plugins/sidebar/newsticker/configfeeds.h b/konq-plugins/sidebar/newsticker/configfeeds.h index 8399b12..369cf74 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.h +++ b/konq-plugins/sidebar/newsticker/configfeeds.h @@ -42,7 +42,7 @@ namespace KSB_News { public: - ConfigFeeds(TQWidget* parent, const char* name = 0); + ConfigFeeds(TQWidget* parent, const char* name = nullptr); }; diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index a96adeb..74edb03 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -64,7 +64,7 @@ namespace KSB_News { KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Default, KDialogBase::Ok, true); - ConfigFeeds *conf_widget = new ConfigFeeds(0, "feedcfgdlg"); + ConfigFeeds *conf_widget = new ConfigFeeds(nullptr, "feedcfgdlg"); m_confdlg->addPage(conf_widget, i18n("RSS Settings"), "pixmap_name"); // User edited the configuration - update your local copies of the diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h index 488b212..de4cf93 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.h +++ b/konq-plugins/sidebar/newsticker/norsswidget.h @@ -34,7 +34,7 @@ namespace KSB_News { public: - NoRSSWidget(TQWidget *parent = 0, const char *name = 0); + NoRSSWidget(TQWidget *parent = nullptr, const char *name = nullptr); private slots: void slotBtnClicked(); diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h index e1f52ba..c2bfa53 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.h +++ b/konq-plugins/sidebar/newsticker/nspanel.h @@ -42,7 +42,7 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// class TTListBox : public TDEListBox, TQToolTip { public: - TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); + TTListBox (TQWidget *parent = nullptr, const char *name = nullptr, WFlags f = 0); void clear(); protected: diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 6a51b11..c7c41c7 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -50,7 +50,7 @@ namespace KSB_News { NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name, TQPixmap appIcon) : TQWidget(parent, name) { - currentPage = 0; + currentPage = nullptr; layout = new TQVBoxLayout(this); pagesheader.setAutoDelete(true); @@ -77,7 +77,7 @@ namespace KSB_News { // bugreport dialog - m_bugreport = new KBugReport(0, true, m_aboutdata); + m_bugreport = new KBugReport(nullptr, true, m_aboutdata); // popup menu @@ -253,7 +253,7 @@ namespace KSB_News { KDialogBase::Apply, KDialogBase::Ok, true); - ConfigFeeds *conf_widget = new ConfigFeeds(0, "feedcfgdlg"); + ConfigFeeds *conf_widget = new ConfigFeeds(nullptr, "feedcfgdlg"); m_confdlg->addPage(conf_widget, i18n("RSS Settings"), TQString()); // User edited the configuration - update your local copies of the diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index e25a5cd..ad1ac0b 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -48,7 +48,7 @@ namespace KSB_News { public: - NSStackTabWidget(TQWidget *parent = 0, const char *name = 0, + NSStackTabWidget(TQWidget *parent = nullptr, const char *name = nullptr, TQPixmap appIcon = TQPixmap()); void addStackTab(NSPanel *nsp, TQWidget *page); void delStackTab(NSPanel *nsp); diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index 284b18f..19eacd0 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -108,7 +108,7 @@ namespace KSB_News { - void *KonqSidebar_News::provides(const TQString &) {return 0;} + void *KonqSidebar_News::provides(const TQString &) {return nullptr;} void KonqSidebar_News::emitStatusBarText (const TQString &) {;} diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h index 6724e19..a3b9825 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.h +++ b/konq-plugins/sidebar/newsticker/sidebar_news.h @@ -48,7 +48,7 @@ namespace KSB_News { public: KonqSidebar_News(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName_, - const char* name=0); + const char* name=nullptr); ~KonqSidebar_News(); virtual void *provides(const TQString &); void emitStatusBarText (const TQString &); diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp index fe8515b..8c48570 100644 --- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp @@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( libtdehtmlsettingsplugin, SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, const TQStringList & ) - : KParts::Plugin( parent, name ), mConfig(0) + : KParts::Plugin( parent, name ), mConfig(nullptr) { setInstance(SettingsPluginFactory::instance()); @@ -97,7 +97,7 @@ SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, TDESelectAction *sAction = new TDESelectAction( i18n("Cache Po&licy"), 0, - 0, 0, actionCollection(), + nullptr, nullptr, actionCollection(), "cachepolicy" ); TQStringList policies; policies += i18n( "&Keep Cache in Sync" ); diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index 2028dae..5d61e3d 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -53,7 +53,7 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, const TQStringList & ) :KParts::Plugin( parent, name ), - m_bSettingsLoaded(false), m_part(0L), m_config(0L) + m_bSettingsLoaded(false), m_part(nullptr), m_config(nullptr) { setInstance(UAChangerPlugin::instance()); @@ -82,7 +82,7 @@ UAChangerPlugin::~UAChangerPlugin() void UAChangerPlugin::slotReloadDescriptions() { delete m_config; - m_config = 0L; + m_config = nullptr; } void UAChangerPlugin::parseDescFiles() diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 57d0666..85fc741 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -46,7 +46,7 @@ K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin, PluginValidators::PluginValidators( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( parent, name ), m_configDialog(0), m_part(0) + : Plugin( parent, name ), m_configDialog(nullptr), m_part(nullptr) { setInstance(PluginValidatorsFactory::instance()); @@ -147,7 +147,7 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) TQString text = i18n( "You cannot validate anything except web pages with " "this plugin." ); - KMessageBox::sorry( 0, text, title ); + KMessageBox::sorry( nullptr, text, title ); return; } @@ -160,7 +160,7 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) TQString title = i18n( "Malformed URL" ); TQString text = i18n( "The URL you entered is not valid, please " "correct it and try again." ); - KMessageBox::sorry( 0, text, title ); + KMessageBox::sorry( nullptr, text, title ); return; } @@ -170,7 +170,7 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) TQString title = i18n( "Upload Not Possible" ); TQString text = i18n( "Validating links is not possible for local " "files." ); - KMessageBox::sorry( 0, text, title ); + KMessageBox::sorry( nullptr, text, title ); return; } validatorUrl = uploadUrl; diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h index 6ffcc58..0350a17 100644 --- a/konq-plugins/validators/validatorsdialog.h +++ b/konq-plugins/validators/validatorsdialog.h @@ -31,7 +31,7 @@ class ValidatorsDialog : public KDialogBase public: - ValidatorsDialog(TQWidget *parent=0, const char *name=0 ); + ValidatorsDialog(TQWidget *parent=nullptr, const char *name=nullptr ); ~ValidatorsDialog(); const TQString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();} diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 04da91b..f508f9f 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -53,7 +53,7 @@ ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename, TDEHTMLPart *part) : KDialogBase(parent, "WebArchiveDialog", false, i18n("Web Archiver"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 ), - m_bPreserveWS(false), m_tmpFile(0), m_url(part->url()) + m_bPreserveWS(false), m_tmpFile(nullptr), m_url(part->url()) { m_widget=new ArchiveViewBase(this); setMainWidget(m_widget); @@ -77,7 +77,7 @@ ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename, void ArchiveDialog::archive() { m_iterator=0; - m_currentLVI=0; + m_currentLVI=nullptr; if (m_tarBall->open(IO_WriteOnly)) { #ifdef DEBUG_WAR kdDebug(90110) << "Web Archive opened " << endl; @@ -89,7 +89,7 @@ void ArchiveDialog::archive() } else { const TQString title = i18n( "Unable to Open Web-Archive" ); const TQString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName()); - KMessageBox::sorry( 0L, text, title ); + KMessageBox::sorry( nullptr, text, title ); } } @@ -124,7 +124,7 @@ void ArchiveDialog::saveFile( const TQString&) } else { const TQString title = i18n( "Could Not Open Temporary File" ); const TQString text = i18n( "Could not open a temporary file" ); - KMessageBox::sorry( 0, text, title ); + KMessageBox::sorry( nullptr, text, title ); } } @@ -481,7 +481,7 @@ void ArchiveDialog::finishedDownloadingURL( TDEIO::Job *job ) file.close(); m_tmpFile->unlink(); delete m_tmpFile; - m_tmpFile=0; + m_tmpFile=nullptr; // Add URL to downloaded URLs diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index 82e8593..f074692 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -108,7 +108,7 @@ void PluginWebArchiver::slotSaveToArchive() } } - ArchiveDialog *dialog=new ArchiveDialog(0L, url.path(), part); + ArchiveDialog *dialog=new ArchiveDialog(nullptr, url.path(), part); dialog->show(); dialog->archive(); } diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp index 451fb8a..609c995 100644 --- a/konq-plugins/webarchiver/webarchivecreator.cpp +++ b/konq-plugins/webarchiver/webarchivecreator.cpp @@ -39,7 +39,7 @@ extern "C" } WebArchiveCreator::WebArchiveCreator() - : m_html(0) + : m_html(nullptr) { } diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp index d1db3e1..94ffc66 100644 --- a/ksig/ksig.cpp +++ b/ksig/ksig.cpp @@ -73,8 +73,8 @@ void KSig::setupActions() KStdAction::paste(tdeApp, TQ_SLOT(paste()), actionCollection()); new TDEAction(i18n("C&lear"), "edit-clear", 0, tdeApp, TQ_SLOT(clear()), actionCollection(), "clear"); - new TDEAction(i18n("Edit Standard Header"), 0, 0, this, TQ_SLOT(editHeader()), actionCollection(), "editHeader"); - new TDEAction(i18n("Edit Standard Footer"), 0, 0, this, TQ_SLOT(editFooter()), actionCollection(), "editFooter"); + new TDEAction(i18n("Edit Standard Header"), nullptr, 0, this, TQ_SLOT(editHeader()), actionCollection(), "editHeader"); + new TDEAction(i18n("Edit Standard Footer"), nullptr, 0, this, TQ_SLOT(editFooter()), actionCollection(), "editFooter"); } void KSig::setupLayout() @@ -104,7 +104,7 @@ void KSig::setupLayout() void KSig::setupSearchLine() { TDEListViewSearchLineWidget *searchWidget = new TDEListViewSearchLineWidget(sigList, this); - new KWidgetAction(searchWidget, i18n("Search"), TDEShortcut(), 0, 0, actionCollection(), "search"); + new KWidgetAction(searchWidget, i18n("Search"), TDEShortcut(), nullptr, nullptr, actionCollection(), "search"); } void KSig::loadData() @@ -218,7 +218,7 @@ void KSig::setDataChanged(bool value) void KSig::editHeader() { - StandardText *t = new StandardText(0, 0, true); + StandardText *t = new StandardText(nullptr, nullptr, true); t->setLabel(i18n("Standard signature header:")); t->setText(header); @@ -229,7 +229,7 @@ void KSig::editHeader() void KSig::editFooter() { - StandardText *t = new StandardText(0, 0, true); + StandardText *t = new StandardText(nullptr, nullptr, true); t->setLabel(i18n("Standard signature footer:")); t->setText(footer); diff --git a/ksig/ksig.h b/ksig/ksig.h index d18dc27..d108390 100644 --- a/ksig/ksig.h +++ b/ksig/ksig.h @@ -31,7 +31,7 @@ class KSig : public TDEMainWindow public: - KSig(TQWidget *parent = 0, const char *name = 0); + KSig(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~KSig(); private: diff --git a/ksig/main.cpp b/ksig/main.cpp index 52d7548..6a11319 100644 --- a/ksig/main.cpp +++ b/ksig/main.cpp @@ -28,8 +28,8 @@ static const char description[] = I18N_NOOP("KSig"); static TDECmdLineOptions options[] = { - { "random", I18N_NOOP("Display a random signature"), 0}, - { "daily", I18N_NOOP("Display a signature for the day"), 0}, + { "random", I18N_NOOP("Display a random signature"), nullptr}, + { "daily", I18N_NOOP("Display a signature for the day"), nullptr}, TDECmdLineLastOption }; @@ -38,9 +38,9 @@ int main(int argc, char *argv[]) TDEAboutData aboutData("ksig", I18N_NOOP("KSig"), "1.1", description, TDEAboutData::License_GPL, - "(c) 2002, Scott Wheeler", 0, 0, "wheeler@kde.org"); + "(c) 2002, Scott Wheeler", nullptr, nullptr, "wheeler@kde.org"); - aboutData.addAuthor("Scott Wheeler", 0, "wheeler@kde.org"); + aboutData.addAuthor("Scott Wheeler", nullptr, "wheeler@kde.org"); TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/ksig/siglistview.cpp b/ksig/siglistview.cpp index 01788e4..4f30859 100644 --- a/ksig/siglistview.cpp +++ b/ksig/siglistview.cpp @@ -23,7 +23,7 @@ #include #include -SigListView *SigListView::listView = 0; +SigListView *SigListView::listView = nullptr; //////////////////////////////////////////////////////////////////////////////// // public members diff --git a/ksig/siglistview.h b/ksig/siglistview.h index 036bc1e..d5b1b49 100644 --- a/ksig/siglistview.h +++ b/ksig/siglistview.h @@ -39,7 +39,7 @@ class SigListView : public TDEListView TQ_OBJECT public: - static SigListView *instance(TQWidget *parent = 0, const char *name = 0); + static SigListView *instance(TQWidget *parent = nullptr, const char *name = nullptr); void load(); void save(); @@ -58,7 +58,7 @@ public slots: void clear() {} protected: - SigListView(TQWidget *parent = 0, const char *name = 0); + SigListView(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~SigListView(); private: diff --git a/ksig/standardtext.h b/ksig/standardtext.h index 69f7d49..079725e 100644 --- a/ksig/standardtext.h +++ b/ksig/standardtext.h @@ -24,7 +24,7 @@ class StandardText : public StandardTextBase TQ_OBJECT public: - StandardText(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); + StandardText(TQWidget *parent = nullptr, const char *name = nullptr, bool modal = false, WFlags fl = 0); virtual ~StandardText(); void setLabel(const TQString &text); diff --git a/noatun-plugins/alarm/kminutespinbox.h b/noatun-plugins/alarm/kminutespinbox.h index 9a83d80..117a482 100644 --- a/noatun-plugins/alarm/kminutespinbox.h +++ b/noatun-plugins/alarm/kminutespinbox.h @@ -31,7 +31,7 @@ class KMinuteSpinBox : public TQSpinBox TQ_OBJECT public: - KMinuteSpinBox(int _step = 1, TQWidget *_parent = 0, const char *_name = 0); + KMinuteSpinBox(int _step = 1, TQWidget *_parent = nullptr, const char *_name = nullptr); protected: virtual TQString mapValueToText(int v); }; diff --git a/noatun-plugins/alarm/kpercentspinbox.h b/noatun-plugins/alarm/kpercentspinbox.h index 1e404a7..959358c 100644 --- a/noatun-plugins/alarm/kpercentspinbox.h +++ b/noatun-plugins/alarm/kpercentspinbox.h @@ -24,7 +24,7 @@ class KPercentSpinBox : public TQSpinBox TQ_OBJECT public: - KPercentSpinBox (int _step=1, TQWidget *_parent=0, const char *name=0); + KPercentSpinBox (int _step=1, TQWidget *_parent=nullptr, const char *name=nullptr); protected: virtual TQString mapValueToText(int v); diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index f433da9..b9d1f92 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -48,7 +48,7 @@ extern "C" } } -Wakeup *Wakeup::wakeme = 0; +Wakeup *Wakeup::wakeme = nullptr; Wakeup::Wakeup() : TQObject(), Plugin() { diff --git a/noatun-plugins/alsaplayer/seeker.h b/noatun-plugins/alsaplayer/seeker.h index a21e27a..4d08299 100644 --- a/noatun-plugins/alsaplayer/seeker.h +++ b/noatun-plugins/alsaplayer/seeker.h @@ -32,7 +32,7 @@ class Seeker : public L33tSlider public: - Seeker(TQWidget * parent, const char * name = 0); + Seeker(TQWidget * parent, const char * name = nullptr); virtual ~Seeker(); protected slots: diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index c62c344..5e69044 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -48,18 +48,18 @@ #include "seeker.h" Charlatan::Charlatan() - : TQWidget (0, "Charlatan"), + : TQWidget (nullptr, "Charlatan"), UserInterface (), - previousButton_ (0L), - stopButton_ (0L), - playButton_ (0L), - nextButton_ (0L), - playListToggleButton_ (0L), - restartButton_ (0L), - seekSlider_ (0L), - titleLabel_ (0L), - positionLabel_ (0L), - showingVolumeTimer_ (0L), + previousButton_ (nullptr), + stopButton_ (nullptr), + playButton_ (nullptr), + nextButton_ (nullptr), + playListToggleButton_ (nullptr), + restartButton_ (nullptr), + seekSlider_ (nullptr), + titleLabel_ (nullptr), + positionLabel_ (nullptr), + showingVolumeTimer_ (nullptr), title_ ("c.h.a.r.l.a.t.a.n") { setAcceptDrops(true); @@ -263,7 +263,7 @@ void Charlatan::setTitleText(const TQString & s) { Player * player = napp->player(); - if (0 == player) + if (!player) { tqWarning("Noatun's player is null. WTF ?"); return; diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp index 286ff95..14f0dd7 100644 --- a/noatun-plugins/dub/dub/dub.cpp +++ b/noatun-plugins/dub/dub/dub.cpp @@ -53,10 +53,10 @@ int Random::seed; #define ID_STATUS_MSG 1 Dub::Dub(DubPlaylist* plist) - : DubApp(0) + : DubApp(nullptr) , playlist(*plist) , dubconfig(*plist->dubconfig) - , activeFile(0) + , activeFile(nullptr) , linear_onedir(this) , linear_recursive(this) , shuffle_onedir(this) @@ -152,7 +152,7 @@ void Dub::Sequencer::set_file(KFileItem** file, KFileItem* val) { KFileItem* Dub::Linear_Seq::first(TQPtrList & items) { // find first file - KFileItem* firstFile = 0; + KFileItem* firstFile = nullptr; for (KFileItem* item = items.first(); item; item = items.next() ) { if (item->isFile()) { firstFile = item; @@ -165,7 +165,7 @@ KFileItem* Dub::Linear_Seq::first(TQPtrList & items) KFileItem* Dub::Linear_Seq::last(TQPtrList & items) { // find last file - KFileItem* lastFile = 0; + KFileItem* lastFile = nullptr; for (KFileItem* item = items.last(); item; item = items.prev() ) { if (item->isFile()) { lastFile = item; @@ -189,7 +189,7 @@ bool Dub::Linear_Seq::find(TQPtrList & items, KFileItem* a_file) KFileItem* Dub::Linear_Seq::next(TQPtrList & items, KFileItem** active_file) { - KFileItem* ret = 0; + KFileItem* ret = nullptr; assert(active_file); bool found = false; if (*active_file) { @@ -215,7 +215,7 @@ KFileItem* Dub::Linear_Seq::next(TQPtrList & items, KFileItem* Dub::Linear_Seq::prev(TQPtrList & items, KFileItem** active_file) { - KFileItem* ret = 0; + KFileItem* ret = nullptr; assert(active_file); bool found = false; if (*active_file) { @@ -248,7 +248,7 @@ KFileItem* Dub::Linear_OneDir::first() else { if (first_file) { // invalidate first delete first_file; - first_file = 0; + first_file = nullptr; } } return first_file; @@ -558,7 +558,7 @@ void Dub::Shuffle_OneDir::init(const TQString& dir) KFileItem* Dub::Shuffle_OneDir::first() { - return 0; + return nullptr; } void Dub::Shuffle_OneDir::next() @@ -588,7 +588,7 @@ KFileItem* Dub::Shuffle_Recursive::random_file() assert(!play_stack.isEmpty()); play_stack.clear(); push_dir(recursion_root); // start pre-order traversal - KFileItem* selected = 0; + KFileItem* selected = nullptr; double file_probability = 0.3; Random::init(); while (!top_dir()->subdirs.isEmpty() && !selected) { diff --git a/noatun-plugins/dub/dub/dub.h b/noatun-plugins/dub/dub/dub.h index a2d6f24..940bbdb 100644 --- a/noatun-plugins/dub/dub/dub.h +++ b/noatun-plugins/dub/dub/dub.h @@ -115,7 +115,7 @@ private: // sequencer that traverses current directory in view order struct Linear_OneDir : public Linear_Seq { - Linear_OneDir(Dub* d) : Linear_Seq(d), first_file(0) {} + Linear_OneDir(Dub* d) : Linear_Seq(d), first_file(nullptr) {} virtual ~Linear_OneDir() {} KFileItem* first(); void next(); diff --git a/noatun-plugins/dub/dub/dubplaylist.cpp b/noatun-plugins/dub/dub/dubplaylist.cpp index f1fd256..33c0120 100644 --- a/noatun-plugins/dub/dub/dubplaylist.cpp +++ b/noatun-plugins/dub/dub/dubplaylist.cpp @@ -36,8 +36,8 @@ extern "C" /** Construct playlist object */ DubPlaylist::DubPlaylist() - : Playlist(0, "Dub Playlist") - , dub(0) + : Playlist(nullptr, "Dub Playlist") + , dub(nullptr) , visible(false) { kdDebug(90010) << "dub: cons playlist" << endl; @@ -58,7 +58,7 @@ void DubPlaylist::clear() { } void DubPlaylist::addFile(const KURL&, bool play) { - KMessageBox::information(0, i18n("Adding files not supported yet, see configuration")); + KMessageBox::information(nullptr, i18n("Adding files not supported yet, see configuration")); } PlaylistItem DubPlaylist::next() { @@ -90,12 +90,12 @@ PlaylistItem DubPlaylist::getFirst() const { return PlaylistItem(firstData); } else - return 0; + return nullptr; } PlaylistItem DubPlaylist::getAfter(const PlaylistItem &item) const { kdDebug(90010) << "dub: getAfter" << endl; - return 0; + return nullptr; } bool DubPlaylist::listVisible() const { diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp index 50405b3..5f27c36 100644 --- a/noatun-plugins/dub/dub/dubplaylistitem.cpp +++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp @@ -79,5 +79,5 @@ KURL DubPlaylistItem::url() const { } /** No descriptions */ void DubPlaylistItem::remove() { - KMessageBox::information(0, i18n("Do you really want to delete this file?")); + KMessageBox::information(nullptr, i18n("Do you really want to delete this file?")); } diff --git a/noatun-plugins/dub/dub/dubplaylistitem.h b/noatun-plugins/dub/dub/dubplaylistitem.h index 211a0bc..69a8ed6 100644 --- a/noatun-plugins/dub/dub/dubplaylistitem.h +++ b/noatun-plugins/dub/dub/dubplaylistitem.h @@ -31,7 +31,7 @@ public: DubPlaylistItem(const KFileItem&); virtual ~DubPlaylistItem(); - virtual TQString property(const TQString &, const TQString & = 0) const; + virtual TQString property(const TQString &, const TQString & = nullptr) const; virtual void setProperty(const TQString &, const TQString &); virtual void clearProperty(const TQString &); virtual TQStringList properties() const; diff --git a/noatun-plugins/dub/dub/dubview.h b/noatun-plugins/dub/dub/dubview.h index b618b17..01b46cf 100644 --- a/noatun-plugins/dub/dub/dubview.h +++ b/noatun-plugins/dub/dub/dubview.h @@ -34,7 +34,7 @@ class DubView : public FileSelectorWidget public: /** Constructor for the main view */ - DubView(TQWidget *parent = 0); + DubView(TQWidget *parent = nullptr); /** Destructor for the main view */ ~DubView(); diff --git a/noatun-plugins/dub/dub/random.h b/noatun-plugins/dub/dub/random.h index cf2a970..2792fb0 100644 --- a/noatun-plugins/dub/dub/random.h +++ b/noatun-plugins/dub/dub/random.h @@ -25,7 +25,7 @@ public: } static void init() { - seed += time(0); + seed += time(nullptr); srandom(seed); } static double random_double (double upper_bound) { diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index 1d7891d..2d49ecd 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -25,7 +25,7 @@ extern "C" View::View(int width, int height, int block, int unblock, TQColor front, TQColor back, int channel) - : TQWidget(0,0, TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WType_TopLevel), mChannel(channel) + : TQWidget(nullptr,nullptr, TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WType_TopLevel), mChannel(channel) { fg = front; bg = back; @@ -135,7 +135,7 @@ void View::draw(float level) FFRS::FFRS() : TQObject(), Plugin() { - dpyleft = dpyright = 0; + dpyleft = dpyright = nullptr; changed(); prefs = new FFRSPrefs(this); connect(prefs, TQ_SIGNAL(changed()), TQ_SLOT(changed())); diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index f369eaf..d155e26 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -41,7 +41,7 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false) back_act->setEnabled(false); forward_act = KStdAction::forward(this, TQ_SLOT(forward()), actionCollection()); forward_act->setEnabled(false); - new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "tde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label"); + new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "tde toolbar widget"), i18n("Search Provider"), 0, nullptr, nullptr, actionCollection(), "search_label"); site_act = new TDESelectAction(i18n("&Search Provider"), 0, this, TQ_SLOT(viewLyrics()), actionCollection(), "search_provider"); /* Add entry to menu */ diff --git a/noatun-plugins/nexscope/bitmappool.cpp b/noatun-plugins/nexscope/bitmappool.cpp index 45f35d0..9e7a979 100644 --- a/noatun-plugins/nexscope/bitmappool.cpp +++ b/noatun-plugins/nexscope/bitmappool.cpp @@ -21,7 +21,7 @@ BitmapPool::~BitmapPool() Bitmap *BitmapPool::get(bool clear) { mMutex.lock(); - BitmapPool::PoolItem *p=0; + BitmapPool::PoolItem *p=nullptr; for (TQPtrListIterator i(mBitmaps); i.current(); ++i) { if (!(*i)->used) diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index b71cf03..582a789 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -30,7 +30,7 @@ public: else list=nex->rendererList(); - Renderer *afterRenderer=0; + Renderer *afterRenderer=nullptr; if (after) afterRenderer=after->mRenderer; diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index f099b84..f0e2548 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -16,7 +16,7 @@ #include "renderers.h" Mutex runLock; -Nex *Nex::sNex=0; +Nex *Nex::sNex=nullptr; TQTime timer; Renderer::Renderer() {} @@ -383,7 +383,7 @@ void RendererList::load(const TQDomElement &e) if (!n.isElement()) continue; TQDomElement child=n.toElement(); - Renderer *r=0; + Renderer *r=nullptr; if (e.tagName()=="List") r=new RendererList; @@ -450,8 +450,8 @@ void RendererListConfigurator::convolve(bool state) Nex::Nex() { sNex=this; - mBitmapPool=0; - mRendererList=0; + mBitmapPool=nullptr; + mRendererList=nullptr; setupSize(width, height); diff --git a/noatun-plugins/nexscope/output.cpp b/noatun-plugins/nexscope/output.cpp index 84885e2..9a9276c 100644 --- a/noatun-plugins/nexscope/output.cpp +++ b/noatun-plugins/nexscope/output.cpp @@ -1,7 +1,7 @@ #include "nex.h" #include -SDL_Surface *OutputSDL::surface=0; +SDL_Surface *OutputSDL::surface=nullptr; OutputSDL::OutputSDL() { diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index 3a9d05a..bdbf1fd 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -33,7 +33,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) { mOblique = oblique; mIgnore = true; - mRegexpEditor=0; + mRegexpEditor=nullptr; { TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7); @@ -176,13 +176,13 @@ class QueryGroupItem : public TDEListViewItem QueryGroup *mItem; public: - QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=0) + QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=nullptr) : TDEListViewItem(parent, after) { init(group); } - QueryGroupItem(TDEListView *parent, QueryGroup *group, QueryGroupItem *after=0) + QueryGroupItem(TDEListView *parent, QueryGroup *group, QueryGroupItem *after=nullptr) : TDEListViewItem(parent, after) { init(group); diff --git a/noatun-plugins/oblique/file.cpp b/noatun-plugins/oblique/file.cpp index e51a5b0..50b2e61 100644 --- a/noatun-plugins/oblique/file.cpp +++ b/noatun-plugins/oblique/file.cpp @@ -26,7 +26,7 @@ File::File(const File &ref) File::File() { - mBase=0; + mBase=nullptr; mId = 0; } diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp index 8dfd965..15ccc29 100644 --- a/noatun-plugins/oblique/menu.cpp +++ b/noatun-plugins/oblique/menu.cpp @@ -72,7 +72,7 @@ void FileMenu::properties() void FileMenu::toggleInSlice(Slice *slice) { - void (File::*task)(Slice*)=0; + void (File::*task)(Slice*)=nullptr; for (TQValueList::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) { if (!task) @@ -156,7 +156,7 @@ SchemaListAction::SchemaListAction( TQObject *parent, const char *name ) : TDEActionMenu(text, parent, name) { - mTree = 0; + mTree = nullptr; if (reciever) connect(this, TQ_SIGNAL(activated(const TQString&)), reciever, slot); connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(prepare())); diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h index 0884853..175c5b2 100644 --- a/noatun-plugins/oblique/menu.h +++ b/noatun-plugins/oblique/menu.h @@ -45,7 +45,7 @@ public: SliceListAction( const TQString &text, Oblique *oblique, TQObject *reciever, const char *slot, - const TQValueList &files = TQValueList(), TQObject *parent=0, const char *name=0 + const TQValueList &files = TQValueList(), TQObject *parent=nullptr, const char *name=nullptr ); signals: diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp index 44685a3..cd160d9 100644 --- a/noatun-plugins/oblique/oblique.cpp +++ b/noatun-plugins/oblique/oblique.cpp @@ -29,8 +29,8 @@ extern "C" Oblique::Oblique() : Playlist(0, 0), mSchemaCollection("oblique/schemas") { - mView = 0; - mAdder = 0; + mView = nullptr; + mAdder = nullptr; TDEConfigGroup g(TDEGlobal::config(), "oblique"); @@ -80,7 +80,7 @@ void Oblique::loopTypeChange(int i) void Oblique::adderDone() { delete mAdder; - mAdder = 0; + mAdder = nullptr; } @@ -236,7 +236,7 @@ void Loader::loadItemsDeferred() DirectoryAdder::DirectoryAdder(const KURL &dir, Oblique *oblique) { - listJob=0; + listJob=nullptr; mOblique = oblique; add(dir); @@ -285,7 +285,7 @@ void DirectoryAdder::addNextPending() void DirectoryAdder::slotResult(TDEIO::Job *job) { - listJob= 0; + listJob= nullptr; if (job && job->error()) job->showErrorDialog(); addNextPending(); diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp index ed83c27..bfafeed 100644 --- a/noatun-plugins/oblique/query.cpp +++ b/noatun-plugins/oblique/query.cpp @@ -13,8 +13,8 @@ QueryGroup::QueryGroup() { - mFirstChild=0; - mNextSibling=0; + mFirstChild=nullptr; + mNextSibling=nullptr; mFuzzyness = Case | Spaces | Articles; mOptions = AutoHide; @@ -22,8 +22,8 @@ QueryGroup::QueryGroup() QueryGroup::QueryGroup(const QueryGroup ©) { - mFirstChild=0; - mNextSibling=0; + mFirstChild=nullptr; + mNextSibling=nullptr; operator=(copy); @@ -84,7 +84,7 @@ QueryGroup *QueryGroup::previous(Query *query) QueryGroup *QueryGroup::previous(QueryGroup *startWith) { QueryGroup *current = startWith; - QueryGroup *after = 0; + QueryGroup *after = nullptr; while (current) { @@ -264,7 +264,7 @@ TQString QueryGroup::presentation(const File &file) const Query::Query() { - mGroupFirst=0; + mGroupFirst=nullptr; } Query::~Query() @@ -274,7 +274,7 @@ Query::~Query() Query::Query(const Query ©) { - mGroupFirst = 0; + mGroupFirst = nullptr; operator=(copy); } @@ -282,7 +282,7 @@ Query &Query::operator =(const Query ©) { if (© == this) return *this; delete mGroupFirst; - mGroupFirst=0; + mGroupFirst=nullptr; if (const QueryGroup *parent = copy.firstChild()) { mGroupFirst = new QueryGroup(*parent); @@ -315,7 +315,7 @@ void Query::insertFirst(QueryGroup *g) void Query::clear() { delete mGroupFirst; - mGroupFirst=0; + mGroupFirst=nullptr; } TQString Query::load(const TQString &filename) @@ -548,7 +548,7 @@ void Query::saveGroup(TQDomElement &parent, QueryGroup *group) void Query::deepCopy(const QueryGroup *from, QueryGroup *toParent) { if (!from) return; - QueryGroup *last=0; + QueryGroup *last=nullptr; while (from) { diff --git a/noatun-plugins/oblique/query.h b/noatun-plugins/oblique/query.h index e8a8d23..54e1169 100644 --- a/noatun-plugins/oblique/query.h +++ b/noatun-plugins/oblique/query.h @@ -160,7 +160,7 @@ public: TQString dbname(Base *base); private: - void loadGroup(TQDomElement element, QueryGroup *parent=0); + void loadGroup(TQDomElement element, QueryGroup *parent=nullptr); void saveGroup(TQDomElement &parent, QueryGroup *group); void deepCopy(const QueryGroup *from, QueryGroup *toParent); diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp index b4af114..9402628 100644 --- a/noatun-plugins/oblique/selector.cpp +++ b/noatun-plugins/oblique/selector.cpp @@ -146,7 +146,7 @@ void SequentialSelector::setCurrent(TreeItem *current) RandomSelector::RandomSelector(Tree *tree) { mTree = tree; - mPrevious = 0; + mPrevious = nullptr; } static TreeItem *randomItem(int &at, TreeItem *item) diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index af8feec..955fd97 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -434,10 +434,10 @@ TreeItem *TreeItem::next() Tree::Tree(Oblique *oblique, TQWidget *parent) : TDEListView(parent), mOblique(oblique), mAutoExpanding(0) { - mCurrent = 0; - lastMenu =0; + mCurrent = nullptr; + lastMenu =nullptr; mPlayableItemCount = 0; - mLoader = 0; + mLoader = nullptr; addColumn(""); setCaption(i18n("Oblique")); @@ -689,7 +689,7 @@ TQDragObject *Tree::dragObject() void Tree::destroyLoader() { delete mLoader; - mLoader = 0; + mLoader = nullptr; } void Tree::setLimit(const TQString &text) @@ -726,12 +726,12 @@ TreeItem *Tree::collate(TreeItem *fix, QueryGroup *group, const File &file, Tree { if (group->matches(file)) { - TreeItem *nodefix=0; + TreeItem *nodefix=nullptr; if (fix && fix->group() == group) nodefix = fix; TreeItem *item = node(nodefix, group, file, childOf); - TreeItem *ti=0; + TreeItem *ti=nullptr; if (group->firstChild()) { ti = collate(fix, group->firstChild(), file, item); diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index 9d2ba29..efc1438 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -23,8 +23,8 @@ class TreeItem : public TDEListViewItem bool mHidden:1; public: - TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p=0); - TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p=0); + TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p=nullptr); + TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p=nullptr); ~TreeItem(); QueryGroup *group() { return mGroup; } @@ -104,7 +104,7 @@ TQ_OBJECT Loader *mLoader; public: - Tree(Oblique *oblique, TQWidget *parent=0); + Tree(Oblique *oblique, TQWidget *parent=nullptr); ~Tree(); TreeItem *firstChild(); TreeItem *find(File item); @@ -166,14 +166,14 @@ private: * check if it fits into the group, and create * the tree nodes for it **/ - TreeItem *collate(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf=0); - TreeItem *collate(const File &file, TreeItem *childOf=0) + TreeItem *collate(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf=nullptr); + TreeItem *collate(const File &file, TreeItem *childOf=nullptr) { if (!mQuery.firstChild()) return 0; return collate(0, mQuery.firstChild(), file, childOf); } - TreeItem *collate(TreeItem *fix, const File &file, TreeItem *childOf=0) + TreeItem *collate(TreeItem *fix, const File &file, TreeItem *childOf=nullptr) { if (!mQuery.firstChild()) return 0; return collate(fix, mQuery.firstChild(), file, childOf); diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 53be59e..2314070 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -30,10 +30,10 @@ public: View::View(Oblique *oblique) - : TDEMainWindow(0, 0) + : TDEMainWindow(0, nullptr) { mOblique = oblique; - mTree = 0; + mTree = nullptr; mTabs = new TabWidget(this); mTabs->tabBar()->hide(); diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp index 0c69c4a..9a7c076 100644 --- a/noatun-plugins/synaescope/ui.cpp +++ b/noatun-plugins/synaescope/ui.cpp @@ -565,7 +565,7 @@ bool Interface::go() // stateButton->icon = core->state; - for (UIObject *i=uiObjects.first(); i!=0; i = uiObjects.next()) + for (UIObject *i=uiObjects.first(); i; i = uiObjects.next()) { if ((i->visibleMask & visibleMask) && (i->activeMask & activeMask)) newVisibleMask |= i->go(mouseButtons,mouseClick, @@ -594,7 +594,7 @@ bool Interface::go() } if (keyHit) - for(UIObject *i=uiObjects.first(); i!=0; i = uiObjects.next()) + for(UIObject *i=uiObjects.first(); i; i = uiObjects.next()) if (i->activeMask & activeMask) i->handleKey(keyHit,action); diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp index 7213e1f..57a5630 100644 --- a/noatun-plugins/tippercanoe/ui.cpp +++ b/noatun-plugins/tippercanoe/ui.cpp @@ -462,7 +462,7 @@ bool Interface::go() // stateButton->icon = core->state; - for (UIObject *i=uiObjects.first(); i!=0; i = uiObjects.next()) + for (UIObject *i=uiObjects.first(); i; i = uiObjects.next()) { if ((i->visibleMask & visibleMask) && (i->activeMask & activeMask)) newVisibleMask |= i->go(mouseButtons,mouseClick, @@ -491,7 +491,7 @@ bool Interface::go() } if (keyHit) - for(UIObject *i=uiObjects.first(); i!=0; i = uiObjects.next()) + for(UIObject *i=uiObjects.first(); i; i = uiObjects.next()) if (i->activeMask & activeMask) i->handleKey(keyHit,action); diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp index 875ea34..c3c046a 100644 --- a/noatun-plugins/wavecapture/wavecapture.cpp +++ b/noatun-plugins/wavecapture/wavecapture.cpp @@ -57,7 +57,7 @@ WaveCapture::WaveCapture() : TQObject(0,0), Plugin(), _id( 0 ), _filename( "" ), _timer( new TQTimer( this ) ), - m_job( 0 ) + m_job( nullptr ) { NOATUNPLUGINC(WaveCapture); @@ -189,7 +189,7 @@ void WaveCapture::stop() void WaveCapture::copyFinished( TDEIO::Job* job ) { if( job == m_job ) - m_job = 0; + m_job = nullptr; } #include "wavecapture.moc" diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp index 2b5a911..6efe829 100644 --- a/renamedlgplugins/audio/audiopreview.cpp +++ b/renamedlgplugins/audio/audiopreview.cpp @@ -37,9 +37,9 @@ AudioPreview::AudioPreview( TQWidget *parent, const char *name, const TQString & : TQVBox( parent, name ) { m_isTempFile = false; - pic = 0; - m_player = 0L; - description = 0; + pic = nullptr; + m_player = nullptr; + description = nullptr; // fileName is created by KUrl::prettyURL() KURL url( fileName ); setSpacing( 0 ); diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp index 078dd7e..1fd683d 100644 --- a/renamedlgplugins/images/imagevisualizer.cpp +++ b/renamedlgplugins/images/imagevisualizer.cpp @@ -33,8 +33,8 @@ ImageVisualizer::ImageVisualizer( TQWidget *parent, const char *name, const TQString &fileName ) : TQVBox( parent, name ) { - pic = 0; - description = 0; + pic = nullptr; + description = nullptr; KURL url=KURL::fromPathOrURL( fileName ); setSpacing( 0 ); if( url.isValid() && url.isLocalFile() ) { diff --git a/tdefile-plugins/cert/tdefile_cert.cpp b/tdefile-plugins/cert/tdefile_cert.cpp index f8df634..afb713e 100644 --- a/tdefile-plugins/cert/tdefile_cert.cpp +++ b/tdefile-plugins/cert/tdefile_cert.cpp @@ -47,7 +47,7 @@ CertPlugin::CertPlugin(TQObject *parent, const char *name, const TQStringList &a KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-x509-ca-cert" ); // our new group - KFileMimeTypeInfo::GroupInfo* group = 0L; + KFileMimeTypeInfo::GroupInfo* group = nullptr; KFileMimeTypeInfo::ItemInfo* item; group = addGroupInfo(info, "certInfo", i18n("Certificate Information")); diff --git a/tdefile-plugins/folder/tdefile_folder.cpp b/tdefile-plugins/folder/tdefile_folder.cpp index 24a0365..1c6d4b9 100644 --- a/tdefile-plugins/folder/tdefile_folder.cpp +++ b/tdefile-plugins/folder/tdefile_folder.cpp @@ -37,7 +37,7 @@ KFolderPlugin::KFolderPlugin(TQObject *parent, const char *name, { KFileMimeTypeInfo* info = addMimeTypeInfo( "inode/directory" ); - KFileMimeTypeInfo::GroupInfo* group = 0L; + KFileMimeTypeInfo::GroupInfo* group = nullptr; group = addGroupInfo(info, "FolderInfo", i18n("Folder Information")); @@ -69,7 +69,7 @@ bool KFolderPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) int items = 0; TDEIO::filesize_t bytes = 0; - while ( (file = list.current()) != 0 ) { + while ( (file = list.current()) != nullptr ) { ++list; if (!file->fileName().startsWith(".")) { items++; diff --git a/tdefile-plugins/html/tdefile_html.cpp b/tdefile-plugins/html/tdefile_html.cpp index a06ad07..2340b9c 100644 --- a/tdefile-plugins/html/tdefile_html.cpp +++ b/tdefile-plugins/html/tdefile_html.cpp @@ -106,7 +106,7 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) TQRegExp rxName("(?:name|http-equiv)\\s*=\\s*\"([^\"]+)\"", false); TQRegExp rxContent("content\\s*=\\s*\"([^\"]+)\"", false); TQRegExp rxCharset("charset\\s*=\\s*(.*)", false); - TQTextCodec *codec = 0; + TQTextCodec *codec = nullptr; // find the meta tags last = 0; diff --git a/tdefile-plugins/lnk/lnkforward.cpp b/tdefile-plugins/lnk/lnkforward.cpp index 4cd82f6..8b1470f 100644 --- a/tdefile-plugins/lnk/lnkforward.cpp +++ b/tdefile-plugins/lnk/lnkforward.cpp @@ -43,8 +43,8 @@ static const char version[] = "1.0"; static const TDECmdLineOptions options[] = { { "map ", I18N_NOOP("Map a Windows drive to a local mountpoint, e.g. \"C=/mnt/windows\"" - "\nThis option can be given multiple times"), 0}, - { "+URL", I18N_NOOP("Windows .lnk file to open"), 0}, + "\nThis option can be given multiple times"), nullptr}, + { "+URL", I18N_NOOP("Windows .lnk file to open"), nullptr}, TDECmdLineLastOption }; diff --git a/tdefile-plugins/lnk/read_lnk.cpp b/tdefile-plugins/lnk/read_lnk.cpp index 47ed5a5..7a4fb82 100644 --- a/tdefile-plugins/lnk/read_lnk.cpp +++ b/tdefile-plugins/lnk/read_lnk.cpp @@ -60,10 +60,10 @@ struct LNKFileLocation bool readLNK(const KURL &url, LNKInfo &info) { - const char* lnkFile = 0; + const char* lnkFile = nullptr; TQString tempFile; - if ( TDEIO::NetAccess::download(url, tempFile, 0) ) + if ( TDEIO::NetAccess::download(url, tempFile, nullptr) ) lnkFile = tempFile.latin1(); else return false; @@ -187,7 +187,7 @@ bool readLNK(const KURL &url, LNKInfo &info) } delete [] data; - data = 0; + data = nullptr; if ( header.flags & 0x4 ) // has description string { diff --git a/tdefile-plugins/lnk/tdefile_lnk.cpp b/tdefile-plugins/lnk/tdefile_lnk.cpp index b706366..c0565c7 100644 --- a/tdefile-plugins/lnk/tdefile_lnk.cpp +++ b/tdefile-plugins/lnk/tdefile_lnk.cpp @@ -42,7 +42,7 @@ lnkPlugin::lnkPlugin(TQObject *parent, const char *name, KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-win-lnk" ); // our new group - KFileMimeTypeInfo::GroupInfo* group = 0; + KFileMimeTypeInfo::GroupInfo* group = nullptr; group = addGroupInfo(info, "lnkInfo", i18n("Windows Link File Information")); KFileMimeTypeInfo::ItemInfo* item; diff --git a/tdefile-plugins/mhtml/tdefile_mhtml.cpp b/tdefile-plugins/mhtml/tdefile_mhtml.cpp index 69d3b55..d97e00e 100644 --- a/tdefile-plugins/mhtml/tdefile_mhtml.cpp +++ b/tdefile-plugins/mhtml/tdefile_mhtml.cpp @@ -39,7 +39,7 @@ mhtmlPlugin::mhtmlPlugin(TQObject *parent, const char *name, : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-mimearchive" ); - KFileMimeTypeInfo::GroupInfo* group = 0L; + KFileMimeTypeInfo::GroupInfo* group = nullptr; group = addGroupInfo(info, "mhtmlInfo", i18n("Document Information")); KFileMimeTypeInfo::ItemInfo* item; item = addItemInfo(group, "Subject", i18n("Subject"), TQVariant::String); -- cgit v1.2.3