Made 'icons' a QVector on the stack

remotes/origin/HEAD
markuspg 10 years ago
parent f589ab1924
commit 90e65ce0bf

@ -24,7 +24,7 @@
lc::MainWindow::MainWindow( QWidget *argParent ) : lc::MainWindow::MainWindow( QWidget *argParent ) :
QMainWindow{ argParent }, QMainWindow{ argParent },
icons{ new QPixmap[ icons_t::ICON_QUANTITY ] }, icons( static_cast< int >( icons_t::ICON_QUANTITY ) ),
ui{ new Ui::MainWindow } ui{ new Ui::MainWindow }
{ {
ui->setupUi( this ); ui->setupUi( this );
@ -44,7 +44,6 @@ lc::MainWindow::MainWindow( QWidget *argParent ) :
lc::MainWindow::~MainWindow() { lc::MainWindow::~MainWindow() {
delete ui; delete ui;
delete valid_items; delete valid_items;
delete[] icons;
} }
bool lc::MainWindow::CheckIfUserIsAdmin() { bool lc::MainWindow::CheckIfUserIsAdmin() {

@ -102,7 +102,7 @@ private:
QStandardItemModel *clients_view_model = nullptr; //! The view storing all clients data QStandardItemModel *clients_view_model = nullptr; //! The view storing all clients data
QTimer *gui_update_timer = nullptr; //! A QTimer triggering updates of the graphical user interface QTimer *gui_update_timer = nullptr; //! A QTimer triggering updates of the graphical user interface
QPixmap *icons = nullptr; //! Array of pixmaps storing the icons indicating the clients' statuses QVector< QPixmap > icons; //! Vector of pixmaps storing the icons indicating the clients' statuses
Lablib *lablib = nullptr; //! Accumulator of all program logic being accessed by the GUI Lablib *lablib = nullptr; //! Accumulator of all program logic being accessed by the GUI
bool local_zLeaves_are_running = false; //! Stores if a local zLeaf instance is running on the server ('true' if local zLeaf exists) bool local_zLeaves_are_running = false; //! Stores if a local zLeaf instance is running on the server ('true' if local zLeaf exists)
QButtonGroup *userChooseButtonGroup = nullptr; //! Used to group the radio buttons choosing which user shall be used for administrative client actions QButtonGroup *userChooseButtonGroup = nullptr; //! Used to group the radio buttons choosing which user shall be used for administrative client actions

Loading…
Cancel
Save