X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=a77969ea7f72313e6c42b71cf0cd09980c53e0da;hp=4bd6388e1051fd506d99ae24f19fa5d43704346f;hb=dde5aab3c1c55ef4bf7b255b976b23320bad384f;hpb=37b0bd3594a0effb8252c22377f003deafc55b19 diff --git a/main.cpp b/main.cpp index 4bd6388..a77969e 100644 --- a/main.cpp +++ b/main.cpp @@ -54,6 +54,7 @@ #include "pv/logging.hpp" #include "pv/mainwindow.hpp" #include "pv/session.hpp" +#include "pv/util.hpp" #ifdef ANDROID #include @@ -254,9 +255,12 @@ int main(int argc, char *argv[]) for (int i = 0; i < argc; i++) open_files.emplace_back(argv[i]); + qRegisterMetaType("util::Timestamp"); + qRegisterMetaType("uint64_t"); + // Prepare the global settings since logging needs them early on pv::GlobalSettings settings; - settings.save_default_palette(); + settings.save_internal_defaults(); settings.set_defaults_where_needed(); settings.apply_theme(); @@ -316,7 +320,7 @@ int main(int argc, char *argv[]) if (open_files.empty()) w.add_default_session(); else - for (string open_file : open_files) + for (string& open_file : open_files) w.add_session_with_file(open_file, open_file_format); #ifdef ENABLE_SIGNALS