Moved app functionality to separate class

.gitignore

@@ -3,3 +3,4 @@ package/*.tar.*
 *~
 *.bak
 *.auto
+build/

src/CMakeLists.txt

@@ -35,6 +35,7 @@ set( SOURCES
   YQPackageSelectorHelp.cc
   YQPatternSelector.cc
 
+  YQPkgApplication.cc
   YQPkgChangeLogView.cc
   YQPkgChangesDialog.cc
   YQPkgClassFilterView.cc

src/YQPackageSelector.cc

@@ -145,9 +145,7 @@ YQPackageSelector::YQPackageSelector( QWidget *		parent,
     _excludeDevelPkgs		= 0;
     _excludeDebugInfoPkgs	= 0;
 
-    // VERSION is a command-line #define (-DVERSION="1.2.3") added
-    // to the compiler command line by cmake from ../../VERSION.cmake
-    logInfo() << "This is libyui-qt-pkg " << VERSION << endl;
+    logDebug() << "Creating YQPackageSelectorBase..." << endl;
 
     if ( onlineUpdateMode() )	logInfo() << "Online update mode" << endl;
     if ( updateMode() )		logInfo() << "Update mode" << endl;
@@ -254,8 +252,6 @@ YQPackageSelector::YQPackageSelector( QWidget *		parent,
     if ( _filters->diskUsageList() )
 	_filters->diskUsageList()->updateDiskUsage();
 
-    logInfo() << "PackageSelector init done" << endl;
-
 
 #if CHECK_DEPENDENCIES_ON_STARTUP
 
@@ -268,6 +264,7 @@ YQPackageSelector::YQPackageSelector( QWidget *		parent,
     }
 #endif
 
+    logDebug() << "YQPackageSelectorBase init done" << endl;
 }
 
 
@@ -1883,5 +1880,3 @@ void YQPackageSelector::normalCursor()
 {
     ::normalCursor();
 }
-
-

src/YQPkgApplication.cc

@@ -0,0 +1,65 @@
+/*
+ *   File name: YQPkgApplication.h
+ *   Summary:	Application class for yqpkg
+ *   License:	GPL V2 - See file LICENSE for details.
+ *              Copyright (c) 2024 SUSE LLC
+ *
+ *   Author:	Stefan Hundhammer <[email protected]>
+ */
+
+
+#include <QApplication>
+
+#include "YQPackageSelector.h"
+#include "YQPkgApplication.h"
+#include "Logger.h"
+#include "Exception.h"
+
+
+YQPkgApplication * YQPkgApplication::_instance = 0;
+
+
+YQPkgApplication::YQPkgApplication()
+    : QObject()
+    , _pkgSel(0)
+{
+    _instance = this;
+    logDebug() << "Creating YQPkgApplication" << endl;
+}
+
+
+YQPkgApplication::~YQPkgApplication()
+{
+    logDebug() << "Destroying YQPkgApplication..." << endl;
+
+    if ( _pkgSel )
+    {
+        delete _pkgSel;
+        _pkgSel = 0;
+    }
+
+    logDebug() << "Destroying YQPkgApplication done" << endl;
+    _instance = 0;
+}
+
+
+void YQPkgApplication::run()
+{
+    createPkgSel();
+    qApp->exec();
+}
+
+
+void YQPkgApplication::createPkgSel()
+{
+    if ( _pkgSel )
+        return;
+
+    _pkgSel = new YQPackageSelector( 0, 0 );
+    CHECK_PTR( _pkgSel );
+
+    QObject::connect( _pkgSel, SIGNAL( commit() ),
+                      qApp,    SLOT  ( quit()   ) );
+
+    _pkgSel->show();
+}

src/YQPkgApplication.h

@@ -0,0 +1,68 @@
+/*
+ *   File name: YQPkgApplication.h
+ *   Summary:	Application class for yqpkg
+ *   License:	GPL V2 - See file LICENSE for details.
+ *              Copyright (c) 2024 SUSE LLC
+ *
+ *   Author:	Stefan Hundhammer <[email protected]>
+ */
+
+
+#ifndef YQPkgApplication_h
+#define YQPkgApplication_h
+
+#include <QObject>
+
+
+class YQPackageSelector;
+
+/**
+ * Application class for yqpkg.
+ **/
+class YQPkgApplication: public QObject
+{
+    Q_OBJECT
+
+public:
+    /**
+     * Constructor
+     **/
+    YQPkgApplication();
+
+    /**
+     * Destructor
+     **/
+    virtual ~YQPkgApplication();
+
+    /**
+     * Return the instance of this class or 0 if there is none.
+     *
+     * This is not a real singleton, but for the life time of this application
+     * this instance will remain alive, i.e. for most other classes related to
+     * this.
+     **/
+    static YQPkgApplication * instance() { return _instance; }
+
+    /**
+     * Run the application. This also handles the Qt event loop.
+     **/
+    void run();
+
+protected:
+
+    /**
+     * Create (and show) the YQPackageSelector if it doesn't already exist.
+     **/
+    void createPkgSel();
+
+
+    //
+    // Data members
+    //
+
+    YQPackageSelector * _pkgSel;
+
+    static YQPkgApplication * _instance;
+};
+
+#endif // YQPkgApplication_h

src/main.cc

@@ -11,7 +11,7 @@
 
 #include <QApplication>
 #include <QObject>
-#include "YQPackageSelector.h"
+#include "YQPkgApplication.h"
 #include "Logger.h"
 #include "Exception.h"
 
@@ -37,23 +37,19 @@ int main( int argc, char *argv[] )
     logVersion();
 
     // Set org/app name for QSettings
-    QCoreApplication::setOrganizationName( "openSUSE" );
-    QCoreApplication::setApplicationName ( progName );
+    QCoreApplication::setOrganizationName( "openSUSE" ); // ~/.cache/openSUSE
+    QCoreApplication::setApplicationName ( progName );   // ~/.cache/openSUSE/yqpkg
 
-    QApplication qtApp( argc, argv);
-    QStringList argList = QCoreApplication::arguments();
-    argList.removeFirst(); // Remove program name
+    QApplication     qtApp( argc, argv);
 
-    QWidget * mainWin = new YQPackageSelector( 0, 0 );
-    CHECK_PTR( mainWin );
-    mainWin->show();
+    {
+        // New scope to limit the life time of this instance
 
-    QObject::connect( mainWin, SIGNAL( commit() ),
-                      &qtApp,  SLOT  ( quit()   ) );
+        YQPkgApplication app;
+        app.run();
+    }
 
-    qtApp.exec();
-
-    delete mainWin;
+    logDebug() << "YQPkgApplication finished" << endl;
 
     return 0;
 }