start replacing raw to smart pointers for mupp.

This commit is contained in:
2023-10-23 20:32:01 +02:00
parent 302f5cd5ca
commit afbe8a8ee6
4 changed files with 115 additions and 138 deletions

View File

@@ -30,6 +30,8 @@
#ifndef _PMUPPGUI_H_
#define _PMUPPGUI_H_
#include <memory>
#include <QMainWindow>
#include <QVector>
#include <QString>
@@ -171,44 +173,44 @@ private:
QString fMacroPath;
QString fMacroName;
QWidget *fCentralWidget;
std::unique_ptr<QWidget> fCentralWidget;
QMenu *fRecentFilesMenu; ///< recent file menu
QAction *fRecentFilesAction[MAX_RECENT_FILES]; ///< array of the recent file actions
QAction *fNormalizeAction;
std::unique_ptr<QAction> fNormalizeAction;
QBoxLayout *fBoxLayout_Main; // top->bottom (0)
QBoxLayout *fBoxLayout_Top; // left->right (1)
QGridLayout *fGridLayout_Left; // 2 columns, 3 rows
QGridLayout *fGridLayout_Right; // 2 columns, 6 rows
QBoxLayout *fBoxLayout_Cmd; // left->right (1)
std::unique_ptr<QBoxLayout> fBoxLayout_Main; // top->bottom (0)
std::unique_ptr<QBoxLayout> fBoxLayout_Top; // left->right (1)
std::unique_ptr<QGridLayout> fGridLayout_Left; // 2 columns, 3 rows
std::unique_ptr<QGridLayout> fGridLayout_Right; // 2 columns, 6 rows
std::unique_ptr<QBoxLayout> fBoxLayout_Cmd; // left->right (1)
QLabel *fColLabel;
QSplitter *fColParamSplitter;
QListWidget *fColList;
QListWidget *fParamList;
QPushButton *fRemoveCollection;
QPushButton *fRefreshCollection;
QLabel *fXaxisLabel;
QLabel *fYaxisLabel;
QListWidget *fViewX;
QListWidget *fViewY;
QPushButton *fAddX;
QPushButton *fAddY;
QPushButton *fAddDitto;
QPushButton *fRemoveX;
QPushButton *fRemoveY;
QPushButton *fPlot;
QSplitter *fCmdSplitter;
QPlainTextEdit *fCmdLineHistory;
QLineEdit *fCmdLine;
QPushButton *fExitButton;
std::unique_ptr<QLabel> fColLabel;
std::unique_ptr<QSplitter> fColParamSplitter;
std::unique_ptr<QListWidget> fColList;
std::unique_ptr<QListWidget> fParamList;
std::unique_ptr<QPushButton> fRemoveCollection;
std::unique_ptr<QPushButton> fRefreshCollection;
std::unique_ptr<QLabel> fXaxisLabel;
std::unique_ptr<QLabel> fYaxisLabel;
std::unique_ptr<QListWidget> fViewX;
std::unique_ptr<QListWidget> fViewY;
std::unique_ptr<QPushButton> fAddX;
std::unique_ptr<QPushButton> fAddY;
std::unique_ptr<QPushButton> fAddDitto;
std::unique_ptr<QPushButton> fRemoveX;
std::unique_ptr<QPushButton> fRemoveY;
std::unique_ptr<QPushButton> fPlot;
std::unique_ptr<QSplitter> fCmdSplitter;
std::unique_ptr<QPlainTextEdit> fCmdLineHistory;
std::unique_ptr<QLineEdit> fCmdLine;
std::unique_ptr<QPushButton> fExitButton;
QVector<QString> fCmdHistory; ///< command history buffer
PVarDialog *fVarDlg; ///< variable dialog
std::unique_ptr<PVarDialog> fVarDlg; ///< variable dialog
QProcess *fMuppPlot; ///< mupp plotter
std::unique_ptr<QProcess> fMuppPlot; ///< mupp plotter
void setupFileActions();
void setupToolActions();