projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Don't reset session name for file devices
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 6e07a2a8baa48a7ba0f0286e867235aad701873c..1504f482ca3915d605ff9a09d66e6c1584ab7362 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-14,8
+14,7
@@
* 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/>.
*/
#include <cassert>
*/
#include <cassert>
@@
-32,6
+31,8
@@
#include <QMouseEvent>
#include <QMouseEvent>
+#include <QDebug>
+
using std::abs;
using std::back_inserter;
using std::copy;
using std::abs;
using std::back_inserter;
using std::copy;
@@
-45,7
+46,8
@@
using std::stable_sort;
using std::vector;
namespace pv {
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
Viewport::Viewport(View &parent) :
ViewWidget(parent),
Viewport::Viewport(View &parent) :
ViewWidget(parent),
@@
-223,5
+225,6
@@
void Viewport::wheelEvent(QWheelEvent *event)
}
}
}
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv