Use nullptr instead of NULL or 0

Author: dg0yt

src/club.cpp

@@ -39,7 +39,7 @@ const int COLUMN_COUNT = 3;
 
 // ### Club ###
 
-Club::Club(const QString& _name) : name(_name), country(NULL), province(NULL)
+Club::Club(const QString& _name) : name(_name), country(nullptr), province(nullptr)
 {
 }
 Club::~Club()
@@ -117,8 +117,8 @@ bool ClubDB::loadFromFile()
 		if (stream.name() == "Club")
 		{
 			Club* new_club = new Club(stream.attributes().value("name").toString());
-			Location* country = NULL;
-			Location* province = NULL;
+			Location* country = nullptr;
+			Location* province = nullptr;
 
 			QStringRef ref = stream.attributes().value("country");
 			if (!ref.isEmpty())
@@ -165,7 +165,7 @@ Club* ClubDB::getByID(int id)
 
 	std::map<int, Club*>::iterator id_it = id_map.find(id);
 	if (id_it == id_map.end())
-		return NULL;
+		return nullptr;
 	else
 		return id_it->second;
 }
@@ -190,7 +190,7 @@ Club* ClubDB::findClub(const QString& name)
 			return clubs[i];
 	}
 
-	return NULL;
+	return nullptr;
 }
 void ClubDB::findSimilarClubs(QString name, std::vector< Club* >& out)
 {
@@ -210,7 +210,7 @@ Club* ClubDB::findClubAt(Location* location, Club* exclude)
 			return clubs[i];
 	}
 
