projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use std:: in the code directly (where possible).
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index b6cca7b2edadb99d8313b7d92ccbf4313c028386..46f8a123ae8907b7d3793dd0b47eac9d3ba3bf1f 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-50,10
+50,12
@@
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
+using std::bind;
using std::dynamic_pointer_cast;
using std::list;
using std::make_shared;
using std::map;
using std::dynamic_pointer_cast;
using std::list;
using std::make_shared;
using std::map;
+using std::placeholders::_1;
using std::shared_ptr;
using std::string;
using std::shared_ptr;
using std::string;
@@
-65,9
+67,6
@@
class ViewItem;
using toolbars::MainBar;
using toolbars::MainBar;
-using std::bind;
-using std::placeholders::_1;
-
const QString MainWindow::WindowTitle = tr("PulseView");
MainWindow::MainWindow(DeviceManager &device_manager,
const QString MainWindow::WindowTitle = tr("PulseView");
MainWindow::MainWindow(DeviceManager &device_manager,
@@
-474,7
+473,7
@@
void MainWindow::restore_ui_settings()
}
}
}
}
-s
td::s
hared_ptr<Session> MainWindow::get_tab_session(int index) const
+shared_ptr<Session> MainWindow::get_tab_session(int index) const
{
// Find the session that belongs to the tab's main window
for (auto entry : session_windows_)
{
// Find the session that belongs to the tab's main window
for (auto entry : session_windows_)
@@
-539,7
+538,7
@@
void MainWindow::on_add_view(const QString &title, views::ViewType type,
Session *session)
{
// We get a pointer and need a reference
Session *session)
{
// We get a pointer and need a reference
- for (s
td::s
hared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_view(title, type, *s);
}
if (s.get() == session)
add_view(title, type, *s);
}
@@
-659,7
+658,7
@@
void MainWindow::on_capture_state_changed(QObject *obj)
void MainWindow::on_new_view(Session *session)
{
// We get a pointer and need a reference
void MainWindow::on_new_view(Session *session)
{
// We get a pointer and need a reference
- for (s
td::s
hared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_view(session->name(), views::ViewTypeTrace, *s);
}
if (s.get() == session)
add_view(session->name(), views::ViewTypeTrace, *s);
}