* 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>
using std::pair;
using std::string;
using std::shared_ptr;
+using std::vector;
using sigrok::Context;
using sigrok::OutputFormat;
namespace widgets {
ExportMenu::ExportMenu(QWidget *parent, shared_ptr<Context> context,
- std::vector<QAction *>open_actions) :
+ vector<QAction *>open_actions) :
QMenu(parent),
context_(context),
mapper_(this)
const map<string, shared_ptr<OutputFormat> > formats =
context->output_formats();
- for (const pair<string, shared_ptr<OutputFormat> > &f : formats) {
+ for (const pair<const string, shared_ptr<OutputFormat> > &f : formats) {
if (f.first == "srzip")
continue;
assert(f.second);
QAction *const action = addAction(tr("Export %1...")
.arg(QString::fromStdString(f.second->description())));
- action->setData(qVariantFromValue((void*)f.second.get()));
+ action->setData(QVariant::fromValue((void*)f.second.get()));
mapper_.setMapping(action, action);
connect(action, SIGNAL(triggered()), &mapper_, SLOT(map()));
}
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ connect(&mapper_, SIGNAL(mappedObject(QObject*)),
+ this, SLOT(on_action(QObject*)));
+#else
connect(&mapper_, SIGNAL(mapped(QObject*)),
this, SLOT(on_action(QObject*)));
+#endif
}
void ExportMenu::on_action(QObject *action)
format_selected((*iter).second);
}
-} // widgets
-} // pv
+} // namespace widgets
+} // namespace pv