-	return NULL;
+	return nullptr;
 }
 QString ClubDB::getUnusedName(const QString& desiredName)
 {
@@ -230,7 +230,7 @@ QString ClubDB::getUnusedName(const QString& desiredName)
 
 void ClubDB::addClub(Club* club, bool setNewID)
 {
-	assert(findClub(club->getName()) == NULL && "Tried to add a club whose name is already used by another club!");
+	assert(findClub(club->getName()) == nullptr && "Tried to add a club whose name is already used by another club!");
 
 	int row = static_cast<int>(clubs.size());
 	int count = 1;
@@ -271,7 +271,7 @@ Club* ClubDB::getItem(const QModelIndex& index) const
 			return item;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 int ClubDB::rowCount(const QModelIndex& parent) const
@@ -395,7 +395,7 @@ ClubTable::ClubTable()
 }
 ClubTable::~ClubTable()
 {
-	setModel(NULL);
+	setModel(nullptr);
 	delete sortedModel;
 }
 

src/club.h

@@ -71,9 +71,9 @@ Q_OBJECT
 	void mergeClubs(Club* src, Club* dest);
 
 	Club* getItem(const QModelIndex &index) const;
-	bool containsName(const QString& name, Club* exclude = NULL);
+	bool containsName(const QString& name, Club* exclude = nullptr);
 	Club* findClub(const QString& name);
-	Club* findClubAt(Location* location, Club* exclude = NULL);
+	Club* findClubAt(Location* location, Club* exclude = nullptr);
 	void findSimilarClubs(QString name, std::vector<Club*>& out);
 	inline void clubChanged(QModelIndex index)
 	{

src/clubDialog.cpp

@@ -77,9 +77,9 @@ ClubDialog::ClubDialog(Club* _club, QWidget* parent) : QDialog(parent, Qt::Windo
 	nameEdit->setText(club->getName());
 	nameEdit->selectAll();
 	setLocationText();
-	if (club->getProvince() != NULL)
+	if (club->getProvince() != nullptr)
 		selectLocation(club->getProvince());
-	else if (club->getCountry() != NULL)
+	else if (club->getCountry() != nullptr)
 		selectLocation(club->getCountry());
 
 	updateActions();
@@ -134,7 +134,7 @@ void ClubDialog::setLocationText()
 
 	if (club->getProvince())
 	{
-		assert((club->getCountry() != NULL) && "Province set for a club, but no country!");
+		assert((club->getCountry() != nullptr) && "Province set for a club, but no country!");
 		text += club->getProvince()->getName() + ", " + club->getCountry()->getName() + "</b>";
 	}
 	else if (club->getCountry())
@@ -150,9 +150,9 @@ void ClubDialog::locationSelected()
 
 	QModelIndex index = locationView->selectionModel()->currentIndex();
 	if (!index.isValid())
-		club->setLocation(NULL, NULL);
+		club->setLocation(nullptr, nullptr);
 	else if (index.parent() == QModelIndex())
-		club->setLocation(locationDB.getItem(locationDB.getSortModel()->mapToSource(index)), NULL);
+		club->setLocation(locationDB.getItem(locationDB.getSortModel()->mapToSource(index)), nullptr);
 	else
 		club->setLocation(locationDB.getItem(locationDB.getSortModel()->mapToSource(index.parent())), locationDB.getItem(locationDB.getSortModel()->mapToSource(index)));
 
@@ -245,7 +245,7 @@ void ClubDialog::removeLocationClicked()
 	QAbstractItemModel* model = locationView->model();
 	Location* index_location = locationDB.getItem(locationDB.getSortModel()->mapToSource(index));
 
-	if (clubDB.findClubAt(index_location, club) != NULL)
+	if (clubDB.findClubAt(index_location, club) != nullptr)
 	{
 		QMessageBox::warning(this, APP_NAME, tr("The location %1 you want to delete is still referenced by at least one club. You must delete the references first!").arg(index_location->getName()));
 		return;
@@ -254,7 +254,7 @@ void ClubDialog::removeLocationClicked()
 	for (int i = 0; i < num_children; ++i)
 	{
 		Location* sub_location = index_location->getChild(i);
-		if (clubDB.findClubAt(sub_location, club) != NULL)
+		if (clubDB.findClubAt(sub_location, club) != nullptr)
 		{
 			QMessageBox::warning(this, APP_NAME, tr("The sub-location %1 you want to delete is still referenced by at least one club. You must delete the references first!").arg(sub_location->getName()));
 			return;

src/clubDialog.h

@@ -37,7 +37,7 @@ class ClubDialog : public QDialog
 Q_OBJECT
 public:
 
-	ClubDialog(Club* _club, QWidget* parent = NULL);
+	ClubDialog(Club* _club, QWidget* parent = nullptr);
 	~ClubDialog();
 
 	// Overridden methods

src/comboBoxDelegate.h

@@ -28,7 +28,7 @@ class ComboBoxDelegate : public QItemDelegate
 Q_OBJECT
 public:
 
-	ComboBoxDelegate(QAbstractItemModel* _model, int _model_column, QObject *parent = 0);
+	ComboBoxDelegate(QAbstractItemModel* _model, int _model_column, QObject* parent = nullptr);
 
 	virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 	virtual void setEditorData(QWidget *editor, const QModelIndex &index) const;

src/csvFile.cpp

@@ -29,7 +29,7 @@
 
 CSVFile::CSVFile(const QString& path, const QChar _separator, const QChar _stringDelimiter, bool escape_minus)
 {
-	stream = NULL;
+	stream = nullptr;
 	file = new QFile(path);
 
 	error = NoError;
@@ -39,8 +39,8 @@ CSVFile::CSVFile(const QString& path, const QChar _separator, const QChar _strin
 }
 CSVFile::CSVFile(QString* string, const QChar _separator, const QChar _stringDelimiter, bool escape_minus)
 {
-	stream = NULL;
-	file = NULL;
+	stream = nullptr;
+	file = nullptr;
 	this->string = string;
 
 	error = NoError;
@@ -141,7 +141,7 @@ std::vector< int >* CSVFile::getColumnVector(const QString& name)
 {
 	ColumnMap::iterator it = columnMap.find(name);
 	if (it == columnMap.end())
-		return NULL;
+		return nullptr;
 	else
 		return &it->second;
 }

src/csvFile.h

@@ -54,7 +54,7 @@ class CSVFile
 	~CSVFile();
 
 	/// Shows a dialog with options for separator and delimiter characters and escaping of -
-	bool showExportDialog(QWidget* parent = NULL);
+	bool showExportDialog(QWidget* parent = nullptr);
 
 	/// Opens the file and reads the first line (the column names) if the file is opened for reading
 	bool open(bool for_reading);

src/event.cpp

@@ -27,7 +27,7 @@
 
 Event::Event()
 {
-	resultList = NULL;
+	resultList = nullptr;
 }
 Event::~Event()
 {
@@ -67,7 +67,7 @@ Category* Event::findCategory(const QString& name)
 		if (categories[i]->name.compare(name, Qt::CaseSensitive) == 0)
 			return categories[i];
 	}
-	return NULL;
+	return nullptr;
 }
 int Event::getNumCategories()
 {

src/layout.cpp

@@ -31,8 +31,8 @@ Layout::Layout(const QString& filename) : filename(filename)
 	// set defaults
 	has_background_color = false;
 	background_color = Qt::white;
-	background_image = NULL;
-	background_image_cache = NULL;
+	background_image = nullptr;
+	background_image_cache = nullptr;
 	owns_background_image = false;
 	aspect = 4 / 3.0f;
 }
@@ -42,7 +42,7 @@ Layout::Layout(const Layout& other)
 	has_background_color = other.has_background_color;
 	background_color = other.background_color;
 	background_image = other.background_image;
-	background_image_cache = NULL;
+	background_image_cache = nullptr;
 	owns_background_image = false;
 
 	for (std::map<QString, Rect*>::const_iterator it = other.rects.begin(); it != other.rects.end(); ++it)
@@ -71,12 +71,12 @@ Layout::~Layout()
 Layout::Point* Layout::getPointByID(const QString& id)
 {
 	std::map<QString, Point*>::iterator it = points.find(id);
-	return (it == points.end()) ? NULL : it->second;
+	return (it == points.end()) ? nullptr : it->second;
 }
 Layout::Rect* Layout::getRectByID(const QString& id)
 {
 	std::map<QString, Rect*>::iterator it = rects.find(id);
-	return (it == rects.end()) ? NULL : it->second;
+	return (it == rects.end()) ? nullptr : it->second;
 }
 
 QFont Layout::qFontFromFont(Layout::Font* font_data, int display_height)
@@ -156,7 +156,7 @@ bool Layout::loadFromFile()
 	QFile file("my layouts/" + filename + ".xml");
 	if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
 	{
-		QMessageBox::warning(NULL, tr("Error"), tr("Could not load layout: %1 because the file could not be opened!").arg(filename));
+		QMessageBox::warning(nullptr, tr("Error"), tr("Could not load layout: %1 because the file could not be opened!").arg(filename));
 		return false;
 	}
 
@@ -296,8 +296,8 @@ Layout::Font* Layout::getFont(const QString& name)
 	std::map<QString, Font*>::iterator it = fonts.find(name);
 	if (it == fonts.end())
 	{
-		QMessageBox::warning(NULL, tr("Error while loading layout"), tr("Cannot find font %1!").arg(name));
-		return NULL;
+		QMessageBox::warning(nullptr, tr("Error while loading layout"), tr("Cannot find font %1!").arg(name));
+		return nullptr;
 	}
 
 	return it->second;
@@ -321,15 +321,15 @@ LayoutDB::LayoutDB()
 	QStringList myLayouts = dir.entryList(nameFilters, QDir::Files | QDir::Hidden | QDir::NoSymLinks | QDir::NoDotAndDotDot, QDir::Name);
 
 	for (int i = 0; i < myLayouts.size(); ++i)
-		layouts.insert(myLayouts.at(i).left(myLayouts.at(i).size() - 4), NULL);
+		layouts.insert(myLayouts.at(i).left(myLayouts.at(i).size() - 4), nullptr);
 
 	// TODO: dir watcher
 }
 Layout* LayoutDB::getOrLoadLayout(const QString& name, QWidget* dialogParent)
 {
 	Layouts::iterator it = layouts.find(name);
 	if (it == layouts.end())
-		return NULL;
+		return nullptr;
 
 	if (*it)
 		return *it;
@@ -339,7 +339,7 @@ Layout* LayoutDB::getOrLoadLayout(const QString& name, QWidget* dialogParent)
 	if (!loadedLayout->loadFromFile())
 	{
 		delete loadedLayout;
-		return NULL;
+		return nullptr;
 	}
 	layouts.insert(name, loadedLayout);
 

src/layout.h

@@ -106,7 +106,7 @@ class LayoutDB
 	typedef QMap<QString, Layout*> Layouts;
 
 	/// Returns the layout with the given name; loads it if it is not loaded yet.
-	/// Returns NULL if there was an error loading it.
+	/// Returns nullptr if there was an error loading it.
 	Layout* getOrLoadLayout(const QString& name, QWidget* dialogParent);
 
 	inline Layouts::iterator begin() {return layouts.begin();}
@@ -124,7 +124,7 @@ class LayoutDB
 
 	LayoutDB();
 
-	/// The value can be NULL if the layout is not loaded yet
+	/// The value can be nullptr if the layout is not loaded yet
 	Layouts layouts;
 };