diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-22 09:42:28 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-22 09:57:47 +0200 |
commit | 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 (patch) | |
tree | 783dc367eacbe3eef9f226d0735d0137e7245648 /tools | |
parent | 9406ab47a92386d676038e467e555c3c80b46f62 (diff) |
Various #include <sal/log.hxx> fixups
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx>
(and don't make use of it themselves), but many other files happen to depend on
it. Cleaned up some, but something like
grep -FwL sal/log.hxx $(git grep -Elw \
'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF') -- \*.cxx)
shows lots more files that potentially need fixing before the include can be
removed from rtl/string.hxx and rtl/ustring.hxx.
Change-Id: Ibf033363e83d37851776f392dc0b077381cd8b90
Diffstat (limited to 'tools')
-rw-r--r-- | tools/source/datetime/ttime.cxx | 3 | ||||
-rw-r--r-- | tools/source/fsys/urlobj.cxx | 1 | ||||
-rw-r--r-- | tools/source/generic/color.cxx | 3 | ||||
-rw-r--r-- | tools/source/generic/config.cxx | 1 | ||||
-rw-r--r-- | tools/source/generic/fract.cxx | 1 | ||||
-rw-r--r-- | tools/source/generic/gen.cxx | 4 | ||||
-rw-r--r-- | tools/source/generic/poly.cxx | 1 | ||||
-rw-r--r-- | tools/source/generic/poly2.cxx | 1 | ||||
-rw-r--r-- | tools/source/inet/inetstrm.cxx | 1 | ||||
-rw-r--r-- | tools/source/stream/stream.cxx | 1 | ||||
-rw-r--r-- | tools/source/stream/strmunx.cxx | 1 |
11 files changed, 17 insertions, 1 deletions
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx index ab1f651bb55e..47dd81b144b0 100644 --- a/tools/source/datetime/ttime.cxx +++ b/tools/source/datetime/ttime.cxx @@ -35,8 +35,9 @@ #include <mach/clock.h> #include <mach/mach.h> #endif -#include <tools/time.hxx> +#include <sal/log.hxx> +#include <tools/time.hxx> #include <osl/diagnose.h> #if defined(SOLARIS) && defined(__GNUC__) diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 08c0c6da5a7e..2fdb0d018bb7 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -33,6 +33,7 @@ #include <rtl/string.h> #include <rtl/textenc.h> #include <rtl/ustring.hxx> +#include <sal/log.hxx> #include <sal/types.h> #include <algorithm> diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index cbdc6e4c8112..741cb159a4bf 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <sstream> #include <stdlib.h> #include <tools/color.hxx> diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index 025db02ad106..257721eaa4b9 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -32,6 +32,7 @@ #include <tools/config.hxx> #include <osl/security.h> #include <rtl/strbuf.hxx> +#include <sal/log.hxx> struct ImplKeyData { diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx index 2c48502a156c..b5db1e02607a 100644 --- a/tools/source/generic/fract.cxx +++ b/tools/source/generic/fract.cxx @@ -22,6 +22,7 @@ #include <tools/lineend.hxx> #include <tools/stream.hxx> #include <rtl/ustring.hxx> +#include <sal/log.hxx> #include <osl/diagnose.h> #include <limits.h> diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index 925d4d61e866..cb5b1dc2a674 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <sstream> + #include <tools/debug.hxx> #include <tools/gen.hxx> #include <tools/stream.hxx> diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 53577424d666..76973f260ca4 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -19,6 +19,7 @@ #include <osl/endian.h> #include <osl/diagnose.h> +#include <sal/log.hxx> #include <tools/bigint.hxx> #include <tools/debug.hxx> #include <tools/helpers.hxx> diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index a800f1ff5892..d390a6e862db 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -23,6 +23,7 @@ #define POLY_CLIP_XOR 3 #include <rtl/math.hxx> +#include <sal/log.hxx> #include <osl/diagnose.h> #include <poly.h> #include <tools/poly.hxx> diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index 3af2fdd4043c..80d68a07817f 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -18,6 +18,7 @@ */ #include <comphelper/string.hxx> +#include <sal/log.hxx> #include <sal/types.h> #include <rtl/strbuf.hxx> #include <tools/inetmsg.hxx> diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 8e6c4de22a60..16cd3421c1a8 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -28,6 +28,7 @@ #include <osl/endian.h> #include <osl/diagnose.h> +#include <sal/log.hxx> #include <comphelper/string.hxx> diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index c7610b440cca..c8e5986daa6a 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -30,6 +30,7 @@ #include <osl/mutex.hxx> #include <osl/thread.h> +#include <sal/log.hxx> // class FileBase #include <osl/file.hxx> |