projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move meta type declaration out of MainWindow
[pulseview.git]
/
pv
/
widgets
/
importmenu.hpp
diff --git
a/pv/widgets/importmenu.hpp
b/pv/widgets/importmenu.hpp
index b56631e0c792589721c8ef0436c540b269120b90..d1d5231afd33d5832c58179f1becb80cca38a4e8 100644
(file)
--- a/
pv/widgets/importmenu.hpp
+++ b/
pv/widgets/importmenu.hpp
@@
-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/>.
*/
#ifndef PULSEVIEW_PV_WIDGETS_IMPORTMENU_HPP
*/
#ifndef PULSEVIEW_PV_WIDGETS_IMPORTMENU_HPP
@@
-26,6
+25,8
@@
#include <QMenu>
#include <QSignalMapper>
#include <QMenu>
#include <QSignalMapper>
+using std::shared_ptr;
+
namespace sigrok {
class Context;
class InputFormat;
namespace sigrok {
class Context;
class InputFormat;
@@
-39,21
+40,21
@@
class ImportMenu : public QMenu
Q_OBJECT;
public:
Q_OBJECT;
public:
- ImportMenu(QWidget *parent, s
td::s
hared_ptr<sigrok::Context> context,
+ ImportMenu(QWidget *parent, shared_ptr<sigrok::Context> context,
QAction *open_action = nullptr);
private Q_SLOTS:
void on_action(QObject *action);
Q_SIGNALS:
QAction *open_action = nullptr);
private Q_SLOTS:
void on_action(QObject *action);
Q_SIGNALS:
- void format_selected(s
td::s
hared_ptr<sigrok::InputFormat> format);
+ void format_selected(shared_ptr<sigrok::InputFormat> format);
private:
private:
- s
td::s
hared_ptr<sigrok::Context> context_;
+ shared_ptr<sigrok::Context> context_;
QSignalMapper mapper_;
};
QSignalMapper mapper_;
};
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv
#endif // PULSEVIEW_PV_WIDGETS_IMPORTMENU_HPP
#endif // PULSEVIEW_PV_WIDGETS_IMPORTMENU_HPP