More linux work.

2014-12-10 21:50:15 -08:00
parent 0438827ba5
commit a9ecb6a78e
61 changed files with 1415 additions and 627 deletions
--- a/Source/Fractorium/OptionsDialog.h
+++ b/Source/Fractorium/OptionsDialog.h
@ -24,7 +24,7 @@ class FractoriumOptionsDialog : public QDialog
 	friend Fractorium;

 public:
-	FractoriumOptionsDialog(FractoriumSettings* settings, QWidget* parent = 0, Qt::WindowFlags f = 0);
+	FractoriumOptionsDialog(FractoriumSettings* settings, QWidget* p = 0, Qt::WindowFlags f = 0);

 public slots:
 	void OnOpenCLCheckBoxStateChanged(int state);