Began getting rid of global "settings" variable

src/Lib/clienthelpnotificationserver.cpp

@@ -28,11 +28,11 @@
 
 #include <memory>
 
-extern std::unique_ptr<lc::Settings> settings;
+lc::ClientHelpNotificationServer::ClientHelpNotificationServer(const Settings *const argSettings,
-
+                                                               QObject *argParent) :
-lc::ClientHelpNotificationServer::ClientHelpNotificationServer(QObject *argParent) :
     QObject{argParent},
-    hostAddress{settings->serverIP}
+    hostAddress{settings->serverIP},
+    settings{argSettings}
 {
     QNetworkConfigurationManager manager;
     if (manager.capabilities()

src/Lib/clienthelpnotificationserver.h

@@ -27,17 +27,21 @@ class QTcpServer;
 
 namespace lc {
 
+class Settings;
+
 class ClientHelpNotificationServer : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit ClientHelpNotificationServer(QObject *argParent = nullptr);
+    explicit ClientHelpNotificationServer(const Settings *const argSettings,
+                                          QObject *argParent = nullptr);
 
 private:
     QTcpServer *helpMessageServer = nullptr;
     const QHostAddress hostAddress;
     QNetworkSession *networkSession = nullptr;
+    const Settings *const settings = nullptr;
 
 private slots:
     void OpenSession();

src/Lib/lablib.cpp

@@ -24,10 +24,11 @@
 
 #include "lablib.h"
 
-lc::Lablib::Lablib(QObject *argParent) :
+lc::Lablib::Lablib(Settings *const argSettings, QObject *argParent) :
     QObject{argParent},
     labSettings{"Labcontrol", "Labcontrol", this},
-    sessionsModel{new SessionsModel{this}}
+    sessionsModel{new SessionsModel{this}},
+settings{argSettings}
 {
     for (const auto &s : settings->GetClients()) {
         connect(this, &Lablib::ZLEAF_RUNNING,
@@ -52,7 +53,8 @@ lc::Lablib::Lablib(QObject *argParent) :
     // Initialize the server for client help requests retrieval
     if (settings->clientHelpNotificationServerPort
             && !settings->serverIP.isEmpty()) {
-        clientHelpNotificationServer = new ClientHelpNotificationServer{this};
+        clientHelpNotificationServer
+            = new ClientHelpNotificationServer{settings, this};
     }
 }
 
@@ -157,7 +159,8 @@ void lc::Lablib::StartNewSession(QVector<Client *> argAssocCl,
                                              argzTreePort, argzTreeVersion,
                                              argPrintLocalReceipts,
                                              argParticipNameReplacement,
-                                             argReceiptsHeader});
+                                             argReceiptsHeader,
+                                             settings});
         occupiedPorts.append(sessionsModel->back()->zTreePort);
     } catch (Session::lcDataTargetPathCreationFailed) {
         QMessageBox::information(nullptr, tr("Chosen data target path could not be created"),

src/Lib/lablib.h

@@ -45,8 +45,6 @@
 #include "sessionsmodel.h"
 #include "settings.h"
 
-extern std::unique_ptr<lc::Settings> settings;
-
 namespace lc {
 
 //! This class represents the entire lab and running sessions.
@@ -62,7 +60,7 @@ public:
      * \brief Lablib's constructor
      * \param[in] argParent This 'lcLablib' instance's parent QObject
      */
-    Lablib(QObject *argParent = nullptr);
+    Lablib(Settings *const argSettings, QObject *argParent = nullptr);
     /** Lablib's destructor
      */
     ~Lablib() override;
@@ -135,6 +133,7 @@ private:
     QVector< quint16 > occupiedPorts;
     //! A derivation from QAbstractTableModel used to store the single Session instances
     SessionsModel *sessionsModel = nullptr;
+    Settings *const settings = nullptr;
 };
 
 } // namespace lc

src/Lib/receipts_handler.cpp

@@ -24,9 +24,8 @@
 #include "receipts_handler.h"
 #include "settings.h"
 
-extern std::unique_ptr<lc::Settings> settings;
+lc::ReceiptsHandler::ReceiptsHandler(const Settings *const argSettings,
-
+                                     const QString &argZTreeDataTargetPath,
-lc::ReceiptsHandler::ReceiptsHandler(const QString &argZTreeDataTargetPath,
                                      bool argPrintReceiptsForLocalClients,
                                      const QString &argAnonymousReceiptsPlaceholder,
                                      const QString &argLatexHeaderName,
@@ -39,6 +38,7 @@ lc::ReceiptsHandler::ReceiptsHandler(const QString &argZTreeDataTargetPath,
     latexHeaderName{argLatexHeaderName},
     paymentFile{expectedPaymentFilePath},
     printReceiptsForLocalClients{argPrintReceiptsForLocalClients},
+    settings{argSettings},
     timer{new QTimer{this}},
 zTreeDataTargetPath{argZTreeDataTargetPath}
 {
@@ -50,7 +50,8 @@ zTreeDataTargetPath{argZTreeDataTargetPath}
     timer->start(2000);
 }
 
-lc::ReceiptsHandler::ReceiptsHandler(const QString &argZTreeDataTargetPath,
+lc::ReceiptsHandler::ReceiptsHandler(const Settings *const argSettings,
+                                     const QString &argZTreeDataTargetPath,
                                      bool argPrintReceiptsForLocalClients,
                                      const QString &argAnonymousReceiptsPlaceholder,
                                      const QString &argLatexHeaderName,
@@ -63,6 +64,7 @@ lc::ReceiptsHandler::ReceiptsHandler(const QString &argZTreeDataTargetPath,
     latexHeaderName{argLatexHeaderName},
     paymentFile{expectedPaymentFilePath},
     printReceiptsForLocalClients{argPrintReceiptsForLocalClients},
+    settings{argSettings},
     zTreeDataTargetPath{argZTreeDataTargetPath}
 {
     qDebug() << "Expected payment file name is:" << expectedPaymentFilePath;
@@ -198,13 +200,14 @@ void lc::ReceiptsHandler::CreateReceiptsFromPaymentFile()
     }
 
     // Open a QTextStream to write to the file
-    QTextStream out(texFile);
+    QTextStream out{texFile};
 
     out << *latexText;
     delete latexText;
     latexText = nullptr;
 
-    receiptsPrinter = new ReceiptsPrinter{dateString, zTreeDataTargetPath, this};
+    receiptsPrinter = new ReceiptsPrinter{dateString, settings,
+                                          zTreeDataTargetPath, this};
     receiptsPrinter->start();
     connect(receiptsPrinter, &ReceiptsPrinter::PrintingFinished,
             this, &ReceiptsHandler::DeleteReceiptsPrinterInstance);

src/Lib/receipts_handler.h

@@ -42,6 +42,8 @@ struct paymentEntry_t {
     double payoff;
 };
 
+class Settings;
+
 //! A class to handle receipts printing.
 /*!
   This class is element of every session and is used to handle the receipts printing.
@@ -51,11 +53,13 @@ class ReceiptsHandler : public QObject
     Q_OBJECT
 
 public:
-    explicit ReceiptsHandler(const QString &argZTreeDataTargetPath,
+    explicit ReceiptsHandler(const Settings *const argSettings,
+                             const QString &argZTreeDataTargetPath,
                              bool argPrintReceiptsForLocalClients,
                              const QString &argAnonymousReceiptsPlaceholder,
                              const QString &argLatexHeaderName, QObject *argParent = nullptr);
-    explicit ReceiptsHandler(const QString &argZTreeDataTargetPath,
+    explicit ReceiptsHandler(const Settings *const argSettings,
+                             const QString &argZTreeDataTargetPath,
                              bool argPrintReceiptsForLocalClients,
                              const QString &argAnonymousReceiptsPlaceholder,
                              const QString &argLatexHeaderName,
@@ -98,6 +102,7 @@ private:
     const bool printReceiptsForLocalClients;
     //! Creates new thread for receipts printing
     ReceiptsPrinter *receiptsPrinter = nullptr;
+    const Settings *const settings = nullptr;
     //! Used for regular checking if the payment file was created
     QTimer *timer = nullptr;
     //! A reference to the data target path stored in the session class instance

src/Lib/receiptsprinter.cpp

@@ -17,25 +17,22 @@
  *  along with Labcontrol.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <memory>
-
 #include "receiptsprinter.h"
 #include "settings.h"
 
-extern std::unique_ptr<lc::Settings> settings;
-
 lc::ReceiptsPrinter::ReceiptsPrinter(const QString &argDateString,
+                                     const Settings *const argSettings,
                                      const QString &argWorkpath,
                                      QObject *argParent) :
     QThread{argParent},
     dateString{argDateString},
-    dvipsCmd{settings->dvipsCmd},
+    dvipsCmd{argSettings->dvipsCmd},
-    latexCmd{settings->latexCmd},
+    latexCmd{argSettings->latexCmd},
-    lprCmd{settings->lprCmd},
+    lprCmd{argSettings->lprCmd},
-    postscriptViewer{ settings->postscriptViewer},
+    postscriptViewer{argSettings->postscriptViewer},
-    ps2pdfCmd{settings->ps2pdfCmd},
+    ps2pdfCmd{argSettings->ps2pdfCmd},
-    rmCmd{settings->rmCmd},
+    rmCmd{argSettings->rmCmd},
-    vncViewer{settings->vncViewer},
+    vncViewer{argSettings->vncViewer},
     workpath{argWorkpath}
 {
 }

src/Lib/receiptsprinter.h

@@ -28,6 +28,8 @@
 
 namespace lc {
 
+class Settings;
+
 //! A class for receipts creation.
 /*!
   This class is used to do the actual printing of the receipts in an own thread.
@@ -151,6 +153,7 @@ class ReceiptsPrinter : public QThread
     }
 public:
     explicit ReceiptsPrinter(const QString &argDateString,
+                             const Settings *const argSettings,
                              const QString &argWorkpath,
                              QObject *argParent = nullptr);
 

src/Lib/session.cpp

@@ -24,19 +24,19 @@
 
 #include <memory>
 
-extern std::unique_ptr<lc::Settings> settings;
-
 lc::Session::Session(QVector<Client *> &&argAssocClients,
                      const QString &argZTreeDataTargetPath, const quint16 argZTreePort,
                      const QString &argZTreeVersionPath, bool argPrintReceiptsForLocalClients,
                      const QString &argAnonymousReceiptsPlaceholder,
-                     const QString &argLatexHeaderName, QObject *argParent):
+                     const QString &argLatexHeaderName,
+                     const Settings *const argSettings,  QObject *argParent):
     QObject{argParent},
     zTreePort{argZTreePort},
     anonymousReceiptsPlaceholder{argAnonymousReceiptsPlaceholder},
     assocClients{std::move(argAssocClients)},
     latexHeaderName{argLatexHeaderName},
     printReceiptsForLocalClients{argPrintReceiptsForLocalClients},
+    settings{argSettings},
     zTreeDataTargetPath{argZTreeDataTargetPath},
     zTreeVersionPath{argZTreeVersionPath}
 {
@@ -88,14 +88,15 @@ void lc::Session::InitializeClasses()
     zTreeDataTargetPath.append("/" + date_string + "-" + QString::number(zTreePort));
     qDebug() << "New session's chosen_zTree_data_target_path:" << zTreeDataTargetPath;
 
-    zTreeInstance = new ZTree{zTreeDataTargetPath, zTreePort,
+    zTreeInstance = new ZTree{settings, zTreeDataTargetPath, zTreePort,
                               zTreeVersionPath, this};
     connect(zTreeInstance, &ZTree::ZTreeClosed,
             this, &Session::OnzTreeClosed);
     // Only create a 'Receipts_Handler' instance, if all neccessary variables were set
     if (latexHeaderName != "None found" && !settings->dvipsCmd.isEmpty()
             && !settings->latexCmd.isEmpty()) {
-        new ReceiptsHandler{zTreeDataTargetPath, printReceiptsForLocalClients,
+        new ReceiptsHandler{settings, zTreeDataTargetPath,
+                            printReceiptsForLocalClients,
                             anonymousReceiptsPlaceholder, latexHeaderName, this};
     } else {
         qDebug() << "No 'ReceiptsHandler' instance was created.";

src/Lib/session.h

@@ -29,6 +29,7 @@
 namespace lc {
 
 class Client;
+class Settings;
 
 //! A class containing an entire session.
 /*!
@@ -46,7 +47,8 @@ public:
             const quint16 argZTreePort, const QString &argZTreeVersionPath,
             bool argPrintReceiptsForLocalClients,
             const QString &argAnonymousReceiptsPlaceholder,
-            const QString &argLatexHeaderName, QObject *argParent = nullptr);
+            const QString &argLatexHeaderName,
+            const Settings *const argSettings, QObject *argParent = nullptr);
     ~Session() override;
 
     /*! Returns the data item with the given index
@@ -78,6 +80,7 @@ private:
     const QString latexHeaderName;
     //! True if receipts shall be printed for local clients
     const bool printReceiptsForLocalClients = true;
+    const Settings *const settings;
     //! The path were the data of this zTree instance's session will be saved
     QString zTreeDataTargetPath;
     //! The session's zTree instance

src/Lib/settings.h

@@ -45,7 +45,7 @@ public:
     {
         return chosenzTreePort;
     }
-    QVector< Client * > &GetClients()
+    const QVector<Client *> &GetClients() const
     {
         return clients;
     }

src/Lib/ztree.cpp

@@ -25,11 +25,11 @@
 
 #include <memory>
 
-extern std::unique_ptr<lc::Settings> settings;
+lc::ZTree::ZTree(const Settings *const argSettings,
-
+                 const QString &argZTreeDataTargetPath, const int argZTreePort,
-lc::ZTree::ZTree(const QString &argZTreeDataTargetPath, const int argZTreePort,
                  const QString &argZTreeVersionPath, QObject *argParent) :
-    QObject{argParent}
+    QObject{argParent},
+    settings{argSettings}
 {
     QStringList arguments{QStringList{} << "-c" << "0" << settings->wineCmd
                           << QString{settings->zTreeInstDir + "/zTree_"

src/Lib/ztree.h

@@ -26,6 +26,8 @@
 
 namespace lc {
 
+class Settings;
+
 //! A class to contain running zTree instances.
 /*!
   This class is element of every session and is used to handle all zTree related data.
@@ -35,7 +37,8 @@ class ZTree: public QObject
     Q_OBJECT
 
 public:
-    ZTree(const QString &argZTreeDataTargetPath,
+    ZTree(const Settings *const argSettings,
+          const QString &argZTreeDataTargetPath,
           const int argZTreePort, const QString &argZTreeVersionPath,
           QObject *argParent = nullptr);
 
@@ -43,6 +46,7 @@ signals:
     void ZTreeClosed(int argExitCode);
 
 private:
+    const Settings *const settings = nullptr;
     QProcess zTreeInstance;
 };
 

src/localzleafstarter.cpp

@@ -25,10 +25,10 @@
 
 #include <memory>
 
-extern std::unique_ptr<lc::Settings> settings;
+lc::LocalzLeafStarter::LocalzLeafStarter(Settings *const argSettings,
-
+                                         QWidget *argParent) :
-lc::LocalzLeafStarter::LocalzLeafStarter(QWidget *argParent) :
     QWidget{argParent},
+    settings{argSettings},
     ui{new Ui::LocalzLeafStarter}
 {
     ui->setupUi(this);

src/localzleafstarter.h

@@ -28,12 +28,15 @@ namespace Ui {
 class LocalzLeafStarter;
 } // namespace Ui
 
+class Settings;
+
 class LocalzLeafStarter : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit LocalzLeafStarter(QWidget *argParent = nullptr);
+    explicit LocalzLeafStarter(Settings *const argSettings,
+                               QWidget *argParent = nullptr);
     ~LocalzLeafStarter() override;
 
 signals:
@@ -41,6 +44,7 @@ signals:
                              int argzTreePort);
 
 private:
+    Settings *const settings = nullptr;
     Ui::LocalzLeafStarter *const ui = nullptr;
 
 private slots:

src/main.cpp

@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
     QApplication a{argc, argv};
     settings = std::make_unique<lc::Settings>(QSettings{"Labcontrol",
                                                         "Labcontrol"});
-    lc::MainWindow w;
+    lc::MainWindow w{settings.get()};
     w.show();
 
     return a.exec();

src/mainwindow.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Markus Prasser
+ * Copyright 2014-2018 Markus Prasser, Tobias Weiss
  *
  * This file is part of Labcontrol.
  *
@@ -17,8 +17,6 @@
  *  along with Labcontrol.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <memory>
-
 #include <QtGlobal>
 #include <QDebug>
 #include <QInputDialog>
@@ -28,15 +26,15 @@
 #include "manualprintingsetup.h"
 #include "Lib/settings.h"
 
-extern std::unique_ptr< lc::Settings > settings;
+lc::MainWindow::MainWindow(Settings *const argSettings,
-
+                           QWidget *argParent) :
-lc::MainWindow::MainWindow( QWidget *argParent ) :
     QMainWindow{argParent},
     icons(static_cast<int>(icons_t::ICON_QUANTITY)),
+    settings{argSettings},
     ui{new Ui::MainWindow}
 {
     ui->setupUi(this);
-    lablib = new Lablib{ this };
+    lablib = new Lablib{settings, this};
 
     LoadIconPixmaps();
 
@@ -80,17 +78,20 @@ lc::MainWindow::MainWindow( QWidget *argParent ) :
     }
 }
 
-lc::MainWindow::~MainWindow() {
+lc::MainWindow::~MainWindow()
+{
     delete ui;
     delete valid_items;
 }
 
-bool lc::MainWindow::CheckIfUserIsAdmin() {
+bool lc::MainWindow::CheckIfUserIsAdmin()
+{
     if (settings->localUserName.isEmpty()) {
         QMessageBox messageBox{QMessageBox::Warning, tr("User not detectable"),
-                                tr( "Your user name could not be queryed. The admin tab will be"
+                               tr("Your user name could not be queryed. The"
-                                    " disabled. You won't be able to perform administrative"
+                                  " admin tab will be disabled. You won't be"
-                                    " actions but can conduct experiments normally." ),
+                                  " able to perform administrative actions"
+                                  " but can conduct experiments normally."),
                                QMessageBox::Ok};
         messageBox.exec();
         return false;
@@ -101,7 +102,8 @@ bool lc::MainWindow::CheckIfUserIsAdmin() {
     return lablib->CheckIfUserIsAdmin();
 }
 
-void lc::MainWindow::DisableDisfunctionalWidgets() {
+void lc::MainWindow::DisableDisfunctionalWidgets()
+{
     const QStringList &zTreeEntries = settings->installedZTreeVersions;
     if ( zTreeEntries.isEmpty() ) {
         ui->CBClientNames->setEnabled( false );
@@ -258,7 +260,8 @@ void lc::MainWindow::DisableDisfunctionalWidgets() {
     }
 }
 
-void lc::MainWindow::LoadIconPixmaps() {
+void lc::MainWindow::LoadIconPixmaps()
+{
     if ( settings->lcDataDir.isEmpty() ) {
         return;
     }
@@ -280,7 +283,8 @@ void lc::MainWindow::LoadIconPixmaps() {
     }
 }
 
-void lc::MainWindow::on_PBKillLocalzLeaf_clicked() {
+void lc::MainWindow::on_PBKillLocalzLeaf_clicked()
+{
     QString program{ settings->killallCmd };
     QStringList arguments;
     arguments << "-I" << "-q" << "zleaf.exe";
@@ -297,8 +301,9 @@ void lc::MainWindow::on_PBKillLocalzLeaf_clicked() {
     qDebug() << program << arguments;
 }
 
-void lc::MainWindow::on_PBPrintPaymentFileManually_clicked() {
+void lc::MainWindow::on_PBPrintPaymentFileManually_clicked()
-    ManualPrintingSetup *manPrint = new ManualPrintingSetup{ this };
+{
+    ManualPrintingSetup *manPrint = new ManualPrintingSetup{settings, this};
     manPrint->setWindowFlags(Qt::Window);
     manPrint->show();
     connect(manPrint, SIGNAL(destroyed(QObject *)),
@@ -307,11 +312,13 @@ void lc::MainWindow::on_PBPrintPaymentFileManually_clicked() {
             this, &MainWindow::StartReceiptsHandler);
 }
 
-void lc::MainWindow::on_PBRunzLeaf_clicked() {
+void lc::MainWindow::on_PBRunzLeaf_clicked()
+{
     // Check if more than one client is selected and issue a warning message if so
     unsigned short int numberOfSelectedClients = 0;
     QModelIndexList activatedItems = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             ++numberOfSelectedClients;
         }
@@ -322,7 +329,8 @@ void lc::MainWindow::on_PBRunzLeaf_clicked() {
         messageBox.exec();
     } else {
         const QString *const fakeName = new QString{ ui->CBClientNames->currentText() };
-        for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend(); ++it ) {
+        for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend();
+                ++it ) {
             if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
                 Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
                 client->StartZLeaf( fakeName );
@@ -332,13 +340,15 @@ void lc::MainWindow::on_PBRunzLeaf_clicked() {
     }
 }
 
-void lc::MainWindow::on_RBUseLocalUser_toggled(bool checked) {
+void lc::MainWindow::on_RBUseLocalUser_toggled(bool checked)
+{
     if ( checked ) {
         qDebug() << "'RBUseLocalUser' got toggled.";
     }
 }
 
-void lc::MainWindow::SetupWidgets() {
+void lc::MainWindow::SetupWidgets()
+{
     // Fill the 'CBClientNames' with possible client names and the 'TVClients' with the clients
     if ( !settings->GetClients().isEmpty() ) {
         valid_items = new QVector< QStandardItem * >;
@@ -446,18 +456,23 @@ void lc::MainWindow::SetupWidgets() {
 void lc::MainWindow::StartReceiptsHandler(QString argzTreeDataTargetPath,
                                           bool argReceiptsForLocalClients,
                                           QString argAnonymousReceiptsPlaceholder,
-                                           QString argLatexHeaderName, QString argDateString) {
+                                          QString argLatexHeaderName,
-    ReceiptsHandler *recHand = new ReceiptsHandler{ argzTreeDataTargetPath,
+                                          QString argDateString)
+{
+    const auto recHand = new ReceiptsHandler{settings, argzTreeDataTargetPath,
                                              argReceiptsForLocalClients,
                                              argAnonymousReceiptsPlaceholder,
-                                                    argLatexHeaderName, argDateString, this };
+                                             argLatexHeaderName,
+                                             argDateString, this};
     connect(recHand, &ReceiptsHandler::PrintingFinished,
             recHand, &ReceiptsHandler::deleteLater);
 }
 
-void lc::MainWindow::UpdateClientsTableView() {
+void lc::MainWindow::UpdateClientsTableView()
+{
     for ( auto s : *valid_items ) {
-        state_t state = static_cast< Client* >( s->data( Qt::UserRole ).value<void *>() )->GetClientState();
+        state_t state = static_cast< Client * >( s->data(
+                                                     Qt::UserRole ).value<void *>() )->GetClientState();
         switch ( state ) {
         case state_t::RESPONDING:
             s->setBackground( QBrush( QColor( 128, 255, 128, 255 ) ) );
@@ -489,9 +504,11 @@ void lc::MainWindow::UpdateClientsTableView() {
 
 /* Experiment tab functions */
 
-void lc::MainWindow::on_PBBoot_clicked() {
+void lc::MainWindow::on_PBBoot_clicked()
+{
     QModelIndexList activatedItems = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
             client->Boot();
@@ -499,7 +516,8 @@ void lc::MainWindow::on_PBBoot_clicked() {
     }
 }
 
-void lc::MainWindow::on_PBChooseFile_clicked() {
+void lc::MainWindow::on_PBChooseFile_clicked()
+{
     QFileDialog *file_dialog = new QFileDialog{ this, tr( "Choose a file to beam" ), QDir::homePath() };
     file_dialog->setFileMode( QFileDialog::Directory );
     file_dialog->setOption( QFileDialog::DontUseNativeDialog, true );
@@ -509,52 +527,62 @@ void lc::MainWindow::on_PBChooseFile_clicked() {
     if (file_dialog->exec()) {
         ui->LEFilePath->setText(file_dialog->selectedFiles().at(0));
         qDebug() << "Chose file" << ui->LEFilePath->text() << "for beaming.";
-    }
+    } else {
-    else {
         ui->LEFilePath->setText( tr( "File choosing cancelled" ) );
         qDebug() << "File choosing cancelled";
     }
     delete file_dialog;
 }
 
-void lc::MainWindow::on_PBBeamFile_clicked() {
+void lc::MainWindow::on_PBBeamFile_clicked()
+{
     QModelIndexList activatedItems = ui->TVClients->selectionModel()->selectedIndexes();
     const QString fileToBeam{ ui->LEFilePath->text() };
     if (fileToBeam == "") {
         QMessageBox::information(this, "Upload failed", "You didn't choose any folder to upload.");
     } else {
         //Iterate over the selected clients to upload the file
-    for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend(); ++it ) {
+        for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend();
+                ++it ) {
             if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
                 Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
                 client->BeamFile( fileToBeam, &settings->pkeyPathUser, &settings->userNameOnClients );
             }
         }
         // Inform the user about the path
-    QMessageBox::information(this, "Upload completed", "The folder was copied to all selected clients.\nThe path on every client is /home/ewfuser/media4ztree" + fileToBeam.mid(fileToBeam.lastIndexOf('/')) +".\nDon't forget to adjust the media path within zTree!");
+        QMessageBox::information(this, "Upload completed",
+                                 "The folder was copied to all selected clients.\nThe path on every client is /home/ewfuser/media4ztree"
+                                 + fileToBeam.mid(fileToBeam.lastIndexOf('/')) +
+                                 ".\nDon't forget to adjust the media path within zTree!");
     }
 }
 
-void lc::MainWindow::on_PBShowORSEE_clicked() {
+void lc::MainWindow::on_PBShowORSEE_clicked()
+{
     lablib->ShowOrsee();
 }
 
-void lc::MainWindow::on_PBShowPreprints_clicked() {
+void lc::MainWindow::on_PBShowPreprints_clicked()
+{
     lablib->ShowPreprints();
 }
 
-void lc::MainWindow::on_PBShutdown_clicked() {
+void lc::MainWindow::on_PBShutdown_clicked()
+{
     // Confirmation dialog
     QMessageBox::StandardButton reply;
-    reply = QMessageBox::question(this, "Confirm", "Really shutdown the selected clients?", QMessageBox::Yes|QMessageBox::No);
+    reply = QMessageBox::question(this, "Confirm", "Really shutdown the selected clients?",
+                                  QMessageBox::Yes | QMessageBox::No);
     if (reply == QMessageBox::Yes) {
         QModelIndexList activatedItems = ui->TVClients->selectionModel()->selectedIndexes();
-        for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend(); ++it ) {
+        for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend();
+                ++it ) {
             if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
                 Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
                 // Do not shut down the server itself
                 if ( client->name == "self") {
-                    QMessageBox::information(NULL, "Shutdown canceled", "It is not allowed to shutdown the server itself via labcontrol!");
+                    QMessageBox::information(NULL, "Shutdown canceled",
+                                             "It is not allowed to shutdown the server itself via labcontrol!");
                 } else {
                     client->Shutdown();
                 }
@@ -565,7 +593,8 @@ void lc::MainWindow::on_PBShutdown_clicked() {
     }
 }
 
-void lc::MainWindow::on_CBWebcamChooser_activated( int argIndex ) {
+void lc::MainWindow::on_CBWebcamChooser_activated( int argIndex )
+{
     if (  argIndex != 0 ) {
         QString program{ settings->webcamDisplayCmd };
         QStringList arguments;
@@ -586,7 +615,8 @@ void lc::MainWindow::on_PBstartBrowser_clicked()
     QString argURL = ui->LEURL->text();
     bool argFullscreen = ui->CBFullscreen->checkState();
     QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
             client->StartClientBrowser( &argURL, &argFullscreen );
@@ -598,10 +628,12 @@ void lc::MainWindow::on_PBstopBrowser_clicked()
 {
     // Confirmation dialog
     QMessageBox::StandardButton reply;
-    reply = QMessageBox::question(this, "Confirm", "Really kill all selected browser instances?", QMessageBox::Yes|QMessageBox::No);
+    reply = QMessageBox::question(this, "Confirm", "Really kill all selected browser instances?",
+                                  QMessageBox::Yes | QMessageBox::No);
     if (reply == QMessageBox::Yes) {
         QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
-        for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
+        for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend();
+                ++it ) {
             if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
                 Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
                 client->StopClientBrowser( );
@@ -616,7 +648,8 @@ void lc::MainWindow::on_PBstopBrowser_clicked()
 void lc::MainWindow::on_PBViewDesktopViewOnly_clicked()
 {
     QModelIndexList activatedItems = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
             client->ShowDesktopViewOnly();
@@ -628,7 +661,8 @@ void lc::MainWindow::on_PBViewDesktopViewOnly_clicked()
 void lc::MainWindow::on_PBViewDesktopFullControl_clicked()
 {
     QModelIndexList activatedItems = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
             client->ShowDesktopFullControl();
@@ -638,9 +672,11 @@ void lc::MainWindow::on_PBViewDesktopFullControl_clicked()
 
 
 /* Session tab functions */
-void lc::MainWindow::on_PBStartzLeaf_clicked() {
+void lc::MainWindow::on_PBStartzLeaf_clicked()
+{
     QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
             client->StartZLeaf( nullptr, ui->LEzLeafCommandline->text() );
@@ -648,8 +684,9 @@ void lc::MainWindow::on_PBStartzLeaf_clicked() {
     }
 }
 
-void lc::MainWindow::on_PBStartLocalzLeaf_clicked() {
+void lc::MainWindow::on_PBStartLocalzLeaf_clicked()
-    LocalzLeafStarter *localzLeafStarter = new LocalzLeafStarter{ this };
+{
+    LocalzLeafStarter *localzLeafStarter = new LocalzLeafStarter{settings, this};
     localzLeafStarter->setWindowFlags( Qt::Window );
     localzLeafStarter->show();
     connect( localzLeafStarter, &LocalzLeafStarter::LocalzLeafRequested,
@@ -659,7 +696,8 @@ void lc::MainWindow::on_PBStartLocalzLeaf_clicked() {
 }
 
 void lc::MainWindow::StartLocalzLeaf( QString argzLeafName, QString argzLeafVersion,
-                                      int argzTreePort ) {
+                                      int argzTreePort )
+{
     if ( settings->tasksetCmd.isEmpty() || settings->wineCmd.isEmpty()
             || settings->zTreeInstDir.isEmpty() ) {
         return;
@@ -687,7 +725,8 @@ void lc::MainWindow::on_PBStopZtree_clicked()
     arguments << "-I" << "-q" << "ztree.exe";
     // Confirmation dialog
     QMessageBox::StandardButton reply;
-    reply = QMessageBox::question(this, "Confirm", "Really kill all z-Tree instances?", QMessageBox::Yes|QMessageBox::No);
+    reply = QMessageBox::question(this, "Confirm", "Really kill all z-Tree instances?",
+                                  QMessageBox::Yes | QMessageBox::No);
     if (reply == QMessageBox::Yes) {
         // Kill all z-Tree processes
         QProcess killLocalzLeafProc;
@@ -721,7 +760,8 @@ void lc::MainWindow::on_CBDataTargetPath_activated( int argIndex )
 }
 
 // Open a folder chooser dialog for zTree data path
-void lc::MainWindow::GetNewDataTargetPath() {
+void lc::MainWindow::GetNewDataTargetPath()
+{
     QFileDialog fileDialog{ this };
     fileDialog.setFileMode( QFileDialog::Directory );
     fileDialog.setDirectory( QDir::homePath() );
@@ -749,7 +789,8 @@ void lc::MainWindow::on_ChBPrintanonymousreceipts_clicked()
 }
 
 // Start session button actions
-void lc::MainWindow::on_PBStartSession_clicked() {
+void lc::MainWindow::on_PBStartSession_clicked()
+{
 
     if ( ui->CBzTreeVersion->currentIndex() == 0 ) {
         QMessageBox::information( this, tr( "No z-Tree version chosen" ),
@@ -793,7 +834,8 @@ void lc::MainWindow::on_PBStartSession_clicked() {
                                     ui->CBzTreeVersion->currentText() );
 
     //Display the command line
-    QString cmd = this->lablib->getzLeafArgs( ui->SBPort->value(), ui->CBzTreeVersion->currentText()).join(" ");
+    QString cmd = this->lablib->getzLeafArgs( ui->SBPort->value(),
+                                              ui->CBzTreeVersion->currentText()).join(" ");
     ui->LEzLeafCommandline->setText(cmd);
 
     //Start z-Leaf on selected clients if checkbox is activated
@@ -816,7 +858,8 @@ void lc::MainWindow::on_PBStartSession_clicked() {
 void lc::MainWindow::on_PBKillzLeaf_clicked()
 {
     QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
             client->KillZLeaf();
@@ -826,7 +869,8 @@ void lc::MainWindow::on_PBKillzLeaf_clicked()
 
 /* Admin tab functions */
 
-void lc::MainWindow::on_PBOpenFilesystem_clicked() {
+void lc::MainWindow::on_PBOpenFilesystem_clicked()
+{
     // Determine the correct user to be used
     QString *userToBeUsed = nullptr;
     if ( ui->RBUseUserRoot->isChecked() ) {
@@ -836,7 +880,8 @@ void lc::MainWindow::on_PBOpenFilesystem_clicked() {
     }
 
     QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
             client->OpenFilesystem( userToBeUsed );
@@ -845,7 +890,8 @@ void lc::MainWindow::on_PBOpenFilesystem_clicked() {
     delete userToBeUsed;
 }
 
-void lc::MainWindow::on_PBExecute_clicked() {
+void lc::MainWindow::on_PBExecute_clicked()
+{
 
     // Get the command to be executed ...
     QString command = ui->CBCommandToExecute->currentText();
@@ -860,7 +906,8 @@ void lc::MainWindow::on_PBExecute_clicked() {
 
     qDebug() << "Executing command" << command << " on chosen clients.";
     QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
             client->OpenTerminal( command, ui->RBUseUserRoot->isChecked() );
@@ -870,7 +917,8 @@ void lc::MainWindow::on_PBExecute_clicked() {
 }
 
 // Issue open terminal call
-void lc::MainWindow::on_PBOpenTerminal_clicked() {
+void lc::MainWindow::on_PBOpenTerminal_clicked()
+{
     QString pkeyPathUser;
     if ( ui->RBUseUserRoot->isChecked() ) {
         pkeyPathUser = settings->pkeyPathRoot;
@@ -878,7 +926,8 @@ void lc::MainWindow::on_PBOpenTerminal_clicked() {
         pkeyPathUser = settings->pkeyPathUser;
     }
     QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
-    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
+    for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend();
+            ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client * >( ( *it ).data( Qt::UserRole ).value< void * >() );
             client->OpenTerminal( QString{}, ui->RBUseUserRoot->isChecked() );

src/mainwindow.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Markus Prasser
+ * Copyright 2014-2018 Markus Prasser, Tobias Weiss
  *
  * This file is part of Labcontrol.
  *
@@ -43,16 +43,20 @@ namespace Ui {
 class MainWindow;
 }
 
+class Settings;
+
 //! The class containing the graphical user interface.
 /*!
   This class represents the graphical user interface and all connected functionality.
 */
-class MainWindow : public QMainWindow {
+class MainWindow : public QMainWindow
+{
     Q_OBJECT
 
 public:
-    explicit MainWindow( QWidget *argParent = nullptr );
+    explicit MainWindow(Settings *const argSettings,
-    ~MainWindow();
+                        QWidget *argParent = nullptr);
+    ~MainWindow() override;
 
 private slots:
     void on_CBWebcamChooser_activated(int index);
@@ -103,21 +107,31 @@ private:
     //! Sets up all used widgets
     void SetupWidgets();
 
-    QStandardItemModel *clients_view_model = nullptr;   //! The view storing all clients data
+    //! The view storing all clients data
-    QTimer *gui_update_timer = nullptr;         //! A QTimer triggering updates of the graphical user interface
+    QStandardItemModel *clients_view_model = nullptr;
-    QVector< QPixmap > icons;                   //! Vector of pixmaps storing the icons indicating the clients' statuses
+    //! A QTimer triggering updates of the graphical user interface
-    Lablib *lablib = nullptr;                   //! Accumulator of all program logic being accessed by the GUI
+    QTimer *gui_update_timer = nullptr;
-    bool localzLeavesAreRunning = false;        //! Stores if a local z-Leaf instance is running on the server ('true' if local z-Leaf exists)
+    //! Vector of pixmaps storing the icons indicating the clients' statuses
-    QButtonGroup *userChooseButtonGroup = nullptr;      //! Used to group the radio buttons choosing which user shall be used for administrative client actions
+    QVector<QPixmap> icons;
-    Ui::MainWindow *ui = nullptr;               //! Pointer storing all GUI items
+    //! Accumulator of all program logic being accessed by the GUI
-    QVector<QStandardItem *> *valid_items = nullptr;    //! Stores all valid Client instances displayed by the table view, its main use is as iterable object for 'update_clients_table_view()'
+    Lablib *lablib = nullptr;
+    //! Stores if a local z-Leaf instance is running on the server ('true' if local z-Leaf exists)
+    bool localzLeavesAreRunning = false;
+    Settings *const settings = nullptr;
+    //! Used to group the radio buttons choosing which user shall be used for administrative client actions
+    QButtonGroup *userChooseButtonGroup = nullptr;
+    //! Pointer storing all GUI items
+    Ui::MainWindow *const ui = nullptr;
+    //! Stores all valid Client instances displayed by the table view, its main use is as iterable object for 'update_clients_table_view()'
+    QVector<QStandardItem *> *valid_items = nullptr;
 
 private slots:
     void StartReceiptsHandler(QString argzTreeDataTargetPath,
                               bool argReceiptsForLocalClients,
                               QString argAnonymousReceiptsPlaceholder,
                               QString argLatexHeaderName,
-                               QString argDateString );
+                              QString argDateString
+                             );
     void on_PBstartBrowser_clicked();
     void on_PBstopBrowser_clicked();
 
@@ -131,6 +145,6 @@ private slots:
     void on_PBKillzLeaf_clicked();
 };
 
-}
+} // namespace lc
 
 #endif // MAINWINDOW_H

src/manualprintingsetup.cpp

@@ -17,13 +17,6 @@
  *  along with Labcontrol.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* #include "manualprintingsetup.h"
-#include "ui_manualprintingsetup.h"
-#include "Lib/settings.h"
-
-#include <QFileDialog>
- */
-
 #include "manualprintingsetup.h"
 #include "ui_manualprintingsetup.h"
 #include "Lib/settings.h"
@@ -33,10 +26,10 @@
 
 #include <memory>
 
-extern std::unique_ptr<lc::Settings> settings;
+lc::ManualPrintingSetup::ManualPrintingSetup(const Settings *const argSettings,
-
+                                             QWidget *argParent) :
-lc::ManualPrintingSetup::ManualPrintingSetup(QWidget *argParent) :
     QWidget{argParent},
+    settings{argSettings},
     ui{new Ui::ManualPrintingSetup}
 {
     ui->setupUi(this);

src/manualprintingsetup.h

@@ -28,12 +28,15 @@ namespace Ui {
 class ManualPrintingSetup;
 } // namespace Ui
 
+class Settings;
+
 class ManualPrintingSetup : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit ManualPrintingSetup(QWidget *argParent = nullptr);
+    explicit ManualPrintingSetup(const Settings *const argSettings,
+                                 QWidget *argParent = nullptr);
     ~ManualPrintingSetup() override;
 
 signals:
@@ -45,6 +48,7 @@ signals:
 
 private:
     QString dateString;
+    const Settings *const settings = nullptr;
     Ui::ManualPrintingSetup *const ui = nullptr;
     QString workPath;