Build fixes for Qt5 Windows/mingw/MXE support.

[pulseview.git] / pv / view / tracetreeitemowner.hpp

diff --git a/pv/view/tracetreeitemowner.hpp b/pv/view/tracetreeitemowner.hpp
index 3e7927a8794a13659764b8801856c90c78ad06e3..6beae5e9003efc94ce080b0280af807a7f73c585 100644 (file)
--- a/pv/view/tracetreeitemowner.hpp
+++ b/pv/view/tracetreeitemowner.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_VIEW_TRACETREEITEMOWNER_HPP
-#define PULSEVIEW_PV_VIEW_TRACETREEITEMOWNER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
 
 #include "viewitemowner.hpp"
 #include "tracetreeitem.hpp"
@@ -28,7 +27,8 @@ namespace pv {
 
 class Session;
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class TraceTreeItem;
 class View;
@@ -39,24 +39,24 @@ public:
        /**
         * Returns the view of the owner.
         */
-       virtual pv::view::View* view() = 0;
+       virtual View* view() = 0;
 
        /**
         * Returns the view of the owner.
         */
-       virtual const pv::view::View* view() const = 0;
+       virtual const View* view() const = 0;
 
        virtual int owner_visual_v_offset() const = 0;
 
        /**
-        * Returns the session of the onwer.
+        * Returns the session of the owner.
         */
-       virtual pv::Session& session() = 0;
+       virtual Session& session() = 0;
 
        /**
         * Returns the session of the owner.
         */
-       virtual const pv::Session& session() const = 0;
+       virtual const Session& session() const = 0;
 
        /**
         * Returns the number of nested parents that this row item owner has.
@@ -100,7 +100,7 @@ public:
        /*
         * Reassigns background color states to all its children, thereby
         * providing them with alternating backgrounds.
-        * @param next_brightness_state First brightness state to use.
+        * @param next_bgcolour_state First brightness state to use.
         * @return The next brightness state to use.
         */
        bool reassign_bgcolour_states(bool next_bgcolour_state);
@@ -111,7 +111,8 @@ public:
        virtual void extents_changed(bool horz, bool vert) = 0;
 };
 
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACETREEITEMOWNER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP