Kaydet (Commit) c30f3ea3 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:includeform: sal

Change-Id: I539ca8b9dee5edc5fc2282a2b9b0ffd78bad8b11
üst 89c13dd3
......@@ -33,28 +33,28 @@
#include <iostream>
#include <string>
#include <sal/types.h>
#include "cppunittester/protectorfactory.hxx"
#include "osl/module.h"
#include "osl/module.hxx"
#include "osl/thread.h"
#include "rtl/character.hxx"
#include "rtl/process.h"
#include "rtl/string.h"
#include "rtl/string.hxx"
#include "rtl/textcvt.h"
#include "rtl/ustring.hxx"
#include "sal/main.h"
#include "cppunit/CompilerOutputter.h"
#include "cppunit/Exception.h"
#include "cppunit/TestFailure.h"
#include "cppunit/TestResult.h"
#include "cppunit/TestResultCollector.h"
#include "cppunit/TestRunner.h"
#include "cppunit/extensions/TestFactoryRegistry.h"
#include "cppunit/plugin/PlugInManager.h"
#include "cppunit/plugin/DynamicLibraryManagerException.h"
#include "cppunit/portability/Stream.h"
#include <cppunittester/protectorfactory.hxx>
#include <osl/module.h>
#include <osl/module.hxx>
#include <osl/thread.h>
#include <rtl/character.hxx>
#include <rtl/process.h>
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <rtl/textcvt.h>
#include <rtl/ustring.hxx>
#include <sal/main.h>
#include <cppunit/CompilerOutputter.h>
#include <cppunit/Exception.h>
#include <cppunit/TestFailure.h>
#include <cppunit/TestResult.h>
#include <cppunit/TestResultCollector.h>
#include <cppunit/TestRunner.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/plugin/PlugInManager.h>
#include <cppunit/plugin/DynamicLibraryManagerException.h>
#include <cppunit/portability/Stream.h>
#include <memory>
#include <boost/algorithm/string.hpp>
......
......@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "rtl/strbuf.hxx"
#include "rtl/string.hxx"
#include "rtl/ustring.hxx"
#include "osl/process.h"
#include "osl/diagnose.hxx"
#include "sal/log.hxx"
#include <rtl/strbuf.hxx>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <osl/process.h>
#include <osl/diagnose.hxx>
#include <sal/log.hxx>
#include <algorithm>
#include <vector>
......
......@@ -17,18 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sal/config.h"
#include <sal/config.h>
#include <cstddef>
#include "sal/log.hxx"
#include "osl/module.h"
#include "osl/module.hxx"
#include "rtl/malformeduriexception.hxx"
#include "rtl/uri.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
#include <sal/log.hxx>
#include <osl/module.h>
#include <osl/module.hxx>
#include <rtl/malformeduriexception.hxx>
#include <rtl/uri.hxx>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <sal/types.h>
extern "C" {
......
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "sal/config.h"
#include <sal/config.h>
#include <cassert>
#include <cstdarg>
......@@ -21,13 +21,13 @@
#include <string.h>
#include <fstream>
#include "osl/thread.hxx"
#include "rtl/string.h"
#include "sal/detail/log.h"
#include "sal/log.hxx"
#include "sal/types.h"
#include "backtraceasstring.hxx"
#include "salusesyslog.hxx"
#include <osl/thread.hxx>
#include <rtl/string.h>
#include <sal/detail/log.h>
#include <sal/log.hxx>
#include <sal/types.h>
#include <backtraceasstring.hxx>
#include <salusesyslog.hxx>
#if defined ANDROID
#include <android/log.h>
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sal/types.h"
#include <sal/types.h>
#ifdef __sun
......
......@@ -21,7 +21,7 @@
#include <sal/backtrace.hxx>
#include "backtrace.h"
#include "backtraceasstring.hxx"
#include <backtraceasstring.hxx>
namespace {
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sal/config.h"
#include <sal/config.h>
#include <assert.h>
......
......@@ -10,9 +10,9 @@
#ifndef INCLUDED_SAL_OSL_UNX_CREATEFILEHANDLEFROMFD_HXX
#define INCLUDED_SAL_OSL_UNX_CREATEFILEHANDLEFROMFD_HXX
#include "sal/config.h"
#include <sal/config.h>
#include "osl/file.h"
#include <osl/file.h>
namespace osl { namespace detail {
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
#define INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
#include "osl/file.h"
#include <osl/file.h>
#include <stddef.h>
#include <sys/types.h>
......
......@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "osl/file.hxx"
#include "osl/detail/file.h"
#include <osl/file.hxx>
#include <osl/detail/file.h>
#include "osl/diagnose.h"
#include "osl/thread.h"
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <osl/signal.h>
#include "rtl/alloc.h"
#include <rtl/alloc.h>
#include <rtl/string.hxx>
#include "system.hxx"
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "osl/file.h"
#include <osl/file.h>
#include "system.hxx"
#include <sys/types.h>
......
......@@ -28,7 +28,7 @@
#include <strings.h>
#include <unistd.h>
#include "osl/file.hxx"
#include <osl/file.hxx>
#include <osl/security.hxx>
#include <osl/diagnose.h>
#include <osl/thread.h>
......@@ -39,7 +39,7 @@
#include <rtl/uri.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.h>
#include "rtl/textcvt.h"
#include <rtl/textcvt.h>
#include <sal/log.hxx>
#include "file_error_transl.hxx"
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_SAL_OSL_UNX_FILE_URL_HXX
#define INCLUDED_SAL_OSL_UNX_FILE_URL_HXX
#include "osl/file.h"
#include <osl/file.h>
namespace rtl { class OUString; }
......
......@@ -19,11 +19,11 @@
#include <sal/config.h>
#include "osl/file.h"
#include <osl/file.h>
#include "osl/diagnose.h"
#include "osl/thread.h"
#include "rtl/alloc.h"
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <rtl/alloc.h>
#include "file_error_transl.hxx"
#include "file_url.hxx"
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sal/config.h"
#include <sal/config.h>
#include <sal/log.hxx>
#include <sal/types.h>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sal/config.h"
#include "rtl/ustring.hxx"
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cassert>
......
......@@ -17,20 +17,20 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "osl/process.h"
#include <osl/process.h>
#include <limits.h>
#include <pthread.h>
#include <stdlib.h>
#include <string.h>
#include "osl/diagnose.h"
#include "osl/file.h"
#include "osl/module.h"
#include "osl/thread.h"
#include "rtl/ustring.hxx"
#include "rtl/strbuf.h"
#include "sal/log.hxx"
#include <osl/diagnose.h>
#include <osl/file.h>
#include <osl/module.h>
#include <osl/thread.h>
#include <rtl/ustring.hxx>
#include <rtl/strbuf.h>
#include <sal/log.hxx>
#include "file_path_helper.hxx"
......
......@@ -8,7 +8,7 @@
*/
#include "system.hxx"
#include "oslrandom.h"
#include <oslrandom.h>
#include <assert.h>
......
......@@ -10,7 +10,7 @@
#include "readwrite_helper.hxx"
#include <osl/diagnose.h>
#include <system.hxx>
#include "system.hxx"
bool safeWrite(int fd, void* data, sal_uInt32 dataSize)
{
......
......@@ -19,7 +19,7 @@
#include <config_features.h>
#include "sal/config.h"
#include <sal/config.h>
#if defined MACOSX
#include <cassert>
......@@ -28,11 +28,11 @@
#include <sys/stat.h>
#endif
#include "osl/process.h"
#include "sal/main.h"
#include "sal/types.h"
#include <osl/process.h>
#include <sal/main.h>
#include <sal/types.h>
#include <saltime.hxx>
#include "saltime.hxx"
#include <salusesyslog.hxx>
#if HAVE_SYSLOG_H
......
......@@ -34,8 +34,8 @@
#include <rtl/bootstrap.h>
#include <sal/log.hxx>
#include "osl/thread.h"
#include "osl/file.h"
#include <osl/thread.h>
#include <osl/file.h>
#if defined LINUX || defined __sun
#include <crypt.h>
......
......@@ -18,11 +18,11 @@
*/
#include <sal/types.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "rtl/byteseq.hxx"
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/byteseq.hxx>
namespace {
......
......@@ -19,13 +19,13 @@
#include <sal/types.h>
#include <rtl/string.hxx>
#include <rtl_String_Const.h>
#include "rtl_String_Const.h"
#include <rtl/strbuf.hxx>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <string.h>
using ::rtl::OStringBuffer;
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <osl_Condition_Const.h>
#include "osl_Condition_Const.h"
#include <stdlib.h>
using namespace osl;
......
......@@ -23,7 +23,7 @@
#include <osl/thread.h>
#include <osl/file.hxx>
#include <osl_File_Const.h>
#include "osl_File_Const.h"
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
......
......@@ -19,7 +19,7 @@
// include files
#include <osl_Module_Const.h>
#include "osl_Module_Const.h"
using namespace osl;
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <osl_Module_Const.h>
#include "osl_Module_Const.h"
#include <stdio.h>
#include <sal/types.h>
......
......@@ -20,11 +20,11 @@
// include files
#include <sal/types.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include <osl_Mutex_Const.h>
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include "osl_Mutex_Const.h"
using namespace osl;
......
......@@ -20,10 +20,10 @@
// include files
#include <sal/types.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/ustring.hxx>
#include <osl/test/uniquepipename.hxx>
......
......@@ -18,10 +18,10 @@
*/
#include <sal/types.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <osl/profile.h>
#include <rtl/bootstrap.hxx>
......
......@@ -25,7 +25,7 @@
#include <windows.h>
#undef min
#endif
#include <osl_Security_Const.h>
#include "osl_Security_Const.h"
#include <osl/thread.h>
#include <rtl/process.h>
#include <rtl/strbuf.hxx>
......
......@@ -22,11 +22,11 @@
#include <limits>
#include <sal/types.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "osl/thread.hxx"
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <osl/thread.hxx>
namespace {
......
......@@ -7,14 +7,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "sal/config.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "rtl/bootstrap.hxx"
#include "rtl/ustring.hxx"
#include <sal/config.h>
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/bootstrap.hxx>
#include <rtl/ustring.hxx>
namespace {
......
......@@ -18,13 +18,13 @@
*/
#include <sal/types.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "rtl/math.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/math.hxx>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
CPPUNIT_NS_BEGIN
......
......@@ -30,8 +30,8 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include "stringhelper.hxx"
#include "valueequal.hxx"
#include <stringhelper.hxx>
#include <valueequal.hxx>
namespace rtl_OUString
{
......
......@@ -11,7 +11,7 @@
#include <cppunit/TestFixture.h>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/HelperMacros.h>
#include "rtl/ustrbuf.hxx"
#include <rtl/ustrbuf.hxx>
namespace test { namespace oustringbuffer {
......
......@@ -21,8 +21,8 @@
#include <cppunit/TestFixture.h>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/HelperMacros.h>
#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.hxx"
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
namespace test { namespace oustringbuffer {
......
......@@ -21,10 +21,10 @@
#include <cppunit/TestFixture.h>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/HelperMacros.h>
#include "rtl/strbuf.hxx"
#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
namespace test { namespace oustringbuffer {
......
......@@ -13,9 +13,9 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include "rtl/string.h"
#include "rtl/string.hxx"
#include "rtl/strbuf.hxx"
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <rtl/strbuf.hxx>
bool rtl_string_unittest_const_literal;
bool rtl_string_unittest_const_literal_function;
......
......@@ -20,8 +20,8 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include "rtl/string.h"
#include "rtl/ustring.hxx"
#include <rtl/string.h>
#include <rtl/ustring.hxx>
namespace test { namespace oustring {
......
......@@ -20,9 +20,9 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include "rtl/strbuf.hxx"
#include "rtl/string.hxx"
#include "rtl/ustring.hxx"
#include <rtl/strbuf.hxx>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <sal/macros.h>
namespace test { namespace oustring {
......
......@@ -20,11 +20,11 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include "rtl/strbuf.hxx"
#include "rtl/string.h"
#include "rtl/string.hxx"
#include "rtl/textenc.h"
#include "rtl/ustring.hxx"
#include <rtl/strbuf.hxx>
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <rtl/textenc.h>
#include <rtl/ustring.hxx>
#include <sal/macros.h>
namespace test { namespace oustring {
......
......@@ -10,7 +10,7 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>
namespace test { namespace oustring {
......
......@@ -18,9 +18,9 @@
#include <config_global.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include "rtl/string.h"
#include "rtl/ustring.hxx"
#include "rtl/ustrbuf.hxx"
#include <rtl/string.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
extern bool rtl_string_unittest_const_literal;
bool rtl_string_unittest_invalid_conversion;
......
......@@ -7,16 +7,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "sal/config.h"
#include