projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tie the "sticky scrolling" setting in with the settings mgmt
[pulseview.git]
/
pv
/
view
/
flag.hpp
diff --git
a/pv/view/flag.hpp
b/pv/view/flag.hpp
index bc82934e161e5829d5d025f515931c5817a60268..092a4b5a05966e7ec30126cd278fac9e99617d14 100644
(file)
--- a/
pv/view/flag.hpp
+++ b/
pv/view/flag.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_VIEW_FLAG_HPP
-#define PULSEVIEW_PV_VIEW_FLAG_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_FLAG_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_FLAG_HPP
#include <memory>
#include <memory>
@@
-28,10
+27,11
@@
class QMenu;
namespace pv {
class QMenu;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class Flag : public TimeMarker,
class Flag : public TimeMarker,
- public std::enable_shared_from_this<
pv::view::
Flag>
+ public std::enable_shared_from_this<Flag>
{
Q_OBJECT
{
Q_OBJECT
@@
-77,7
+77,8
@@
private:
QString text_;
};
QString text_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_FLAG_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_FLAG_HPP