client/gui: Small changes based on review feedback

- Use QCoreApplication::exec() instead of explicit QEventLoop
- Use QApplication object methods instead of static methods
- Fix header #define

src/client/gui/argparser.h

@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef ARGPARSER_H
-#define ARGPARSER_H
+#ifndef MULTIPASS_ARGPARSER_H
+#define MULTIPASS_ARGPARSER_H
 
 #include <QCommandLineParser>
 
@@ -33,4 +33,4 @@ class ArgParser : public QCommandLineParser
     int verbosity_level{0};
 };
 } // namespace multipass
-#endif // ARGPARSER_H
+#endif // MULTIPASS_ARGPARSER_H

src/client/gui/gui_cmd.cpp

@@ -22,7 +22,7 @@
 #include <multipass/cli/client_platform.h>
 #include <multipass/cli/format_utils.h>
 
-#include <QEventLoop>
+#include <QCoreApplication>
 #include <QTimer>
 #include <QtConcurrent/QtConcurrent>
 
@@ -38,13 +38,11 @@ mp::ReturnCode cmd::GuiCmd::run(mp::ArgParser* parser)
         return ReturnCode::CommandFail;
     }
 
-    QEventLoop loop;
-
     create_actions();
     create_menu();
     tray_icon.show();
 
-    return static_cast<ReturnCode>(loop.exec());
+    return static_cast<ReturnCode>(QCoreApplication::exec());
 }
 
 std::string cmd::GuiCmd::name() const

src/client/gui/main.cpp

@@ -26,11 +26,11 @@ namespace mp = multipass;
 int main(int argc, char* argv[])
 {
     QApplication app(argc, argv);
-    QCoreApplication::setApplicationName("multipass-gui");
+    app.setApplicationName("multipass-gui");
 
     mp::ClientConfig config{mp::client::get_server_address(), mp::RpcConnectionType::ssl,
                             std::move(mp::client::get_cert_provider()), std::cout, std::cerr};
     mp::ClientGui client{config};
 
-    return client.run(QCoreApplication::arguments());
+    return client.run(app.arguments());
 }