projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logging: Minor consistency fixes.
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index 50c30fd2a0992ded9b45032aae38888579a64fd0..810cab27919f3cca59ed450710ec9701d1bb8e17 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-14,15
+14,13
@@
* 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_TOOLBARS_MAINBAR_HPP
#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
*/
#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
-#include <stdint.h>
-
+#include <cstdint>
#include <list>
#include <memory>
#include <list>
#include <memory>
@@
-40,13
+38,15
@@
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
+using std::shared_ptr;
+
namespace sigrok {
class Device;
class InputFormat;
class OutputFormat;
}
namespace sigrok {
class Device;
class InputFormat;
class OutputFormat;
}
-Q_DECLARE_METATYPE(s
td::s
hared_ptr<sigrok::Device>)
+Q_DECLARE_METATYPE(shared_ptr<sigrok::Device>)
class QAction;
class QAction;
@@
-56,7
+56,7
@@
class MainWindow;
class Session;
namespace views {
class Session;
namespace views {
-namespace
TraceView
{
+namespace
trace
{
class View;
}
}
class View;
}
}
@@
-86,7
+86,7
@@
private:
public:
MainBar(Session &session, QWidget *parent,
public:
MainBar(Session &session, QWidget *parent,
- pv::views::
TraceView
::View *view);
+ pv::views::
trace
::View *view);
void update_device_list();
void update_device_list();
@@
-125,16
+125,15
@@
private:
private Q_SLOTS:
void show_session_error(const QString text, const QString info_text);
private Q_SLOTS:
void show_session_error(const QString text, const QString info_text);
- void capture_state_changed(int state);
-
void add_decoder(srd_decoder *decoder);
void add_decoder(srd_decoder *decoder);
- void export_file(s
td::s
hared_ptr<sigrok::OutputFormat> format,
+ void export_file(shared_ptr<sigrok::OutputFormat> format,
bool selection_only = false);
bool selection_only = false);
- void import_file(s
td::s
hared_ptr<sigrok::InputFormat> format);
+ void import_file(shared_ptr<sigrok::InputFormat> format);
void on_device_selected();
void on_device_changed();
void on_device_selected();
void on_device_changed();
+ void on_capture_state_changed(int state);
void on_sample_count_changed();
void on_sample_rate_changed();
void on_sample_count_changed();
void on_sample_rate_changed();