projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1132 by passing segment IDs, not segment instances
[pulseview.git]
/
pv
/
widgets
/
colourpopup.hpp
diff --git
a/pv/widgets/colourpopup.hpp
b/pv/widgets/colourpopup.hpp
index 9273b5da5e19228b8a115f57c0ae6deec9fbf6d8..6e4de20e1de9b32d9571a4b8012dd383109fc2c0 100644
(file)
--- a/
pv/widgets/colourpopup.hpp
+++ b/
pv/widgets/colourpopup.hpp
@@
-14,12
+14,11
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
*/
-#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"
@@
-34,7
+33,7
@@
class ColourPopup : public Popup
Q_OBJECT
public:
Q_OBJECT
public:
- ColourPopup(int rows, int cols, QWidget *par
t
ent);
+ ColourPopup(int rows, int cols, QWidget *parent);
WellArray& well_array();
WellArray& well_array();
@@
-49,7
+48,7
@@
private:
QVBoxLayout layout_;
};
QVBoxLayout layout_;
};
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv
-#endif // PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
+#endif // PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
PP