NOISSUE Cleanup duplication and Microsoft JDK

2021-06-18 17:02:41 +02:00
parent fd04ff2b08
commit 7ac6c4f3d9
2 changed files with 34 additions and 95 deletions
--- a/api/logic/java/JavaUtils.h
+++ b/api/logic/java/JavaUtils.h
@ -39,7 +39,6 @@ public:
    JavaInstallPtr GetDefaultJava();

 #ifdef Q_OS_WIN
-    QList<JavaInstallPtr> FindOracleJavaFromRegistryKey(DWORD keyType, QString keyName);
-    QList<JavaInstallPtr> FindAdoptJavaFromRegistryKey(DWORD keyType, QString keyName);
+    QList<JavaInstallPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName, QString keyJavaDir, QString subkeySuffix = "");
 #endif
 };