Fixed memory leaks - part I

juliagoda · Dec 10, 2018 · 3242b0e · 3242b0e
1 parent 9fe2bec
commit 3242b0e
Show file tree

Hide file tree

Showing 56 changed files with 1,179 additions and 212 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -161,7 +161,6 @@ set(antimicro_SOURCES
     src/joybuttonwidget.cpp
     src/joystick.cpp
     src/joybutton.cpp
-    #src/joybuttonslotslist.cpp
     src/xml/joybuttonxml.cpp
     src/joybuttontypes/joygradientbutton.cpp
     src/event.cpp
@@ -180,11 +179,9 @@ set(antimicro_SOURCES
     src/advancebuttondialog.cpp
     src/simplekeygrabberbutton.cpp
     src/joybuttonslot.cpp
-    src/xml/joybuttonslotxml.cpp
     src/joybuttontypes/joyaxisbutton.cpp
     src/aboutdialog.cpp
     src/setjoystick.cpp
-    src/xml/setjoystickxml.cpp
     src/sdleventreader.cpp
     src/setaxisthrottledialog.cpp
     src/keyboard/virtualkeypushbutton.cpp
@@ -193,7 +190,6 @@ set(antimicro_SOURCES
     src/buttoneditdialog.cpp
     src/commandlineutility.cpp
     src/joycontrolstick.cpp
-    src/xml/joycontrolstickxml.cpp
     src/joybuttontypes/joycontrolstickbutton.cpp
     src/joybuttontypes/joycontrolstickmodifierbutton.cpp
     src/joycontrolstickeditdialog.cpp
@@ -224,6 +220,7 @@ set(antimicro_SOURCES
     src/inputdevice.cpp
     src/xml/inputdevicexml.cpp
     src/mainsettingsdialog.cpp
+    src/gamecontroller/gamecontrollertriggerbutton.cpp
     src/setnamesdialog.cpp
     src/autoprofileinfo.cpp
     src/addeditautoprofiledialog.cpp
@@ -268,7 +265,6 @@ set(antimicro_HEADERS
     src/joybuttonwidget.h
     src/joystick.h
     src/joybutton.h
-    #src/joybuttonslotslist.h
     src/xml/joybuttonxml.h
     src/joybuttontypes/joygradientbutton.h
     src/inputdaemon.h
@@ -286,11 +282,9 @@ set(antimicro_HEADERS
     src/advancebuttondialog.h
     src/simplekeygrabberbutton.h
     src/joybuttonslot.h
-    src/xml/joybuttonslotxml.h
     src/joybuttontypes/joyaxisbutton.h
     src/aboutdialog.h
     src/setjoystick.h
-    src/xml/setjoystickxml.h
     src/sdleventreader.h
     src/setaxisthrottledialog.h
     src/keyboard/virtualkeypushbutton.h
@@ -299,7 +293,6 @@ set(antimicro_HEADERS
     src/buttoneditdialog.h
     src/commandlineutility.h
     src/joycontrolstick.h
-    src/xml/joycontrolstickxml.h
     src/joybuttontypes/joycontrolstickbutton.h
     src/joybuttontypes/joycontrolstickmodifierbutton.h
     src/joycontrolstickeditdialog.h
@@ -330,6 +323,7 @@ set(antimicro_HEADERS
     src/inputdevice.h
     src/xml/inputdevicexml.h
     src/mainsettingsdialog.h
+    src/gamecontroller/gamecontrollertriggerbutton.h
     src/setnamesdialog.h
     src/autoprofileinfo.h
     src/addeditautoprofiledialog.h
@@ -401,25 +395,17 @@ if(USE_SDL_2)
          src/gamecontroller/gamecontrollertrigger.cpp
          src/gamecontrollermappingdialog.cpp
          src/gamecontrollerexample.cpp
-         src/gamecontroller/gamecontrollertriggerbutton.cpp
-         src/gamecontroller/xml/gamecontrtriggbtnxml.cpp
          src/gamecontroller/xml/gamecontrollerxml.cpp
          src/gamecontroller/xml/gamecontrollertriggerxml.cpp
-         src/gamecontroller/xml/gamecontrollerdpadxml.cpp
-         src/gamecontroller/xml/gamecontrollersetxml.cpp
     )
     LIST(APPEND antimicro_HEADERS src/gamecontroller/gamecontroller.h
         src/gamecontroller/gamecontrollerdpad.h
         src/gamecontroller/gamecontrollerset.h
         src/gamecontroller/gamecontrollertrigger.h
         src/gamecontrollermappingdialog.h
         src/gamecontrollerexample.h
-        src/gamecontroller/gamecontrollertriggerbutton.h
-        src/gamecontroller/xml/gamecontrtriggbtnxml.h
         src/gamecontroller/xml/gamecontrollerxml.h
         src/gamecontroller/xml/gamecontrollertriggerxml.h
-        src/gamecontroller/xml/gamecontrollerdpadxml.h
-        src/gamecontroller/xml/gamecontrollersetxml.h
     )
 endif(USE_SDL_2)
 

diff --git a/src/gamecontroller/gamecontroller.cpp b/src/gamecontroller/gamecontroller.cpp
@@ -25,7 +25,12 @@
 #include "joybuttontypes/joycontrolstickbutton.h"
 #include "common.h"
 #include "messagehandler.h"
+//#include "logger.h"
 
+#include <cmath>
+
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 #include <QDebug>
 
 

diff --git a/src/gamecontroller/gamecontroller.h b/src/gamecontroller/gamecontroller.h
@@ -20,7 +20,11 @@
 
 #include <SDL2/SDL_gamecontroller.h>
 #include <inputdevice.h>
+#include <xml/inputdevicexml.h>
 
+
+class QXmlStreamReader;
+class QXmlStreamWriter;
 class AntiMicroSettings;
 
 // holds information about gamecontrollers

diff --git a/src/gamecontroller/gamecontrollerdpad.cpp b/src/gamecontroller/gamecontrollerdpad.cpp
@@ -21,7 +21,9 @@
 #include "messagehandler.h"
 #include "setjoystick.h"
 #include "joybutton.h"
+#include "xml/joydpadxml.h"
 
+#include <QXmlStreamReader>
 #include <QDebug>
 
 
@@ -30,6 +32,7 @@ GameControllerDPad::GameControllerDPad(JoyButton *upButton, JoyButton *downButto
     VDPad(upButton, downButton, leftButton, rightButton, index, originset, parentSet, parent)
 {
     qInstallMessageHandler(MessageHandler::myMessageOutput);
+    dpadXml = new JoyDPadXml(getDPad(), this);
 }
 
 
@@ -80,3 +83,26 @@ QString GameControllerDPad::getXmlName()
 
     return GlobalVariables::GameControllerDPad::xmlName;
 }
+
+
+void GameControllerDPad::readJoystickConfig(QXmlStreamReader *xml)
+{
+    qInstallMessageHandler(MessageHandler::myMessageOutput);
+
+    if (xml->isStartElement() && (xml->name() == GlobalVariables::VDPad::xmlName))
+    {
+        xml->readNextStartElement();
+
+        while (!xml->atEnd() && (!xml->isEndElement() && (xml->name() != GlobalVariables::VDPad::xmlName)))
+        {
+            bool found = dpadXml->readMainConfig(xml);
+
+            if (!found)
+            {
+                xml->skipCurrentElement();
+            }
+
+            xml->readNextStartElement();
+        }
+    }
+}
diff --git a/src/gamecontroller/gamecontrollerdpad.h b/src/gamecontroller/gamecontrollerdpad.h
@@ -22,8 +22,10 @@
 
 #include "vdpad.h"
 
+class QXmlStreamReader;
 class JoyButton;
 class SetJoystick;
+class JoyDPadXml;
 class DPad;
 
 // holds information about gamecontroller dpad
@@ -37,9 +39,15 @@ class GameControllerDPad : public VDPad
                                 int index, int originset, SetJoystick *parentSet, QObject *parent = nullptr);
 
     virtual QString getName(bool forceFullFormat, bool displayName);
-    virtual QString getXmlName();
+    virtual QString getXmlName(); // GameControllerDPadXml class
+
+    void readJoystickConfig(QXmlStreamReader *xml); // GameControllerDPadXml class
 
     VDPad* getDPad();
+
+private:
+    JoyDPadXml* dpadXml;
+
 };
 
 #endif // GAMECONTROLLERDPAD_H