Merge branch 'master' of https://github.com/huderlem/porymap into connections

include/scripting.h

@@ -30,8 +30,9 @@ class Scripting
 {
 public:
     Scripting(MainWindow *mainWindow);
-    static void stop();
+    ~Scripting();
     static void init(MainWindow *mainWindow);
+    static void stop();
     static void populateGlobalObject(MainWindow *mainWindow);
     static QJSEngine *getEngine();
     static void invokeAction(int actionIndex);

include/scriptutility.h

@@ -10,7 +10,8 @@ class ScriptUtility : public QObject
 
 public:
     ScriptUtility(MainWindow *mainWindow);
-    void clearActions();
+    ~ScriptUtility();
+
     QString getActionFunctionName(int actionIndex);
     Q_INVOKABLE bool registerAction(QString functionName, QString actionName, QString shortcut = "");
     Q_INVOKABLE bool registerToggleAction(QString functionName, QString actionName, QString shortcut = "", bool checked = false);
@@ -59,6 +60,7 @@ private:
 
     MainWindow *window;
     QList<QAction *> registeredActions;
+    QSet<QTimer *> activeTimers;
     QHash<int, QString> actionMap;
 };
 

include/ui/noscrollcombobox.h

@@ -14,6 +14,8 @@ public:
     void setNumberItem(int value);
     void setHexItem(uint32_t value);
     void setClearButtonEnabled(bool enabled);
+    void setEditable(bool editable);
+    void setLineEdit(QLineEdit *edit);
 
 private:
     void setItem(int index, const QString &text);