instantiate CliOptions in ViewModelCollection (not in main)

Author: pestophagous

src/app/main.cc

@@ -37,10 +37,9 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv ); // ... note next line...
     // QQuickStyle::setStyle( "Fusion" ); // <-- call setStyle after creating app (if style is needed)
-    project::CliOptions cliOptions( app );
 
     // ViewModels must OUTLIVE the qml engine, so create them first:
-    project::ViewModelCollection vms( cliOptions );
+    project::ViewModelCollection vms( app );
 
     // For antialiasing: https://stackoverflow.com/a/49576756/10278
     // QSurfaceFormat format;
@@ -63,7 +62,7 @@ int main( int argc, char* argv[] )
 
     engine.addImportPath( "qrc:///" ); // needed for finding qml in our plugins
     engine.load( QUrl( QStringLiteral( "qrc:///qml/main.qml" ) ) );
-    if( cliOptions.ShowColorPalette() )
+    if( vms.Options().ShowColorPalette() )
     {
         // This second app window will cause the FASSERT about root objects
         // count to trigger below, but just choose 'c' to continue beyond the

src/app/view_model_collection.cc

@@ -24,8 +24,8 @@ namespace project
 using str = std::string;
 
 // clang-format off
-ViewModelCollection::ViewModelCollection( const CliOptions& opts )
-    : m_opts( &opts ),
+ViewModelCollection::ViewModelCollection( const QCoreApplication& app )
+    : m_opts( std::make_unique<CliOptions>( app ) ),
       m_eventFilter( std::make_unique<EventFilter>() ),
       m_qmlLogger( std::make_unique<QmlMessageInterceptor>( !m_opts->MaximumQtLogging() ) ),
       m_logging( std::make_unique<LoggingTags>( *m_opts ) )
@@ -39,6 +39,11 @@ ViewModelCollection::ViewModelCollection( const CliOptions& opts )
 
 ViewModelCollection::~ViewModelCollection() = default;
 
+const CliOptions& ViewModelCollection::Options() const
+{
+    return *m_opts;
+}
+
 void ViewModelCollection::ExportContextPropertiesToQml( QQmlApplicationEngine* engine )
 {
     // Sort of a "silly" demo usage of project::Log<>

src/app/view_model_collection.h

@@ -25,7 +25,7 @@ class QmlMessageInterceptor;
 class ViewModelCollection
 {
 public:
-    explicit ViewModelCollection( const CliOptions& opts );
+    explicit ViewModelCollection( const QCoreApplication& app );
     ~ViewModelCollection();
 
     ViewModelCollection( const ViewModelCollection& ) = delete;
@@ -35,8 +35,10 @@ class ViewModelCollection
 
     void SetRootObject( QObject* object );
 
+    const CliOptions& Options() const;
+
 private:
-    const CliOptions* const m_opts;
+    std::unique_ptr<const CliOptions> m_opts;
     std::unique_ptr<EventFilter> m_eventFilter;
     std::unique_ptr<QmlMessageInterceptor> m_qmlLogger;
     std::unique_ptr<LoggingTags> m_logging;