[Libreoffice-commits] core.git: store/IwyuFilter_store.yaml store/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 8 08:07:10 UTC 2019
store/IwyuFilter_store.yaml | 17 +++++++++++++++++
store/source/lockbyte.cxx | 1 -
store/source/lockbyte.hxx | 3 ++-
store/source/object.hxx | 1 -
store/source/storbase.hxx | 5 -----
store/source/storbios.cxx | 2 --
store/source/storbios.hxx | 4 ++--
store/source/storcach.cxx | 3 +--
store/source/storcach.hxx | 5 +++--
store/source/stordata.hxx | 4 +++-
store/source/stordir.cxx | 2 +-
store/source/stordir.hxx | 2 +-
store/source/storlckb.cxx | 2 --
store/source/storlckb.hxx | 4 ++--
store/source/storpage.cxx | 4 ----
store/source/storpage.hxx | 3 ++-
store/source/stortree.cxx | 1 +
17 files changed, 35 insertions(+), 28 deletions(-)
New commits:
commit 31c1995037a7ad408a5af6917288d8e3888a472d
Author: Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Thu Dec 27 19:24:45 2018 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Jan 8 09:06:44 2019 +0100
tdf#42949 Fix IWYU warnings in store/source/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I99f1611f41378a0baa7688db5a5f78e0169f0d5b
Reviewed-on: https://gerrit.libreoffice.org/65649
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/store/IwyuFilter_store.yaml b/store/IwyuFilter_store.yaml
new file mode 100644
index 000000000000..2dadc69a50ac
--- /dev/null
+++ b/store/IwyuFilter_store.yaml
@@ -0,0 +1,17 @@
+---
+assumeFilename: store/source/storbase.cxx
+blacklist:
+ store/source/storbase.hxx:
+ # Needed for OSL_BIGENDIAN macro
+ - osl/endian.h
+ store/source/stordir.hxx:
+ # Checking other file gives this
+ - namespace store { struct OStoreDirectoryPageData; }
+ store/source/storlckb.hxx:
+ # Checking other file gives this
+ - namespace store { struct OStoreDataPageData; }
+ - namespace store { struct OStoreDirectoryPageData; }
+ store/source/storpage.hxx:
+ # Checking other file gives this
+ - namespace store { struct OStoreDirectoryPageData; }
+ - namespace store { class OStoreDirectoryPageObject; }
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index 4d21848bfe32..dfc7ad920a99 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -23,7 +23,6 @@
#include <osl/diagnose.h>
#include <osl/file.h>
#include <osl/process.h>
-#include <rtl/alloc.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
diff --git a/store/source/lockbyte.hxx b/store/source/lockbyte.hxx
index a7beb54dd7b9..04634328a922 100644
--- a/store/source/lockbyte.hxx
+++ b/store/source/lockbyte.hxx
@@ -26,13 +26,14 @@
#include <sal/types.h>
-#include <rtl/ref.hxx>
#include <rtl/ustring.h>
#include <salhelper/simplereferenceobject.hxx>
#include <store/types.h>
#include "storbase.hxx"
+namespace rtl { template <class reference_type> class Reference; }
+
namespace store
{
diff --git a/store/source/object.hxx b/store/source/object.hxx
index 32e54292134f..f19936558ccb 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_STORE_SOURCE_OBJECT_HXX
#include <sal/types.h>
-#include <osl/interlck.h>
#include <salhelper/simplereferenceobject.hxx>
namespace store
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index accfdf7d73f9..9a630348e58f 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -25,7 +25,6 @@
#include <sal/types.h>
-#include <rtl/alloc.h>
#include <rtl/crc.h>
#include <rtl/ref.hxx>
@@ -35,8 +34,6 @@
#include <store/types.h>
#include <memory>
-#include <stddef.h>
-#include <string.h>
#include <utility>
/** @file store common internals.
@@ -518,8 +515,6 @@ public:
}
};
-class OStorePageBIOS;
-
class OStorePageObject
{
typedef PageData page;
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index 1edd3feb39e4..b1bac9852938 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -22,7 +22,6 @@
#include "storbios.hxx"
#include <sal/types.h>
-#include <sal/macros.h>
#include <sal/log.hxx>
#include <rtl/alloc.h>
@@ -32,7 +31,6 @@
#include <osl/mutex.hxx>
#include <store/types.h>
-#include "object.hxx"
#include "lockbyte.hxx"
#include "storcach.hxx"
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 8c2abd54f5a7..6ba09a876e50 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -26,13 +26,13 @@
#include <store/types.h>
#include "object.hxx"
-#include "lockbyte.hxx"
#include "storbase.hxx"
-#include "storcach.hxx"
namespace store
{
+class ILockBytes;
+class PageCache;
struct SuperBlockPage;
class OStorePageBIOS : public store::OStoreObject
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index ab89b50eb904..3fdf60ec13a0 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -28,11 +28,10 @@
#include <osl/diagnose.h>
#include <store/types.h>
-#include "object.hxx"
#include "storbase.hxx"
#include <memory>
-#include <stddef.h>
+#include <string.h>
using namespace store;
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index c2626cbfa3bf..ec7d6d138aa3 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -25,12 +25,13 @@
#include <memory>
#include <sal/types.h>
-#include <rtl/ref.hxx>
#include <store/types.h>
-#include "storbase.hxx"
#include "object.hxx"
+namespace rtl { template <class reference_type> class Reference; }
+namespace store { struct PageData; }
+
namespace store
{
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index de587c144a9b..35fe20c0729a 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -25,15 +25,17 @@
#include <memory>
#include <sal/types.h>
-#include <sal/macros.h>
#include <rtl/string.h>
#include <store/types.h>
#include "storbase.hxx"
+#include <string.h>
namespace store
{
+class OStorePageBIOS;
+
constexpr sal_uInt32 STORE_MAGIC_DATAPAGE(0x94190310);
struct OStoreDataPageData : public store::PageData
diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx
index 1fec9d435bb6..15d3945e0774 100644
--- a/store/source/stordir.cxx
+++ b/store/source/stordir.cxx
@@ -23,11 +23,11 @@
#include <rtl/textcvt.h>
#include <rtl/ref.hxx>
+#include <rtl/ustring.h>
#include <osl/mutex.hxx>
#include <store/types.h>
-#include "object.hxx"
#include "storbase.hxx"
#include "stordata.hxx"
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 8874e00b596d..f9845bc295eb 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -28,11 +28,11 @@
#include "object.hxx"
#include "storbase.hxx"
-#include "storpage.hxx"
namespace store
{
+class OStorePageManager;
struct OStoreDirectoryPageData;
class OStoreDirectory_Impl : public store::OStoreObject
diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx
index 8d38b951a39d..1aaf2cbc0a77 100644
--- a/store/source/storlckb.cxx
+++ b/store/source/storlckb.cxx
@@ -20,13 +20,11 @@
#include "storlckb.hxx"
#include <sal/types.h>
-#include <sal/macros.h>
#include <rtl/string.h>
#include <rtl/ref.hxx>
#include <osl/mutex.hxx>
#include <store/types.h>
-#include "object.hxx"
#include "storbase.hxx"
#include "stordata.hxx"
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index 46fdc988ed8d..b31bcd28de6e 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -22,16 +22,16 @@
#include <sal/types.h>
-#include <rtl/ustring.h>
+#include <rtl/string.h>
#include <rtl/ref.hxx>
#include "object.hxx"
#include "storbase.hxx"
-#include "storpage.hxx"
namespace store
{
+class OStorePageManager;
struct OStoreDataPageData;
struct OStoreDirectoryPageData;
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx
index d441121e0ac4..4eb9c2596442 100644
--- a/store/source/storpage.cxx
+++ b/store/source/storpage.cxx
@@ -22,14 +22,10 @@
#include <sal/types.h>
#include <sal/log.hxx>
#include <rtl/string.h>
-#include <rtl/ref.hxx>
#include <osl/mutex.hxx>
#include <store/types.h>
-#include "object.hxx"
-#include "lockbyte.hxx"
-
#include "storbase.hxx"
#include "stordata.hxx"
#include "stortree.hxx"
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 8b4785a21ce3..4a03c736c495 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -21,9 +21,9 @@
#define INCLUDED_STORE_SOURCE_STORPAGE_HXX
#include <sal/types.h>
+#include <rtl/string.h>
#include "object.hxx"
-#include "lockbyte.hxx"
#include "storbase.hxx"
#include "storbios.hxx"
@@ -32,6 +32,7 @@
namespace store
{
+class ILockBytes;
struct OStoreDirectoryPageData;
class OStoreDirectoryPageObject;
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx
index 87378794ba5b..48dfb90c840b 100644
--- a/store/source/stortree.cxx
+++ b/store/source/stortree.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <memory>
+#include <string.h>
#include "stortree.hxx"
More information about the Libreoffice-commits
mailing list