penButtons as qmap

Author: sulincix

src/tools.h

@@ -30,7 +30,7 @@
 extern "C" {
     #include "utils/Settings.h"
 }
-extern QPushButton **penButtons;
+extern QMap<qint64, QPushButton*> penButtons;
 
 extern DrawingWidget *drawing;
 extern FloatingWidget *floatingWidget;
@@ -60,8 +60,6 @@ extern int getPen();
 extern void setPenStyle(int style);
 extern void setLineStyle(int style);
 
-extern QPushButton **penButtons;
-
 extern QPushButton *typeButton;
 
 extern OverView *ov;

src/tools/pen.cpp

@@ -1,6 +1,6 @@
 #include "../tools.h"
 
-QPushButton **penButtons;
+QMap<qint64, QPushButton*> penButtons;
 
 QPushButton *penSwitch;
 
@@ -65,8 +65,6 @@ void setLineStyle(int style){
 }
 
 void setupPenType(){
-    penButtons = (QPushButton**)calloc(1024, sizeof(QPushButton*));
-
     penButtons[PEN] = create_button(":images/pen.svg", [=](){
         setPen(PEN);
     });

src/tools/update.cpp

@@ -44,11 +44,8 @@ void updateGoBackButtons(){
 }
 
 void backgroundStyleEvent(){
-    for(int i=0; i<1024; i++){
-        if(penButtons[i] != nullptr){
-            //printf("%d\n", i);
-            penButtons[i]->setStyleSheet(QString("background-color: none;"));
-        }
+    for (auto it = penButtons.begin(); it != penButtons.end(); ++it) {
+        it.value()->setStyleSheet(QString("background-color: none;"));
     }
     int btns[] = {
         getPen(), drawing->getLineStyle(),