Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / widgets / exportmenu.cpp

diff --git a/pv/widgets/exportmenu.cpp b/pv/widgets/exportmenu.cpp
index 4fa9d197726f1c25da09e952da56c7d317ec4dc7..13c977d50cda7cedc8f72dd19f9e2599ca2cc56f 100644 (file)
--- a/pv/widgets/exportmenu.cpp
+++ b/pv/widgets/exportmenu.cpp
@@ -14,8 +14,7 @@
  * 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 <algorithm>
@@ -32,6 +31,7 @@ using std::map;
 using std::pair;
 using std::string;
 using std::shared_ptr;
+using std::vector;
 
 using sigrok::Context;
 using sigrok::OutputFormat;
@@ -40,16 +40,23 @@ namespace pv {
 namespace widgets {
 
 ExportMenu::ExportMenu(QWidget *parent, shared_ptr<Context> context,
-       QAction *open_action) :
+       vector<QAction *>open_actions) :
        QMenu(parent),
        context_(context),
        mapper_(this)
 {
        assert(context);
 
-       if (open_action) {
-               addAction(open_action);
-               setDefaultAction(open_action);
+       if (!open_actions.empty()) {
+               bool first_action = true;
+               for (auto open_action : open_actions) {
+                       addAction(open_action);
+
+                       if (first_action) {
+                               first_action = false;
+                               setDefaultAction(open_action);
+                       }
+               }
                addSeparator();
        }