[PATCH 4/4] kconfig: qconf: use nullptr in C++11 code

[Rolf Eike Beer <eb@emlix.com>]

This C++11 keyword is typesafe, i.e. it can't be assigned to non-pointers, and
it makes it visually clear that this is about a pointer.

Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
 scripts/kconfig/qconf.cc | 42 ++++++++++++++++++++--------------------
 scripts/kconfig/qconf.h  |  8 ++++----
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 4d500cc9ba9d..7cfd19dadc51 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -303,7 +303,7 @@ ConfigList::ConfigList(QWidget *parent, const char *name)
 	: QTreeWidget(parent),
 	  updateAll(false),
 	  showName(false), mode(singleMode), optMode(normalOpt),
-	  rootEntry(0), headerPopup(0)
+	  rootEntry(nullptr), headerPopup(nullptr)
 {
 	setObjectName(name);
 	setSortingEnabled(false);
@@ -417,7 +417,7 @@ void ConfigList::updateSelection(void)
 
 void ConfigList::updateList()
 {
-	ConfigItem* last = 0;
+	ConfigItem* last = nullptr;
 	ConfigItem *item;
 
 	if (!rootEntry) {
@@ -439,7 +439,7 @@ void ConfigList::updateList()
 	if (rootEntry != &rootmenu && mode == singleMode) {
 		item = (ConfigItem *)topLevelItem(0);
 		if (!item)
-			item = new ConfigItem(this, 0);
+			item = new ConfigItem(this, nullptr);
 		last = item;
 	}
 	if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) &&
@@ -489,7 +489,7 @@ void ConfigList::setValue(ConfigItem* item, tristate val)
 	int type;
 	tristate oldval;
 
-	sym = item->menu ? item->menu->sym : 0;
+	sym = item->menu ? item->menu->sym : nullptr;
 	if (!sym)
 		return;
 
@@ -553,7 +553,7 @@ void ConfigList::setRootMenu(struct menu *menu)
 	type = menu && menu->prompt ? menu->prompt->type : P_UNKNOWN;
 	if (type != P_MENU)
 		return;
-	updateMenuList(0);
+	updateMenuList(nullptr);
 	rootEntry = menu;
 	updateListAll();
 	if (currentItem()) {
@@ -610,7 +610,7 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu)
 
 	last = parent->firstChild();
 	if (last && !last->goParent)
-		last = 0;
+		last = nullptr;
 	for (child = menu->list; child; child = child->next) {
 		item = last ? last->nextSibling() : parent->firstChild();
 		type = child->prompt ? child->prompt->type : P_UNKNOWN;
@@ -639,7 +639,7 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu)
 			if (mode == fullMode || mode == menuMode || type != P_MENU)
 				updateMenuList(item, child);
 			else
-				updateMenuList(item, 0);
+				updateMenuList(item, nullptr);
 			last = item;
 			continue;
 		}
@@ -647,7 +647,7 @@ hide:
 		if (item && item->menu == child) {
 			last = parent->firstChild();
 			if (last == item)
-				last = 0;
+				last = nullptr;
 			else while (last->nextSibling() != item)
 				last = last->nextSibling();
 			delete item;
@@ -673,7 +673,7 @@ void ConfigList::updateMenuList(struct menu *menu)
 
 	last = (ConfigItem *)topLevelItem(0);
 	if (last && !last->goParent)
-		last = 0;
+		last = nullptr;
 	for (child = menu->list; child; child = child->next) {
 		item = last ? last->nextSibling() : (ConfigItem *)topLevelItem(0);
 		type = child->prompt ? child->prompt->type : P_UNKNOWN;
@@ -702,7 +702,7 @@ void ConfigList::updateMenuList(struct menu *menu)
 			if (mode == fullMode || mode == menuMode || type != P_MENU)
 				updateMenuList(item, child);
 			else
-				updateMenuList(item, 0);
+				updateMenuList(item, nullptr);
 			last = item;
 			continue;
 		}
@@ -710,7 +710,7 @@ hide:
 		if (item && item->menu == child) {
 			last = (ConfigItem *)topLevelItem(0);
 			if (last == item)
-				last = 0;
+				last = nullptr;
 			else while (last->nextSibling() != item)
 				last = last->nextSibling();
 			delete item;
@@ -853,7 +853,7 @@ skip:
 
 void ConfigList::focusInEvent(QFocusEvent *e)
 {
-	struct menu *menu = NULL;
+	struct menu *menu = nullptr;
 
 	Parent::focusInEvent(e);
 
@@ -912,7 +912,7 @@ void ConfigList::setAllOpen(bool open)
 }
 
 ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
-	: Parent(parent), sym(0), _menu(0)
+	: Parent(parent), sym(nullptr), _menu(nullptr)
 {
 	setObjectName(name);
 	setOpenLinks(false);
@@ -964,7 +964,7 @@ void ConfigInfoView::setInfo(struct menu *m)
 	if (_menu == m)
 		return;
 	_menu = m;
-	sym = NULL;
+	sym = nullptr;
 	if (!_menu)
 		clear();
 	else
@@ -1156,7 +1156,7 @@ void ConfigInfoView::contextMenuEvent(QContextMenuEvent *event)
 }
 
 ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow *parent)
-	: Parent(parent), result(NULL)
+	: Parent(parent), result(nullptr)
 {
 	setObjectName("search");
 	setWindowTitle("Search Config");
@@ -1228,7 +1228,7 @@ void ConfigSearchWindow::search(void)
 {
 	struct symbol **p;
 	struct property *prop;
-	ConfigItem *lastItem = NULL;
+	ConfigItem *lastItem = nullptr;
 
 	free(result);
 	list->clear();
@@ -1247,7 +1247,7 @@ void ConfigSearchWindow::search(void)
  * Construct the complete config widget
  */
 ConfigMainWindow::ConfigMainWindow(void)
-	: searchWindow(0)
+	: searchWindow(nullptr)
 {
 	bool ok = true;
 	QVariant x, y;
@@ -1524,7 +1524,7 @@ void ConfigMainWindow::changeMenu(struct menu *menu)
 void ConfigMainWindow::setMenuLink(struct menu *menu)
 {
 	struct menu *parent;
-	ConfigList* list = NULL;
+	ConfigList* list = nullptr;
 	ConfigItem* item;
 
 	if (configList->menuSkip(menu))
@@ -1601,7 +1601,7 @@ void ConfigMainWindow::showSingleView(void)
 	backAction->setEnabled(true);
 
 	menuList->hide();
-	menuList->setRootMenu(0);
+	menuList->setRootMenu(nullptr);
 	configList->mode = singleMode;
 	if (configList->rootEntry == &rootmenu)
 		configList->updateListAll();
@@ -1647,7 +1647,7 @@ void ConfigMainWindow::showFullView(void)
 	backAction->setEnabled(false);
 
 	menuList->hide();
-	menuList->setRootMenu(0);
+	menuList->setRootMenu(nullptr);
 	configList->mode = fullMode;
 	if (configList->rootEntry == &rootmenu)
 		configList->updateListAll();
@@ -1800,7 +1800,7 @@ int main(int ac, char** av)
 	cmdline.process(*configApp);
 
 	if (cmdline.isSet(silent))
-		conf_set_message_callback(NULL);
+		conf_set_message_callback(nullptr);
 
 	QStringList args = cmdline.positionalArguments();
 	if (args.isEmpty())
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 1c90fec4c2da..5f6c57383aba 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -42,7 +42,7 @@ class ConfigList : public QTreeWidget {
 	Q_OBJECT
 	typedef class QTreeWidget Parent;
 public:
-	ConfigList(QWidget *parent, const char *name = 0);
+	ConfigList(QWidget *parent, const char *name = nullptr);
 	~ConfigList();
 	void reinit(void);
 	ConfigItem* findConfigItem(struct menu *);
@@ -115,12 +115,12 @@ class ConfigItem : public QTreeWidgetItem {
 	typedef class QTreeWidgetItem Parent;
 public:
 	ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m = nullptr)
-	: Parent(parent, after), nextItem(0), menu(m), goParent(false)
+	: Parent(parent, after), nextItem(nullptr), menu(m), goParent(false)
 	{
 		init();
 	}
 	ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m)
-	: Parent(parent, after), nextItem(0), menu(m), goParent(false)
+	: Parent(parent, after), nextItem(nullptr), menu(m), goParent(false)
 	{
 		init();
 	}
@@ -180,7 +180,7 @@ class ConfigInfoView : public QTextBrowser {
 	typedef class QTextBrowser Parent;
 	QMenu *contextMenu;
 public:
-	ConfigInfoView(QWidget* parent, const char *name = 0);
+	ConfigInfoView(QWidget* parent, const char *name = nullptr);
 	bool showDebug(void) const { return _showDebug; }
 
 public slots:
-- 
2.47.1


-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, Registry Number HR B 3160
Managing Directors: Heike Jordan, Dr. Uwe Kracke
VAT ID No. DE 205 198 055
Office Berlin: Panoramastr. 1, 10178 Berlin, Germany
Office Bonn: Bachstr. 6, 53115 Bonn, Germany
http://www.emlix.com

emlix - your embedded Linux partner