Fixes warnings (replaces 0 or NULL by nullptr, etc.)

cpina · May 9, 2020 · d0072fc · d0072fc
1 parent 47d9e59
commit d0072fc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/gui/AuxiliarGUI.cpp b/gui/AuxiliarGUI.cpp
@@ -5,7 +5,7 @@
 
 #include "CMakeOptions.h"
 
-void *AuxiliarGUI::m=0;
+void *AuxiliarGUI::m=nullptr;
 
 QString AuxiliarGUI::version = QDACCO_VERSION;
 QString AuxiliarGUI::copyright_date = "2005, 2006, 2007, 2008, 2009, 2011, 2013, 2015, 2017, 2020";

diff --git a/gui/about.h b/gui/about.h
@@ -40,7 +40,7 @@ class About : public QDialog
 {
 	Q_OBJECT
 	public:
-		About(QWidget *parent = 0);
+        About(QWidget *parent = nullptr);
 
 	private:
 		Ui::About ui;

diff --git a/gui/configure.h b/gui/configure.h
@@ -39,7 +39,7 @@ class Configure : public QDialog
 {
 	Q_OBJECT
 	public:
-		Configure(QWidget *parent = 0);
+        Configure(QWidget *parent = nullptr);
 
 	private:
 		Ui::Configure ui;

diff --git a/gui/main.cpp b/gui/main.cpp
@@ -246,7 +246,7 @@ bool Main::eventFilter(QObject *, QEvent *event) //obj
 		type!=QEvent::User+Auxiliar::KeyUp() &&
 		type!=QEvent::User+Auxiliar::KeyNextPage() &&
 		type!=QEvent::User+Auxiliar::KeyPrevPage()) {
-			return NULL;
+            return false;
 	}
 
 	if (ui.llistat->isVisible()) {
@@ -268,7 +268,7 @@ void Main::buscarEnter()
 	if (ui.llistat->isVisible()) {
 		QListWidgetItem *item;
 		item = ui.llistat->currentItem();
-		if (item!=NULL) {
+        if (item!=nullptr) {
 			ui.paraula->setText(item->text());
 		}
 	}
@@ -332,7 +332,7 @@ void Main::UpdateList() {
 	handler.setIgnoreAccents(m_IgnoreAccents);
 
 	AuxiliarGUI::m=this;
-    void (*ptrFunction)(QString)=NULL;
+    void (*ptrFunction)(QString)=nullptr;
 	ptrFunction = lib2class;
 
 	handler.setAddFunction(ptrFunction);
@@ -496,7 +496,6 @@ void Main::posarApunt (int all) {
 }
 
 int Main::isValidWord(QString &q) {
-        QChar first;
         //We transform the word to not-capital
         //We check that first letter is a letter
         //We delete space before word
@@ -533,7 +532,7 @@ void Main::selectItem()
 
 	item = ui.llistat->item(0);
 
-	if (item!=NULL) {
+    if (item!=nullptr) {
 		if (item->text().compare(m_searched)==0) {
 			ui.llistat->setCurrentRow(0);
 		}
@@ -698,5 +697,6 @@ void Main::restaura() {
 }
 
 void Main::quit() {
+    // This is not the usual way to exit a Qt application!
 	exit(0);
 }
diff --git a/gui/textbrowser.h b/gui/textbrowser.h
@@ -64,7 +64,7 @@ class TextBrowser : public QTextBrowser
 		}
 
 	public:
-		TextBrowser(QWidget *&) {};
+        TextBrowser(QWidget *&) {}
 
 		void setFather(QMainWindow *m) {
 			m_parent=m;