Use #pragma once

LibreOffice core uses that, too, and we support an even more restricted set of compilers. Change-Id: I0d0e2c8608e323eb5ef0f35ee8c46d02ab49a745 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92467 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tor Lillqvist <[email protected]>
yuuolo · Apr 18, 2020 · 4eb5987 · 4eb5987
1 parent 21dfba7
commit 4eb5987
Show file tree

Hide file tree

Showing 58 changed files with 76 additions and 207 deletions.
diff --git a/common/Authorization.hpp b/common/Authorization.hpp
@@ -9,8 +9,7 @@
 
 // WOPI Authorization
 
-#ifndef INCLUDED_AUTHORIZATION_HPP
-#define INCLUDED_AUTHORIZATION_HPP
+#pragma once
 
 #include <string>
 
@@ -51,6 +50,4 @@ class Authorization
     void authorizeRequest(Poco::Net::HTTPRequest& request) const;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Clipboard.hpp b/common/Clipboard.hpp
@@ -8,8 +8,8 @@
  */
 
 // Clipboard abstraction.
-#ifndef INCLUDED_CLIPBOARD_HPP
-#define INCLUDED_CLIPBOARD_HPP
+
+#pragma once
 
 #include <string>
 #include <vector>
@@ -142,6 +142,4 @@ class ClipboardCache
     }
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Common.hpp b/common/Common.hpp
@@ -7,11 +7,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#pragma once
+
 #include <string>
 
 // Default values and other shared data between processes.
-#ifndef INCLUDED_COMMON_HPP
-#define INCLUDED_COMMON_HPP
 
 constexpr int DEFAULT_CLIENT_PORT_NUMBER = 9980;
 
@@ -50,6 +50,4 @@ constexpr const char CAPABILITIES_END_POINT[] = "/hosting/capabilities";
 extern int ClientPortNumber;
 extern std::string MasterLocation;
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Crypto.hpp b/common/Crypto.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_CRYPTO_HPP
-#define INCLUDED_CRYPTO_HPP
+#pragma once
 
 #if ENABLE_SUPPORT_KEY
 
@@ -39,6 +38,4 @@ class SupportKey {
 
 #endif
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/FileUtil.hpp b/common/FileUtil.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_FILEUTIL_HPP
-#define INCLUDED_FILEUTIL_HPP
+#pragma once
 
 #include <string>
 
@@ -98,6 +97,4 @@ namespace FileUtil
 
 } // end namespace FileUtil
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/JsonUtil.hpp b/common/JsonUtil.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_JSONUTIL_HPP
-#define INCLUDED_JSONUTIL_HPP
+#pragma once
 
 #include <cstddef>
 #include <set>
@@ -140,7 +139,5 @@ bool findJSONValue(Poco::JSON::Object::Ptr &object, const std::string& key, T& v
 
 } // end namespace JsonUtil
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 
diff --git a/common/LOOLWebSocket.hpp b/common/LOOLWebSocket.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_LOOLWEBSOCKET_HPP
-#define INCLUDED_LOOLWEBSOCKET_HPP
+#pragma once
 
 #include <cstdlib>
 #include <mutex>
@@ -157,6 +156,4 @@ class LOOLWebSocket : public Poco::Net::WebSocket
     }
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Log.hpp b/common/Log.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_LOG_HPP
-#define INCLUDED_LOG_HPP
+#pragma once
 
 #include <sys/syscall.h>
 #include <unistd.h>
@@ -409,6 +408,4 @@ namespace Log
         }                                                                                          \
     } while (false)
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Message.hpp b/common/Message.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_MESSAGE_HPP
-#define INCLUDED_MESSAGE_HPP
+#pragma once
 
 #include <atomic>
 #include <string>
@@ -184,6 +183,4 @@ class Message
     const Type _type;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/MessageQueue.hpp b/common/MessageQueue.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_MESSAGEQUEUE_HPP
-#define INCLUDED_MESSAGEQUEUE_HPP
+#pragma once
 
 #include <algorithm>
 #include <condition_variable>
