From 76764117f78002846232027868ed44f70043ba8f Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 8 Nov 2026 08:04:34 -0300 Subject: Replace zero pointer constants in feeds and mobile components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- akregator/src/aboutdata.cpp | 2 +- akregator/src/actionmanager.cpp | 4 +- akregator/src/actionmanager.h | 4 +- akregator/src/actionmanagerimpl.cpp | 30 ++++++------- akregator/src/actionmanagerimpl.h | 4 +- akregator/src/addfeeddialog.cpp | 2 +- akregator/src/addfeeddialog.h | 4 +- akregator/src/akregator_options.h | 8 ++-- akregator/src/akregator_part.cpp | 22 ++++----- akregator/src/akregator_run.cpp | 4 +- akregator/src/akregator_view.cpp | 52 +++++++++++----------- akregator/src/akregator_view.h | 2 +- akregator/src/article.cpp | 10 ++--- akregator/src/articlefilter.cpp | 16 +++---- akregator/src/articleinterceptor.cpp | 4 +- akregator/src/articlelistview.cpp | 38 ++++++++-------- akregator/src/articlelistview.h | 2 +- akregator/src/articleviewer.cpp | 8 ++-- akregator/src/dragobjects.cpp | 2 +- akregator/src/dragobjects.h | 2 +- akregator/src/feed.cpp | 12 ++--- akregator/src/feediconmanager.cpp | 6 +-- akregator/src/feediconmanager.h | 2 +- akregator/src/feedlist.cpp | 6 +-- akregator/src/feedlist.h | 4 +- akregator/src/feedlistview.cpp | 32 ++++++------- akregator/src/feedlistview.h | 4 +- akregator/src/feedstoragedummyimpl.cpp | 2 +- akregator/src/fetchqueue.cpp | 2 +- akregator/src/fetchqueue.h | 2 +- akregator/src/folder.cpp | 12 ++--- akregator/src/frame.cpp | 6 +-- akregator/src/kernel.cpp | 6 +-- akregator/src/librss/article.cpp | 2 +- akregator/src/librss/article.h | 2 +- akregator/src/librss/category.cpp | 6 +-- akregator/src/librss/document.cpp | 2 +- akregator/src/librss/enclosure.cpp | 4 +- akregator/src/librss/image.cpp | 4 +- akregator/src/librss/loader.cpp | 6 +-- akregator/src/librss/testlibrss.cpp | 2 +- akregator/src/librss/textinput.cpp | 2 +- akregator/src/listtabwidget.cpp | 4 +- akregator/src/listtabwidget.h | 2 +- akregator/src/mainwindow.cpp | 10 ++--- akregator/src/mk4storage/feedstoragemk4impl.cpp | 4 +- akregator/src/mk4storage/storagemk4impl.cpp | 6 +-- akregator/src/nodelist.cpp | 6 +-- akregator/src/nodelist.h | 2 +- akregator/src/notificationmanager.cpp | 2 +- akregator/src/notificationmanager.h | 2 +- akregator/src/pageviewer.cpp | 4 +- akregator/src/pluginmanager.cpp | 12 ++--- akregator/src/progressmanager.cpp | 24 +++++----- akregator/src/propertiesdialog.h | 4 +- akregator/src/searchbar.cpp | 2 +- akregator/src/searchbar.h | 2 +- akregator/src/settings_advanced.h | 2 +- akregator/src/simplenodeselector.cpp | 14 +++--- akregator/src/simplenodeselector.h | 4 +- akregator/src/speechclient.cpp | 4 +- akregator/src/storage.cpp | 2 +- akregator/src/storagedummyimpl.cpp | 4 +- akregator/src/storagefactoryregistry.cpp | 4 +- akregator/src/tabwidget.cpp | 12 ++--- akregator/src/tabwidget.h | 2 +- akregator/src/tag.cpp | 4 +- akregator/src/tagaction.cpp | 4 +- akregator/src/tagaction.h | 2 +- akregator/src/tagfolder.cpp | 2 +- akregator/src/tagnode.cpp | 4 +- akregator/src/tagnodelist.cpp | 10 ++--- akregator/src/tagpropertiesdialog.cpp | 2 +- akregator/src/tagpropertiesdialog.h | 2 +- akregator/src/tagset.cpp | 2 +- akregator/src/tagset.h | 2 +- akregator/src/trayicon.cpp | 2 +- akregator/src/trayicon.h | 2 +- akregator/src/treenode.cpp | 14 +++--- akregator/src/viewer.cpp | 2 +- kandy/src/atcommand.cpp | 2 +- kandy/src/cmdpropertiesdialog.h | 2 +- kandy/src/commandscheduler.h | 2 +- kandy/src/kandy.cpp | 8 ++-- kandy/src/kandyprefsdialog.cpp | 6 +-- kandy/src/kandyprefsdialog.h | 2 +- kandy/src/kandyview.cpp | 2 +- kandy/src/main.cpp | 14 +++--- kandy/src/mobilegui.cpp | 8 ++-- kandy/src/mobilegui.h | 4 +- kandy/src/mobilemain.cpp | 2 +- kandy/src/modem.cpp | 8 ++-- kandy/src/modem.h | 2 +- kmobile/devices/skeleton/skeleton.h | 4 +- kmobile/kmobile.cpp | 4 +- kmobile/kmobiledevice.cpp | 2 +- kmobile/kmobiledevice.h | 4 +- kmobile/kmobileitem.cpp | 8 ++-- kmobile/kmobileview.cpp | 2 +- kmobile/main.cpp | 6 +-- kmobile/pref.h | 4 +- kmobile/systemtray.h | 2 +- kontact/interfaces/core.cpp | 2 +- kontact/interfaces/core.h | 2 +- kontact/interfaces/plugin.cpp | 8 ++-- kontact/interfaces/plugin.h | 2 +- kontact/interfaces/summary.h | 2 +- kontact/interfaces/uniqueapphandler.cpp | 10 ++--- kontact/plugins/akregator/akregator_plugin.cpp | 2 +- .../plugins/kaddressbook/kaddressbook_plugin.cpp | 4 +- kontact/plugins/karm/karm_plugin.cpp | 2 +- kontact/plugins/kmail/kcmkmailsummary.cpp | 4 +- kontact/plugins/kmail/kcmkmailsummary.h | 2 +- kontact/plugins/kmail/kmail_plugin.cpp | 4 +- kontact/plugins/kmail/summarywidget.cpp | 2 +- kontact/plugins/kmail/summarywidget.h | 2 +- kontact/plugins/knode/knode_plugin.cpp | 4 +- kontact/plugins/knotes/knotes_part.cpp | 10 ++--- kontact/plugins/knotes/knotes_part.h | 2 +- kontact/plugins/knotes/knotes_part_p.h | 2 +- kontact/plugins/knotes/knotes_plugin.cpp | 2 +- kontact/plugins/knotes/knotetip.cpp | 6 +-- kontact/plugins/knotes/summarywidget.cpp | 2 +- kontact/plugins/knotes/summarywidget.h | 2 +- kontact/plugins/korganizer/journalplugin.cpp | 4 +- kontact/plugins/korganizer/kcmkorgsummary.cpp | 4 +- kontact/plugins/korganizer/kcmkorgsummary.h | 2 +- kontact/plugins/korganizer/korganizerplugin.cpp | 4 +- kontact/plugins/korganizer/summarywidget.cpp | 4 +- kontact/plugins/korganizer/summarywidget.h | 2 +- kontact/plugins/korganizer/todoplugin.cpp | 4 +- kontact/plugins/korganizer/todosummarywidget.cpp | 6 +-- kontact/plugins/korganizer/todosummarywidget.h | 2 +- kontact/plugins/newsticker/kcmkontactknt.cpp | 10 ++--- kontact/plugins/newsticker/kcmkontactknt.h | 2 +- kontact/plugins/newsticker/newsticker_plugin.h | 2 +- kontact/plugins/newsticker/summarywidget.cpp | 2 +- kontact/plugins/newsticker/summarywidget.h | 2 +- kontact/plugins/specialdates/kcmsdsummary.cpp | 6 +-- kontact/plugins/specialdates/kcmsdsummary.h | 2 +- kontact/plugins/specialdates/sdsummarywidget.cpp | 4 +- kontact/plugins/specialdates/sdsummarywidget.h | 2 +- .../plugins/specialdates/specialdates_plugin.cpp | 2 +- kontact/plugins/specialdates/specialdates_plugin.h | 2 +- kontact/plugins/summary/dropwidget.h | 2 +- kontact/plugins/summary/kcmkontactsummary.cpp | 4 +- kontact/plugins/summary/kcmkontactsummary.h | 4 +- kontact/plugins/summary/summaryview_part.cpp | 2 +- kontact/plugins/summary/summaryview_part.h | 2 +- kontact/plugins/summary/summaryview_plugin.cpp | 6 +-- kontact/plugins/weather/summarywidget.cpp | 6 +-- kontact/plugins/weather/summarywidget.h | 2 +- kontact/plugins/weather/weather_plugin.cpp | 2 +- kontact/plugins/weather/weather_plugin.h | 2 +- kontact/src/aboutdialog.h | 2 +- kontact/src/iconsidepane.cpp | 16 +++---- kontact/src/iconsidepane.h | 4 +- kontact/src/kcmkontact.cpp | 6 +-- kontact/src/kcmkontact.h | 2 +- kontact/src/main.cpp | 20 ++++----- kontact/src/mainwindow.cpp | 38 ++++++++-------- kontact/src/mainwindow.h | 2 +- kontact/src/profiledialog.cpp | 4 +- kontact/src/profiledialog.h | 2 +- kontact/src/profilemanager.cpp | 4 +- kontact/src/profilemanager.h | 2 +- kontact/src/sidepanebase.h | 2 +- korn/account_input.h | 2 +- korn/accountmanager.cpp | 2 +- korn/accountmanager.h | 2 +- korn/boxcontainer.h | 2 +- korn/boxcontaineritem.cpp | 36 +++++++-------- korn/boxcontaineritem.h | 2 +- korn/dcop_proto.h | 2 +- korn/dcopdrop.cpp | 2 +- korn/dockedcontainer.cpp | 2 +- korn/dockedcontainer.h | 2 +- korn/dockeditem.h | 2 +- korn/hvcontainer.cpp | 6 +-- korn/hvcontainer.h | 2 +- korn/hvitem.cpp | 2 +- korn/hvitem.h | 2 +- korn/keditlistboxman.cpp | 18 ++++---- korn/keditlistboxman.h | 8 ++-- korn/kmail_proto.cpp | 4 +- korn/kornaccountcfgimpl.cpp | 8 ++-- korn/kornaccountcfgimpl.h | 2 +- korn/kornapp.h | 2 +- korn/kornboxcfgimpl.cpp | 6 +-- korn/korncfgimpl.cpp | 4 +- korn/korncfgimpl.h | 2 +- korn/kornshell.cpp | 10 ++--- korn/kornshell.h | 2 +- korn/label.h | 2 +- korn/maildlg.cpp | 4 +- korn/maildlg.h | 2 +- korn/mailsubject.cpp | 16 +++---- korn/main.cpp | 16 +++---- korn/password.cpp | 4 +- korn/protocol.h | 2 +- korn/protocols.cpp | 2 +- korn/subjectsdlg.cpp | 12 ++--- korn/subjectsdlg.h | 2 +- korn/systemtray.h | 2 +- korn/tdeio.cpp | 46 +++++++++---------- korn/tdeio_count.cpp | 34 +++++++------- korn/tdeio_count.h | 2 +- korn/tdeio_delete.cpp | 10 ++--- korn/tdeio_delete.h | 2 +- korn/tdeio_read.cpp | 8 ++-- korn/tdeio_read.h | 2 +- korn/tdeio_single_subject.cpp | 4 +- korn/tdeio_subjects.cpp | 14 +++--- 213 files changed, 617 insertions(+), 617 deletions(-) diff --git a/akregator/src/aboutdata.cpp b/akregator/src/aboutdata.cpp index 77bab8e8a..d0267f464 100644 --- a/akregator/src/aboutdata.cpp +++ b/akregator/src/aboutdata.cpp @@ -30,7 +30,7 @@ namespace Akregator { AboutData::AboutData() : TDEAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A TDE Feed Aggregator"), - License_GPL, I18N_NOOP("(C) 2004, 2005 Akregator developers"), 0) + License_GPL, I18N_NOOP("(C) 2004, 2005 Akregator developers"), nullptr) { addAuthor( "Frank Osterfeld", I18N_NOOP("Maintainer"), "frank.osterfeld@kdemail.net" ); addAuthor( "Teemu Rytilahti", I18N_NOOP("Developer"), "tpr@d5k.net" ); diff --git a/akregator/src/actionmanager.cpp b/akregator/src/actionmanager.cpp index 2dcdeb59f..4a223d55e 100644 --- a/akregator/src/actionmanager.cpp +++ b/akregator/src/actionmanager.cpp @@ -30,7 +30,7 @@ namespace Akregator class ActionManager::ActionManagerPrivate {}; -ActionManager* ActionManager::m_self = 0; +ActionManager* ActionManager::m_self = nullptr; ActionManager* ActionManager::getInstance() { @@ -49,7 +49,7 @@ ActionManager::ActionManager(TQObject* parent, const char* name) : TQObject(pare ActionManager::~ActionManager() { delete d; - d = 0; + d = nullptr; } } // namespace Akregator diff --git a/akregator/src/actionmanager.h b/akregator/src/actionmanager.h index 70e347d37..ecb28c2c1 100644 --- a/akregator/src/actionmanager.h +++ b/akregator/src/actionmanager.h @@ -43,10 +43,10 @@ class ActionManager : public TQObject static ActionManager* getInstance(); static void setInstance(ActionManager* manager); - ActionManager(TQObject* parent=0, const char* name=0); + ActionManager(TQObject* parent=nullptr, const char* name=nullptr); virtual ~ActionManager(); - virtual TDEAction* action(const char* name, const char* classname=0) = 0; + virtual TDEAction* action(const char* name, const char* classname=nullptr) = 0; virtual TQWidget* container(const char* name) = 0; private: diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 6c7b3cee9..5be571f8c 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -159,7 +159,7 @@ void ActionManagerImpl::setTagSet(TagSet* tagSet) if (tagSet == d->tagSet) return; - if (d->tagSet != 0) + if (d->tagSet) { disconnect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); disconnect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); @@ -167,7 +167,7 @@ void ActionManagerImpl::setTagSet(TagSet* tagSet) d->tagSet = tagSet; - if (tagSet != 0) + if (tagSet) { connect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); connect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); @@ -185,7 +185,7 @@ void ActionManagerImpl::setTagSet(TagSet* tagSet) //TODO: remove actions from menus, delete actions, clear maps - if (tagSet != 0L) + if (tagSet) { TQValueList list = tagSet->toMap().values(); for (TQValueList::ConstIterator it = list.begin(); it != list.end(); ++it) @@ -219,7 +219,7 @@ void ActionManagerImpl::slotTagRemoved(const Tag& tag) void ActionManagerImpl::slotNodeSelected(TreeNode* node) { - if (node != 0) + if (node) d->nodeSelectVisitor->visit(node); } @@ -227,15 +227,15 @@ ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* parent, const char* n { d->nodeSelectVisitor = new NodeSelectVisitor(this); d->part = part; - d->tagSet = 0; - d->listTabWidget = 0; - d->articleList = 0; - d->trayIcon = 0; - d->articleViewer = 0; - d->view = 0; - d->tabWidget = 0; - d->tagMenu = 0; - d->speakSelectedArticlesAction = 0; + d->tagSet = nullptr; + d->listTabWidget = nullptr; + d->articleList = nullptr; + d->trayIcon = nullptr; + d->articleViewer = nullptr; + d->view = nullptr; + d->tabWidget = nullptr; + d->tagMenu = nullptr; + d->speakSelectedArticlesAction = nullptr; d->actionCollection = part->actionCollection(); initPart(); } @@ -244,7 +244,7 @@ ActionManagerImpl::~ActionManagerImpl() { delete d->nodeSelectVisitor; delete d; - d = 0; + d = nullptr; } void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon) @@ -436,7 +436,7 @@ TDEActionCollection* ActionManagerImpl::actionCollection() } TDEAction* ActionManagerImpl::action(const char* name, const char* classname) { - return d->actionCollection != 0 ? d->actionCollection->action(name, classname) : 0; + return d->actionCollection ? d->actionCollection->action(name, classname) : nullptr; } } // namespace Akregator diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h index 6b1929869..eb9e8dc7c 100644 --- a/akregator/src/actionmanagerimpl.h +++ b/akregator/src/actionmanagerimpl.h @@ -53,10 +53,10 @@ class ActionManagerImpl : public ActionManager public: - ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0); + ActionManagerImpl(Part* part, TQObject* parent=nullptr, const char* name=nullptr); virtual ~ActionManagerImpl(); - virtual TDEAction* action(const char* name, const char* classname=0); + virtual TDEAction* action(const char* name, const char* classname=nullptr); virtual TQWidget* container(const char* name); void initView(View* view); diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 1e09dc716..953c2ef1d 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -42,7 +42,7 @@ namespace Akregator { AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name) : AddFeedWidgetBase(parent, name) { - pixmapLabel1->setPixmap(tdeApp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true)); + pixmapLabel1->setPixmap(tdeApp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, nullptr, true)); statusLabel->setText(TQString()); } diff --git a/akregator/src/addfeeddialog.h b/akregator/src/addfeeddialog.h index b81948ded..fea130a67 100644 --- a/akregator/src/addfeeddialog.h +++ b/akregator/src/addfeeddialog.h @@ -43,7 +43,7 @@ namespace Akregator TQ_OBJECT public: - AddFeedWidget(TQWidget *parent = 0, const char *name = 0); + AddFeedWidget(TQWidget *parent = nullptr, const char *name = nullptr); ~AddFeedWidget(); }; @@ -52,7 +52,7 @@ namespace Akregator TQ_OBJECT public: - AddFeedDialog(TQWidget *parent = 0, const char *name = 0); + AddFeedDialog(TQWidget *parent = nullptr, const char *name = nullptr); ~AddFeedDialog(); void setURL(const TQString& t); diff --git a/akregator/src/akregator_options.h b/akregator/src/akregator_options.h index 20f29ffc6..072ffd915 100644 --- a/akregator/src/akregator_options.h +++ b/akregator/src/akregator_options.h @@ -32,11 +32,11 @@ namespace Akregator { static TDECmdLineOptions akregator_options[] = { - { "a", 0, 0 }, - { "addfeed ", I18N_NOOP( "Add a feed with the given URL" ), 0}, - { "g", 0, 0 }, + { "a", nullptr, nullptr }, + { "addfeed ", I18N_NOOP( "Add a feed with the given URL" ), nullptr}, + { "g", nullptr, nullptr }, { "group ", I18N_NOOP( "When adding feeds, place them in this group" ), I18N_NOOP("Imported") }, - { "hide-mainwindow", I18N_NOOP( "Hide main window on startup" ), 0}, + { "hide-mainwindow", I18N_NOOP( "Hide main window on startup" ), nullptr}, TDECmdLineLastOption }; diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 14562fc84..a542f2272 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -124,10 +124,10 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, , MyBasePart(parent, name) , m_standardListLoaded(false) , m_shuttingDown(false) - , m_mergedPart(0) - , m_view(0) + , m_mergedPart(nullptr) + , m_view(nullptr) , m_backedUpList(false) - , m_storage(0) + , m_storage(nullptr) { // we need an instance setInstance( AkregatorFactory::instance() ); @@ -143,14 +143,14 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, Backend::StorageFactoryRegistry::self()->registerFactory(dummyFactory, dummyFactory->key()); loadPlugins(); // FIXME: also unload them! - m_storage = 0; + m_storage = nullptr; Backend::StorageFactory* factory = Backend::StorageFactoryRegistry::self()->getFactory(Settings::archiveBackend()); TQStringList storageParams; storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false")); - if (factory != 0) + if (factory) { if (factory->allowsMultipleWriteAccess()) { @@ -266,9 +266,9 @@ void Part::slotOnShutdown() m_view->slotOnShutdown(); //delete m_view; delete TrayIcon::getInstance(); - TrayIcon::setInstance(0L); + TrayIcon::setInstance(nullptr); delete m_storage; - m_storage = 0; + m_storage = nullptr; //delete m_actionManager; } @@ -535,7 +535,7 @@ TQWidget* Part::getMainWindow() TQWidget *wid; // check if there is an akregator main window - while ( (wid = it.current()) != 0 ) + while ((wid = it.current()) != nullptr) { ++it; //kdDebug() << "win name: " << wid->name() << endl; @@ -547,7 +547,7 @@ TQWidget* Part::getMainWindow() } // if not, check for kontact main window TQWidgetListIt it2( *l ); - while ( (wid = it2.current()) != 0 ) + while ((wid = it2.current()) != nullptr) { ++it2; if (TQString(wid->name()).startsWith("kontact-mainwindow")) @@ -557,7 +557,7 @@ TQWidget* Part::getMainWindow() } } delete l; - return 0; + return nullptr; } void Part::loadTagSet(const TQString& path) @@ -1026,7 +1026,7 @@ bool Part::tryToLock(const TQString& backendName) KCursorSaver idle( KBusyPtr::idle() ); if ( KMessageBox::No == - KMessageBox::warningYesNo( 0, msg, TQString(), + KMessageBox::warningYesNo( nullptr, msg, TQString(), i18n("Force Access"), i18n("Disable Archive")) ) { diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp index d22f2f613..fec34601b 100644 --- a/akregator/src/akregator_run.cpp +++ b/akregator/src/akregator_run.cpp @@ -31,7 +31,7 @@ namespace Akregator { BrowserRun::BrowserRun(TQWidget* mainWindow, Viewer* currentViewer, const KURL& url, const KParts::URLArgs& args, OpeningMode mode) - : KParts::BrowserRun(url, args, 0L, mainWindow, false, false, true) + : KParts::BrowserRun(url, args, nullptr, mainWindow, false, false, true) { m_currentViewer = currentViewer; m_openingMode = mode; @@ -61,7 +61,7 @@ void BrowserRun::slotViewerDeleted() { // HACK: if the mode is to open the page in the current viewer, we set it to new tab (foreground) if the part gets deleted meanwhile - m_currentViewer = 0; + m_currentViewer = nullptr; m_openingMode = NEW_TAB_FOREGROUND; } diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 35d55057d..1d466f802 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -148,7 +148,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { TQString msg = i18n("Are you sure you want to delete tag %1? The tag will be removed from all articles.").arg(node->title()); - if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(nullptr, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue) { Tag tag = node->tag(); TQValueList
articles = m_view->m_feedList->rootNode()->articles(tag.id()); @@ -170,7 +170,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor else msg = i18n("Are you sure you want to delete folder %1 and its feeds and subfolders?").arg(node->title()); - if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(nullptr, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue) { delete node; m_view->m_listTabWidget->activeView()->setFocus(); @@ -186,7 +186,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor else msg = i18n("Are you sure you want to delete feed %1?").arg(node->title()); - if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(nullptr, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue) { delete node; m_view->m_listTabWidget->activeView()->setFocus(); @@ -223,7 +223,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_tagNodeList = new TagNodeList(m_feedList, Kernel::self()->tagSet()); m_shuttingDown = false; m_displayingAboutPage = false; - m_currentFrame = 0L; + m_currentFrame = nullptr; setFocusPolicy(TQWidget::StrongFocus); TQVBoxLayout *lt = new TQVBoxLayout( this ); @@ -394,13 +394,13 @@ void View::slotOnShutdown() { m_shuttingDown = true; // prevents slotFrameChanged from crashing - m_articleList->slotShowNode(0); - m_articleViewer->slotShowNode(0); + m_articleList->slotShowNode(nullptr); + m_articleViewer->slotShowNode(nullptr); Kernel::self()->fetchQueue()->slotAbort(); - m_feedListView->setNodeList(0); - ProgressManager::self()->setFeedList(0); + m_feedListView->setNodeList(nullptr); + ProgressManager::self()->setFeedList(nullptr); delete m_feedList; delete m_tagNodeList; @@ -489,7 +489,7 @@ void View::slotCaptionChanged(const TQString &c) void View::slotStarted() { if (sender() == m_currentFrame) - emit signalStarted(0); + emit signalStarted(nullptr); } void View::slotCanceled(const TQString &s) @@ -614,7 +614,7 @@ void View::addFeedToGroup(const TQString& url, const TQString& groupName) // Locate the group. TreeNode* node = m_feedListView->findNodeByTitle(groupName); - Folder* group = 0; + Folder* group = nullptr; if (!node || !node->isGroup()) { Folder* g = new Folder( groupName ); @@ -626,7 +626,7 @@ void View::addFeedToGroup(const TQString& url, const TQString& groupName) // Invoke the Add Feed dialog with url filled in. if (group) - addFeed(url, 0, group, true); + addFeed(url, nullptr, group, true); } void View::slotNormalView() @@ -711,7 +711,7 @@ void View::slotFrameChanged(Frame *f) switch (f->state()) { case Frame::Started: - emit signalStarted(0); + emit signalStarted(nullptr); break; case Frame::Canceled: emit signalCanceled(TQString()); @@ -856,7 +856,7 @@ void View::slotUrlClickedInViewer(const KURL& url, Viewer* viewer, bool newTab, } else { - slotOpenURL(url, 0L, background ? BrowserRun::NEW_TAB_BACKGROUND : BrowserRun::NEW_TAB_FOREGROUND); + slotOpenURL(url, nullptr, background ? BrowserRun::NEW_TAB_BACKGROUND : BrowserRun::NEW_TAB_FOREGROUND); } } @@ -880,7 +880,7 @@ void View::slotOpenURLReply(const KURL& url, Viewer* currentViewer, BrowserRun:: void View::slotFeedAdd() { - Folder* group = 0; + Folder* group = nullptr; if (!m_feedListView->selectedNode()) group = m_feedList->rootNode(); // all feeds else @@ -901,7 +901,7 @@ void View::slotFeedAdd() void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec) { - AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" ); + AddFeedDialog *afd = new AddFeedDialog( nullptr, "add_feed" ); afd->setURL(KURL::decode_string(url)); @@ -919,7 +919,7 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool au Feed* feed = afd->feed; delete afd; - FeedPropertiesDialog *dlg = new FeedPropertiesDialog( 0, "edit_feed" ); + FeedPropertiesDialog *dlg = new FeedPropertiesDialog( nullptr, "edit_feed" ); dlg->setFeed(feed); dlg->selectFeedName(); @@ -946,7 +946,7 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool au void View::slotFeedAddGroup() { TreeNode* node = m_feedListView->selectedNode(); - TreeNode* after = 0; + TreeNode* after = nullptr; if (!node) node = m_feedListView->rootNode(); @@ -1043,13 +1043,13 @@ void View::slotOpenHomepage() switch (Settings::lMBBehaviour()) { case Settings::EnumLMBBehaviour::OpenInExternalBrowser: - slotOpenURL(url, 0, BrowserRun::EXTERNAL); + slotOpenURL(url, nullptr, BrowserRun::EXTERNAL); break; case Settings::EnumLMBBehaviour::OpenInBackground: - slotOpenURL(url, 0, BrowserRun::NEW_TAB_BACKGROUND); + slotOpenURL(url, nullptr, BrowserRun::NEW_TAB_BACKGROUND); break; default: - slotOpenURL(url, 0, BrowserRun::NEW_TAB_FOREGROUND); + slotOpenURL(url, nullptr, BrowserRun::NEW_TAB_FOREGROUND); } } @@ -1115,13 +1115,13 @@ void View::slotMouseButtonPressed(int button, const Article& article, const TQPo switch (Settings::mMBBehaviour()) { case Settings::EnumMMBBehaviour::OpenInExternalBrowser: - slotOpenURL(link, 0L, BrowserRun::EXTERNAL); + slotOpenURL(link, nullptr, BrowserRun::EXTERNAL); break; case Settings::EnumMMBBehaviour::OpenInBackground: - slotOpenURL(link, 0L, BrowserRun::NEW_TAB_BACKGROUND); + slotOpenURL(link, nullptr, BrowserRun::NEW_TAB_BACKGROUND); break; default: - slotOpenURL(link, 0L, BrowserRun::NEW_TAB_FOREGROUND); + slotOpenURL(link, nullptr, BrowserRun::NEW_TAB_FOREGROUND); } } } @@ -1231,7 +1231,7 @@ void View::slotOpenCurrentArticle() if (link.isValid()) { - slotOpenURL(link, 0L, BrowserRun::NEW_TAB_FOREGROUND); + slotOpenURL(link, nullptr, BrowserRun::NEW_TAB_FOREGROUND); } } @@ -1256,7 +1256,7 @@ void View::slotOpenCurrentArticleBackgroundTab() if (link.isValid()) { - slotOpenURL(link, 0L, BrowserRun::NEW_TAB_BACKGROUND); + slotOpenURL(link, nullptr, BrowserRun::NEW_TAB_BACKGROUND); } } @@ -1329,7 +1329,7 @@ void View::slotArticleDelete() articles.count()); } - if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Article"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(nullptr, msg, i18n("Delete Article"), KStdGuiItem::del()) == KMessageBox::Continue) { if (m_listTabWidget->activeView()->selectedNode()) m_listTabWidget->activeView()->selectedNode()->setNotificationMode(false); diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index 629f90578..357069731 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -108,7 +108,7 @@ namespace Akregator { feed list is replaced by the parsed one @param doc TQDomDocument generated from OPML @param parent The parent group the new nodes */ - bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0); + bool loadFeeds(const TQDomDocument& doc, Folder* parent = nullptr); /** @return the displayed Feed List in OPML format diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp index 0e01d3e7c..929c23e57 100644 --- a/akregator/src/article.cpp +++ b/akregator/src/article.cpp @@ -75,8 +75,8 @@ Article::Article() : d(new Private) { d->hash = 0; d->status = 0; - d->feed = 0; - d->archive = 0; + d->feed = nullptr; + d->archive = nullptr; } Article::Article(const TQString& guid, Feed* feed) : d(new Private) @@ -190,13 +190,13 @@ Article::Article(RSS::Article article, Feed* feed) : d(new Private) Article::Article(RSS::Article article, Backend::FeedStorage* archive) : d(new Private) { - d->feed = 0; + d->feed = nullptr; initialize(article, archive); } bool Article::isNull() const { - return d->archive == 0; // TODO: use proper null state + return !d->archive; // TODO: use proper null state } void Article::offsetPubDate(int secs) @@ -235,7 +235,7 @@ Article::~Article() if (d->deref()) { delete d; - d = 0; + d = nullptr; } } diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index 0f773e342..42490c58b 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -387,7 +387,7 @@ TagMatcher::TagMatcher() : d(new TagMatcherPrivate) TagMatcher::~TagMatcher() { delete d; - d = 0; + d = nullptr; } bool TagMatcher::matches(const Article& article) const @@ -401,7 +401,7 @@ TagMatcher* TagMatcher::clone() const } -TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0) +TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(nullptr) { *this = other; } @@ -507,8 +507,8 @@ class ArticleFilter::ArticleFilterPrivate : public Shared ArticleFilter::ArticleFilter() : d(new ArticleFilterPrivate) { d->id = TDEApplication::random(); - d->action = 0; - d->matcher = 0; + d->action = nullptr; + d->matcher = nullptr; } ArticleFilter::ArticleFilter(const AbstractMatcher& matcher, const AbstractAction& action) : d(new ArticleFilterPrivate) @@ -530,7 +530,7 @@ ArticleFilter::~ArticleFilter() delete d->action; delete d->matcher; delete d; - d = 0; + d = nullptr; } } @@ -651,15 +651,15 @@ bool DeleteAction::operator==(const AbstractAction& other) { AbstractAction* ptr = const_cast(&other); DeleteAction* o = dynamic_cast(ptr); - return o != 0; + return o != nullptr; } void ArticleFilter::readConfig(TDEConfig* config) { delete d->matcher; - d->matcher = 0; + d->matcher = nullptr; delete d->action; - d->action = 0; + d->action = nullptr; d->name = config->readEntry(TQString::fromLatin1("name")); d->id = config->readNumEntry(TQString::fromLatin1("id"), 0); diff --git a/akregator/src/articleinterceptor.cpp b/akregator/src/articleinterceptor.cpp index 7183ab8e2..520f26c83 100644 --- a/akregator/src/articleinterceptor.cpp +++ b/akregator/src/articleinterceptor.cpp @@ -14,7 +14,7 @@ class ArticleInterceptorManager::ArticleInterceptorManagerPrivate }; -ArticleInterceptorManager* ArticleInterceptorManager::m_self = 0; +ArticleInterceptorManager* ArticleInterceptorManager::m_self = nullptr; KStaticDeleter interceptormanagersd; ArticleInterceptorManager* ArticleInterceptorManager::self() @@ -27,7 +27,7 @@ ArticleInterceptorManager* ArticleInterceptorManager::self() ArticleInterceptorManager::~ArticleInterceptorManager() { delete d; - d = 0; + d = nullptr; } ArticleInterceptorManager::ArticleInterceptorManager() : d(new ArticleInterceptorManagerPrivate) diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index 7cbe624f3..9aae5aa14 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -218,7 +218,7 @@ ArticleListView::ArticleListView(TQWidget *parent, const char *name) { d = new ArticleListViewPrivate(this); d->noneSelected = true; - d->node = 0; + d->node = nullptr; d->columnMode = ArticleListViewPrivate::feedMode; d->columnLayoutVisitor = new ColumnLayoutVisitor(this); @@ -340,7 +340,7 @@ void ArticleListView::slotClear() if (d->node) disconnectFromNode(d->node); - d->node = 0; + d->node = nullptr; d->articleMap.clear(); clear(); } @@ -380,7 +380,7 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList< bool statusActive = !(d->statusFilter.matchesAll()); bool textActive = !(d->textFilter.matchesAll()); - TQListViewItem* next = 0; // the item to select if a selected item is deleted + TQListViewItem* next = nullptr; // the item to select if a selected item is deleted for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { @@ -420,7 +420,7 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList< // if the only selected item was deleted, select // an item next to it - if (singleSelected && next != 0) + if (singleSelected && next) { setSelected(next, true); setCurrentItem(next); @@ -441,7 +441,7 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList< // is deleted, we will select the next item in the list bool singleSelected = selectedArticles().count() == 1; - TQListViewItem* next = 0; // the item to select if a selected item is deleted + TQListViewItem* next = nullptr; // the item to select if a selected item is deleted setUpdatesEnabled(false); @@ -466,7 +466,7 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList< // if the only selected item was deleted, select // an item next to it - if (singleSelected && next != 0) + if (singleSelected && next) { setSelected(next, true); setCurrentItem(next); @@ -501,7 +501,7 @@ void ArticleListView::applyFilters() bool statusActive = !(d->statusFilter.matchesAll()); bool textActive = !(d->textFilter.matchesAll()); - ArticleItem* ali = 0; + ArticleItem* ali = nullptr; if (!statusActive && !textActive) { @@ -541,7 +541,7 @@ void ArticleListView::applyFilters() int ArticleListView::visibleArticles() { int visible = 0; - ArticleItem* ali = 0; + ArticleItem* ali = nullptr; for (TQListViewItemIterator it(this); it.current(); ++it) { ali = static_cast (it.current()); visible += ali->isVisible() ? 1 : 0; @@ -616,7 +616,7 @@ void ArticleListView::viewportPaintEvent(TQPaintEvent *e) TQDragObject *ArticleListView::dragObject() { - TQDragObject* d = 0; + TQDragObject* d = nullptr; TQValueList
articles = selectedArticles(); if (!articles.isEmpty()) { @@ -627,7 +627,7 @@ TQDragObject *ArticleListView::dragObject() void ArticleListView::slotPreviousArticle() { - ArticleItem* ali = 0; + ArticleItem* ali = nullptr; if (!currentItem() || selectedItems().isEmpty()) ali = dynamic_cast(lastChild()); else @@ -645,7 +645,7 @@ void ArticleListView::slotPreviousArticle() void ArticleListView::slotNextArticle() { - ArticleItem* ali = 0; + ArticleItem* ali = nullptr; if (!currentItem() || selectedItems().isEmpty()) ali = dynamic_cast(firstChild()); else @@ -663,18 +663,18 @@ void ArticleListView::slotNextArticle() void ArticleListView::slotNextUnreadArticle() { - ArticleItem* start = 0L; + ArticleItem* start = nullptr; if (!currentItem() || selectedItems().isEmpty()) start = dynamic_cast(firstChild()); else start = dynamic_cast(currentItem()->itemBelow() ? currentItem()->itemBelow() : firstChild()); ArticleItem* i = start; - ArticleItem* unread = 0L; + ArticleItem* unread = nullptr; do { - if (i == 0L) + if (!i) i = static_cast(firstChild()); else { @@ -698,18 +698,18 @@ void ArticleListView::slotNextUnreadArticle() void ArticleListView::slotPreviousUnreadArticle() { - ArticleItem* start = 0L; + ArticleItem* start = nullptr; if (!currentItem() || selectedItems().isEmpty()) start = dynamic_cast(lastChild()); else start = dynamic_cast(currentItem()->itemAbove() ? currentItem()->itemAbove() : firstChild()); ArticleItem* i = start; - ArticleItem* unread = 0L; + ArticleItem* unread = nullptr; do { - if (i == 0L) + if (!i) i = static_cast(lastChild()); else { @@ -719,7 +719,7 @@ void ArticleListView::slotPreviousUnreadArticle() i = static_cast(i->itemAbove() ? i->itemAbove() : lastChild()); } } - while ( !(unread != 0L || i == start) ); + while (!unread && i != start); if (unread) { @@ -794,7 +794,7 @@ ArticleListView::~ArticleListView() Settings::writeConfig(); delete d->columnLayoutVisitor; delete d; - d = 0; + d = nullptr; } TQValueList
ArticleListView::selectedArticles() const diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h index 6455aead0..34c1001d7 100644 --- a/akregator/src/articlelistview.h +++ b/akregator/src/articlelistview.h @@ -45,7 +45,7 @@ namespace Akregator TQ_OBJECT public: - ArticleListView(TQWidget *parent = 0, const char *name = 0); + ArticleListView(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~ArticleListView(); /** returns the current article, or a null article if there is none */ diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index e2259ad58..8147d7262 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -159,7 +159,7 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor }; ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) - : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView) + : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(nullptr), m_viewMode(NormalView) { setJScriptEnabled(false); setJavaEnabled(false); @@ -632,7 +632,7 @@ void ArticleViewer::slotShowArticle(const Article& article) m_viewMode = NormalView; disconnectFromNode(m_node); m_article = article; - m_node = 0; + m_node = nullptr; m_link = article.link(); if (article.feed()->loadLinkedWebsite()) openURL(article.link()); @@ -674,7 +674,7 @@ void ArticleViewer::slotUpdateCombinedView() { if ( !(*it).isDeleted() && m_textFilter.matches(*it) && m_statusFilter.matches(*it) ) { - text += "

"+formatArticleCombinedMode(0, *it)+"

"; + text += "

"+formatArticleCombinedMode(nullptr, *it)+"

"; ++num; } } @@ -710,7 +710,7 @@ void ArticleViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& void ArticleViewer::slotClear() { disconnectFromNode(m_node); - m_node = 0; + m_node = nullptr; m_article = Article(); renderContent(TQString()); diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp index 1141d4652..64ecd2860 100644 --- a/akregator/src/dragobjects.cpp +++ b/akregator/src/dragobjects.cpp @@ -65,7 +65,7 @@ const char* ArticleDrag::format(int i) const else if (i == 1) return "akregator/articles"; - return 0; + return nullptr; } TQByteArray ArticleDrag::encodedData(const char* mime) const diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h index 3b4d7f8d7..9ac264287 100644 --- a/akregator/src/dragobjects.h +++ b/akregator/src/dragobjects.h @@ -50,7 +50,7 @@ class ArticleDrag : public KURLDrag public: - ArticleDrag(const TQValueList

& articles, TQWidget* dragSource=0, const char* name=0); + ArticleDrag(const TQValueList
& articles, TQWidget* dragSource=nullptr, const char* name=nullptr); static bool canDecode(const TQMimeSource* e); static bool decode(const TQMimeSource* e, TQValueList& articles); diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index ef54e0823..6e07d979b 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -125,7 +125,7 @@ TQString Feed::archiveModeToString(ArchiveMode mode) Feed* Feed::fromOPML(TQDomElement e) { - Feed* feed = 0; + Feed* feed = nullptr; if( e.hasAttribute("xmlUrl") || e.hasAttribute("xmlurl") || e.hasAttribute("xmlURL") ) { @@ -285,9 +285,9 @@ Feed::Feed() : TreeNode(), d(new FeedPrivate) d->fetchError = false; d->lastErrorFetch = 0; d->fetchTries = 0; - d->loader = 0; + d->loader = nullptr; d->articlesLoaded = false; - d->archive = 0; + d->archive = nullptr; d->loadLinkedWebsite = false; } @@ -296,7 +296,7 @@ Feed::~Feed() slotAbortFetch(); emitSignalDestroyed(); delete d; - d = 0; + d = nullptr; } bool Feed::useCustomFetchInterval() const { return d->autoFetch; } @@ -598,7 +598,7 @@ void Feed::slotImageFetched(const TQPixmap& image) void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) { // Note that loader instances delete themselves - d->loader = 0; + d->loader = nullptr; // fetching wasn't successful: if (status != RSS::Success) @@ -767,7 +767,7 @@ TreeNode* Feed::next() else p = p->parent(); } - return 0; + return nullptr; } void Feed::doArticleNotification() diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index 39aad70d3..cb77d951a 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -46,7 +46,7 @@ class FeedIconManager::FeedIconManagerPrivate TQDict urlDict; }; -FeedIconManager *FeedIconManager::m_instance = 0; +FeedIconManager *FeedIconManager::m_instance = nullptr; static KStaticDeleter feediconmanagersd; @@ -81,7 +81,7 @@ FeedIconManager::FeedIconManager(TQObject * parent, const char *name) FeedIconManager::~FeedIconManager() { delete d; - d = 0; + d = nullptr; } void FeedIconManager::loadIcon(const TQString & url) @@ -146,7 +146,7 @@ void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL TQPixmap p = TQPixmap(iconFile); if (!p.isNull()) // we don't set null pixmaps, as feed checks pixmap.isNull() to find out whether the icon was already loaded or not. It would request the icon another time, resulting an infinite loop (until stack overflow that is { - while (( f = d->urlDict.take(hostOrURL) )) + while ((f = d->urlDict.take(hostOrURL)) != nullptr) if (d->registeredFeeds.contains(f)) f->setFavicon(p); } diff --git a/akregator/src/feediconmanager.h b/akregator/src/feediconmanager.h index 55adb33e6..d31349b44 100644 --- a/akregator/src/feediconmanager.h +++ b/akregator/src/feediconmanager.h @@ -50,7 +50,7 @@ namespace Akregator public: - FeedIconManager(TQObject * = 0L, const char * = 0L); + FeedIconManager(TQObject * = nullptr, const char * = nullptr); ~FeedIconManager(); static FeedIconManager *self(); diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp index 0c34e3933..86f4299e5 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -194,17 +194,17 @@ bool FeedList::readFromXML(const TQDomDocument& doc) FeedList::~FeedList() { emit signalDestroyed(this); - setRootNode(0); + setRootNode(nullptr); delete d->addNodeVisitor; delete d->removeNodeVisitor; delete d; - d = 0; + d = nullptr; } Feed* FeedList::findByURL(const TQString& feedURL) const { if (d->urlMap[feedURL].isEmpty()) - return 0; + return nullptr; else return *(d->urlMap[feedURL].begin()); } diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h index cc3473d63..a9a1e63d6 100644 --- a/akregator/src/feedlist.h +++ b/akregator/src/feedlist.h @@ -47,14 +47,14 @@ TQ_OBJECT public: - FeedList(TQObject *parent = 0, const char *name = 0); + FeedList(TQObject *parent = nullptr, const char *name = nullptr); /** Destructor. Contained nodes are deleted! */ ~FeedList(); /** appends another feed list as sub tree. The root node of @c list is ignored. NOTE: nodes are _moved_ from @c list to this feed list, not copied */ - void append(FeedList* list, Folder* parent=0, TreeNode* after=0); + void append(FeedList* list, Folder* parent=nullptr, TreeNode* after=nullptr); /** reads an OPML document and appends the items to this list @param doc the OPML document to parse diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index 34aa68255..7cd3df86a 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -214,7 +214,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor if (m_view->findNodeItem(node)) return true; - TagNodeItem* item = 0; + TagNodeItem* item = nullptr; TreeNode* prev = node->prevSibling(); FolderItem* parentItem = static_cast(m_view->findNodeItem(node->parent())); if (parentItem) @@ -248,7 +248,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor if (m_view->findNodeItem(node)) return true; - TagFolderItem* item = 0; + TagFolderItem* item = nullptr; TreeNode* prev = node->prevSibling(); FolderItem* parentItem = static_cast(m_view->findNodeItem(node->parent())); if (parentItem) @@ -286,7 +286,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor if (m_view->findNodeItem(node)) return true; - FolderItem* item = 0; + FolderItem* item = nullptr; TreeNode* prev = node->prevSibling(); FolderItem* parentItem = static_cast(m_view->findNodeItem(node->parent())); if (parentItem) @@ -323,7 +323,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor if (m_view->findNodeItem(node)) return true; - FeedItem* item = 0; + FeedItem* item = nullptr; TreeNode* prev = node->prevSibling(); FolderItem* parentItem = static_cast(m_view->findNodeItem(node->parent())); @@ -404,7 +404,7 @@ NodeListView::~NodeListView() delete d->createItemVisitor; delete d->deleteItemVisitor; delete d; - d = 0; + d = nullptr; } void NodeListView::setNodeList(NodeList* nodeList) @@ -433,14 +433,14 @@ void NodeListView::setNodeList(NodeList* nodeList) Folder* NodeListView::rootNode() { - return d->nodeList ? d->nodeList->rootNode() : 0; + return d->nodeList ? d->nodeList->rootNode() : nullptr; } TreeNode* NodeListView::selectedNode() { TreeNodeItem* item = dynamic_cast (selectedItem()); - return ( item ? item->node() : 0) ; + return ( item ? item->node() : nullptr) ; } void NodeListView::setSelectedNode(TreeNode* node) @@ -454,7 +454,7 @@ TreeNode* NodeListView::findNodeByTitle(const TQString& title) { TreeNodeItem* item = dynamic_cast(findItemByTitle(title, 0)); if (!item) - return 0; + return nullptr; else return item->node(); } @@ -489,7 +489,7 @@ void NodeListView::clear() for( ; it.current(); ++it ) disconnectFromNode( it.current()->node() ); d->itemDict.clear(); - d->nodeList = 0; + d->nodeList = nullptr; TDEListView::clear(); } @@ -515,7 +515,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem* if (KURLDrag::canDecode(e)) { FolderItem* parent = dynamic_cast (d->parent); - TreeNodeItem* afterMe = 0; + TreeNodeItem* afterMe = nullptr; if(d->afterme) afterMe = dynamic_cast (d->afterme); @@ -523,7 +523,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem* KURL::List urls; KURLDrag::decode( e, urls ); e->accept(); - emit signalDropped( urls, afterMe ? afterMe->node() : 0, parent ? parent->node() : 0); + emit signalDropped( urls, afterMe ? afterMe->node() : nullptr, parent ? parent->node() : nullptr); } } else @@ -539,7 +539,7 @@ void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem* openFolder(); Folder* parentNode = (dynamic_cast (d->parent))->node(); - TreeNode* afterMeNode = 0; + TreeNode* afterMeNode = nullptr; TreeNode* current = selectedNode(); if (d->afterme) @@ -633,7 +633,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) d->autoopentimer.start(750); d->parent = i; - d->afterme = 0; + d->afterme = nullptr; } else { @@ -883,7 +883,7 @@ void NodeListView::slotItemRenamed(TQListViewItem* item, int col, const TQString void NodeListView::slotContextMenu(TDEListView* list, TQListViewItem* item, const TQPoint& p) { TreeNodeItem* ti = dynamic_cast(item); - emit signalContextMenu(list, ti ? ti->node() : 0, p); + emit signalContextMenu(list, ti ? ti->node() : nullptr, p); if (ti) ti->showContextMenu(p); } @@ -972,7 +972,7 @@ void NodeListView::slotNodeListDestroyed(NodeList* list) if (list != d->nodeList) return; - setNodeList(0); + setNodeList(nullptr); } void NodeListView::slotNodeDestroyed(TreeNode* node) @@ -1008,7 +1008,7 @@ TQDragObject *NodeListView::dragObject() md->setPixmap(*(i->pixmap(0))); FeedItem *fi = dynamic_cast(i); if (fi) { - md->addDragObject(new KURLDrag(KURL(fi->node()->xmlUrl()), 0L)); + md->addDragObject(new KURLDrag(KURL(fi->node()->xmlUrl()), nullptr)); } } return md; diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index d7aff329c..1e3d2d583 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -41,7 +41,7 @@ class NodeListView : public TDEListView TQ_OBJECT public: - NodeListView( TQWidget *parent = 0, const char *name = 0 ); + NodeListView( TQWidget *parent = nullptr, const char *name = nullptr ); virtual ~NodeListView(); /** sets the feed list to show. Disconnects from the old feed list, if there is any. */ @@ -195,7 +195,7 @@ class TagNodeListView : public NodeListView TQ_OBJECT public: - TagNodeListView(TQWidget *parent = 0, const char *name = 0) {} + TagNodeListView(TQWidget *parent = nullptr, const char *name = nullptr) {} virtual ~TagNodeListView() {} private: diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp index 1dd23b060..c40650e5d 100644 --- a/akregator/src/feedstoragedummyimpl.cpp +++ b/akregator/src/feedstoragedummyimpl.cpp @@ -90,7 +90,7 @@ FeedStorageDummyImpl::FeedStorageDummyImpl(const TQString& url, StorageDummyImpl FeedStorageDummyImpl::~FeedStorageDummyImpl() { - delete d; d = 0; + delete d; d = nullptr; } void FeedStorageDummyImpl::commit() diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp index 0bc7b38e3..1baa7f6ad 100644 --- a/akregator/src/fetchqueue.cpp +++ b/akregator/src/fetchqueue.cpp @@ -49,7 +49,7 @@ FetchQueue::~FetchQueue() { slotAbort(); delete d; - d = 0; + d = nullptr; } void FetchQueue::slotAbort() diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h index d93b955f6..6c7a0f3fb 100644 --- a/akregator/src/fetchqueue.h +++ b/akregator/src/fetchqueue.h @@ -40,7 +40,7 @@ class FetchQueue : public TQObject public: - FetchQueue(TQObject* parent=0, const char* name=0); + FetchQueue(TQObject* parent=nullptr, const char* name=nullptr); virtual ~FetchQueue(); /** returns true when no feeds are neither fetching nor queued */ diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index 57105f4fa..1001acecb 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -76,7 +76,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate) Folder::~Folder() { - TreeNode* tmp = 0; + TreeNode* tmp = nullptr; for (TQValueList::ConstIterator it = d->children.begin(); it != d->children.end(); ++it) { delete tmp; @@ -87,7 +87,7 @@ Folder::~Folder() emitSignalDestroyed(); delete d; - d = 0; + d = nullptr; } TQStringList Folder::tags() const @@ -204,7 +204,7 @@ void Folder::removeChild(TreeNode* node) // kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl; if (node && d->children.contains(node)) { - node->setParent(0); + node->setParent(nullptr); d->children.remove(node); disconnectFromNode(node); updateUnreadCount(); @@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node) TreeNode* Folder::firstChild() { - return d->children.isEmpty() ? 0 : d->children.first(); + return d->children.isEmpty() ? nullptr : d->children.first(); } TreeNode* Folder::lastChild() { - return d->children.isEmpty() ? 0 : d->children.last(); + return d->children.isEmpty() ? nullptr : d->children.last(); } bool Folder::isOpen() const @@ -340,7 +340,7 @@ TreeNode* Folder::next() else p = p->parent(); } - return 0; + return nullptr; } } // namespace Akregator diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 64e0e37f6..54cedead3 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -46,7 +46,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co m_title=tit; m_state=Idle; m_progress=-1; - m_progressItem=0; + m_progressItem=nullptr; if (watchSignals) // e.g, articles tab has no part { @@ -186,7 +186,7 @@ void Frame::setCanceled(const TQString &s) if(m_progressItem) { m_progressItem->setStatus(i18n("Loading canceled")); m_progressItem->setComplete(); - m_progressItem = 0; + m_progressItem = nullptr; } m_state=Canceled; emit canceled(s); @@ -197,7 +197,7 @@ void Frame::setCompleted() if(m_progressItem) { m_progressItem->setStatus(i18n("Loading completed")); m_progressItem->setComplete(); - m_progressItem = 0; + m_progressItem = nullptr; } m_state=Completed; emit completed(); diff --git a/akregator/src/kernel.cpp b/akregator/src/kernel.cpp index b5b45a4fa..9a74b1b5b 100644 --- a/akregator/src/kernel.cpp +++ b/akregator/src/kernel.cpp @@ -32,7 +32,7 @@ namespace Akregator { -Kernel* Kernel::m_self = 0; +Kernel* Kernel::m_self = nullptr; static KStaticDeleter kernelsd; @@ -47,8 +47,8 @@ Kernel::Kernel() { m_fetchQueue = new FetchQueue(); m_tagSet = new TagSet(); - m_storage = 0; - m_feedList = 0; + m_storage = nullptr; + m_feedList = nullptr; } Kernel::~Kernel() diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 88d42a7dc..a251c3918 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -48,7 +48,7 @@ Article::Article() : d(new Private) { } -Article::Article(const Article &other) : d(0) +Article::Article(const Article &other) : d(nullptr) { *this = other; } diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index 574f48403..f2a51ff96 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -158,7 +158,7 @@ namespace RSS * Note that you have to delete the KURLLabel object returned by * this method yourself. */ - KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const; + KURLLabel *widget(TQWidget *parent = nullptr, const char *name = nullptr) const; typedef TQMap MetaInfoMap; diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp index 7f6c70c2e..7017b17d4 100644 --- a/akregator/src/librss/category.cpp +++ b/akregator/src/librss/category.cpp @@ -58,7 +58,7 @@ class Category::CategoryPrivate : public Shared bool Category::isNull() const { - return d == 0; + return !d; } Category Category::fromXML(const TQDomElement& e) @@ -76,7 +76,7 @@ Category::Category() : d(new CategoryPrivate) d->isNull = true; } -Category::Category(const Category& other) : d(0) +Category::Category(const Category& other) : d(nullptr) { *this = other; } @@ -93,7 +93,7 @@ Category::~Category() if (d->deref()) { delete d; - d = 0; + d = nullptr; } } diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 07ea2b0e8..3d12b1ba6 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -67,7 +67,7 @@ Document::Document() : d(new Private) { } -Document::Document(const Document &other) : d(0) +Document::Document(const Document &other) : d(nullptr) { *this = other; } diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp index e048fa887..965268e64 100644 --- a/akregator/src/librss/enclosure.cpp +++ b/akregator/src/librss/enclosure.cpp @@ -91,7 +91,7 @@ Enclosure::Enclosure() : d(new EnclosurePrivate) d->length = -1; } -Enclosure::Enclosure(const Enclosure& other) : d(0) +Enclosure::Enclosure(const Enclosure& other) : d(nullptr) { *this = other; } @@ -109,7 +109,7 @@ Enclosure::~Enclosure() if (d->deref()) { delete d; - d = 0; + d = nullptr; } } diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 149534e18..8928be396 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/image.cpp @@ -39,7 +39,7 @@ Image::Image() : TQObject(), d(new Private) { } -Image::Image(const Image &other) : TQObject(), d(0) +Image::Image(const Image &other) : TQObject(), d(nullptr) { *this = other; } @@ -67,7 +67,7 @@ Image::~Image() if (d->deref()) { delete d->pixmapBuffer; - d->pixmapBuffer=0L; + d->pixmapBuffer=nullptr; delete d; } } diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index d6ed25db7..d4b2cf5cc 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -58,7 +58,7 @@ class FileRetriever::Private }; KStaticDeleter FileRetriever::Private::userAgentsd; -TQString* FileRetriever::Private::userAgent = 0L; +TQString* FileRetriever::Private::userAgent = nullptr; FileRetriever::FileRetriever() : d(new Private) { @@ -73,14 +73,14 @@ bool FileRetriever::m_useCache = true; TQString FileRetriever::userAgent() { - if (Private::userAgent == 0L) + if (!Private::userAgent) FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new TQString); return *Private::userAgent; } void FileRetriever::setUserAgent(const TQString &ua) { - if (Private::userAgent == 0L) + if (!Private::userAgent) FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new TQString); (*Private::userAgent) = ua; } diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index 5e298ea3a..fcbce233c 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -56,7 +56,7 @@ void TestRetriever::retrieveData(const KURL &url) static const TDECmdLineOptions options[] = { - { "+url", I18N_NOOP("URL of feed"), 0 }, + { "+url", I18N_NOOP("URL of feed"), nullptr }, TDECmdLineLastOption }; diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp index a32c9f584..aa30c8bcf 100644 --- a/akregator/src/librss/textinput.cpp +++ b/akregator/src/librss/textinput.cpp @@ -29,7 +29,7 @@ TextInput::TextInput() : d(new Private) { } -TextInput::TextInput(const TextInput &other) : d(0) +TextInput::TextInput(const TextInput &other) : d(nullptr) { *this = other; } diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index 8349f28ad..16ec6e2e1 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -155,7 +155,7 @@ void ListTabWidget::slotTabClicked(int id) ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(parent, name), d(new ListTabWidgetPrivate) { d->idCounter = 0; - d->current = 0; + d->current = nullptr; d->currentID = -1; d->viewMode = verticalTabs; d->layout = new TQHBoxLayout(this); @@ -176,7 +176,7 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare ListTabWidget::~ListTabWidget() { delete d; - d = 0; + d = nullptr; } diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h index 4038f9a2a..5cae52b1b 100644 --- a/akregator/src/listtabwidget.h +++ b/akregator/src/listtabwidget.h @@ -50,7 +50,7 @@ TQ_OBJECT public: - ListTabWidget(TQWidget* parent=0, const char* name=0); + ListTabWidget(TQWidget* parent=nullptr, const char* name=nullptr); virtual ~ListTabWidget(); enum ViewMode { single, /* horizontalTabs, */ verticalTabs }; diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 6b2dea29f..8002b114b 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -68,13 +68,13 @@ BrowserInterface::BrowserInterface( MainWindow *shell, const char *name ) } MainWindow::MainWindow() - : KParts::MainWindow( 0L, "akregator_mainwindow" ){ + : KParts::MainWindow( nullptr, "akregator_mainwindow" ){ // set the shell's ui resource file setXMLFile("akregator_shell.rc"); m_browserIface=new BrowserInterface(this, "browser_interface"); - m_part=0; + m_part=nullptr; // then, setup our actions @@ -91,7 +91,7 @@ MainWindow::MainWindow() statusBar()->addWidget (m_statusLabel, 1, false); setupActions(); - createGUI(0L); + createGUI(nullptr); } bool MainWindow::loadPart() @@ -238,7 +238,7 @@ bool MainWindow::queryExit() if ( !tdeApp->sessionSaving() ) { delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like TDEHTMLPageCache - m_part = 0; + m_part = nullptr; } else kdDebug() << "MainWindow::queryExit(): saving session" << endl; @@ -255,7 +255,7 @@ void MainWindow::slotQuit() bool MainWindow::queryClose() { - if (tdeApp->sessionSaving() || TrayIcon::getInstance() == 0 || TrayIcon::getInstance()->isHidden() ) + if (tdeApp->sessionSaving() || !TrayIcon::getInstance() || TrayIcon::getInstance()->isHidden()) { return true; } diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 8a4af99ce..86b831f22 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -158,7 +158,7 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main c4_View hash = d->storage->GetAs("archiveHash[_H:I,_R:I]"); d->archiveView = d->archiveView.Hash(hash, 1); // hash on guid - d->tagStorage = 0; + d->tagStorage = nullptr; if (d->taggingEnabled) { @@ -178,7 +178,7 @@ FeedStorageMK4Impl::~FeedStorageMK4Impl() if (d->taggingEnabled) delete d->tagStorage; // delete d->catStorage; - delete d; d = 0; + delete d; d = nullptr; } void FeedStorageMK4Impl::markDirty() diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp index 9c504c2f4..ac726dc59 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -97,7 +97,7 @@ StorageMK4Impl::~StorageMK4Impl() { close(); delete d; - d = 0; + d = nullptr; } void StorageMK4Impl::initialize(const TQStringList& params) { @@ -151,11 +151,11 @@ bool StorageMK4Impl::close() d->storage->Commit(); delete d->storage; - d->storage = 0; + d->storage = nullptr; d->feedListStorage->Commit(); delete d->feedListStorage; - d->feedListStorage = 0; + d->feedListStorage = nullptr; return true; } diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp index 40a8d6222..99c42f9f8 100644 --- a/akregator/src/nodelist.cpp +++ b/akregator/src/nodelist.cpp @@ -120,7 +120,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor NodeList::NodeList(TQObject *parent, const char *name) : d(new NodeListPrivate) { - d->rootNode = 0; + d->rootNode = nullptr; d->addNodeVisitor = new AddNodeVisitor(this); d->removeNodeVisitor = new RemoveNodeVisitor(this); @@ -153,7 +153,7 @@ const TQValueList& NodeList::asFlatList() const bool NodeList::isEmpty() const { - return d->rootNode->firstChild() == 0; + return !d->rootNode->firstChild(); } TQValueList* NodeList::flatList() const @@ -205,7 +205,7 @@ NodeList::~NodeList() delete d->addNodeVisitor; delete d->removeNodeVisitor; delete d; - d = 0; + d = nullptr; } int NodeList::generateID() diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h index e023e12b3..b91edf12c 100644 --- a/akregator/src/nodelist.h +++ b/akregator/src/nodelist.h @@ -52,7 +52,7 @@ TQ_OBJECT public: - NodeList(TQObject *parent=0, const char *name=0); + NodeList(TQObject *parent=nullptr, const char *name=nullptr); virtual ~NodeList(); virtual Folder* rootNode() const; diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index 6faf7b85a..05fe4ae2d 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -49,7 +49,7 @@ NotificationManager::NotificationManager() : TQObject() NotificationManager::~NotificationManager() { - m_self = 0; + m_self = nullptr; } void NotificationManager::setWidget(TQWidget* widget, TDEInstance* inst) diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h index 74b3c7842..556e0e63d 100644 --- a/akregator/src/notificationmanager.h +++ b/akregator/src/notificationmanager.h @@ -44,7 +44,7 @@ class NotificationManager : public TQObject ~NotificationManager(); /** the widget used for notification, normally either the mainwindow or the tray icon */ - void setWidget(TQWidget* widget, TDEInstance* inst=0); + void setWidget(TQWidget* widget, TDEInstance* inst=nullptr); public slots: diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 03d8a4db8..db5fb6398 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -158,7 +158,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) PageViewer::~PageViewer() { delete d; - d = 0; + d = nullptr; } // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp) @@ -249,7 +249,7 @@ void PageViewer::slotStop() bool PageViewer::openURL(const KURL& url) { updateHistoryEntry(); // update old history entry before switching to the new one - emit started(0); + emit started(nullptr); bool val = TDEHTMLPart::openURL(url); diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp index e29c5011d..4097f6eb5 100644 --- a/akregator/src/pluginmanager.cpp +++ b/akregator/src/pluginmanager.cpp @@ -64,7 +64,7 @@ PluginManager::createFromQuery( const TQString &constraint ) if ( offers.isEmpty() ) { kdWarning() << k_funcinfo << "No matching plugin found." << endl; - return 0; + return nullptr; } // Select plugin with highest rank @@ -90,18 +90,18 @@ PluginManager::createFromService( const KService::Ptr service ) KLibrary *lib = loader->globalLibrary( TQFile::encodeName( service->library() ) ); if ( !lib ) { - KMessageBox::error( 0, i18n( "

KLibLoader could not load the plugin:
%1

" + KMessageBox::error( nullptr, i18n( "

KLibLoader could not load the plugin:
%1

" "

Error message:
%2

" ) .arg( service->library() ) .arg( loader->lastErrorMessage() ) ); - return 0; + return nullptr; } //look up address of init function and cast it to pointer-to-function Plugin* (*create_plugin)() = ( Plugin* (*)() ) lib->symbol( "create_plugin" ); if ( !create_plugin ) { kdWarning() << k_funcinfo << "create_plugin == NULL" << endl; - return 0; + return nullptr; } //create plugin on the heap Plugin* plugin = create_plugin(); @@ -140,7 +140,7 @@ PluginManager::getService( const Plugin* plugin ) { if ( !plugin ) { kdWarning() << k_funcinfo << "pointer == NULL" << endl; - return 0; + return nullptr; } //search plugin in store @@ -176,7 +176,7 @@ PluginManager::showAbout( const TQString &constraint ) str += ""; - KMessageBox::information( 0, str, i18n( "Plugin Information" ) ); + KMessageBox::information( nullptr, str, i18n( "Plugin Information" ) ); } diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index 1e205c8e5..e06337ec4 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -49,7 +49,7 @@ class ProgressManager::ProgressManagerPrivate }; static KStaticDeleter progressmanagersd; -ProgressManager* ProgressManager::m_self = 0; +ProgressManager* ProgressManager::m_self = nullptr; ProgressManager* ProgressManager::self() { @@ -60,13 +60,13 @@ ProgressManager* ProgressManager::self() ProgressManager::ProgressManager() : d(new ProgressManagerPrivate) { - d->feedList = 0; + d->feedList = nullptr; } ProgressManager::~ProgressManager() { delete d; - d = 0; + d = nullptr; } void ProgressManager::setFeedList(FeedList* feedList) @@ -74,7 +74,7 @@ void ProgressManager::setFeedList(FeedList* feedList) if (feedList == d->feedList) return; - if (d->feedList != 0) + if (d->feedList) { for (TQMap::ConstIterator it = d->handlers.begin(); it != d->handlers.end(); ++it) delete *it; @@ -86,7 +86,7 @@ void ProgressManager::setFeedList(FeedList* feedList) d->feedList = feedList; - if (feedList != 0) + if (feedList) { TQValueList list = feedList->asFlatList(); @@ -140,7 +140,7 @@ class ProgressItemHandler::ProgressItemHandlerPrivate ProgressItemHandler::ProgressItemHandler(Feed* feed) : d(new ProgressItemHandlerPrivate) { d->feed = feed; - d->progressItem = 0; + d->progressItem = nullptr; connect(feed, TQ_SIGNAL(fetchStarted(Feed*)), this, TQ_SLOT(slotFetchStarted())); connect(feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFetchCompleted())); @@ -153,11 +153,11 @@ ProgressItemHandler::~ProgressItemHandler() if (d->progressItem) { d->progressItem->setComplete(); - d->progressItem = 0; + d->progressItem = nullptr; } delete d; - d = 0; + d = nullptr; } void ProgressItemHandler::slotFetchStarted() @@ -165,7 +165,7 @@ void ProgressItemHandler::slotFetchStarted() if (d->progressItem) { d->progressItem->setComplete(); - d->progressItem = 0; + d->progressItem = nullptr; } d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), TQStyleSheet::escape( d->feed->title() ), TQString(), true); @@ -180,7 +180,7 @@ void ProgressItemHandler::slotFetchCompleted() { d->progressItem->setStatus(i18n("Fetch completed")); d->progressItem->setComplete(); - d->progressItem = 0; + d->progressItem = nullptr; } } @@ -190,7 +190,7 @@ void ProgressItemHandler::slotFetchError() { d->progressItem->setStatus(i18n("Fetch error")); d->progressItem->setComplete(); - d->progressItem = 0; + d->progressItem = nullptr; } } @@ -200,7 +200,7 @@ void ProgressItemHandler::slotFetchAborted() { d->progressItem->setStatus(i18n("Fetch aborted")); d->progressItem->setComplete(); - d->progressItem = 0; + d->progressItem = nullptr; } } diff --git a/akregator/src/propertiesdialog.h b/akregator/src/propertiesdialog.h index 6734a5652..eb607e238 100644 --- a/akregator/src/propertiesdialog.h +++ b/akregator/src/propertiesdialog.h @@ -35,7 +35,7 @@ namespace Akregator TQ_OBJECT public: - FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0); + FeedPropertiesWidget(TQWidget *parent = nullptr, const char *name = nullptr); ~FeedPropertiesWidget(); virtual void slotUpdateComboBoxActivated(int index); virtual void slotUpdateCheckBoxToggled(bool enabled); @@ -47,7 +47,7 @@ namespace Akregator TQ_OBJECT public: - FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0); + FeedPropertiesDialog(TQWidget *parent = nullptr, const char *name = nullptr); ~FeedPropertiesDialog(); void setFeed(Feed* feed); diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index a43f8bcda..4ee4ff91f 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -110,7 +110,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), SearchBar::~SearchBar() { delete d; - d = 0; + d = nullptr; } TQString SearchBar::text() const diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h index 113da6990..8c8265d4e 100644 --- a/akregator/src/searchbar.h +++ b/akregator/src/searchbar.h @@ -44,7 +44,7 @@ class SearchBar : public TQHBox public: - SearchBar(TQWidget* parent=0, const char* name=0); + SearchBar(TQWidget* parent=nullptr, const char* name=nullptr); virtual ~SearchBar(); TQString text() const; diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h index e2e14fe70..b62d33fd2 100644 --- a/akregator/src/settings_advanced.h +++ b/akregator/src/settings_advanced.h @@ -21,7 +21,7 @@ class SettingsAdvanced : public SettingsAdvancedBase public: - SettingsAdvanced(TQWidget* parent=0, const char* name=0); + SettingsAdvanced(TQWidget* parent=nullptr, const char* name=nullptr); /** returns the key of the currently selected factory */ TQString selectedFactory() const; diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index ddb545054..08d334825 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -59,7 +59,7 @@ SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* n SelectNodeDialog::~SelectNodeDialog() { delete d; - d = 0; + d = nullptr; } TreeNode* SelectNodeDialog::selectedNode() const @@ -74,7 +74,7 @@ void SelectNodeDialog::slotSelectNode(TreeNode* node) void SelectNodeDialog::slotNodeSelected(TreeNode* node) { - enableButtonOK(node != 0); + enableButtonOK(node != nullptr); } @@ -112,10 +112,10 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor virtual bool visitTreeNode(TreeNode* node) { - TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0; + TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : nullptr; - TDEListViewItem* item = 0; - if (pi != 0) + TDEListViewItem* item = nullptr; + if (pi) item = new TDEListViewItem(pi, node->title()); else item = new TDEListViewItem(m_view->d->view, node->title()); @@ -157,7 +157,7 @@ SimpleNodeSelector::~SimpleNodeSelector() { delete d->visitor; delete d; - d = 0; + d = nullptr; } TreeNode* SimpleNodeSelector::selectedNode() const @@ -168,7 +168,7 @@ TreeNode* SimpleNodeSelector::selectedNode() const void SimpleNodeSelector::slotSelectNode(TreeNode* node) { TQListViewItem* item = d->nodeToItem[node]; - if (item != 0) + if (item) d->view->setSelected(item, true); } diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h index e0578d152..e64cf8764 100644 --- a/akregator/src/simplenodeselector.h +++ b/akregator/src/simplenodeselector.h @@ -46,7 +46,7 @@ class SelectNodeDialog : public KDialogBase TQ_OBJECT public: - SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0); + SelectNodeDialog(FeedList* feedList, TQWidget* parent=nullptr, char* name=nullptr); virtual ~SelectNodeDialog(); TreeNode* selectedNode() const; @@ -70,7 +70,7 @@ class SimpleNodeSelector : public TQWidget public: - SimpleNodeSelector(FeedList* feedList, TQWidget* parent=0, const char* name=0); + SimpleNodeSelector(FeedList* feedList, TQWidget* parent=nullptr, const char* name=nullptr); virtual ~SimpleNodeSelector(); TreeNode* selectedNode() const; diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp index 1eae57407..cb0609c40 100644 --- a/akregator/src/speechclient.cpp +++ b/akregator/src/speechclient.cpp @@ -48,7 +48,7 @@ class SpeechClient::SpeechClientPrivate TQValueList pendingJobs; }; -SpeechClient* SpeechClient::m_self = 0; +SpeechClient* SpeechClient::m_self = nullptr; static KStaticDeleter speechclsd; @@ -69,7 +69,7 @@ SpeechClient::SpeechClient() : DCOPStub("kttsd", "KSpeech"), DCOPObject("akregat SpeechClient::~SpeechClient() { delete d; - d = 0; + d = nullptr; } void SpeechClient::slotSpeak(const TQString& text, const TQString& language) diff --git a/akregator/src/storage.cpp b/akregator/src/storage.cpp index 09d4d3966..6dc8504e3 100644 --- a/akregator/src/storage.cpp +++ b/akregator/src/storage.cpp @@ -26,7 +26,7 @@ namespace Akregator { namespace Backend { -Storage* Storage::m_instance = 0; +Storage* Storage::m_instance = nullptr; Storage* Storage::getInstance() { diff --git a/akregator/src/storagedummyimpl.cpp b/akregator/src/storagedummyimpl.cpp index 393be7d14..a166286bc 100644 --- a/akregator/src/storagedummyimpl.cpp +++ b/akregator/src/storagedummyimpl.cpp @@ -49,7 +49,7 @@ class StorageDummyImpl::StorageDummyImplPrivate entry.unread = unread; entry.totalCount = totalCount; entry.lastFetch = lastFetch; - entry.feedStorage = 0; + entry.feedStorage = nullptr; feeds[url] = entry; } @@ -64,7 +64,7 @@ StorageDummyImpl::StorageDummyImpl() : d(new StorageDummyImplPrivate) StorageDummyImpl::~StorageDummyImpl() { - delete d; d = 0; + delete d; d = nullptr; } void StorageDummyImpl::initialize(const TQStringList&) {} diff --git a/akregator/src/storagefactoryregistry.cpp b/akregator/src/storagefactoryregistry.cpp index 50fb6005d..98b436377 100644 --- a/akregator/src/storagefactoryregistry.cpp +++ b/akregator/src/storagefactoryregistry.cpp @@ -40,7 +40,7 @@ class StorageFactoryRegistry::StorageFactoryRegistryPrivate TQMap map; }; -StorageFactoryRegistry* StorageFactoryRegistry::m_instance = 0; +StorageFactoryRegistry* StorageFactoryRegistry::m_instance = nullptr; static KStaticDeleter storagefactoryregistrysd; StorageFactoryRegistry* StorageFactoryRegistry::self() @@ -85,7 +85,7 @@ StorageFactoryRegistry::StorageFactoryRegistry() : d(new StorageFactoryRegistryP StorageFactoryRegistry::~StorageFactoryRegistry() { delete d; - d = 0; + d = nullptr; } } diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index 3af5fd808..b9b0d3c21 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -67,7 +67,7 @@ TabWidget::TabWidget(TQWidget * parent, const char *name) :KTabWidget(parent, name), d(new TabWidgetPrivate) { d->CurrentMaxLength = 30; - d->currentItem = 0; + d->currentItem = nullptr; setMinimumSize(250,150); setTabReorderingEnabled(false); connect( this, TQ_SIGNAL( currentChanged(TQWidget *) ), this, @@ -89,7 +89,7 @@ TabWidget::TabWidget(TQWidget * parent, const char *name) TabWidget::~TabWidget() { delete d; - d = 0; + d = nullptr; } void TabWidget::slotSettingsChanged() @@ -125,7 +125,7 @@ Frame *TabWidget::currentFrame() { TQWidget* w = currentPage(); - return w ? d->frames[w] : 0; + return w ? d->frames[w] : nullptr; } TQPtrList TabWidget::frames() const @@ -250,7 +250,7 @@ void TabWidget::contextMenu(int i, const TQPoint &p) //kdDebug() << indexOf(d->currentItem) << endl; if (w && indexOf(d->currentItem) != 0) static_cast(w)->exec(p); - d->currentItem = 0; + d->currentItem = nullptr; } void TabWidget::slotDetachTab() @@ -301,7 +301,7 @@ void TabWidget::slotCloseTab() if (d->frames.find(d->currentItem)) removeFrame(d->frames.find(d->currentItem)); delete d->currentItem; - d->currentItem = 0; + d->currentItem = nullptr; } void TabWidget::initiateDrag(int tab) @@ -311,7 +311,7 @@ void TabWidget::initiateDrag(int tab) Frame* frame = d->frames[page(tab)]; - if (frame != 0) + if (frame) { KURL::List lst; lst.append( frame->part()->url() ); diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h index e190f51db..67c07f0d7 100644 --- a/akregator/src/tabwidget.h +++ b/akregator/src/tabwidget.h @@ -41,7 +41,7 @@ class TabWidget : public KTabWidget public: - TabWidget(TQWidget * parent = 0, const char *name = 0); + TabWidget(TQWidget * parent = nullptr, const char *name = nullptr); virtual ~TabWidget(); void addFrame(Frame *f); diff --git a/akregator/src/tag.cpp b/akregator/src/tag.cpp index f42724b36..7885b105e 100644 --- a/akregator/src/tag.cpp +++ b/akregator/src/tag.cpp @@ -64,7 +64,7 @@ Tag Tag::fromCategory(const TQString& term, const TQString& scheme, const TQStri } -Tag::Tag(const Tag& other) : d(0) +Tag::Tag(const Tag& other) : d(nullptr) { *this = other; } @@ -74,7 +74,7 @@ Tag::~Tag() if (d->deref()) { delete d; - d = 0; + d = nullptr; } } diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index b4a252a5f..189a3272d 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -46,7 +46,7 @@ class TagAction::TagActionPrivate TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent) //TDEAction (const TQString &text, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0) - : TDEToggleAction(tag.name(), TDEShortcut(), 0, 0, parent), d(new TagActionPrivate) + : TDEToggleAction(tag.name(), TDEShortcut(), nullptr, nullptr, parent), d(new TagActionPrivate) { d->tag = tag; connect(this, TQ_SIGNAL(toggled(const Tag&, bool)), receiver, slot); @@ -56,7 +56,7 @@ TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TagAction::~TagAction() { delete d; - d = 0; + d = nullptr; } Tag TagAction::tag() const diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h index 5837944b4..8711eaf40 100644 --- a/akregator/src/tagaction.h +++ b/akregator/src/tagaction.h @@ -42,7 +42,7 @@ class TagAction : public TDEToggleAction public: - TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent=0); + TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent=nullptr); virtual ~TagAction(); //virtual int plug(TQWidget *widget, int index=-1); diff --git a/akregator/src/tagfolder.cpp b/akregator/src/tagfolder.cpp index 7aa8190fb..db1c8beb4 100644 --- a/akregator/src/tagfolder.cpp +++ b/akregator/src/tagfolder.cpp @@ -41,7 +41,7 @@ TagFolder::~TagFolder() { emitSignalDestroyed(); delete d; - d = 0; + d = nullptr; } bool TagFolder::accept(TreeNodeVisitor* visitor) diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index af64e5465..5859331d6 100644 --- a/akregator/src/tagnode.cpp +++ b/akregator/src/tagnode.cpp @@ -83,7 +83,7 @@ TagNode::~TagNode() { emitSignalDestroyed(); delete d; - d = 0; + d = nullptr; } bool TagNode::accept(TreeNodeVisitor* visitor) @@ -149,7 +149,7 @@ TreeNode* TagNode::next() else p = p->parent(); } - return 0; + return nullptr; } void TagNode::slotDeleteExpiredArticles() diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp index 288ecc774..36b5f833f 100644 --- a/akregator/src/tagnodelist.cpp +++ b/akregator/src/tagnodelist.cpp @@ -75,7 +75,7 @@ TagNodeList::~TagNodeList() { emit signalDestroyed(this); delete d; - d = 0; + d = nullptr; } TagFolder* TagNodeList::rootNode() const @@ -120,7 +120,7 @@ void TagNodeList::slotNodeDestroyed(TreeNode* node) TagNode* tagNode = dynamic_cast(node); TQString id = tagNode ? tagNode->tag().id() : TQString(); - if (tagNode != 0 && containsTagId(id)) + if (tagNode && containsTagId(id)) { rootNode()->removeChild(tagNode); d->tagIdToNodeMap.remove(id); @@ -135,7 +135,7 @@ void TagNodeList::slotNodeAdded(TreeNode* node) TagNode* tagNode = dynamic_cast(node); TQString id = tagNode ? tagNode->tag().id() : TQString(); - if (tagNode != 0L && !containsTagId(id)) + if (tagNode && !containsTagId(id)) { d->tagIdToNodeMap[id] = tagNode; emit signalTagNodeAdded(tagNode); @@ -149,7 +149,7 @@ void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node) TagNode* tagNode = dynamic_cast(node); TQString id = tagNode ? tagNode->tag().id() : TQString(); - if (parent == rootNode() && tagNode != 0L && containsTagId(id)) + if (parent == rootNode() && tagNode && containsTagId(id)) { d->tagIdToNodeMap.remove(id); emit signalTagNodeRemoved(tagNode); @@ -196,7 +196,7 @@ void TagNodeList::slotTagRemoved(const Tag& tag) if (containsTagId(tag.id())) { delete d->tagIdToNodeMap[tag.id()]; - d->tagIdToNodeMap[tag.id()] = 0; + d->tagIdToNodeMap[tag.id()] = nullptr; } } diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp index b21f1d03e..869fbaf56 100644 --- a/akregator/src/tagpropertiesdialog.cpp +++ b/akregator/src/tagpropertiesdialog.cpp @@ -53,7 +53,7 @@ TagPropertiesDialog::TagPropertiesDialog(TQWidget *parent, const char *name) : K TagPropertiesDialog::~TagPropertiesDialog() { delete d; - d = 0; + d = nullptr; } void TagPropertiesDialog::setTag(const Tag& tag) diff --git a/akregator/src/tagpropertiesdialog.h b/akregator/src/tagpropertiesdialog.h index 347f1f030..9a00f517d 100644 --- a/akregator/src/tagpropertiesdialog.h +++ b/akregator/src/tagpropertiesdialog.h @@ -38,7 +38,7 @@ class TagPropertiesDialog : public KDialogBase public: - TagPropertiesDialog(TQWidget *parent=0, const char *name=0); + TagPropertiesDialog(TQWidget *parent=nullptr, const char *name=nullptr); virtual ~TagPropertiesDialog(); void setTag(const Tag& tag); diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp index 66fb70aad..a508ca190 100644 --- a/akregator/src/tagset.cpp +++ b/akregator/src/tagset.cpp @@ -49,7 +49,7 @@ TagSet::~TagSet() (*it).removedFromTagSet(this); delete d; - d = 0; + d = nullptr; } void TagSet::insert(const Tag& tag) diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h index 12a4247e5..9252f91dd 100644 --- a/akregator/src/tagset.h +++ b/akregator/src/tagset.h @@ -51,7 +51,7 @@ class TagSet : public TQObject public: - TagSet(TQObject* parent=0); + TagSet(TQObject* parent=nullptr); virtual ~TagSet(); /** adds a tag to the tag set. The tag set will emit signalTagAdded */ diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index fe816d19c..92abd6e53 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -44,7 +44,7 @@ namespace Akregator { -TrayIcon* TrayIcon::m_instance = 0; +TrayIcon* TrayIcon::m_instance = nullptr; TrayIcon* TrayIcon::getInstance() { diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h index 5d9f4feac..cbf109d86 100644 --- a/akregator/src/trayicon.h +++ b/akregator/src/trayicon.h @@ -40,7 +40,7 @@ namespace Akregator static TrayIcon* getInstance(); static void setInstance(TrayIcon* trayIcon); - TrayIcon(TQWidget *parent = 0, const char *name = 0); + TrayIcon(TQWidget *parent = nullptr, const char *name = nullptr); ~TrayIcon(); TQPixmap takeScreenshot() const; diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp index a4ae0936e..d6a074d96 100644 --- a/akregator/src/treenode.cpp +++ b/akregator/src/treenode.cpp @@ -46,13 +46,13 @@ class TreeNode::TreeNodePrivate }; TreeNode::TreeNode() - : TQObject(0, 0), d(new TreeNodePrivate) + : TQObject(nullptr, nullptr), d(new TreeNodePrivate) { d->doNotify = true; d->nodeChangeOccurred = false; d->articleChangeOccurred = false; d->title = ""; - d->parent = 0; + d->parent = nullptr; d->id = 0; d->signalDestroyedEmitted = false; @@ -71,7 +71,7 @@ TreeNode::~TreeNode() { delete d; - d = 0; + d = nullptr; } const TQString& TreeNode::title() const @@ -92,24 +92,24 @@ void TreeNode::setTitle(const TQString& title) TreeNode* TreeNode::nextSibling() const { if (!d->parent) - return 0; + return nullptr; TQValueList children = d->parent->children(); TreeNode* me = (TreeNode*)this; int idx = children.findIndex(me); - return idx+1 < children.size() ? *(children.at(idx+1)) : 0L; + return idx+1 < children.size() ? *(children.at(idx+1)) : nullptr; } TreeNode* TreeNode::prevSibling() const { if (!d->parent) - return 0; + return nullptr; TQValueList children = d->parent->children(); TreeNode* me = (TreeNode*)this; int idx = children.findIndex(me); - return idx > 0 ? *(d->parent->children().at(idx-1)) : 0L; + return idx > 0 ? *(d->parent->children().at(idx-1)) : nullptr; } Folder* TreeNode::parent() const diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index da06562d0..789e3d3ce 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -48,7 +48,7 @@ namespace Akregator { Viewer::Viewer(TQWidget *parent, const char *name) - : TDEHTMLPart(parent, name), m_url(0) + : TDEHTMLPart(parent, name), m_url(nullptr) { setZoomFactor(100); setMetaRefreshEnabled(true); diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp index 755e8e664..a3a8dbf3f 100644 --- a/kandy/src/atcommand.cpp +++ b/kandy/src/atcommand.cpp @@ -272,7 +272,7 @@ TQString ATCommand::processOutput(const TQString &output) TQString aChar = hexString.mid(i,2); TQString result; while(!aChar.isEmpty()) { - int charValue = aChar.toInt(0,16); + int charValue = aChar.toInt(nullptr,16); TQChar charEncoded(charValue); // result += aChar + ": " + charEncoded + "\n"; result += charEncoded; diff --git a/kandy/src/cmdpropertiesdialog.h b/kandy/src/cmdpropertiesdialog.h index ca75dd1e9..556a29611 100644 --- a/kandy/src/cmdpropertiesdialog.h +++ b/kandy/src/cmdpropertiesdialog.h @@ -33,7 +33,7 @@ class CmdPropertiesDialog : public CmdPropertiesDialog_base TQ_OBJECT public: - CmdPropertiesDialog(ATCommand *cmd,TQWidget* parent=0,const char* name=0, + CmdPropertiesDialog(ATCommand *cmd,TQWidget* parent=nullptr,const char* name=nullptr, bool modal=false,WFlags fl=0); ~CmdPropertiesDialog(); diff --git a/kandy/src/commandscheduler.h b/kandy/src/commandscheduler.h index a1fd9a23b..d26271545 100644 --- a/kandy/src/commandscheduler.h +++ b/kandy/src/commandscheduler.h @@ -36,7 +36,7 @@ class CommandScheduler : public TQObject { TQ_OBJECT public: - CommandScheduler (Modem *modem,TQObject *parent = 0, const char *name = 0); + CommandScheduler (Modem *modem,TQObject *parent = nullptr, const char *name = nullptr); void execute(const TQString &command); void execute(ATCommand *command); diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index 643ecafae..54d81238d 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -58,12 +58,12 @@ #include "kandy.moc" Kandy::Kandy(CommandScheduler *scheduler) - : TDEMainWindow( 0, "Kandy" ), - mPrinter(0) + : TDEMainWindow( nullptr, "Kandy" ), + mPrinter(nullptr) { mScheduler = scheduler; - mPreferencesDialog = 0; + mPreferencesDialog = nullptr; mView = new KandyView(mScheduler,this); @@ -344,5 +344,5 @@ void Kandy::showMobileGui() void Kandy::showErrorMessage( const TQString &text ) { - KMessageBox::error( 0, text ); + KMessageBox::error( nullptr, text ); } diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index e852ccd65..b0621b0f7 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -74,7 +74,7 @@ KandyPrefsDialog::~KandyPrefsDialog() void KandyPrefsDialog::setupSerialTab() { - TQFrame *topFrame = addPage(i18n("Serial Interface"),0, + TQFrame *topFrame = addPage(i18n("Serial Interface"),nullptr, DesktopIcon("connect_no",TDEIcon::SizeMedium)); TQGridLayout *topLayout = new TQGridLayout(topFrame,6,2); @@ -113,7 +113,7 @@ void KandyPrefsDialog::setupSerialTab() void KandyPrefsDialog::setupAddressbookTab() { - TQFrame *topFrame = addPage(i18n("Address Book"), 0, + TQFrame *topFrame = addPage(i18n("Address Book"), nullptr, DesktopIcon("kaddressbook", TDEIcon::SizeMedium)); TQGridLayout *topLayout = new TQGridLayout(topFrame, 13, 4); @@ -350,7 +350,7 @@ void KandyPrefsDialog::setupAddressbookTab() void KandyPrefsDialog::setupWindowsTab() { - TQFrame *topFrame = addPage(i18n("Windows"),0, + TQFrame *topFrame = addPage(i18n("Windows"),nullptr, DesktopIcon("window_duplicate",TDEIcon::SizeMedium)); TQGridLayout *topLayout = new TQGridLayout(topFrame,6,2); diff --git a/kandy/src/kandyprefsdialog.h b/kandy/src/kandyprefsdialog.h index 240376022..23d9a225c 100644 --- a/kandy/src/kandyprefsdialog.h +++ b/kandy/src/kandyprefsdialog.h @@ -45,7 +45,7 @@ class KandyPrefsDialog : public KPrefsDialog public: /** Initialize dialog and pages */ - KandyPrefsDialog(TQWidget *parent=0,char *name=0,bool modal=false); + KandyPrefsDialog(TQWidget *parent=nullptr,char *name=nullptr,bool modal=false); ~KandyPrefsDialog(); protected: diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index 51987b30c..b3e94df2d 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -192,7 +192,7 @@ void KandyView::appendOutput(const char *line) void KandyView::setResult(ATCommand *command) { - if (command == 0) { + if (!command) { kdDebug(5960) << "KandyView::setResult(): Error! No command." << endl; mResultView->setText(i18n("Error")); return; diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp index 00ca8764b..24b966d3e 100644 --- a/kandy/src/main.cpp +++ b/kandy/src/main.cpp @@ -46,10 +46,10 @@ static const char version[] = "0.5.1"; static TDECmdLineOptions options[] = { - { "terminal", I18N_NOOP("Show terminal window"), 0 }, - { "mobilegui", I18N_NOOP("Show mobile GUI"), 0 }, - { "nogui", I18N_NOOP("Do not show GUI"), 0 }, - { "+[profile]", I18N_NOOP("Filename of command profile file"), 0 }, + { "terminal", I18N_NOOP("Show terminal window"), nullptr }, + { "mobilegui", I18N_NOOP("Show mobile GUI"), nullptr }, + { "nogui", I18N_NOOP("Do not show GUI"), nullptr }, + { "+[profile]", I18N_NOOP("Filename of command profile file"), nullptr }, TDECmdLineLastOption // End of options. }; @@ -88,10 +88,10 @@ void initModem(Modem *modem) int main(int argc, char **argv) { TDEAboutData about("kandy", I18N_NOOP("Kandy"), version, description, - TDEAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0, + TDEAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",nullptr, "http://kandy.kde.org/"); - about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); - about.addAuthor( "Heiko Falk", 0, "hf2@ls12.cs.uni-dortmund.de" ); + about.addAuthor( "Cornelius Schumacher", nullptr, "schumacher@kde.org" ); + about.addAuthor( "Heiko Falk", nullptr, "hf2@ls12.cs.uni-dortmund.de" ); TDECmdLineArgs::init(argc,argv,&about); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 1ba89cdde..77de1e29c 100644 --- a/kandy/src/mobilegui.cpp +++ b/kandy/src/mobilegui.cpp @@ -154,7 +154,7 @@ class PhoneBookItem : public TQCheckListItem PhoneBookItem( TQListView *v ) : TQCheckListItem( v, "", TQCheckListItem::CheckBox ) { - mSyncEntry = 0; + mSyncEntry = nullptr; } PhoneBookItem( TQListView *v, SyncEntry *syncEntry, const TQString &name, @@ -655,7 +655,7 @@ TQString MobileGui::decodeSuffix( const TQString &suffix ) // as Hex-Number of a special GSM character. if ( ( theSuffix.left( 1 ) == "\"" ) && ( theSuffix.right( 1 ) == "\"" ) ) { TQString tmp = ""; - char suffixNumber = (char) dequote( suffix ).toUInt( 0, 16 ); + char suffixNumber = (char) dequote( suffix ).toUInt( nullptr, 16 ); tmp += suffixNumber; theSuffix = GSM2String( tmp ); @@ -1278,7 +1278,7 @@ void MobileGui::mergePhonebooks() for ( i = 0; i < mSyncer->mKabEntries.count(); i++ ) if ( mSyncer->mKabEntries.at( i )->mOn ) { mSyncer->mCommonEntries.append( - new SyncEntryCommon( true, mSyncer->mKabEntries.at( i ), 0 ) ); + new SyncEntryCommon( true, mSyncer->mKabEntries.at( i ), nullptr ) ); mSyncer->mKabEntries.at( i )->mOn = false; } @@ -1353,7 +1353,7 @@ void MobileGui::mergePhonebooks() if ( !equivalentEntryFound && mobileEntry->mOn ) { // No equivalent entry exists; generate a new one. mSyncer->mCommonEntries.append( - new SyncEntryCommon( true, 0, mobileEntry ) ); + new SyncEntryCommon( true, nullptr, mobileEntry ) ); mobileEntry->mOn = false; } } diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h index a8e27eaa3..de7896f9a 100644 --- a/kandy/src/mobilegui.h +++ b/kandy/src/mobilegui.h @@ -42,8 +42,8 @@ class MobileGui : public MobileGui_base, virtual public KandyIface public: - MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* parent=0, - const char* name=0, WFlags fl=0 ); + MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* parent=nullptr, + const char* name=nullptr, WFlags fl=0 ); ~MobileGui(); void exit(); diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index fd1b0a8f0..d9b405bfb 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -48,7 +48,7 @@ #include "mobilemain.moc" MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs) - : TDEMainWindow( 0, "MobileMain" ) + : TDEMainWindow( nullptr, "MobileMain" ) { mView = new MobileGui(scheduler, prefs, this); setCentralWidget(mView); diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp index ef16d00d9..d1e79165a 100644 --- a/kandy/src/modem.cpp +++ b/kandy/src/modem.cpp @@ -247,7 +247,7 @@ void Modem::close() timer->stop(); delete sn; - sn = 0; + sn = nullptr; unlockDevice(); @@ -371,7 +371,7 @@ void Modem::timerStart( int msec ) void Modem::receiveXModem( bool crc ) { - disconnect( sn, 0, this, 0 ); + disconnect( sn, nullptr, this, nullptr ); connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readXChar( int ) ) ); xcrc = crc; @@ -575,7 +575,7 @@ void Modem::init() is_locked = false; fd = -1; - sn = 0; + sn = nullptr; cspeed = B38400; @@ -597,7 +597,7 @@ void Modem::xreset() xsize = 0; if ( sn ) { - disconnect( sn, 0, this, 0 ); + disconnect( sn, nullptr, this, nullptr ); connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) ); } } diff --git a/kandy/src/modem.h b/kandy/src/modem.h index 9c1216cbc..692ca8a05 100644 --- a/kandy/src/modem.h +++ b/kandy/src/modem.h @@ -48,7 +48,7 @@ class Modem : public TQObject TQ_OBJECT public: - Modem(KandyPrefs *kprefs, TQObject *parent = 0, const char *name = 0); + Modem(KandyPrefs *kprefs, TQObject *parent = nullptr, const char *name = nullptr); virtual ~Modem(); void setSpeed(int speed); diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h index b96af359c..8985fc5d1 100644 --- a/kmobile/devices/skeleton/skeleton.h +++ b/kmobile/devices/skeleton/skeleton.h @@ -31,11 +31,11 @@ class KMobileSkeleton : public KMobileDevice TQ_OBJECT public: - KMobileSkeleton( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() ); + KMobileSkeleton( TQObject *obj=nullptr, const char *name=nullptr, const TQStringList &args=TQStringList() ); ~KMobileSkeleton(); // createObject needs to be reimplemented by every KMobileDevice driver - TQObject *createObject( TQObject *parent=0, const char *name=0, + TQObject *createObject( TQObject *parent=nullptr, const char *name=nullptr, const char *classname="TQObject", const TQStringList &args=TQStringList() ); // connect, disconnect and current status diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index e2ace6a86..37a54a2c4 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -53,7 +53,7 @@ #include "kmobile_selectiondialog.h" KMobile::KMobile() - : TDEMainWindow( 0, "kmobile" ) + : TDEMainWindow( nullptr, "kmobile" ) { m_config = new TDEConfig("kmobilerc"); @@ -108,7 +108,7 @@ void KMobile::setupActions() this, TQ_SLOT(addDevice()), actionCollection(), "device_add"); new TDEAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ), "Delete", this, TQ_SLOT(removeDevice()), actionCollection(), "device_remove"); - new TDEAction(i18n("Re&name Device..."), 0, Key_F2, + new TDEAction(i18n("Re&name Device..."), nullptr, Key_F2, this, TQ_SLOT(renameDevice()), actionCollection(), "device_rename"); new TDEAction(i18n("&Configure Device..."), "configure", 0, this, TQ_SLOT(configDevice()), actionCollection(), "device_configure"); diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index 160e0f9cc..aee9d9dd1 100644 --- a/kmobile/kmobiledevice.cpp +++ b/kmobile/kmobiledevice.cpp @@ -48,7 +48,7 @@ */ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList &args) - : KLibFactory(obj,name), m_config(0L), d(0L), m_fd(-1) + : KLibFactory(obj,name), m_config(nullptr), d(nullptr), m_fd(-1) { setClassType(Unclassified); setCapabilities(hasNothing); diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 00c43ee9e..1fa46f08d 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -85,14 +85,14 @@ public: * * @param parent The parent widget. It will be used as parent for message boxes. */ - virtual bool connectDevice( TQWidget *parent = 0 ) = 0; + virtual bool connectDevice( TQWidget *parent = nullptr ) = 0; /** * Disconnect from the device. * * @param parent The parent widget. It will be used as parent for message boxes. */ - virtual bool disconnectDevice( TQWidget *parent = 0 ) = 0; + virtual bool disconnectDevice( TQWidget *parent = nullptr ) = 0; /** * Returns true, if the device is currently connected and the link is online. diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index 08458307b..f326406e1 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -30,7 +30,7 @@ #define PRINT_DEBUG kdDebug() << "KMobileItem: " KMobileItem::KMobileItem(TQIconView *parent, TDEConfig *_config, KService::Ptr service) - : TQObject(parent), TQIconViewItem(parent), m_dev(0L) + : TQObject(parent), TQIconViewItem(parent), m_dev(nullptr) { config = _config; @@ -52,7 +52,7 @@ KMobileItem::KMobileItem(TQIconView *parent, TDEConfig *_config, KService::Ptr s /* restore this item from the config file */ KMobileItem::KMobileItem(TQIconView *parent, TDEConfig *_config, int reload_index) - : TQObject(parent), TQIconViewItem(parent), m_dev(0L) + : TQObject(parent), TQIconViewItem(parent), m_dev(nullptr) { config = _config; @@ -163,7 +163,7 @@ KService::Ptr KMobileItem::getServicePtr() const } PRINT_DEBUG << TQString("Service for library '%1' not found in KService list") .arg(m_deviceDesktopFile) << endl; - return 0L; + return nullptr; } /* @@ -188,7 +188,7 @@ bool KMobileItem::driverAvailable() PRINT_DEBUG << TQString("Got KMobileDevice object at 0x%1, configfile=%2") .arg((unsigned long)m_dev, 0, 16).arg(m_deviceConfigFile) << endl; - return (m_dev != 0); + return m_dev != nullptr; } #include "kmobileitem.moc" diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 58941dc6b..56c2a9637 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -95,7 +95,7 @@ KMobileItem *KMobileView::findDevice( const TQString &deviceName ) const if (item->text() == deviceName) return static_cast(item); } - return 0L; + return nullptr; } bool KMobileView::startKonqueror( const TQString &devName ) diff --git a/kmobile/main.cpp b/kmobile/main.cpp index c1e9cae9d..2e733cbdf 100644 --- a/kmobile/main.cpp +++ b/kmobile/main.cpp @@ -31,15 +31,15 @@ static const char version[] = "0.1"; static TDECmdLineOptions options[] = { - { "minimized", I18N_NOOP( "Minimize on startup to system tray" ), 0 }, + { "minimized", I18N_NOOP( "Minimize on startup to system tray" ), nullptr }, TDECmdLineLastOption }; int main(int argc, char **argv) { TDEAboutData about("kmobile", I18N_NOOP("KMobile"), version, description, - TDEAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org"); - about.addAuthor( "Helge Deller", 0, "deller@kde.org" ); + TDEAboutData::License_GPL, "(C) 2003-2005 Helge Deller", nullptr, nullptr, "deller@kde.org"); + about.addAuthor( "Helge Deller", nullptr, "deller@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); TDEUniqueApplication app; diff --git a/kmobile/pref.h b/kmobile/pref.h index 787cc5813..424377a87 100644 --- a/kmobile/pref.h +++ b/kmobile/pref.h @@ -28,7 +28,7 @@ class KMobilePrefPageOne : public TQFrame TQ_OBJECT public: - KMobilePrefPageOne(TQWidget *parent = 0); + KMobilePrefPageOne(TQWidget *parent = nullptr); }; class KMobilePrefPageTwo : public TQFrame @@ -36,7 +36,7 @@ class KMobilePrefPageTwo : public TQFrame TQ_OBJECT public: - KMobilePrefPageTwo(TQWidget *parent = 0); + KMobilePrefPageTwo(TQWidget *parent = nullptr); }; #endif // _KMOBILEPREF_H_ diff --git a/kmobile/systemtray.h b/kmobile/systemtray.h index 88219269e..a9af6ddc3 100644 --- a/kmobile/systemtray.h +++ b/kmobile/systemtray.h @@ -31,7 +31,7 @@ class SystemTray : public KSystemTray public: - SystemTray(TDEMainWindow *parent = 0, const char *name = 0); + SystemTray(TDEMainWindow *parent = nullptr, const char *name = nullptr); virtual ~SystemTray(); protected slots: diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 859e76fa9..1e2ccd9ff 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -66,7 +66,7 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) KParts::ReadOnlyPart *part = KParts::ComponentFactory:: createPartInstanceFromLibrary - ( libname, this, 0, this, "kontact", TQStringList(), &error ); + ( libname, this, nullptr, this, "kontact", TQStringList(), &error ); KParts::ReadOnlyPart *pimPart = dynamic_cast( part ); if ( pimPart ) { diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index cc71407c8..2529a491d 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -80,7 +80,7 @@ class TDE_EXPORT Core : public KParts::MainWindow void dayChanged( const TQDate& ); protected: - Core( TQWidget *parentWidget = 0, const char *name = 0 ); + Core( TQWidget *parentWidget = nullptr, const char *name = nullptr ); TQString lastErrorMessage() const; diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index b3ec82024..2c6df5d6d 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -60,11 +60,11 @@ Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name ) TDEGlobal::locale()->insertCatalogue(name); d->core = core; - d->dcopClient = 0; + d->dcopClient = nullptr; d->newActions = new TQPtrList; d->syncActions = new TQPtrList; d->hasPart = true; - d->part = 0; + d->part = nullptr; d->disabled = false; } @@ -138,7 +138,7 @@ const TDEAboutData *Plugin::aboutData() } else { kdError() << "Plugin::aboutData(): Can't load instance for " << title() << endl; - return 0; + return nullptr; } } @@ -208,7 +208,7 @@ void Plugin::configUpdated() void Plugin::partDestroyed() { - d->part = 0; + d->part = nullptr; } void Plugin::slotConfigUpdated() diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index f2911ade0..d646a12da 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -171,7 +171,7 @@ class TDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient Reimplement this method if you want to add a widget for your application to Kontact's summary page. */ - virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; } + virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return nullptr; } /** Returns whether the plugin provides a part that should be shown in the sidebar. diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index cd97525a0..c96b4ab1f 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -39,7 +39,7 @@ class TDE_EXPORT Summary : public TQWidget public: - Summary( TQWidget *parent, const char *name = 0 ); + Summary( TQWidget *parent, const char *name = nullptr ); virtual ~Summary(); diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 7fe8633ea..613f593d2 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -185,11 +185,11 @@ void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId ) static TDECmdLineOptions options[] = { - { "module ", I18N_NOOP( "Start with a specific Kontact module" ), 0 }, - { "iconify", I18N_NOOP( "Start in iconified (minimized) mode" ), 0 }, - { "list", I18N_NOOP( "List all possible modules and exit" ), 0 }, - { "listprofiles", I18N_NOOP( "List all possible profiles and exit" ), 0 }, - { "profile ", I18N_NOOP( "Start with a specific Kontact profile" ), 0 }, + { "module ", I18N_NOOP( "Start with a specific Kontact module" ), nullptr }, + { "iconify", I18N_NOOP( "Start in iconified (minimized) mode" ), nullptr }, + { "list", I18N_NOOP( "List all possible modules and exit" ), nullptr }, + { "listprofiles", I18N_NOOP( "List all possible profiles and exit" ), nullptr }, + { "profile ", I18N_NOOP( "Start with a specific Kontact profile" ), nullptr }, TDECmdLineLastOption }; diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index 17cd5862c..f4e3d1903 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_akregator, PluginFactory( "kontact_akregator" ) ) AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "akregator" ), m_stub(0) + : Kontact::Plugin( core, core, "akregator" ), m_stub(nullptr) { setInstance( PluginFactory::instance() ); diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index 8cdef7588..15b8bbaa5 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -53,7 +53,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kaddressbookplugin, KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "kaddressbook" ), - mStub( 0 ) + mStub( nullptr ) { setInstance( KAddressbookPluginFactory::instance() ); @@ -78,7 +78,7 @@ KAddressbookPlugin::~KAddressbookPlugin() KParts::ReadOnlyPart* KAddressbookPlugin::createPart() { KParts::ReadOnlyPart * part = loadPart(); - if ( !part ) return 0; + if ( !part ) return nullptr; // Create the stub that allows us to talk to the part mStub = new KAddressBookIface_stub( dcopClient(), "kaddressbook", diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp index a84dd63b2..2bb93c223 100644 --- a/kontact/plugins/karm/karm_plugin.cpp +++ b/kontact/plugins/karm/karm_plugin.cpp @@ -53,7 +53,7 @@ KarmPlugin::~KarmPlugin() KParts::ReadOnlyPart* KarmPlugin::createPart() { KParts::ReadOnlyPart * part = loadPart(); - if ( !part ) return 0; + if ( !part ) return nullptr; // this calls a DCOP interface from karm via the lib KarmDCOPIface_stub that is generated automatically mStub = new KarmDCOPIface_stub( dcopClient(), "KArm", diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 7b2d92b2d..1681133c6 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -61,10 +61,10 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name ) TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkmailsummary" ), I18N_NOOP( "Mail Summary Configuration Dialog" ), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 Tobias Koenig" ) ); - about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); + about->addAuthor( "Tobias Koenig", nullptr, "tokoe@kde.org" ); setAboutData( about ); } diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h index e66811538..704146b77 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.h +++ b/kontact/plugins/kmail/kcmkmailsummary.h @@ -39,7 +39,7 @@ class KCMKMailSummary : public TDECModule public: - KCMKMailSummary( TQWidget *parent = 0, const char *name = 0 ); + KCMKMailSummary( TQWidget *parent = nullptr, const char *name = nullptr ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 8d9c670a3..d3e3d7452 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kmailplugin, KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "kmail" ), - mStub( 0 ) + mStub( nullptr ) { setInstance( KMailPluginFactory::instance() ); @@ -157,7 +157,7 @@ TQString KMailPlugin::tipFile() const KParts::ReadOnlyPart* KMailPlugin::createPart() { KParts::ReadOnlyPart *part = loadPart(); - if ( !part ) return 0; + if ( !part ) return nullptr; mStub = new KMailIface_stub( dcopClient(), "kmail", "KMailIface" ); diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 31e229921..01fdd01c6 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -94,7 +94,7 @@ void SummaryWidget::slotUnreadCountChanged() kdDebug(5602) << "Calling kmail->KMailIface->folderList() via DCOP failed." << endl; } - mTimeOfLastMessageCountUpdate = ::time( 0 ); + mTimeOfLastMessageCountUpdate = ::time( nullptr ); } void SummaryWidget::updateFolderList( const TQStringList& folders ) diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h index d5fb299c1..50cf91e19 100644 --- a/kontact/plugins/kmail/summarywidget.h +++ b/kontact/plugins/kmail/summarywidget.h @@ -45,7 +45,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); + SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = nullptr ); int summaryHeight() const { return 1; } TQStringList configModules() const; diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index 8a6fb54fd..3b71495c8 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knodeplugin, KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "knode" ), mStub(0) + : Kontact::Plugin( core, core, "knode" ), mStub(nullptr) { setInstance( KNodePluginFactory::instance() ); @@ -86,7 +86,7 @@ void KNodePlugin::slotPostArticle() KParts::ReadOnlyPart* KNodePlugin::createPart() { KParts::ReadOnlyPart *part = loadPart(); - if ( !part ) return 0; + if ( !part ) return nullptr; mStub = new KNodeIface_stub( dcopClient(), "knode", "KNodeIface" ); return part; diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 385a6f897..2a2382fe5 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -42,7 +42,7 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( parent, name ), mNotesView( new KNotesIconView() ), mNoteTip( new KNoteTip( mNotesView ) ), - mNoteEditDlg( 0 ), + mNoteEditDlg( nullptr ), mManager( new KNotesResourceManager() ) { mNoteList.setAutoDelete( true ); @@ -83,7 +83,7 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) connect( mNotesView, TQ_SIGNAL( currentChanged( TQIconViewItem* ) ), this, TQ_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) ); - slotOnCurrentChanged( 0 ); + slotOnCurrentChanged( nullptr ); new KParts::SideBarExtension( mNotesView, this, "NotesSideBarExtension" ); @@ -103,10 +103,10 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) KNotesPart::~KNotesPart() { delete mNoteTip; - mNoteTip = 0; + mNoteTip = nullptr; delete mManager; - mManager = 0; + mManager = nullptr; } void KNotesPart::printSelectedNotes() @@ -344,7 +344,7 @@ void KNotesPart::slotOnItem( TQIconViewItem *i ) void KNotesPart::slotOnViewport() { - mNoteTip->setNote( 0 ); + mNoteTip->setNote( nullptr ); } // TODO: also with takeItem, clear(), diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h index 62766b1fb..717d3a01e 100644 --- a/kontact/plugins/knotes/knotes_part.h +++ b/kontact/plugins/knotes/knotes_part.h @@ -50,7 +50,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface public: - KNotesPart( TQObject *parent = 0, const char *name = 0 ); + KNotesPart( TQObject *parent = nullptr, const char *name = nullptr ); ~KNotesPart(); bool openFile(); diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 735f492e4..fe75d9957 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -118,7 +118,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient public: - KNoteEditDlg( TQWidget *parent = 0, const char *name = 0 ) + KNoteEditDlg( TQWidget *parent = nullptr, const char *name = nullptr ) : KDialogBase( Plain, i18n( "Edit Note" ), Ok | Cancel, Ok, parent, name, true, true ) { diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index 1b66eea12..e4ca5b9bb 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knotesplugin, KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & ) : Kontact::Plugin( core, core, "knotes" ), - mAboutData( 0 ) + mAboutData( nullptr ) { setInstance( KNotesPluginFactory::instance() ); diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index fe39868a3..2db092276 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -41,11 +41,11 @@ KNoteTip::KNoteTip( TDEIconView *parent ) - : TQFrame( 0, 0, WX11BypassWM | // this will make Seli happy >:-P + : TQFrame( nullptr, nullptr, WX11BypassWM | // this will make Seli happy >:-P WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop ), mFilter( false ), mView( parent ), - mNoteIVI( 0 ), + mNoteIVI( nullptr ), mPreview( new TQTextEdit( this ) ) { mPreview->setReadOnly( true ); @@ -64,7 +64,7 @@ KNoteTip::KNoteTip( TDEIconView *parent ) KNoteTip::~KNoteTip() { delete mPreview; - mPreview = 0; + mPreview = nullptr; } void KNoteTip::setNote( KNotesIconViewItem *item ) diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index d7269fac2..67ad4aba2 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -46,7 +46,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name ) - : Kontact::Summary( parent, name ), mLayout( 0 ), mPlugin( plugin ) + : Kontact::Summary( parent, name ), mLayout( nullptr ), mPlugin( plugin ) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h index 1ac015f4a..0b56ad060 100644 --- a/kontact/plugins/knotes/summarywidget.h +++ b/kontact/plugins/knotes/summarywidget.h @@ -46,7 +46,7 @@ class KNotesSummaryWidget : public Kontact::Summary public: - KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); + KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = nullptr ); void updateSummary( bool force = false ) { Q_UNUSED( force ); updateView(); } diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index a028d9379..70f736eef 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_journalplugin, JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "korganizer" ), - mIface( 0 ) + mIface( nullptr ) { setInstance( JournalPluginFactory::instance() ); instance()->iconLoader()->addAppDir("tdepim"); @@ -70,7 +70,7 @@ KParts::ReadOnlyPart *JournalPlugin::createPart() KParts::ReadOnlyPart *part = loadPart(); if ( !part ) - return 0; + return nullptr; dcopClient(); // ensure that we register to DCOP as "korganizer" mIface = new KCalendarIface_stub( dcopClient(), "kontact", "CalendarIface" ); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 41efc83ee..ba47342db 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -66,10 +66,10 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name ) TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkorgsummary" ), I18N_NOOP( "Schedule Configuration Dialog" ), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2003 - 2004 Tobias Koenig" ) ); - about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); + about->addAuthor( "Tobias Koenig", nullptr, "tokoe@kde.org" ); setAboutData( about ); } diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h index ce451f4e9..8fcbb0ac9 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.h +++ b/kontact/plugins/korganizer/kcmkorgsummary.h @@ -35,7 +35,7 @@ class KCMKOrgSummary : public TDECModule public: - KCMKOrgSummary( TQWidget *parent = 0, const char *name = 0 ); + KCMKOrgSummary( TQWidget *parent = nullptr, const char *name = nullptr ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 69cdd7576..460e61ad7 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -58,7 +58,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_korganizerplugin, KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "korganizer" ), - mIface( 0 ) + mIface( nullptr ) { setInstance( KOrganizerPluginFactory::instance() ); @@ -95,7 +95,7 @@ KParts::ReadOnlyPart *KOrganizerPlugin::createPart() KParts::ReadOnlyPart *part = loadPart(); if ( !part ) - return 0; + return nullptr; mIface = new KCalendarIface_stub( dcopClient(), "kontact", "CalendarIface" ); diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 8400b83ee..4a286ad03 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -52,7 +52,7 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, const char *name ) - : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ) + : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( nullptr ) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); @@ -90,7 +90,7 @@ void SummaryWidget::updateView() config.setGroup( "Calendar" ); int days = config.readNumEntry( "DaysToShow", 1 ); - TQLabel *label = 0; + TQLabel *label = nullptr; int counter = 0; TQPixmap pm = loader.loadIcon( "appointment", TDEIcon::Small ); TQPixmap pmb = loader.loadIcon( "calendarbirthday", TDEIcon::Small ); diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h index d0c9353e8..726f3e284 100644 --- a/kontact/plugins/korganizer/summarywidget.h +++ b/kontact/plugins/korganizer/summarywidget.h @@ -43,7 +43,7 @@ class SummaryWidget : public Kontact::Summary public: SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, - const char *name = 0 ); + const char *name = nullptr ); ~SummaryWidget(); int summaryHeight() const { return 3; } diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index bcb2c5661..1aaa16243 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -56,7 +56,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_todoplugin, TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& ) : Kontact::Plugin( core, core, "korganizer" ), - mIface( 0 ) + mIface( nullptr ) { setInstance( TodoPluginFactory::instance() ); instance()->iconLoader()->addAppDir("tdepim"); @@ -87,7 +87,7 @@ KParts::ReadOnlyPart *TodoPlugin::createPart() KParts::ReadOnlyPart *part = loadPart(); if ( !part ) - return 0; + return nullptr; dcopClient(); // ensure that we register to DCOP as "korganizer" mIface = new KCalendarIface_stub( dcopClient(), "kontact", "CalendarIface" ); diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 2fb9bf957..e126b6908 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -91,7 +91,7 @@ void TodoSummaryWidget::updateView() TDEIconLoader loader( "tdepim" ); - TQLabel *label = 0; + TQLabel *label = nullptr; int counter = 0; TQDate currentDate = TQDate::currentDate(); @@ -212,11 +212,11 @@ void TodoSummaryWidget::completeTodo( const TQString &uid ) { KCal::Todo *todo = mCalendar->todo( uid ); IncidenceChanger *changer = new IncidenceChanger( mCalendar, this ); - if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) { + if ( !todo->isReadOnly() && changer->beginChange( todo, nullptr, TQString() ) ) { KCal::Todo *oldTodo = todo->clone(); todo->setCompleted( TQDateTime::currentDateTime() ); changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED, this ); - changer->endChange( todo, 0, TQString() ); + changer->endChange( todo, nullptr, TQString() ); delete oldTodo; updateView(); } diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h index 6aa1bc4dc..88c7d62bc 100644 --- a/kontact/plugins/korganizer/todosummarywidget.h +++ b/kontact/plugins/korganizer/todosummarywidget.h @@ -43,7 +43,7 @@ class TodoSummaryWidget : public Kontact::Summary public: TodoSummaryWidget( TodoPlugin *plugin, TQWidget *parent, - const char *name = 0 ); + const char *name = nullptr ); ~TodoSummaryWidget(); int summaryHeight() const { return 3; } diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 84aaca95d..355ac5a1e 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -57,7 +57,7 @@ extern "C" NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *parent ) : KDialogBase( Plain, i18n( "New News Feed" ), Ok | Cancel, - Ok, parent, 0, true, true ) + Ok, parent, nullptr, true, true ) { TQWidget *page = plainPage(); TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(), @@ -219,7 +219,7 @@ void KCMKontactKNT::addNews() return; NewsItem *item = dynamic_cast( mAllNews->selectedItem() ); - if ( item == 0 ) + if (!item) return; DCOPRef service( "rssservice", "RSSService" ); @@ -236,7 +236,7 @@ void KCMKontactKNT::removeNews() return; NewsItem *item = dynamic_cast( mSelectedNews->selectedItem() ); - if ( item == 0 ) + if (!item) return; DCOPRef service( "rssservice", "RSSService" ); @@ -441,10 +441,10 @@ const TDEAboutData* KCMKontactKNT::aboutData() const { TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkontactknt" ), I18N_NOOP( "Newsticker Configuration Dialog" ), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2003 - 2004 Tobias Koenig" ) ); - about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); + about->addAuthor( "Tobias Koenig", nullptr, "tokoe@kde.org" ); return about; } diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h index 9227cb54b..0f5e49757 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.h +++ b/kontact/plugins/newsticker/kcmkontactknt.h @@ -41,7 +41,7 @@ class KCMKontactKNT : public TDECModule public: - KCMKontactKNT( TQWidget *parent = 0, const char *name = 0 ); + KCMKontactKNT( TQWidget *parent = nullptr, const char *name = nullptr ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/newsticker/newsticker_plugin.h b/kontact/plugins/newsticker/newsticker_plugin.h index ebaf34b45..f353206f5 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.h +++ b/kontact/plugins/newsticker/newsticker_plugin.h @@ -35,7 +35,7 @@ class NewsTickerPlugin : public Kontact::Plugin virtual Kontact::Summary *createSummaryWidget( TQWidget* parentWidget ); protected: - virtual KParts::ReadOnlyPart* createPart() { return 0L; } + virtual KParts::ReadOnlyPart* createPart() { return nullptr; } }; #endif diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index e209d031e..498f62ee6 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -43,7 +43,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), - DCOPObject( "NewsTickerPlugin" ), mLayout( 0 ), mFeedCounter( 0 ) + DCOPObject( "NewsTickerPlugin" ), mLayout( nullptr ), mFeedCounter( 0 ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h index 2363dcc40..a79077e1d 100644 --- a/kontact/plugins/newsticker/summarywidget.h +++ b/kontact/plugins/newsticker/summarywidget.h @@ -60,7 +60,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( TQWidget *parent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = nullptr ); int summaryHeight() const; TQStringList configModules() const; diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index 3a97d2c16..1966fa849 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -236,11 +236,11 @@ const TDEAboutData* KCMSDSummary::aboutData() const { TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmsdsummary" ), I18N_NOOP( "Special Dates Configuration Dialog" ), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 Tobias Koenig" ) ); - about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); - about->addAuthor( "Allen Winter", 0, "winter@kde.org" ); + about->addAuthor( "Tobias Koenig", nullptr, "tokoe@kde.org" ); + about->addAuthor( "Allen Winter", nullptr, "winter@kde.org" ); return about; } diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h index e3189656f..b2ddf5d2a 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.h +++ b/kontact/plugins/specialdates/kcmsdsummary.h @@ -39,7 +39,7 @@ class KCMSDSummary : public TDECModule public: - KCMSDSummary( TQWidget *parent = 0, const char *name = 0 ); + KCMSDSummary( TQWidget *parent = nullptr, const char *name = nullptr ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 083392efe..0ae62293d 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -79,7 +79,7 @@ class SDEntry SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name ) - : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 ) + : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( nullptr ), mHolidays( nullptr ) { // Create the Summary Layout TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); @@ -223,7 +223,7 @@ void SDSummaryWidget::updateView() TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true ); TQValueList dates; - TQLabel *label = 0; + TQLabel *label = nullptr; // No reason to show the date year TQString savefmt = TDEGlobal::locale()->dateFormat(); diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h index 2c63b259f..d7f83cf49 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.h +++ b/kontact/plugins/specialdates/sdsummarywidget.h @@ -47,7 +47,7 @@ class SDSummaryWidget : public Kontact::Summary public: SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, - const char *name = 0 ); + const char *name = nullptr ); TQStringList configModules() const; void configUpdated(); diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index a1893aef6..200e9c37e 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_specialdatesplugin, SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& ) : Kontact::Plugin( core, core, name ), - mAboutData( 0 ) + mAboutData( nullptr ) { setInstance( SpecialdatesPluginFactory::instance() ); instance()->iconLoader()->addAppDir( "tdepim" ); diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h index a0da69388..5758068f0 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.h +++ b/kontact/plugins/specialdates/specialdates_plugin.h @@ -42,7 +42,7 @@ class SpecialdatesPlugin : public Kontact::Plugin virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); protected: - virtual KParts::ReadOnlyPart *createPart() { return 0; } + virtual KParts::ReadOnlyPart *createPart() { return nullptr; } private: TDEAboutData *mAboutData; diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h index fe92825a2..a8952773c 100644 --- a/kontact/plugins/summary/dropwidget.h +++ b/kontact/plugins/summary/dropwidget.h @@ -30,7 +30,7 @@ class DropWidget : public TQWidget public: - DropWidget( TQWidget *parent, const char *name = 0 ); + DropWidget( TQWidget *parent, const char *name = nullptr ); signals: void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment ); diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 0ceb1ec44..14a331996 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -109,10 +109,10 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactsummary" ), I18N_NOOP( "TDE Kontact Summary" ), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2004 Tobias Koenig" ) ); - about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); + about->addAuthor( "Tobias Koenig", nullptr, "tokoe@kde.org" ); setAboutData( about ); } diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h index bfc72d40b..cc22090f4 100644 --- a/kontact/plugins/summary/kcmkontactsummary.h +++ b/kontact/plugins/summary/kcmkontactsummary.h @@ -36,7 +36,7 @@ class PluginView : public TDEListView public: - PluginView( TQWidget *parent, const char *name = 0 ); + PluginView( TQWidget *parent, const char *name = nullptr ); ~PluginView(); }; @@ -46,7 +46,7 @@ class KCMKontactSummary : public TDECModule public: - KCMKontactSummary( TQWidget *parent = 0, const char *name = 0 ); + KCMKontactSummary( TQWidget *parent = nullptr, const char *name = nullptr ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index fec7f36cb..ab885ac6c 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -69,7 +69,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, const TDEAboutData *aboutData, TQObject *parent, const char *name ) : KParts::ReadOnlyPart( parent, name ), - mCore( core ), mFrame( 0 ), mConfigAction( 0 ) + mCore( core ), mFrame( nullptr ), mConfigAction( nullptr ) { setInstance( new TDEInstance( aboutData ) ); diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index c7c55e14b..548370e50 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -57,7 +57,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart public: SummaryViewPart( Kontact::Core *core, const char *widgetName, const TDEAboutData *aboutData, - TQObject *parent = 0, const char *name = 0 ); + TQObject *parent = nullptr, const char *name = nullptr ); ~SummaryViewPart(); public slots: diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index 711c2b39e..06abbc721 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -35,12 +35,12 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_summaryplugin, SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& ) : Kontact::Plugin( core, core, name), - mAboutData( 0 ), mPart( 0 ) + mAboutData( nullptr ), mPart( nullptr ) { setInstance( SummaryViewFactory::instance() ); - mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, 0, - 0, actionCollection(), + mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, nullptr, + nullptr, actionCollection(), "kontact_summary_sync" ); connect( mSyncAction, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( syncAccount( const TQString& ) ) ); connect( mSyncAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillSyncActionSubEntries() ) ); diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index fb28ab335..f5f114457 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -40,7 +40,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) : Kontact::Summary( parent, name ), - DCOPObject( "WeatherSummaryWidget" ), mProc( 0 ) + DCOPObject( "WeatherSummaryWidget" ), mProc( nullptr ) { mLayout = new TQVBoxLayout( this, 3, 3 ); mLayout->setAlignment( TQt::AlignTop ); @@ -217,14 +217,14 @@ void SummaryWidget::showReport( const TQString &stationID ) if ( !mProc->start() ) { delete mProc; - mProc = 0; + mProc = nullptr; } } void SummaryWidget::reportFinished( TDEProcess* ) { mProc->deleteLater(); - mProc = 0; + mProc = nullptr; } #include "summarywidget.moc" diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h index 196269fd8..dd61c1201 100644 --- a/kontact/plugins/weather/summarywidget.h +++ b/kontact/plugins/weather/summarywidget.h @@ -90,7 +90,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject // K_DCOP public: - SummaryWidget( TQWidget *parent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = nullptr ); TQStringList configModules() const; diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index 506b16fda..3ab4654c0 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin, WeatherPluginFactory( "kontact_weatherplugin" ) ) WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, core, name ), mAboutData( 0 ) + : Kontact::Plugin( core, core, name ), mAboutData( nullptr ) { setInstance( WeatherPluginFactory::instance() ); } diff --git a/kontact/plugins/weather/weather_plugin.h b/kontact/plugins/weather/weather_plugin.h index a7eb5b613..922583d84 100644 --- a/kontact/plugins/weather/weather_plugin.h +++ b/kontact/plugins/weather/weather_plugin.h @@ -37,7 +37,7 @@ class WeatherPlugin : public Kontact::Plugin const TDEAboutData *aboutData(); protected: - virtual KParts::ReadOnlyPart *createPart() { return 0; } + virtual KParts::ReadOnlyPart *createPart() { return nullptr; } private: TDEAboutData *mAboutData; }; diff --git a/kontact/src/aboutdialog.h b/kontact/src/aboutdialog.h index de20c1ee4..fadc57249 100644 --- a/kontact/src/aboutdialog.h +++ b/kontact/src/aboutdialog.h @@ -37,7 +37,7 @@ class AboutDialog : public KDialogBase public: - AboutDialog( Kontact::Core *core, const char *name = 0 ); + AboutDialog( Kontact::Core *core, const char *name = nullptr ); protected: void addAboutPlugin( Kontact::Plugin *plugin ); diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index f9a261a92..1973dded0 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -61,7 +61,7 @@ class PluginProxy { public: PluginProxy() - : mPlugin( 0 ) + : mPlugin( nullptr ) { } PluginProxy( Plugin *plugin ) @@ -254,8 +254,8 @@ Navigator::Navigator( IconSidePane *parent, const char *name ) : TDEListBox( parent, name ), mSidePane( parent ), mShowIcons( true ), mShowText( true ) { - mMouseOn = 0; - mHighlightItem = 0; + mMouseOn = nullptr; + mHighlightItem = nullptr; mViewMode = sizeIntToEnum( Prefs::self()->sidePaneIconSize() ); mShowIcons = Prefs::self()->sidePaneShowIcons(); mShowText = Prefs::self()->sidePaneShowText(); @@ -407,8 +407,8 @@ void Navigator::enterEvent( TQEvent *event ) void Navigator::leaveEvent( TQEvent *event ) { TDEListBox::leaveEvent( event ); - slotMouseOn( 0 ); - mMouseOn = 0; + slotMouseOn( nullptr ); + mMouseOn = nullptr; } void Navigator::slotExecuted( TQListBoxItem *item ) @@ -484,8 +484,8 @@ void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos ) } } int maxWidth = 0; - TQListBoxItem* it = 0; - for (int i = 0; (it = item(i)) != 0; ++i) + TQListBoxItem* it = nullptr; + for (int i = 0; (it = item(i)) != nullptr; ++i) { int width = it->width(this); if (width > maxWidth) @@ -532,7 +532,7 @@ void Navigator::slotMouseOn( TQListBoxItem* newItem ) void Navigator::slotMouseOff() { - slotMouseOn( 0 ); + slotMouseOn( nullptr ); } IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name ) diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h index bb91997b5..35fc1eeda 100644 --- a/kontact/src/iconsidepane.h +++ b/kontact/src/iconsidepane.h @@ -120,7 +120,7 @@ class Navigator : public TDEListBox TQ_OBJECT public: - Navigator( IconSidePane *parent = 0, const char *name = 0 ); + Navigator( IconSidePane *parent = nullptr, const char *name = nullptr ); virtual void setSelected( TQListBoxItem *, bool ); @@ -176,7 +176,7 @@ class IconSidePane : public SidePaneBase TQ_OBJECT public: - IconSidePane( Core *core, TQWidget *parent, const char *name = 0 ); + IconSidePane( Core *core, TQWidget *parent, const char *name = nullptr ); ~IconSidePane(); virtual void indicateForegrunding( Kontact::Plugin* ); diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 0d2426a0e..3911cf26d 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -90,11 +90,11 @@ const TDEAboutData* KcmKontact::aboutData() const { TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactconfig" ), I18N_NOOP( "TDE Kontact" ), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2003 Cornelius Schumacher" ) ); - about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); - about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); + about->addAuthor( "Cornelius Schumacher", nullptr, "schumacher@kde.org" ); + about->addAuthor( "Tobias Koenig", nullptr, "tokoe@kde.org" ); return about; } diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h index 5dcb714ca..eed9d9a3a 100644 --- a/kontact/src/kcmkontact.h +++ b/kontact/src/kcmkontact.h @@ -42,7 +42,7 @@ class KcmKontact : public KPrefsModule public: - KcmKontact( TQWidget *parent = 0, const char *name = 0 ); + KcmKontact( TQWidget *parent = nullptr, const char *name = nullptr ); virtual const TDEAboutData* aboutData() const; }; diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 1602a300e..0a3e3a802 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -51,7 +51,7 @@ static const char version[] = "1.2.9"; class KontactApp : public TDEUniqueApplication { public: - KontactApp() : mMainWindow( 0 ), mSessionRestored( false ) + KontactApp() : mMainWindow( nullptr ), mSessionRestored( false ) { TDEGlobal::iconLoader()->addAppDir( "tdepim" ); } @@ -147,15 +147,15 @@ int main( int argc, char **argv ) TDEAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description, TDEAboutData::License_GPL, I18N_NOOP("(C) 2008-2018 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), - 0, "http://www.trinitydesktop.org" ); - about.addAuthor( "Daniel Molkentin", 0, "molkentin@kde.org" ); - about.addAuthor( "Don Sanders", 0, "sanders@kde.org" ); - about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); - about.addAuthor( "Tobias K\303\266nig", 0, "tokoe@kde.org" ); - about.addAuthor( "David Faure", 0, "faure@kde.org" ); - about.addAuthor( "Ingo Kl\303\266cker", 0, "kloecker@kde.org" ); - about.addAuthor( "Sven L\303\274ppken", 0, "sven@kde.org" ); - about.addAuthor( "Zack Rusin", 0, "zack@kde.org" ); + nullptr, "http://www.trinitydesktop.org" ); + about.addAuthor( "Daniel Molkentin", nullptr, "molkentin@kde.org" ); + about.addAuthor( "Don Sanders", nullptr, "sanders@kde.org" ); + about.addAuthor( "Cornelius Schumacher", nullptr, "schumacher@kde.org" ); + about.addAuthor( "Tobias K\303\266nig", nullptr, "tokoe@kde.org" ); + about.addAuthor( "David Faure", nullptr, "faure@kde.org" ); + about.addAuthor( "Ingo Kl\303\266cker", nullptr, "kloecker@kde.org" ); + about.addAuthor( "Sven L\303\274ppken", nullptr, "sven@kde.org" ); + about.addAuthor( "Zack Rusin", nullptr, "zack@kde.org" ); about.addAuthor( "Matthias Hoelzer-Kluepfel", I18N_NOOP("Original Author"), "mhk@kde.org" ); TDECmdLineArgs::init( argc, argv, &about ); diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 27af94f59..d289dc50e 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -87,8 +87,8 @@ using namespace Kontact; class SettingsDialogWrapper : public KSettings::Dialog { public: - SettingsDialogWrapper( ContentInListView content, TQWidget * parent = 0 ) - : KSettings::Dialog( content, parent, 0 ) + SettingsDialogWrapper( ContentInListView content, TQWidget * parent = nullptr ) + : KSettings::Dialog( content, parent, nullptr ) { } @@ -103,8 +103,8 @@ class SettingsDialogWrapper : public KSettings::Dialog }; MainWindow::MainWindow() - : Kontact::Core(), mTopWidget( 0 ), mSplitter( 0 ), - mCurrentPlugin( 0 ), mAboutDialog( 0 ), mReallyClose( false ), mSyncActionsEnabled( true ) + : Kontact::Core(), mTopWidget( nullptr ), mSplitter( nullptr ), + mCurrentPlugin( nullptr ), mAboutDialog( nullptr ), mReallyClose( false ), mSyncActionsEnabled( true ) { // Set this to be the group leader for all subdialogs - this means // modal subdialogs will only affect this dialog, not the other windows @@ -119,7 +119,7 @@ void MainWindow::initGUI() initWidgets(); setupActions(); setHelpMenuEnabled( false ); - KHelpMenu *helpMenu = new KHelpMenu( this, 0, true, actionCollection() ); + KHelpMenu *helpMenu = new KHelpMenu( this, nullptr, true, actionCollection() ); connect( helpMenu, TQ_SIGNAL( showAboutApplication() ), TQ_SLOT( showAboutDialog() ) ); @@ -150,7 +150,7 @@ void MainWindow::initGUI() setStandardToolBarMenuEnabled( true ); - createGUI( 0 ); + createGUI( nullptr ); loadPlugins(); @@ -209,7 +209,7 @@ MainWindow::~MainWindow() for ( KParts::Part *p = parts.last(); p; p = parts.prev() ) { delete p; - p = 0; + p = nullptr; } Prefs::self()->writeConfig(); @@ -240,7 +240,7 @@ void MainWindow::initWidgets() mTopWidget->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); setCentralWidget( mTopWidget ); - TQHBox *mBox = 0; + TQHBox *mBox = nullptr; mSplitter = new TQSplitter( mTopWidget ); mBox = new TQHBox( mTopWidget ); mSidePane = new IconSidePane( this, mSplitter ); @@ -358,7 +358,7 @@ void MainWindow::setupActions() new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQ_SLOT( slotShowTip() ), actionCollection(), "help_tipofday" ); - KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); + KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", nullptr, nullptr, actionCollection(), "navigator_spacer_item" ); spacerAction->setAutoSized( true ); } @@ -455,7 +455,7 @@ void MainWindow::slotLoadProfile( const TQString& id ) bool MainWindow::isPluginLoaded( const KPluginInfo *info ) { - return (pluginFromInfo( info ) != 0); + return pluginFromInfo(info); } Plugin *MainWindow::pluginFromInfo( const KPluginInfo *info ) @@ -465,7 +465,7 @@ Plugin *MainWindow::pluginFromInfo( const KPluginInfo *info ) if ( (*it)->identifier() == info->pluginName() ) return *it; - return 0; + return nullptr; } Plugin *MainWindow::pluginFromAction( const TDEAction *action ) @@ -476,7 +476,7 @@ Plugin *MainWindow::pluginFromAction( const TDEAction *action ) return *it; } } - return 0; + return nullptr; } bool MainWindow::isPluginLoadedByAction( const TDEAction *action ) @@ -503,13 +503,13 @@ void MainWindow::sortActionsByWeight() TQPtrListIterator eit( mActionPlugins ); TDEAction *action; - while ( ( action = eit.current() ) != 0 ) { + while ((action = eit.current()) != nullptr) { ++eit; TQPtrListIterator sortIt( sorted ); uint at = 0; TDEAction *saction; Plugin *p1 = pluginFromAction( action ); - while ( ( saction = sortIt.current() ) != 0 ) { + while ((saction = sortIt.current()) != nullptr) { Plugin *p2 = pluginFromAction( saction ); if ( p1 && p2 && p1->weight() >= p2->weight() ) { ++sortIt; @@ -625,7 +625,7 @@ void MainWindow::updateShortcuts() TQPtrListIterator it( mActionPlugins ); int i = 1; TDEAction *action; - while ( ( action = it.current() ) != 0 ) { + while ((action = it.current()) != nullptr) { ++it; if ( isPluginLoadedByAction( action ) ) { loadedActions.append( action ); @@ -664,7 +664,7 @@ bool MainWindow::removePlugin( const KPluginInfo *info ) removeChildClient( plugin ); if ( mCurrentPlugin == plugin ) - mCurrentPlugin = 0; + mCurrentPlugin = nullptr; plugin->deleteLater(); // removes the part automatically mPlugins.remove( it ); @@ -673,7 +673,7 @@ bool MainWindow::removePlugin( const KPluginInfo *info ) mPluginAction.remove( plugin ); } - if ( mCurrentPlugin == 0 ) { + if (!mCurrentPlugin) { PluginList::Iterator it; for ( it = mPlugins.begin(); it != mPlugins.end(); ++it ) { if ( (*it)->showInSideBar() ) { @@ -714,7 +714,7 @@ void MainWindow::partLoaded( Kontact::Plugin*, KParts::ReadOnlyPart *part ) void MainWindow::slotActivePartChanged( KParts::Part *part ) { if ( !part ) { - createGUI( 0 ); + createGUI( nullptr ); return; } @@ -960,7 +960,7 @@ void MainWindow::slotQuit() void MainWindow::slotPreferences() { - static SettingsDialogWrapper *dlg = 0; + static SettingsDialogWrapper *dlg = nullptr; if ( !dlg ) { // do not show settings of components running standalone TQValueList filteredPlugins = mPluginInfos; diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h index da7e23ca1..84d142c98 100644 --- a/kontact/src/mainwindow.h +++ b/kontact/src/mainwindow.h @@ -77,7 +77,7 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont virtual int startServiceFor( const TQString& serviceType, const TQString& constraint = TQString(), const TQString& preferences = TQString(), - TQString *error = 0, TQCString* dcopService = 0, + TQString *error = nullptr, TQCString* dcopService = nullptr, int flags = 0 ); virtual PluginList pluginList() const { return mPlugins; } diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index 0c9c2a491..221a6f0ba 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -34,7 +34,7 @@ #include #include -Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialogBase( parent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close ) +Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialogBase( parent, /*name=*/nullptr, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close ) { setWFlags( flags ); setCaption( i18n("Configure Profiles") ); @@ -252,7 +252,7 @@ void Kontact::ProfileDialog::listItemRenamed( TQListViewItem* item, const TQStri void Kontact::ProfileDialog::updateButtonState() { - const bool hasSelection = m_list->selectedItem() != 0; + const bool hasSelection = m_list->selectedItem() != nullptr; m_deleteProfileButton->setEnabled( hasSelection ); m_saveProfileButton->setEnabled( hasSelection); actionButton( KDialogBase::Ok )->setEnabled( hasSelection ); diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h index 7661cb5bd..ac93cf280 100644 --- a/kontact/src/profiledialog.h +++ b/kontact/src/profiledialog.h @@ -43,7 +43,7 @@ TQ_OBJECT public: - explicit ProfileDialog( TQWidget* parent = 0, WFlags f = 0 ); + explicit ProfileDialog( TQWidget* parent = nullptr, WFlags f = 0 ); private: enum ListColumn { diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 80941e022..67e5ad966 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -117,13 +117,13 @@ bool Kontact::Profile::operator==( const Kontact::Profile& other ) const return m_id == other.m_id && m_name == other.m_name && m_description == other.m_description; } -Kontact::ProfileManager* Kontact::ProfileManager::m_self = 0; +Kontact::ProfileManager* Kontact::ProfileManager::m_self = nullptr; static KStaticDeleter profileManagerSD; Kontact::ProfileManager* Kontact::ProfileManager::self() { - if ( m_self == 0 ) + if (!m_self) { profileManagerSD.setObject( m_self, new Kontact::ProfileManager ); m_self->readConfig(); diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h index bd05d49d7..32a47a9c7 100644 --- a/kontact/src/profilemanager.h +++ b/kontact/src/profilemanager.h @@ -146,7 +146,7 @@ private: static Kontact::Profile readFromConfiguration( const TQString& configFile, bool isLocal ); - explicit ProfileManager( TQObject* parent = 0 ); + explicit ProfileManager( TQObject* parent = nullptr ); void readConfig(); diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h index 5a92a0a15..49d69f457 100644 --- a/kontact/src/sidepanebase.h +++ b/kontact/src/sidepanebase.h @@ -36,7 +36,7 @@ class SidePaneBase : public TQVBox TQ_OBJECT public: - SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 ); + SidePaneBase( Core *core, TQWidget *parent, const char *name = nullptr ); virtual ~SidePaneBase(); signals: diff --git a/korn/account_input.h b/korn/account_input.h index 548db498b..e73c68cb5 100644 --- a/korn/account_input.h +++ b/korn/account_input.h @@ -280,7 +280,7 @@ public: * * @return 0 */ - virtual TQWidget* leftWidget() { return 0; } + virtual TQWidget* leftWidget() { return nullptr; } /** * This function returns the checkbox. * @return A pointer to the checkbox. diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp index 5a30e56a8..29355bd4f 100644 --- a/korn/accountmanager.cpp +++ b/korn/accountmanager.cpp @@ -32,7 +32,7 @@ #include -KornSubjectsDlg* AccountManager::_subjectsDlg = 0; +KornSubjectsDlg* AccountManager::_subjectsDlg = nullptr; AccountManager::AccountManager( TQObject * parent, const char * name ) : TQObject( parent, name ), diff --git a/korn/accountmanager.h b/korn/accountmanager.h index 38b5069ce..5e6ece199 100644 --- a/korn/accountmanager.h +++ b/korn/accountmanager.h @@ -45,7 +45,7 @@ public: /** * Constructor, parameters are directed to TQObject. */ - AccountManager( TQObject * parent = 0, const char * name = 0 ); + AccountManager( TQObject * parent = nullptr, const char * name = nullptr ); /** * Destructor diff --git a/korn/boxcontainer.h b/korn/boxcontainer.h index bd489ed6f..4f37e7783 100644 --- a/korn/boxcontainer.h +++ b/korn/boxcontainer.h @@ -41,7 +41,7 @@ public: * @param parent The parent of this object * @param name The name of this object */ - BoxContainer( TQObject *parent = 0, const char * name = 0 ); + BoxContainer( TQObject *parent = nullptr, const char * name = nullptr ); /** * Destructor */ diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 99f54dd9d..8525e79e7 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -56,11 +56,11 @@ BoxContainerItem::BoxContainerItem( TQObject * parent, const char * name ) for( i = 0; i < 2; ++i ) { - _icons[ i ] = 0; - _anims[ i ] = 0; - _fgColour[ i ] = 0; - _bgColour[ i ] = 0; - _fonts[ i ] = 0; + _icons[ i ] = nullptr; + _anims[ i ] = nullptr; + _fgColour[ i ] = nullptr; + _bgColour[ i ] = nullptr; + _fonts[ i ] = nullptr; } for( i = 0; i < 3; ++i ) @@ -85,46 +85,46 @@ void BoxContainerItem::readConfig( TDEConfig* config, const int index ) if( config->readBoolEntry( "hasnormalicon", false ) ) _icons[ 0 ] = new TQString( config->readEntry( "normalicon", "" ) ); else - _icons[ 0 ] = 0; + _icons[ 0 ] = nullptr; if( config->readBoolEntry( "hasnewicon", false ) ) _icons[ 1 ] = new TQString( config->readEntry( "newicon", "" ) ); else - _icons[ 1 ] = 0; + _icons[ 1 ] = nullptr; if( config->readBoolEntry( "hasnormalanim", false ) ) _anims[ 0 ] = new TQString( config->readEntry( "normalanim", "" ) ); else - _anims[ 0 ] = 0; + _anims[ 0 ] = nullptr; if( config->readBoolEntry( "hasnewanim", false ) ) _anims[ 1 ] = new TQString( config->readEntry( "newanim", "" ) ); else - _anims[ 1 ] = 0; + _anims[ 1 ] = nullptr; if( config->readBoolEntry( "hasnormalfgcolour", false ) ) _fgColour[ 0 ] = new TQColor( config->readColorEntry( "normalfgcolour" ) ); else - _fgColour[ 0 ] = 0; + _fgColour[ 0 ] = nullptr; if( config->readBoolEntry( "hasnewfgcolour", false ) ) _fgColour[ 1 ] = new TQColor( config->readColorEntry( "newfgcolour" ) ); else - _fgColour[ 1 ] = 0; + _fgColour[ 1 ] = nullptr; if( config->readBoolEntry( "hasnormalbgcolour", false ) ) _bgColour[ 0 ] = new TQColor( config->readColorEntry( "normalbgcolour" ) ); else - _bgColour[ 0 ] = 0; + _bgColour[ 0 ] = nullptr; if( config->readBoolEntry( "hasnewbgcolour", false ) ) _bgColour[ 1 ] = new TQColor( config->readColorEntry( "newbgcolour" ) ); else - _bgColour[ 1 ] = 0; + _bgColour[ 1 ] = nullptr; if( config->readBoolEntry( "hasnormalfont", false ) ) _fonts[ 0 ] = new TQFont( config->readFontEntry( "normalfont" ) ); else - _fonts[ 0 ] = 0; + _fonts[ 0 ] = nullptr; if( config->readBoolEntry( "hasnewfont", false ) ) _fonts[ 1 ] = new TQFont( config->readFontEntry( "newfont" ) ); else - _fonts[ 1 ] = 0; + _fonts[ 1 ] = nullptr; //Read information about the mappings. _recheckSettings[ 0 ] = config->readBoolEntry( "leftrecheck", true ); @@ -217,7 +217,7 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" ); TQVBox *mainvlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( TQString(objId()) ).arg( accountName ) - .arg( total ), "", TQPixmap(), 0 ); + .arg( total ), "", TQPixmap(), nullptr ); TQGrid *mainglayout = new TQGrid( date ? 3 : 2 ,mainvlayout, "Grid-Layout" ); TQLabel *title = new TQLabel( i18n("From"), mainglayout, "from_label" ); @@ -405,13 +405,13 @@ void BoxContainerItem::help() void BoxContainerItem::reportBug() { - KBugReport bug( 0, true ); + KBugReport bug( nullptr, true ); bug.exec(); //modal: it doesn't recheck anymore } void BoxContainerItem::about() { - TDEAboutApplication about( 0, "KOrn About", true ); + TDEAboutApplication about( nullptr, "KOrn About", true ); about.exec(); //modal: it doesn't recheck anymore } diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h index 575e98355..8343df157 100644 --- a/korn/boxcontaineritem.h +++ b/korn/boxcontaineritem.h @@ -55,7 +55,7 @@ public: * @param name The name of this object, See TQObject::TQObject * @see BoxContainerItem::readConfig */ - BoxContainerItem( TQObject * parent = 0, const char * name = 0 ); + BoxContainerItem( TQObject * parent = nullptr, const char * name = nullptr ); /** * The default destructor. This only removes _command-pointer. diff --git a/korn/dcop_proto.h b/korn/dcop_proto.h index defcf0c20..004f2f753 100644 --- a/korn/dcop_proto.h +++ b/korn/dcop_proto.h @@ -111,7 +111,7 @@ public: * * @return 0 */ - virtual const TDEIO_Protocol* getKIOProtocol() const { return 0; } + virtual const TDEIO_Protocol* getKIOProtocol() const { return nullptr; } }; #endif diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp index 55edda74d..520d043a2 100644 --- a/korn/dcopdrop.cpp +++ b/korn/dcopdrop.cpp @@ -37,7 +37,7 @@ DCOPDrop::DCOPDrop() _msgList( new TQMap< int, KornMailSubject* > ), _name( new TQString( "" ) ), _counter( 1 ), - _interface( 0 ) + _interface( nullptr ) { } diff --git a/korn/dockedcontainer.cpp b/korn/dockedcontainer.cpp index 5e2463886..47d2f34e6 100644 --- a/korn/dockedcontainer.cpp +++ b/korn/dockedcontainer.cpp @@ -31,7 +31,7 @@ DockedContainer::~DockedContainer() BoxContainerItem* DockedContainer::newBoxInstance() const { - return new DockedItem( 0, "foobar" ); + return new DockedItem( nullptr, "foobar" ); } #include "dockedcontainer.moc" diff --git a/korn/dockedcontainer.h b/korn/dockedcontainer.h index af79349e8..4343e11cb 100644 --- a/korn/dockedcontainer.h +++ b/korn/dockedcontainer.h @@ -31,7 +31,7 @@ class DockedContainer : public BoxContainer { TQ_OBJECT public: - DockedContainer( TQObject * parent = 0, const char * name = 0 ); + DockedContainer( TQObject * parent = nullptr, const char * name = nullptr ); ~DockedContainer(); protected: diff --git a/korn/dockeditem.h b/korn/dockeditem.h index d0ad6a235..b21b299b0 100644 --- a/korn/dockeditem.h +++ b/korn/dockeditem.h @@ -43,7 +43,7 @@ public: * @param parant The parent window * @param name The name of the TQObject's parents. */ - DockedItem( TQWidget * parent = 0, const char * name = 0 ); + DockedItem( TQWidget * parent = nullptr, const char * name = nullptr ); /** * Empty destructor; does nothing at the moment */ diff --git a/korn/hvcontainer.cpp b/korn/hvcontainer.cpp index cb2aef721..d54f53c22 100644 --- a/korn/hvcontainer.cpp +++ b/korn/hvcontainer.cpp @@ -26,12 +26,12 @@ HVContainer::HVContainer( TQt::Orientation orientation, TQObject * parent, const char * name ) : BoxContainer( parent, name ), - box( 0 ) + box( nullptr ) { if( orientation == TQt::Horizontal ) - box = new TQHBox( 0, "hbox" ); + box = new TQHBox( nullptr, "hbox" ); else - box = new TQVBox( 0, "vbox" ); + box = new TQVBox( nullptr, "vbox" ); } HVContainer::~HVContainer() diff --git a/korn/hvcontainer.h b/korn/hvcontainer.h index ccb469fbb..238f2b975 100644 --- a/korn/hvcontainer.h +++ b/korn/hvcontainer.h @@ -38,7 +38,7 @@ public: * * @param orientation The orientation of the box: it is a vertical or horizontal box? */ - HVContainer( TQt::Orientation orientation, TQObject * parent = 0 , const char * name = 0 ); + HVContainer( TQt::Orientation orientation, TQObject * parent = nullptr , const char * name = nullptr ); ~HVContainer(); /** diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index 47ee53d25..329bc572d 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -31,7 +31,7 @@ #include HVItem::HVItem( TQWidget *parent, const char *name ) - : BoxContainerItem( 0, name ), + : BoxContainerItem( nullptr, name ), _label( new Label( parent, "label" ) ), _popup( new TDEPopupMenu( _label, "popupmenu" ) ), _actions( new TDEActionCollection( _popup, "actions" ) ) diff --git a/korn/hvitem.h b/korn/hvitem.h index 19b583a51..e2612f260 100644 --- a/korn/hvitem.h +++ b/korn/hvitem.h @@ -33,7 +33,7 @@ class HVItem : public BoxContainerItem { TQ_OBJECT public: - HVItem( TQWidget *parent = 0, const char *name = 0 ); + HVItem( TQWidget *parent = nullptr, const char *name = nullptr ); ~HVItem(); /** diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp index a3e8b4d4d..26381e46e 100644 --- a/korn/keditlistboxman.cpp +++ b/korn/keditlistboxman.cpp @@ -27,9 +27,9 @@ KEditListBoxManager::KEditListBoxManager( TQWidget *parent, const char *name, bool checkAtEntering, int buttons ) : KEditListBox( parent, name, checkAtEntering, buttons ), - _config( 0 ), - _groupName( 0 ), - _subGroupName( 0 ), + _config( nullptr ), + _groupName( nullptr ), + _subGroupName( nullptr ), _prevCount( 0 ) { init(); @@ -39,9 +39,9 @@ KEditListBoxManager::KEditListBoxManager( const TQString& title, TQWidget *paren const char *name, bool checkAtEntering, int buttons) : KEditListBox( title, parent, name, checkAtEntering, buttons ), - _config( 0 ), - _groupName( 0 ), - _subGroupName( 0 ), + _config( nullptr ), + _groupName( nullptr ), + _subGroupName( nullptr ), _prevCount( 0 ) { init(); @@ -52,9 +52,9 @@ KEditListBoxManager::KEditListBoxManager( const TQString& title, TQWidget *parent, const char *name, bool checkAtEntering, int buttons ) : KEditListBox( title, customEditor, parent, name, checkAtEntering, buttons ), - _config( 0 ), - _groupName( 0 ), - _subGroupName( 0 ), + _config( nullptr ), + _groupName( nullptr ), + _subGroupName( nullptr ), _prevCount( 0 ) { init(); diff --git a/korn/keditlistboxman.h b/korn/keditlistboxman.h index 235b96791..27307edc6 100644 --- a/korn/keditlistboxman.h +++ b/korn/keditlistboxman.h @@ -38,14 +38,14 @@ public: /** * Constructor: @see KEditListBoxManager::KEditListBoxManager( const TQString&, TQWidget, const char * name, bool, int ) */ - KEditListBoxManager( TQWidget *parent = 0, const char *name = 0, + KEditListBoxManager( TQWidget *parent = nullptr, const char *name = nullptr, bool checkAtEntering=true, int buttons = All ); /** * The save as above, but with other options for KEditListBox. */ - KEditListBoxManager( const TQString& title, TQWidget *parent = 0, - const char *name = 0, bool checkAtEntering=true, + KEditListBoxManager( const TQString& title, TQWidget *parent = nullptr, + const char *name = nullptr, bool checkAtEntering=true, int buttons = All ); /** @@ -53,7 +53,7 @@ public: */ KEditListBoxManager( const TQString& title, const KEditListBox::CustomEditor &customEditor, - TQWidget *parent = 0, const char *name = 0, + TQWidget *parent = nullptr, const char *name = nullptr, bool checkAtEntering = true, int buttons = All ); /** diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp index b53dae5bc..5bf4e8b56 100644 --- a/korn/kmail_proto.cpp +++ b/korn/kmail_proto.cpp @@ -70,7 +70,7 @@ const Protocol* KMail_Protocol::getProtocol( TDEConfigGroup* config ) const //Type not recognized, or does not exist in KOrn kdWarning() << "KMail configuration not found" << endl; - return 0; + return nullptr; } KMailDrop* KMail_Protocol::createMaildrop( TDEConfigGroup *config ) const @@ -83,7 +83,7 @@ KMailDrop* KMail_Protocol::createMaildrop( TDEConfigGroup *config ) const return new KKioDrop(); kdWarning() << "KMail configuration not found" << endl; - return 0; + return nullptr; } TQMap< TQString, TQString > * KMail_Protocol::createConfig( TDEConfigGroup* config, const TQString& ) const diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index bf1e614c9..ba09ab33f 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -39,14 +39,14 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name ) : KornAccountCfg( parent, name ), - _config( 0 ), + _config( nullptr ), _fields( 0 ), _urlfields( 0 ), _boxnr( 0 ), _accountnr( 0 ), - _vlayout( 0 ), - _protocolLayout( 0 ), - _groupBoxes( 0 ), + _vlayout( nullptr ), + _protocolLayout( nullptr ), + _groupBoxes( nullptr ), _accountinput( new TQPtrList< AccountInput >() ) { connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) ); diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h index 20fe6372e..31f60efa3 100644 --- a/korn/kornaccountcfgimpl.h +++ b/korn/kornaccountcfgimpl.h @@ -39,7 +39,7 @@ class KornAccountCfgImpl : public KornAccountCfg { TQ_OBJECT public: - KornAccountCfgImpl( TQWidget * parent = 0, const char * name = 0 ); + KornAccountCfgImpl( TQWidget * parent = nullptr, const char * name = nullptr ); ~KornAccountCfgImpl(); void readConfig( TDEConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr ); diff --git a/korn/kornapp.h b/korn/kornapp.h index 03f7ae4bd..33194bdbb 100644 --- a/korn/kornapp.h +++ b/korn/kornapp.h @@ -23,7 +23,7 @@ public: /** * KornApp Constructor */ - KornApp() : TDEUniqueApplication(), _shell( 0 ), _instanceCount( 0 ) {} + KornApp() : TDEUniqueApplication(), _shell( nullptr ), _instanceCount( 0 ) {} /** * KornApp Destructor diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index cd9cbdf36..35bad9b9d 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -40,8 +40,8 @@ class TDEConfig; KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name ) : KornBoxCfg( parent, name ), - _config( 0 ), - _base( 0 ), + _config( nullptr ), + _base( nullptr ), _index( -1 ) { _fonts[ 0 ] = new TQFont; @@ -353,7 +353,7 @@ void KornBoxCfgImpl::slotCancel() void KornBoxCfgImpl::slotDialogDestroyed() { - _base->deleteLater(); _base = 0; + _base->deleteLater(); _base = nullptr; _group->deleteLater(); elbAccounts->setEnabled( true ); } diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index f0e4f983f..bbbec0e61 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -40,7 +40,7 @@ KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name ) : KornCfgWidget( parent, name ), _config( new TDEConfig( "kornrc" ) ), - _base( 0 ) + _base( nullptr ) { elbBoxes->setSubGroupName( "korn-%1-%2" ); elbBoxes->setGroupName( "korn-%1" ); @@ -84,7 +84,7 @@ void KornCfgImpl::slotEditBox() void KornCfgImpl::slotDialogDestroyed() { - _base->deleteLater(); _base = 0; + _base->deleteLater(); _base = nullptr; elbBoxes->setEnabled( true ); } diff --git a/korn/korncfgimpl.h b/korn/korncfgimpl.h index a00073277..b231f3848 100644 --- a/korn/korncfgimpl.h +++ b/korn/korncfgimpl.h @@ -31,7 +31,7 @@ class KornCfgImpl : public KornCfgWidget { TQ_OBJECT public: - KornCfgImpl( TQWidget * parent = 0, const char * name = 0 ); + KornCfgImpl( TQWidget * parent = nullptr, const char * name = nullptr ); ~KornCfgImpl(); private slots: diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index c35674142..ddd78b8aa 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -35,8 +35,8 @@ KornShell::KornShell( TQWidget * parent, const char * name ) : TQWidget( parent, name ), _config( new TDEConfig( "kornrc" ) ), - _box( 0 ), - _configDialog( 0 ), + _box( nullptr ), + _configDialog( nullptr ), _show( false ) { _config->checkUpdate( "korn_kde_3_4_config_change", "korn-3-4-config_change.upd" ); @@ -78,7 +78,7 @@ void KornShell::optionDlg() return; } - _configDialog = new KDialogBase( 0, "Configuration Dialog", false, i18n( "Korn Configuration" ), + _configDialog = new KDialogBase( nullptr, "Configuration Dialog", false, i18n( "Korn Configuration" ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply, KDialogBase::Ok, true ); KornCfgImpl *widget = new KornCfgImpl( _configDialog, "Configuration widget" ); @@ -132,7 +132,7 @@ void KornShell::readConfig() void KornShell::slotDialogClosed() { - _configDialog->deleteLater(); _configDialog = 0; + _configDialog->deleteLater(); _configDialog = nullptr; //At this time, just delete all widgets and make a new one. //Maybe, this should replaces later by a better variant. @@ -144,7 +144,7 @@ void KornShell::slotApply() //At this time, just delete all widgets and make a new one. //Maybe, this should replaces later by a better variant. - delete _box; _box = 0; + delete _box; _box = nullptr; _config->reparseConfiguration(); diff --git a/korn/kornshell.h b/korn/kornshell.h index 3de3e4851..3f975b02e 100644 --- a/korn/kornshell.h +++ b/korn/kornshell.h @@ -33,7 +33,7 @@ class KornShell : public TQWidget { TQ_OBJECT public: - KornShell( TQWidget * parent = 0, const char * name = 0 ); + KornShell( TQWidget * parent = nullptr, const char * name = nullptr ); ~KornShell(); void show(); diff --git a/korn/label.h b/korn/label.h index 7f68e9c41..aad5dbda6 100644 --- a/korn/label.h +++ b/korn/label.h @@ -29,7 +29,7 @@ class Label : public TQLabel { TQ_OBJECT public: - Label( TQWidget * parent = 0, const char * name = 0 ) : TQLabel( parent, name ) {} + Label( TQWidget * parent = nullptr, const char * name = nullptr ) : TQLabel( parent, name ) {} virtual ~Label() {} protected: diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp index d8a1b653a..3319830bf 100644 --- a/korn/maildlg.cpp +++ b/korn/maildlg.cpp @@ -9,7 +9,7 @@ KornMailDlg::KornMailDlg( TQWidget *parent ) : KDialogBase( parent, "maildialog", true, i18n("Mail Details"), User1|Close, Close, true, KGuiItem(i18n("&Full Message"))), - _progress( 0 ) + _progress( nullptr ) { TQWidget * page = new TQWidget( this ); setMainWidget(page); @@ -103,7 +103,7 @@ void KornMailDlg::deleteProgress() disconnect( _mailDrop, TQ_SIGNAL(readMailReady(TQString*)), this, TQ_SLOT(readMailReady(TQString*))); delete _progress; - _progress = 0; + _progress = nullptr; } #include "maildlg.moc" diff --git a/korn/maildlg.h b/korn/maildlg.h index df0b02e01..dfa4f41f4 100644 --- a/korn/maildlg.h +++ b/korn/maildlg.h @@ -48,7 +48,7 @@ public: * KornMailDlg Constructor * @param parent parent widget */ - KornMailDlg( TQWidget *parent=0 ); + KornMailDlg( TQWidget *parent=nullptr ); /** * Set the mail details to show. The mails body is transfered to the edit control diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp index 841e183b6..fbb08ce17 100644 --- a/korn/mailsubject.cpp +++ b/korn/mailsubject.cpp @@ -9,7 +9,7 @@ #include #include -KornMailSubject::KornMailSubject() : _id(0), _drop(0), _size(-1), _date(-1), _fullMessage(false) +KornMailSubject::KornMailSubject() : _id(nullptr), _drop(nullptr), _size(-1), _date(-1), _fullMessage(false) { } @@ -19,7 +19,7 @@ KornMailSubject::KornMailSubject(KornMailId * id, KMailDrop *drop) } KornMailSubject::KornMailSubject(const KornMailSubject & src) - : _id(0), _drop(0), _size(-1), _date(-1) + : _id(nullptr), _drop(nullptr), _size(-1), _date(-1) { operator=(src); } @@ -34,7 +34,7 @@ KornMailSubject & KornMailSubject::operator= (const KornMailSubject & src) _fullMessage = src._fullMessage; if (_id) delete _id; - _id = 0; + _id = nullptr; if (src._id) _id = src._id->clone(); _drop = src._drop; @@ -45,7 +45,7 @@ KornMailSubject::~KornMailSubject() { if (_id) delete _id; - _id = 0; + _id = nullptr; } TQString KornMailSubject::toString() const @@ -87,7 +87,7 @@ TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr) // verbatimly copy normal text if (pos[0]!='=' || pos[1]!='?') { result += LWSP_buffer + pos[0]; - LWSP_buffer = 0; + LWSP_buffer = nullptr; lastWasEncodedWord = false; continue; } @@ -133,7 +133,7 @@ TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr) lastWasEncodedWord = true; ++pos; // eat '?' (for loop eats '=') - LWSP_buffer = 0; + LWSP_buffer = nullptr; } continue; invalid_encoded_word: @@ -144,7 +144,7 @@ invalid_encoded_word: result += "=?"; lastWasEncodedWord = false; ++pos; // eat '?' (for loop eats '=') - LWSP_buffer = 0; + LWSP_buffer = nullptr; } return result; } @@ -176,7 +176,7 @@ TQCString KornMailSubject::unfold( const TQCString & header ) //----------------------------------------------------------------------------- const TQTextCodec* KornMailSubject::codecForName(const TQCString& _str) { - if (_str.isEmpty()) return 0; + if (_str.isEmpty()) return nullptr; TQCString codec = _str; return TDEGlobal::charsets()->codecForName(codec); } diff --git a/korn/main.cpp b/korn/main.cpp index 9efbc3693..93e259df3 100644 --- a/korn/main.cpp +++ b/korn/main.cpp @@ -19,13 +19,13 @@ int main(int argc, char *argv[]) TDEAboutData aboutData(argv[0], I18N_NOOP("Korn"), version, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2004, The Korn Developers")); - aboutData.addAuthor("Sirtaj Singh Kang",0, "taj@kde.org"); - aboutData.addAuthor("Cristian Tibirna",0, "tibirna@kde.org"); - aboutData.addAuthor("Kurt Granroth",0, "granroth@kde.org"); - aboutData.addAuthor("Rik Hemsley",0, "rik@kde.org"); - aboutData.addAuthor("Fixes by Jörg Habenicht",0, "j.habenicht@europemail.com"); - aboutData.addAuthor("Preview by Heiner Eichmann",0, "h.eichmann@gmx.de"); - aboutData.addAuthor("Mart Kelder",0,"mart@kelder31.nl"); + aboutData.addAuthor("Sirtaj Singh Kang",nullptr, "taj@kde.org"); + aboutData.addAuthor("Cristian Tibirna",nullptr, "tibirna@kde.org"); + aboutData.addAuthor("Kurt Granroth",nullptr, "granroth@kde.org"); + aboutData.addAuthor("Rik Hemsley",nullptr, "rik@kde.org"); + aboutData.addAuthor("Fixes by Jörg Habenicht",nullptr, "j.habenicht@europemail.com"); + aboutData.addAuthor("Preview by Heiner Eichmann",nullptr, "h.eichmann@gmx.de"); + aboutData.addAuthor("Mart Kelder",nullptr,"mart@kelder31.nl"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEUniqueApplication::addCmdLineOptions(); @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) } KornApp *app = new KornApp(); - KornShell *korn = new KornShell( 0, "shell" ); + KornShell *korn = new KornShell( nullptr, "shell" ); app->setShell( korn ); //app->enableSessionManagement( true ); diff --git a/korn/password.cpp b/korn/password.cpp index ca6139b4f..55eb8bd9e 100644 --- a/korn/password.cpp +++ b/korn/password.cpp @@ -26,7 +26,7 @@ #include #include -TDEWallet::Wallet* KOrnPassword::m_wallet = 0; +TDEWallet::Wallet* KOrnPassword::m_wallet = nullptr; bool KOrnPassword::m_openFailed = false; bool KOrnPassword::m_useWallet = false; //Not default true until moving works @@ -177,7 +177,7 @@ void KOrnPassword::open() if( m_openFailed ) return; //Not open, and can't be opened - delete m_wallet; m_wallet = 0; + delete m_wallet; m_wallet = nullptr; m_wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0 ); if( !m_wallet ) diff --git a/korn/protocol.h b/korn/protocol.h index 423d1ba0b..9490305fa 100644 --- a/korn/protocol.h +++ b/korn/protocol.h @@ -56,7 +56,7 @@ public: //Functions that return a derived class. //This way, no explicit cast is needed - virtual const TDEIO_Protocol* getKIOProtocol() const { return 0; } + virtual const TDEIO_Protocol* getKIOProtocol() const { return nullptr; } }; #endif //PROTOCOL_H diff --git a/korn/protocols.cpp b/korn/protocols.cpp index 17365535d..48ceb455c 100644 --- a/korn/protocols.cpp +++ b/korn/protocols.cpp @@ -35,7 +35,7 @@ #include #include -TQDict* Protocols::protocols = 0; +TQDict* Protocols::protocols = nullptr; const Protocol* Protocols::getProto( const TQString& proto ) { diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index 4b10691dc..c79733f9f 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -55,7 +55,7 @@ int KornSubjectsDlg::SubjectListViewItem::compare( TQListViewItem* item, int col KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) : KDialogBase( parent, "urldialog", true, "test", Close, Close, true), _mailDrop( new TQPtrList< KMailDrop > ), - _subjects(0), _delete(0), mailDlg(0), _canDeleteMaildrop( true ) + _subjects(nullptr), _delete(nullptr), mailDlg(nullptr), _canDeleteMaildrop( true ) { _loadSubjectsCanceled = false; setModal( true ); @@ -157,7 +157,7 @@ KornSubjectsDlg::~KornSubjectsDlg() { if (_subjects) delete _subjects; - _subjects = 0; + _subjects = nullptr; } void KornSubjectsDlg::loadSubjectsCanceled() @@ -274,7 +274,7 @@ void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop ) connect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), drop, TQ_SLOT( readSubjectsCanceled() ) ); if( _subjects->it->current()->canReadSubjects() ) - _subjects->it->current()->readSubjects( 0 ); + _subjects->it->current()->readSubjects( nullptr ); else subjectsReady( true ); } @@ -316,7 +316,7 @@ void KornSubjectsDlg::deleteSubjectsStruct() delete _subjects->progress; delete _subjects->subjects; delete _subjects->it; - delete _subjects; _subjects = 0; + delete _subjects; _subjects = nullptr; } //Slots @@ -451,7 +451,7 @@ void KornSubjectsDlg::deleteDeleteStruct() delete _delete->messages; delete _delete->ids; delete _delete->progress; - delete _delete; _delete = 0; + delete _delete; _delete = nullptr; } void KornSubjectsDlg::fillDeleteMessageList() @@ -507,7 +507,7 @@ void KornSubjectsDlg::deleteNextMessage() connect( _delete->progress, TQ_SIGNAL( canceled() ), _delete->drop, TQ_SLOT( deleteMailsCanceled() ) ); // delete the mails - _delete->drop->deleteMails( _delete->ids, 0 ); + _delete->drop->deleteMails( _delete->ids, nullptr ); } void KornSubjectsDlg::deleteMailsReady( bool /*success*/ ) diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h index 7c9efa88b..e4ec769f1 100644 --- a/korn/subjectsdlg.h +++ b/korn/subjectsdlg.h @@ -106,7 +106,7 @@ public: * KornSubjectsDlg Constructor * @param parent parent widget */ - KornSubjectsDlg( TQWidget *parent=0 ); + KornSubjectsDlg( TQWidget *parent=nullptr ); /** * This functions clears all available KMailDrop's. diff --git a/korn/systemtray.h b/korn/systemtray.h index f3d5b4f8d..bb7c84c34 100644 --- a/korn/systemtray.h +++ b/korn/systemtray.h @@ -38,7 +38,7 @@ public: * @param parant The parent window * @param name The name of the TQObject's parents. */ - SystemTray( TQWidget * parent = 0, const char * name = 0 ); + SystemTray( TQWidget * parent = nullptr, const char * name = nullptr ); /** * Empty destructor; does nothing at the moment */ diff --git a/korn/tdeio.cpp b/korn/tdeio.cpp index 4db8d91ca..d1b87ab56 100644 --- a/korn/tdeio.cpp +++ b/korn/tdeio.cpp @@ -76,18 +76,18 @@ KKioDrop::KKioDrop() : KPollableDrop(), - _kurl( 0 ), - _metadata( 0 ), + _kurl( nullptr ), + _metadata( nullptr ), _valid(false), - _protocol( 0 ), + _protocol( nullptr ), _ssl(false), - _count( 0 ), - _subjects( 0 ), - _read( 0 ), + _count( nullptr ), + _subjects( nullptr ), + _read( nullptr ), _readSubjectsTotalSteps( 0 ), _deleteMailsTotalSteps( 0 ), - _process( 0 ), - _mailurls( 0 ) + _process( nullptr ), + _mailurls( nullptr ) { _kurl = new KURL; _metadata = new TDEIO::MetaData; @@ -114,18 +114,18 @@ KKioDrop::KKioDrop() KKioDrop::KKioDrop( TDEConfigGroup* ) : KPollableDrop(), - _kurl( 0 ), - _metadata( 0 ), + _kurl( nullptr ), + _metadata( nullptr ), _valid(false), - _protocol( 0 ), + _protocol( nullptr ), _ssl(false), - _count( 0 ), - _subjects( 0 ), - _read( 0 ), + _count( nullptr ), + _subjects( nullptr ), + _read( nullptr ), _readSubjectsTotalSteps( 0 ), _deleteMailsTotalSteps( 0 ), - _process( 0 ), - _mailurls( 0 ) + _process( nullptr ), + _mailurls( nullptr ) { _kurl = new KURL; _metadata = new TDEIO::MetaData; @@ -284,7 +284,7 @@ KKioDrop::~KKioDrop() bool KKioDrop::canReadSubjects( ) { - return (_protocol!=0?_protocol->canReadSubjects():false); + return (_protocol ? _protocol->canReadSubjects() : false); } TQValueVector * KKioDrop::doReadSubjects(bool * ) @@ -303,7 +303,7 @@ TQValueVector * KKioDrop::doReadSubjects(bool * ) bool KKioDrop::canReadMail( ) { - return (_protocol!=0?_protocol->canReadMail():false); + return (_protocol ? _protocol->canReadMail() : false); } bool KKioDrop::deleteMails(TQPtrList * ids, bool * /*stop*/) @@ -314,7 +314,7 @@ bool KKioDrop::deleteMails(TQPtrList * ids, bool * /*stop*/) bool KKioDrop::canDeleteMails () { - return (_protocol!=0?_protocol->canDeleteMail():false); + return (_protocol ? _protocol->canDeleteMail() : false); } TQString KKioDrop::readMail(const KornMailId * item, bool * ) @@ -455,7 +455,7 @@ bool KKioDrop::startProcess() if( _protocol->configName() != "process" ) return true; - if( _process != 0 ) { + if(_process) { return false; } @@ -481,11 +481,11 @@ bool KKioDrop::stopProcess() if( _protocol->configName() != "process" ) return true; - if( _process != 0 ) { + if(_process) { // debug( "proc stop" ); _process->kill( SIGHUP ); delete _process; - _process = 0; + _process = nullptr; } return true; @@ -544,7 +544,7 @@ void KKioDrop::processExit(TDEProcess* proc) { assert(static_cast(proc) == static_cast(_process)); - _process = 0; + _process = nullptr; // debug( "proc exited" ); } diff --git a/korn/tdeio_count.cpp b/korn/tdeio_count.cpp index 3c35a6a4a..47bfda7dd 100644 --- a/korn/tdeio_count.cpp +++ b/korn/tdeio_count.cpp @@ -36,14 +36,14 @@ TDEIO_Count::TDEIO_Count( TQObject * parent, const char * name ) : TQObject ( parent, name ), - _kurl( 0 ), - _metadata( 0 ), - _protocol( 0 ), + _kurl( nullptr ), + _metadata( nullptr ), + _protocol( nullptr ), _valid( true ), - _new_mailurls( 0 ), + _new_mailurls( nullptr ), _subjects_pending( 0 ), _total_new_messages( 0 ), - _popup_subjects( 0 ) + _popup_subjects( nullptr ) { } @@ -90,7 +90,7 @@ void TDEIO_Count::count( KKioDrop *drop ) _tdeio->emitShowPassivePopup( i18n( "Not able to open a tdeio slave for %1." ).arg( _protocol->configName() ) ); _valid = false; _tdeio->emitValidChanged(); - _slave = 0; + _slave = nullptr; //delete _new_mailurls; _new_mailurls = 0; //No connection pending return; } @@ -109,7 +109,7 @@ void TDEIO_Count::count( KKioDrop *drop ) } else { - _slave = 0; //Prevent disconnecting not-existing slave + _slave = nullptr; //Prevent disconnecting not-existing slave } /* Blocking this function: no new counts can be started from now */ @@ -150,14 +150,14 @@ void TDEIO_Count::stopActiveCount() { //Slave seems to be disconnected by canceling the last job of the slave //TDEIO::Scheduler::disconnectSlave( _slave ); - _slave = 0; + _slave = nullptr; } //Deletings settings - delete _kurl; _kurl = 0; - delete _metadata; _metadata = 0; + delete _kurl; _kurl = nullptr; + delete _metadata; _metadata = nullptr; - delete _new_mailurls; _new_mailurls = 0; + delete _new_mailurls; _new_mailurls = nullptr; } void TDEIO_Count::showPassive( const TQString& id ) @@ -192,8 +192,8 @@ void TDEIO_Count::disconnectSlave() //Disconnect slave TDEIO::Scheduler::disconnectSlave( _slave ); - _slave = 0; - _protocol = 0; + _slave = nullptr; + _protocol = nullptr; } //This function is called when fetching is over @@ -220,8 +220,8 @@ void TDEIO_Count::result( TDEIO::Job* job ) disconnectSlave(); //Deletings settings - delete _kurl; _kurl = 0; - delete _metadata; _metadata = 0; + delete _kurl; _kurl = nullptr; + delete _metadata; _metadata = nullptr; if( _tdeio->_mailurls->count() != _new_mailurls->count() ) { @@ -232,7 +232,7 @@ void TDEIO_Count::result( TDEIO::Job* job ) { *_tdeio->_mailurls = *_new_mailurls; } - delete _new_mailurls; _new_mailurls = 0; + delete _new_mailurls; _new_mailurls = nullptr; _valid = true; _tdeio->emitValidChanged(); @@ -315,7 +315,7 @@ void TDEIO_Count::addtoPassivePopup( KornMailSubject* subject ) if( _subjects_pending == 0 ) { _tdeio->emitShowPassivePopup( dynamic_cast< TQPtrList* >( _popup_subjects ), _total_new_messages ); - delete _popup_subjects; _popup_subjects = 0; + delete _popup_subjects; _popup_subjects = nullptr; _total_new_messages = 0; disconnectSlave(); diff --git a/korn/tdeio_count.h b/korn/tdeio_count.h index fd22d5abd..a7f66b806 100644 --- a/korn/tdeio_count.h +++ b/korn/tdeio_count.h @@ -45,7 +45,7 @@ class TDEIO_Count : public TQObject { TQ_OBJECT public: - TDEIO_Count( TQObject * parent = 0, const char * name = 0 ); + TDEIO_Count( TQObject * parent = nullptr, const char * name = nullptr ); ~TDEIO_Count(); //This function starts counting diff --git a/korn/tdeio_delete.cpp b/korn/tdeio_delete.cpp index 6b8b06fea..6c7ec4d80 100644 --- a/korn/tdeio_delete.cpp +++ b/korn/tdeio_delete.cpp @@ -33,10 +33,10 @@ #include TDEIO_Delete::TDEIO_Delete( TQObject * parent, const char * name ) : TQObject( parent, name ), - _tdeio( 0 ), + _tdeio( nullptr ), _total( 0 ), - _jobs( 0 ), - _slave( 0 ), + _jobs( nullptr ), + _slave( nullptr ), _valid( true ) { _jobs = new TQPtrList< TDEIO::Job >; @@ -94,7 +94,7 @@ void TDEIO_Delete::disConnect( ) if( _slave ) { TDEIO::Scheduler::disconnectSlave( _slave ); - _slave = 0; + _slave = nullptr; } } @@ -117,7 +117,7 @@ bool TDEIO_Delete::setupSlave( KURL kurl, TDEIO::MetaData metadata, const TDEIO_ void TDEIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaData metadata, const TDEIO_Protocol *& protocol ) { - TDEIO::Job* job = 0; + TDEIO::Job* job = nullptr; kurl = dynamic_cast( item )->getId(); diff --git a/korn/tdeio_delete.h b/korn/tdeio_delete.h index f55500fa9..2c038d279 100644 --- a/korn/tdeio_delete.h +++ b/korn/tdeio_delete.h @@ -39,7 +39,7 @@ class TDEIO_Delete : public TQObject public: //constructors - TDEIO_Delete( TQObject * parent = 0, const char * name = 0 ); + TDEIO_Delete( TQObject * parent = nullptr, const char * name = nullptr ); ~TDEIO_Delete( ); //This function should be called if there are messages to be deleted. diff --git a/korn/tdeio_read.cpp b/korn/tdeio_read.cpp index ee61243de..4ade935e4 100644 --- a/korn/tdeio_read.cpp +++ b/korn/tdeio_read.cpp @@ -35,8 +35,8 @@ TDEIO_Read::TDEIO_Read( TQObject * parent, const char * name ) : TQObject( parent, name ), - _job( 0 ), - _message( 0 ) + _job( nullptr ), + _message( nullptr ) { _message = new TQString; } @@ -68,7 +68,7 @@ void TDEIO_Read::canceled( ) { if( _job ) delete _job; - _job = 0; + _job = nullptr; } void TDEIO_Read::slotResult( TDEIO::Job* job ) @@ -82,7 +82,7 @@ void TDEIO_Read::slotResult( TDEIO::Job* job ) _tdeio->emitReadMailReady( _message ); *_message = ""; - _job = 0; + _job = nullptr; } void TDEIO_Read::slotData( TDEIO::Job* job, const TQByteArray & data ) diff --git a/korn/tdeio_read.h b/korn/tdeio_read.h index 9c2841324..267f44f06 100644 --- a/korn/tdeio_read.h +++ b/korn/tdeio_read.h @@ -36,7 +36,7 @@ class TDEIO_Read : public TQObject { TQ_OBJECT public: - TDEIO_Read( TQObject * parent = 0, const char * name = 0 ); + TDEIO_Read( TQObject * parent = nullptr, const char * name = nullptr ); ~TDEIO_Read(); public slots: diff --git a/korn/tdeio_single_subject.cpp b/korn/tdeio_single_subject.cpp index 9e3975cc9..3821c9466 100644 --- a/korn/tdeio_single_subject.cpp +++ b/korn/tdeio_single_subject.cpp @@ -140,14 +140,14 @@ void TDEIO_Single_Subject::slotResult( TDEIO::Job *job ) { kdWarning() << i18n( "Error when fetching %1: %2" ).arg( *_name ).arg( job->errorString() ) << endl; } else { - KornMailSubject * mailSubject = new KornMailSubject( new KornStringId( *_name ), 0 ); + KornMailSubject * mailSubject = new KornMailSubject( new KornStringId( *_name ), nullptr ); parseMail( _message, mailSubject, _protocol->fullMessage() ); mailSubject->decodeHeaders(); mailSubject->setSize( _size ); emit readSubject( mailSubject ); } - _job = 0; + _job = nullptr; emit finished( this ); } diff --git a/korn/tdeio_subjects.cpp b/korn/tdeio_subjects.cpp index 3a946bb39..2a54553cd 100644 --- a/korn/tdeio_subjects.cpp +++ b/korn/tdeio_subjects.cpp @@ -33,8 +33,8 @@ TDEIO_Subjects::TDEIO_Subjects( TQObject * parent, const char * name ) : TQObject( parent, name ), - _protocol( 0 ), - _slave( 0 ), + _protocol( nullptr ), + _slave( nullptr ), _valid( true ) { _jobs = new TQPtrList; @@ -49,7 +49,7 @@ TDEIO_Subjects::~TDEIO_Subjects( ) delete _jobs; delete _kurl; delete _metadata; - _protocol = 0; + _protocol = nullptr; } void TDEIO_Subjects::doReadSubjects( KKioDrop *drop ) @@ -89,7 +89,7 @@ void TDEIO_Subjects::getConnection( ) if( _slave ) { TDEIO::Scheduler::disconnectSlave( _slave ); - _slave = 0; + _slave = nullptr; } if( _protocol->connectionBased( ) ) @@ -105,7 +105,7 @@ void TDEIO_Subjects::getConnection( ) _tdeio->emitShowPassivePopup( i18n( "Not able to open a tdeio-slave for %1." ).arg( _protocol->configName() ) ); _valid = false; _tdeio->emitValidChanged(); - _slave = 0; + _slave = nullptr; _tdeio->emitReadSubjectsReady( false ); return; } @@ -140,7 +140,7 @@ void TDEIO_Subjects::disConnect( bool result ) if( _slave ) { TDEIO::Scheduler::disconnectSlave( _slave ); - _slave = 0; + _slave = nullptr; } _tdeio->emitReadSubjectsReady( result ); } @@ -151,7 +151,7 @@ void TDEIO_Subjects::cancelled( ) _jobs->clear(); //_slave died in cancelJob with is by called from the destructor of TDEIO_Single_Subject, //withs is by called by _jobs->clear because autoRemove equals true. - _slave = 0; + _slave = nullptr; disConnect( false ); } -- cgit v1.2.3