binaryurp/source/currentcontext.hxx | 12 +++++++-----
binaryurp/source/outgoingrequests.hxx | 26 ++++++++++++++++----------
binaryurp/source/reader.hxx | 25 +++++++++++++------------
binaryurp/source/readerstate.hxx | 9 +++++----
binaryurp/source/specialfunctionids.hxx | 8 ++++----
codemaker/source/codemaker/options.cxx | 15 ++++-----------
codemaker/source/cppumaker/cppuoptions.hxx | 10 ++++++----
codemaker/source/cppumaker/dumputils.hxx | 18 +++++++++---------
codemaker/source/javamaker/javaoptions.hxx | 10 ++++++----
solenv/clang-format/excludelist | 9 ---------
10 files changed, 70 insertions(+), 72 deletions(-)
New commits:
commit a079d78439cd371dd270fb5a1de125d5de9cf472
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 12:51:06 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Nov 13 15:13:38 2020 +0100
tdf#123936 Formatting files in module codemaker with clang-format
Change-Id: Icd006d12942489a10fc2b3b801233c9527284721
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105652
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/codemaker/source/codemaker/options.cxx
b/codemaker/source/codemaker/options.cxx
index 9b8dbf61f6bf..2d85b35a9823 100644
--- a/codemaker/source/codemaker/options.cxx
+++ b/codemaker/source/codemaker/options.cxx
@@ -17,18 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <codemaker/options.hxx>
-Options::Options()
-{
-}
-
-Options::~Options()
-{
-
-}
+Options::Options() {}
+Options::~Options() {}
bool Options::isValid(const OString& option) const
{
@@ -38,11 +31,11 @@ bool Options::isValid(const OString& option) const
const OString& Options::getOption(const OString& option) const
{
OptionMap::const_iterator i(m_options.find(option));
- if (i == m_options.end()) {
+ if (i == m_options.end())
+ {
throw IllegalArgument("Option is not valid or currently not set.");
}
return i->second;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/cppuoptions.hxx
b/codemaker/source/cppumaker/cppuoptions.hxx
index 76dba06b1210..f3d65e4fa8ed 100644
--- a/codemaker/source/cppumaker/cppuoptions.hxx
+++ b/codemaker/source/cppumaker/cppuoptions.hxx
@@ -25,13 +25,15 @@ class CppuOptions : public Options
{
public:
CppuOptions()
- : Options() {}
+ : Options()
+ {
+ }
- bool initOptions(int ac, char* av[], bool bCmdFile=false) override;
+ bool initOptions(int ac, char* av[], bool bCmdFile = false) override;
- OString prepareHelp() override;
+ OString prepareHelp() override;
- OString prepareVersion() const;
+ OString prepareVersion() const;
protected:
};
diff --git a/codemaker/source/cppumaker/dumputils.hxx
b/codemaker/source/cppumaker/dumputils.hxx
index 965b64eda93f..58ccdc93fac5 100644
--- a/codemaker/source/cppumaker/dumputils.hxx
+++ b/codemaker/source/cppumaker/dumputils.hxx
@@ -21,19 +21,19 @@
#include <sal/config.h>
-namespace rtl { class OUString; }
+namespace rtl
+{
+class OUString;
+}
class FileStream;
-namespace codemaker::cppumaker {
-
-bool dumpNamespaceOpen(
- FileStream & out, rtl::OUString const & entityName, bool fullModuleType);
-
-bool dumpNamespaceClose(
- FileStream & out, rtl::OUString const & entityName, bool fullModuleType);
+namespace codemaker::cppumaker
+{
+bool dumpNamespaceOpen(FileStream& out, rtl::OUString const& entityName, bool
fullModuleType);
-void dumpTypeIdentifier(FileStream & out, rtl::OUString const & entityName);
+bool dumpNamespaceClose(FileStream& out, rtl::OUString const& entityName, bool
fullModuleType);
+void dumpTypeIdentifier(FileStream& out, rtl::OUString const& entityName);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/javaoptions.hxx
b/codemaker/source/javamaker/javaoptions.hxx
index 956f24ccc8c9..5e6161c0470e 100644
--- a/codemaker/source/javamaker/javaoptions.hxx
+++ b/codemaker/source/javamaker/javaoptions.hxx
@@ -25,13 +25,15 @@ class JavaOptions : public Options
{
public:
JavaOptions()
- : Options() {}
+ : Options()
+ {
+ }
- bool initOptions(int ac, char* av[], bool bCmdFile=false) override;
+ bool initOptions(int ac, char* av[], bool bCmdFile = false) override;
- OString prepareHelp() override;
+ OString prepareHelp() override;
- OString prepareVersion() const;
+ OString prepareVersion() const;
protected:
};
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index d9346c570ffc..01e90e8b7c1f 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -1429,27 +1429,23 @@ cli_ure/source/uno_bridge/cli_uno.cxx
codemaker/source/codemaker/codemaker.cxx
codemaker/source/codemaker/exceptiontree.cxx
codemaker/source/codemaker/global.cxx
-codemaker/source/codemaker/options.cxx
codemaker/source/codemaker/typemanager.cxx
codemaker/source/codemaker/unotype.cxx
codemaker/source/commoncpp/commoncpp.cxx
codemaker/source/commonjava/commonjava.cxx
codemaker/source/cppumaker/cppumaker.cxx
codemaker/source/cppumaker/cppuoptions.cxx
-codemaker/source/cppumaker/cppuoptions.hxx
codemaker/source/cppumaker/cpputype.cxx
codemaker/source/cppumaker/cpputype.hxx
codemaker/source/cppumaker/dependencies.cxx
codemaker/source/cppumaker/dependencies.hxx
codemaker/source/cppumaker/dumputils.cxx
-codemaker/source/cppumaker/dumputils.hxx
codemaker/source/cppumaker/includes.cxx
codemaker/source/cppumaker/includes.hxx
codemaker/source/javamaker/classfile.cxx
codemaker/source/javamaker/classfile.hxx
codemaker/source/javamaker/javamaker.cxx
codemaker/source/javamaker/javaoptions.cxx
-codemaker/source/javamaker/javaoptions.hxx
codemaker/source/javamaker/javatype.cxx
codemaker/source/javamaker/javatype.hxx
comphelper/qa/container/comphelper_ifcontainer.cxx
commit 31fbd2be47819796eb6e7c23a8fc23925004abd6
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 12:49:11 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Nov 13 15:13:02 2020 +0100
tdf#123936 Formatting files in module binaryurp with clang-format
Change-Id: If0965d1d1fa500d74bad16871f7036fe4bb6d869
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105647
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/binaryurp/source/currentcontext.hxx
b/binaryurp/source/currentcontext.hxx
index a7a99cf4fec9..b5f55a8244c9 100644
--- a/binaryurp/source/currentcontext.hxx
+++ b/binaryurp/source/currentcontext.hxx
@@ -21,14 +21,16 @@
#include <sal/config.h>
-namespace com::sun::star::uno { class UnoInterfaceReference; }
-
-namespace binaryurp::current_context {
+namespace com::sun::star::uno
+{
+class UnoInterfaceReference;
+}
+namespace binaryurp::current_context
+{
com::sun::star::uno::UnoInterfaceReference get();
-void set(com::sun::star::uno::UnoInterfaceReference const & value);
-
+void set(com::sun::star::uno::UnoInterfaceReference const& value);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/outgoingrequests.hxx
b/binaryurp/source/outgoingrequests.hxx
index 0aa7b57580d1..7816032596f1 100644
--- a/binaryurp/source/outgoingrequests.hxx
+++ b/binaryurp/source/outgoingrequests.hxx
@@ -26,33 +26,39 @@
#include <osl/mutex.hxx>
-namespace binaryurp { struct OutgoingRequest; }
-namespace rtl { class ByteSequence; }
-
-namespace binaryurp {
+namespace binaryurp
+{
+struct OutgoingRequest;
+}
+namespace rtl
+{
+class ByteSequence;
+}
-class OutgoingRequests {
+namespace binaryurp
+{
+class OutgoingRequests
+{
public:
OutgoingRequests();
~OutgoingRequests();
- void push(rtl::ByteSequence const & tid, OutgoingRequest const & request);
+ void push(rtl::ByteSequence const& tid, OutgoingRequest const& request);
- OutgoingRequest top(rtl::ByteSequence const & tid);
+ OutgoingRequest top(rtl::ByteSequence const& tid);
- void pop(rtl::ByteSequence const & tid) throw ();
+ void pop(rtl::ByteSequence const& tid) throw();
private:
OutgoingRequests(const OutgoingRequests&) = delete;
OutgoingRequests& operator=(const OutgoingRequests&) = delete;
- typedef std::map< rtl::ByteSequence, std::vector< OutgoingRequest > > Map;
+ typedef std::map<rtl::ByteSequence, std::vector<OutgoingRequest>> Map;
osl::Mutex mutex_;
Map map_;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/reader.hxx b/binaryurp/source/reader.hxx
index af9bae09524f..2f3ec0dd9e2e 100644
--- a/binaryurp/source/reader.hxx
+++ b/binaryurp/source/reader.hxx
@@ -30,35 +30,36 @@
#include "readerstate.hxx"
-namespace binaryurp {
- class Bridge;
- class Unmarshal;
+namespace binaryurp
+{
+class Bridge;
+class Unmarshal;
}
-namespace binaryurp {
-
-class Reader: public salhelper::Thread {
+namespace binaryurp
+{
+class Reader : public salhelper::Thread
+{
public:
- explicit Reader(rtl::Reference< Bridge > const & bridge);
+ explicit Reader(rtl::Reference<Bridge> const& bridge);
private:
virtual ~Reader() override;
virtual void execute() override;
- void readMessage(Unmarshal & unmarshal);
+ void readMessage(Unmarshal& unmarshal);
- void readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1);
+ void readReplyMessage(Unmarshal& unmarshal, sal_uInt8 flags1);
- rtl::ByteSequence getTid(Unmarshal & unmarshal, bool newTid) const;
+ rtl::ByteSequence getTid(Unmarshal& unmarshal, bool newTid) const;
- rtl::Reference< Bridge > bridge_;
+ rtl::Reference<Bridge> bridge_;
com::sun::star::uno::TypeDescription lastType_;
OUString lastOid_;
rtl::ByteSequence lastTid_;
ReaderState state_;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx
index 33900ef4c34a..a93a45dfcc1d 100644
--- a/binaryurp/source/readerstate.hxx
+++ b/binaryurp/source/readerstate.hxx
@@ -27,12 +27,14 @@
#include "cache.hxx"
-namespace binaryurp {
-
-struct ReaderState {
+namespace binaryurp
+{
+struct ReaderState
+{
private:
ReaderState(const ReaderState&) = delete;
ReaderState& operator=(const ReaderState&) = delete;
+
public:
ReaderState() {}
@@ -40,7 +42,6 @@ public:
OUString oidCache[cache::size];
rtl::ByteSequence tidCache[cache::size];
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/specialfunctionids.hxx
b/binaryurp/source/specialfunctionids.hxx
index 3f885eff28b0..e2b6ae0f8134 100644
--- a/binaryurp/source/specialfunctionids.hxx
+++ b/binaryurp/source/specialfunctionids.hxx
@@ -21,9 +21,10 @@
#include <sal/config.h>
-namespace binaryurp {
-
-enum SpecialFunctionIds {
+namespace binaryurp
+{
+enum SpecialFunctionIds
+{
SPECIAL_FUNCTION_ID_QUERY_INTERFACE = 0,
SPECIAL_FUNCTION_ID_RESERVED = 1,
@@ -34,7 +35,6 @@ enum SpecialFunctionIds {
SPECIAL_FUNCTION_ID_COMMIT_CHANGE = 5
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 7e9920a35fb2..d9346c570ffc 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -440,7 +440,6 @@ binaryurp/source/bridgefactory.cxx
binaryurp/source/bridgefactory.hxx
binaryurp/source/cache.hxx
binaryurp/source/currentcontext.cxx
-binaryurp/source/currentcontext.hxx
binaryurp/source/incomingreply.hxx
binaryurp/source/incomingrequest.cxx
binaryurp/source/incomingrequest.hxx
@@ -450,13 +449,9 @@ binaryurp/source/marshal.cxx
binaryurp/source/marshal.hxx
binaryurp/source/outgoingrequest.hxx
binaryurp/source/outgoingrequests.cxx
-binaryurp/source/outgoingrequests.hxx
binaryurp/source/proxy.cxx
binaryurp/source/proxy.hxx
binaryurp/source/reader.cxx
-binaryurp/source/reader.hxx
-binaryurp/source/readerstate.hxx
-binaryurp/source/specialfunctionids.hxx
binaryurp/source/unmarshal.cxx
binaryurp/source/unmarshal.hxx
binaryurp/source/writer.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