@@ -253,6 +252,4 @@ class TileQueue : public MessageQueue
     std::vector<int> _viewOrder;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Png.hpp b/common/Png.hpp
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#pragma once
+
 /* cairo - a vector graphics library with display and print output
  *
  * Copyright © 2003 University of Southern California

diff --git a/common/Protocol.hpp b/common/Protocol.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_LOOLPROTOCOL_HPP
-#define INCLUDED_LOOLPROTOCOL_HPP
+#pragma once
 
 #include <cstdint>
 #include <cstdlib>
@@ -346,6 +345,4 @@ namespace LOOLProtocol
     }
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Rectangle.hpp b/common/Rectangle.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_RECTANGLE_HPP
-#define INCLUDED_RECTANGLE_HPP
+#pragma once
 
 #include <limits>
 
@@ -124,6 +123,4 @@ struct Rectangle
 
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Seccomp.hpp b/common/Seccomp.hpp
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SECCOMP_HPP
-#define INCLUDED_SECCOMP_HPP
+
+#pragma once
 
 #include <Protocol.hpp>
 
@@ -24,6 +24,4 @@ namespace Rlimit {
     bool handleSetrlimitCommand(const StringVector& tokens);
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Session.hpp b/common/Session.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SESSION_HPP
-#define INCLUDED_SESSION_HPP
+#pragma once
 
 #include <atomic>
 #include <cassert>
@@ -291,6 +290,4 @@ class Session : public MessageHandlerInterface
     int _canonicalViewId;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
@@ -56,11 +56,13 @@ namespace SigUtil
 
     bool getTerminationFlag()
     {
+        LOG_TRC("getTerminationFlag: " << (TerminationFlag ? "YES" : "NO"));
         return TerminationFlag;
     }
 
     void setTerminationFlag()
     {
+        LOG_TRC("setTerminationFlag");
         TerminationFlag = true;
     }
 

diff --git a/common/SigUtil.hpp b/common/SigUtil.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SIGNALUTIL_HPP
-#define INCLUDED_SIGNALUTIL_HPP
+#pragma once
 
 #include <atomic>
 #include <mutex>
@@ -83,6 +82,4 @@ namespace SigUtil
 
 } // end namespace SigUtil
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/SpookyV2.h b/common/SpookyV2.h
@@ -26,6 +26,8 @@
 // slower than MD5.
 //
 
+#pragma once
+
 #include <stddef.h>
 
 #ifdef _MSC_VER

diff --git a/common/StringVector.hpp b/common/StringVector.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_STRINGVECTOR_HPP
-#define INCLUDED_STRINGVECTOR_HPP
+#pragma once
 
 #include <string>
 #include <vector>
@@ -77,6 +76,4 @@ class StringVector
     bool equals(size_t index, const StringVector& other, size_t otherIndex);
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Unit.hpp b/common/Unit.hpp
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_UNIT_HPP
-#define INCLUDED_UNIT_HPP
+
+#pragma once
 
 #include <atomic>
 #include <cassert>
@@ -300,6 +300,4 @@ class UnitKit : public UnitBase
     }
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/UnitHTTP.hpp b/common/UnitHTTP.hpp
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_UNITHTTP_HPP
-#define INCLUDED_UNITHTTP_HPP
+
+#pragma once
 
 #include <memory>
 #include <sstream>
@@ -157,6 +157,4 @@ class UnitWebSocket
     }
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Util.hpp b/common/Util.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_UTIL_HPP
-#define INCLUDED_UTIL_HPP
+#pragma once
 
 #include <cassert>
 #include <cerrno>
@@ -1005,6 +1004,4 @@ int main(int argc, char**argv)
 
 } // end namespace Util
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/security.h b/common/security.h
@@ -10,6 +10,8 @@
  * Place for simple security-related code.
  */
 
+#pragma once
+
 #include <sys/mount.h>
 #include <sys/types.h>
 

diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_CHILDSESSION_HPP
-#define INCLUDED_CHILDSESSION_HPP
+#pragma once
 
 #include <mutex>
 #include <unordered_map>
@@ -336,6 +335,4 @@ class ChildSession final : public Session
     bool _copyToClipboard;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */