extensions/source/scanner/grid.hxx | 5 +----
extensions/source/scanner/sane.hxx | 5 +----
extensions/source/scanner/sanedlg.hxx | 6 +-----
extensions/source/scanner/scanner.hxx | 5 +----
extensions/source/scanner/twain32shim.hxx | 5 +----
5 files changed, 5 insertions(+), 21 deletions(-)
New commits:
commit 9f749e97854009697d4263960c966313d3dd19d2
Author: Tolunay Dündar <dndr....@protonmail.com>
AuthorDate: Thu Dec 19 19:59:37 2019 +0300
Commit: Muhammet Kara <muhammet.k...@collabora.com>
CommitDate: Fri Dec 20 19:35:23 2019 +0100
tdf#124176: Use pragma once instead of include guards
Change-Id: Ic035497bd07633bd4af02a8fe69ac701d4a45492
Reviewed-on: https://gerrit.libreoffice.org/85537
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.k...@collabora.com>
diff --git a/extensions/source/scanner/grid.hxx
b/extensions/source/scanner/grid.hxx
index 51345cca5917..1f3a0f191cca 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_GRID_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_GRID_HXX
+#pragma once
#include <vcl/customweld.hxx>
#include <vcl/weld.hxx>
@@ -49,6 +48,4 @@ public:
double* getNewYValues();
};
-#endif // INCLUDED_EXTENSIONS_SOURCE_SCANNER_GRID_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/sane.hxx
b/extensions/source/scanner/sane.hxx
index 19cff7a32f58..135fe8872048 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANE_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANE_HXX
+#pragma once
#include <osl/thread.h>
#include <osl/module.h>
@@ -179,6 +178,4 @@ inline Link<Sane&,void> Sane::SetReloadOptionsHdl( const
Link<Sane&,void>& rLink
return aRet;
}
-#endif // INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/sanedlg.hxx
b/extensions/source/scanner/sanedlg.hxx
index 00e3f59da53a..ad87667bf13a 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANEDLG_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANEDLG_HXX
+#pragma once
#include <vcl/customweld.hxx>
#include <vcl/weld.hxx>
@@ -108,7 +107,4 @@ public:
bool getDoScan() const { return doScan;}
};
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/scanner.hxx
b/extensions/source/scanner/scanner.hxx
index 854bb07e8db4..da3b9d7b80c4 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SCANNER_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SCANNER_HXX
+#pragma once
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
@@ -89,6 +88,4 @@ public:
/// @throws Exception
Reference< XInterface > ScannerManager_CreateInstance( const Reference<
css::lang::XMultiServiceFactory >& rxFactory );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/twain32shim.hxx
b/extensions/source/scanner/twain32shim.hxx
index b72df438d596..9f42f0a4d5dc 100644
--- a/extensions/source/scanner/twain32shim.hxx
+++ b/extensions/source/scanner/twain32shim.hxx
@@ -8,8 +8,7 @@
*
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_TWAIN32SHIM_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_TWAIN32SHIM_HXX
+#pragma once
#include <prewin.h>
#include <postwin.h>
@@ -65,6 +64,4 @@ void ThrowWin32Error(const char* sFunc, DWORD nWin32Error)
void ThrowLastError(const char* sFunc) { ThrowWin32Error(sFunc,
GetLastError()); }
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
