Mercurial > ldforge / file diff

--- a/src/dialogs/configdialog.h	Sun Sep 06 03:00:28 2015 +0300
+++ b/src/dialogs/configdialog.h	Sun Sep 06 03:10:03 2015 +0300
@@ -31,7 +31,7 @@
 	PROPERTY (public,	QKeySequence,	sequence,	setSequence,	STOCK_WRITE)
 
 public:
-	explicit ShortcutListItem (QListWidget* view = null, int type = Type) :
+	explicit ShortcutListItem (QListWidget* view = nullptr, int type = Type) :
 		QListWidgetItem (view, type) {}
 };
 
@@ -75,7 +75,7 @@
 	void applySettings();
 	void addShortcut (QAction* act);
 	void setButtonBackground (QPushButton* button, QString value);
-	void updateQuickColorList (LDQuickColor* sel = null);
+	void updateQuickColorList (LDQuickColor* sel = nullptr);
 	void setShortcutText (ShortcutListItem* item);
 	int getItemRow (QListWidgetItem* item, QList<QListWidgetItem*>& haystack);
 	QString quickColorString();
@@ -107,8 +107,8 @@
 	Q_OBJECT
 
 public:
-	explicit KeySequenceDialog (QKeySequence seq, QWidget* parent = null, Qt::WindowFlags f = 0);
-	static bool staticDialog (ShortcutListItem* item, QWidget* parent = null);
+	explicit KeySequenceDialog (QKeySequence seq, QWidget* parent = nullptr, Qt::WindowFlags f = 0);
+	static bool staticDialog (ShortcutListItem* item, QWidget* parent = nullptr);
 
 	QLabel* lb_output;
 	QDialogButtonBox* bbx_buttons;