X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.hpp;h=e938dbbc01d1dc4c877be7bb7e42b07a460fd5f1;hb=e4e5a958507a2c4e2643f21e3c735021da97e577;hp=a47288c736c022b415e5cece48fd9bb81ac68197;hpb=f4ce3e772e3dad5b59f1ab27a6a3c01fdbfb8e1d;p=pulseview.git
diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index a47288c..e938dbb 100644
--- 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
- * 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 .
*/
#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
-#include
-
+#include
#include
#include
@@ -40,13 +38,15 @@
#include
#include
+using std::shared_ptr;
+
namespace sigrok {
class Device;
class InputFormat;
class OutputFormat;
}
-Q_DECLARE_METATYPE(std::shared_ptr)
+Q_DECLARE_METATYPE(shared_ptr)
class QAction;
@@ -56,7 +56,7 @@ class MainWindow;
class Session;
namespace views {
-namespace TraceView {
+namespace trace {
class View;
}
}
@@ -86,7 +86,7 @@ private:
public:
MainBar(Session &session, QWidget *parent,
- pv::views::TraceView::View *view);
+ pv::views::trace::View *view);
void update_device_list();
@@ -100,8 +100,6 @@ public:
QAction* action_save_selection_as() const;
QAction* action_connect() const;
- void session_error(const QString text, const QString info_text);
-
private:
void run_stop();
@@ -127,9 +125,9 @@ private Q_SLOTS:
void add_decoder(srd_decoder *decoder);
- void export_file(std::shared_ptr format,
+ void export_file(shared_ptr format,
bool selection_only = false);
- void import_file(std::shared_ptr format);
+ void import_file(shared_ptr format);
void on_device_selected();
void on_device_changed();