Merge branch 'feature_profiling' into integration_json_and_tools

1 files changed, 23 insertions, 0 deletions

diff --git a/logic/tools/JProfiler.h b/logic/tools/JProfiler.h
new file mode 100644
index 00000000..88a02462
--- /dev/null
+++ b/logic/tools/JProfiler.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "BaseProfiler.h"
+
+class JProfiler : public BaseProfiler
+{
+	Q_OBJECT
+public:
+	JProfiler(BaseInstance *instance, QObject *parent = 0);
+
+protected:
+	void beginProfilingImpl(MinecraftProcess *process);
+};
+
+class JProfilerFactory : public BaseProfilerFactory
+{
+public:
+	QString name() const override { return "JProfiler"; }
+	void registerSettings(SettingsObject *settings) override;
+	BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override;
+	bool check(QString *error) override;
+	bool check(const QString &path, QString *error) override;
+};