Centralize session error notification

[pulseview.git] / pv / widgets / colourpopup.hpp

diff --git a/pv/widgets/colourpopup.hpp b/pv/widgets/colourpopup.hpp
index a1ee251c7add8d907036e7dad53e1ccb20f90915..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
- * 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_HPP
+#define PULSEVIEW_PV_WIDGETS_COLOURPOPUP_HPP
 
 #include "popup.hpp"
 #include "wellarray.hpp"
@@ -34,9 +33,9 @@ class ColourPopup : public Popup
        Q_OBJECT
 
 public:
-       ColourPopup(int rows, int cols, QWidget *partent);
+       ColourPopup(int rows, int cols, QWidget *parent);
 
-       QWellArray& well_array();
+       WellArray& well_array();
 
 Q_SIGNALS:
        void selected(int row, int col);
@@ -45,11 +44,11 @@ private Q_SLOTS:
        void colour_selected(int, int);
 
 private:
-       QWellArray well_array_;
+       WellArray well_array_;
        QVBoxLayout layout_;
 };
 
-} // widgets
-} // pv
+}  // namespace widgets
+}  // namespace pv
 
-#endif // PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H
+#endif // PULSEVIEW_PV_WIDGETS_COLOURPOPUP_HPP