diff -r e964085e6913 -r 16766ac1bbd9 src/colorSelectDialog.h
--- a/src/colorSelectDialog.h Thu Oct 03 18:07:06 2013 +0300
+++ b/src/colorSelectDialog.h Thu Oct 03 20:56:20 2013 +0300
@@ -16,8 +16,8 @@
* along with this program. If not, see .
*/
-#ifndef COLORSELECTOR_H
-#define COLORSELECTOR_H
+#ifndef LDFORGE_COLORSELECTOR_H
+#define LDFORGE_COLORSELECTOR_H
#include
#include "common.h"
@@ -26,28 +26,28 @@
class Ui_ColorSelUI;
class QGraphicsScene;
-class ColorSelector : public QDialog {
- Q_OBJECT
+class ColorSelector : public QDialog
+{ Q_OBJECT
READ_PROPERTY (LDColor*, sel, setSelection)
-
-public:
- explicit ColorSelector (short defval = -1, QWidget* parent = null);
- virtual ~ColorSelector();
- static bool getColor (short& val, short defval = -1, QWidget* parent = null);
-
-protected:
- void mousePressEvent (QMouseEvent* event);
- void resizeEvent (QResizeEvent* ev);
-
-private:
- Ui_ColorSelUI* ui;
- QGraphicsScene* m_scene;
- bool m_firstResize;
-
- int numRows() const;
- int viewportWidth() const;
- void drawScene();
- void drawColorInfo();
+
+ public:
+ explicit ColorSelector (short defval = -1, QWidget* parent = null);
+ virtual ~ColorSelector();
+ static bool getColor (short& val, short defval = -1, QWidget* parent = null);
+
+ protected:
+ void mousePressEvent (QMouseEvent* event);
+ void resizeEvent (QResizeEvent* ev);
+
+ private:
+ Ui_ColorSelUI* ui;
+ QGraphicsScene* m_scene;
+ bool m_firstResize;
+
+ int numRows() const;
+ int viewportWidth() const;
+ void drawScene();
+ void drawColorInfo();
};
-#endif // COLORSELECTOR_H
\ No newline at end of file
+#endif // COLORSELECTOR_H