summaryrefslogtreecommitdiff
path: root/jvmfwk/plugins
diff options
context:
space:
mode:
authorPhilipp Hofer <philipp.hofer@protonmail.com>2020-11-12 13:04:38 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-11-18 12:55:23 +0100
commit856bdfb0585cea3c67eedfb535c6477d51e4c352 (patch)
treec81dda45df735b62f66a625f40cc57b62864fdc0 /jvmfwk/plugins
parent11a7e6640197db97cd89630857b6ff5ba742d183 (diff)
tdf#123936 Formatting files in module jvmfwk with clang-format
Change-Id: Ie643402fbf10ac837c975d29068b7973e9dd6210 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105685 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'jvmfwk/plugins')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx13
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx8
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx8
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx21
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx2
5 files changed, 23 insertions, 29 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index 4826ea720d7f..dd3e15cb99c0 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -24,26 +24,23 @@
namespace jfw_plugin
{
-
-class GnuInfo: public VendorBase
+class GnuInfo : public VendorBase
{
private:
OUString m_sJavaHome;
+
public:
- static char const* const* getJavaExePaths(int * size);
+ static char const* const* getJavaExePaths(int* size);
static rtl::Reference<VendorBase> createInstance();
- virtual char const* const* getRuntimePaths(int * size) override;
+ virtual char const* const* getRuntimePaths(int* size) override;
virtual char const* const* getLibraryPaths(int* size) override;
- virtual bool initialize(
- std::vector<std::pair<OUString, OUString> > props) override;
+ virtual bool initialize(std::vector<std::pair<OUString, OUString>> props) override;
virtual int compareVersions(const OUString& sSecond) const override;
-
};
-
}
#endif
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index 57b3a5e39639..f722234ef24b 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -26,19 +26,17 @@ namespace jfw_plugin
{
/* Do not forget to put this class in the vendor map in vendorlist.cxx
*/
-class OtherInfo: public VendorBase
+class OtherInfo : public VendorBase
{
public:
- static char const* const* getJavaExePaths(int * size);
+ static char const* const* getJavaExePaths(int* size);
static rtl::Reference<VendorBase> createInstance();
- virtual char const* const* getRuntimePaths(int * size) override;
+ virtual char const* const* getRuntimePaths(int* size) override;
virtual char const* const* getLibraryPaths(int* size) override;
virtual int compareVersions(const OUString& sSecond) const override;
-
};
-
}
#endif
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index 781e2dd782b4..773f40080bab 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -24,20 +24,18 @@
namespace jfw_plugin
{
-
-class SunInfo: public VendorBase
+class SunInfo : public VendorBase
{
public:
- static char const* const* getJavaExePaths(int * size);
+ static char const* const* getJavaExePaths(int* size);
static rtl::Reference<VendorBase> createInstance();
- virtual char const* const* getRuntimePaths(int * size) override;
+ virtual char const* const* getRuntimePaths(int* size) override;
virtual char const* const* getLibraryPaths(int* size) override;
virtual int compareVersions(const OUString& sSecond) const override;
};
-
}
#endif
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index a493fb5a8b1c..3c181ed3b7be 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -22,7 +22,8 @@
#include <rtl/ustring.hxx>
-namespace jfw_plugin {
+namespace jfw_plugin
+{
// Define OSL_DEBUG_LEVEL >= 2 to run a test when this lib is loaded
/* SunVersion is used to compare java versions based on a string, as taken
@@ -68,7 +69,7 @@ class SunVersion final
Rel_RC2,
Rel_RC3
#if defined(FREEBSD)
- ,
+ ,
Rel_FreeBSD
#endif
};
@@ -79,8 +80,9 @@ class SunVersion final
char m_nUpdateSpecial;
PreRelease m_preRelease;
+
public:
- explicit SunVersion(const char * szVer);
+ explicit SunVersion(const char* szVer);
explicit SunVersion(const OUString& usVer);
~SunVersion();
@@ -88,16 +90,16 @@ public:
Pre-release versions are taken into account.
1.5.0-beta > 1.5.0-ea > 1.4.2
*/
- bool operator > (const SunVersion& ver) const;
- bool operator < (const SunVersion& ver) const;
- bool operator == (const SunVersion& ver) const;
+ bool operator>(const SunVersion& ver) const;
+ bool operator<(const SunVersion& ver) const;
+ bool operator==(const SunVersion& ver) const;
/** Test if the version is compatible tu SUN's versioning scheme
*/
- operator bool () { return m_bValid;}
+ operator bool() { return m_bValid; }
private:
- bool init(const char * szVer);
+ bool init(const char* szVer);
bool m_bValid;
@@ -105,9 +107,8 @@ private:
"ea" is passed then Rel_EA is returned. If the string is no pre release
then Rel_NONE is returned.
*/
- static PreRelease getPreRelease(const char *szRel);
+ static PreRelease getPreRelease(const char* szRel);
};
-
}
#endif // INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNVERSION_HXX
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx
index ebada192408f..ae43cee91c42 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx
@@ -7,7 +7,7 @@
#include <rtl/ustring.hxx>
-bool JvmfwkUtil_isLoadableJVM( OUString const & aURL );
+bool JvmfwkUtil_isLoadableJVM(OUString const& aURL);
#endif