projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to new configuration API.
[pulseview.git]
/
pv
/
widgets
/
colourpopup.hpp
diff --git
a/pv/widgets/colourpopup.hpp
b/pv/widgets/colourpopup.hpp
index a1ee251c7add8d907036e7dad53e1ccb20f90915..2abf1b78c94aa59c6e4fcd8fe4941d87e4b4fbe0 100644
(file)
--- a/
pv/widgets/colourpopup.hpp
+++ b/
pv/widgets/colourpopup.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
-#define PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
+#ifndef PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
PP
+#define PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
PP
#include "popup.hpp"
#include "wellarray.hpp"
#include "popup.hpp"
#include "wellarray.hpp"
@@
-36,7
+36,7
@@
class ColourPopup : public Popup
public:
ColourPopup(int rows, int cols, QWidget *partent);
public:
ColourPopup(int rows, int cols, QWidget *partent);
-
Q
WellArray& well_array();
+ WellArray& well_array();
Q_SIGNALS:
void selected(int row, int col);
Q_SIGNALS:
void selected(int row, int col);
@@
-45,11
+45,11
@@
private Q_SLOTS:
void colour_selected(int, int);
private:
void colour_selected(int, int);
private:
-
Q
WellArray well_array_;
+ WellArray well_array_;
QVBoxLayout layout_;
};
} // widgets
} // pv
QVBoxLayout layout_;
};
} // widgets
} // pv
-#endif // PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
+#endif // PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
PP