Kaydet (Commit) daf7c3e7 authored tarafından Mike Kaganski's avatar Mike Kaganski

basic: consistently use "" and <> in include directives

Change-Id: I147c0e9b9b1e09af593f54799e45e1348cd40716
Reviewed-on: https://gerrit.libreoffice.org/43298Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst da7c1eb1
......@@ -26,7 +26,7 @@
#include <basic/sbmod.hxx>
#include <basic/sbstar.hxx>
#include "sbprop.hxx"
#include <sbprop.hxx>
// create object from user-type (+StringID+StringID)
SbxObject* createUserTypeImpl( const OUString& rClassName );
......
......@@ -17,7 +17,7 @@
#include <osl/process.h>
#include <rtl/math.hxx>
#include "scanner.hxx"
#include <scanner.hxx>
namespace
{
......
......@@ -19,10 +19,10 @@
#include <basic/basicmanagerrepository.hxx>
#include <basic/basmgr.hxx>
#include "scriptcont.hxx"
#include "dlgcont.hxx"
#include <scriptcont.hxx>
#include <dlgcont.hxx>
#include <basic/sbuno.hxx>
#include "sbintern.hxx"
#include <sbintern.hxx>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
......
......@@ -39,9 +39,9 @@
#include <basic/sbuno.hxx>
#include <basic/basmgr.hxx>
#include "global.hxx"
#include <global.hxx>
#include <sbunoobj.hxx>
#include "sbintern.hxx"
#include <sbintern.hxx>
#include <memory>
#include <vector>
......
......@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "errobject.hxx"
#include <errobject.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/script/XDefaultProperty.hpp>
#include "sbintern.hxx"
#include "runtime.hxx"
#include <sbintern.hxx>
#include <runtime.hxx>
using namespace ::com::sun::star;
using namespace ::ooo;
......
......@@ -15,7 +15,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include "global.hxx"
#include <global.hxx>
namespace
{
......
......@@ -21,9 +21,9 @@
#include <tools/tenccvt.hxx>
#include <osl/thread.h>
#include <basic/sbx.hxx>
#include "sb.hxx"
#include <sb.hxx>
#include <string.h>
#include "image.hxx"
#include <image.hxx>
#include <codegen.hxx>
#include <memory>
......
......@@ -18,7 +18,7 @@
*/
#include "propacc.hxx"
#include <propacc.hxx>
#include <basic/sbstar.hxx>
#include <basic/sbuno.hxx>
......
......@@ -17,29 +17,29 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sb.hxx"
#include <sb.hxx>
#include <tools/stream.hxx>
#include <vcl/errinf.hxx>
#include <comphelper/solarmutex.hxx>
#include <basic/sbx.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/processfactory.hxx>
#include "image.hxx"
#include "sbunoobj.hxx"
#include "sbjsmeth.hxx"
#include "sbjsmod.hxx"
#include "sbintern.hxx"
#include "runtime.hxx"
#include <image.hxx>
#include <sbunoobj.hxx>
#include <sbjsmeth.hxx>
#include <sbjsmod.hxx>
#include <sbintern.hxx>
#include <runtime.hxx>
#include <basic/sbuno.hxx>
#include "sbobjmod.hxx"
#include "stdobj.hxx"
#include "filefmt.hxx"
#include "basic.hrc"
#include <sbobjmod.hxx>
#include <stdobj.hxx>
#include <filefmt.hxx>
#include <basic.hrc>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XCloseBroadcaster.hpp>
#include <com/sun/star/util/XCloseListener.hpp>
#include "errobject.hxx"
#include <errobject.hxx>
#include <memory>
#include <unordered_map>
......
......@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sbintern.hxx"
#include "sbunoobj.hxx"
#include "token.hxx"
#include "symtbl.hxx"
#include "parser.hxx"
#include "codegen.hxx"
#include <sbintern.hxx>
#include <sbunoobj.hxx>
#include <token.hxx>
#include <symtbl.hxx>
#include <parser.hxx>
#include <codegen.hxx>
#include <basic/basmgr.hxx>
SbiGlobals* SbiGlobals::pGlobals = nullptr;
......
......@@ -78,7 +78,7 @@
#include <basic/sbuno.hxx>
#include <basic/sberrors.hxx>
#include <sbunoobj.hxx>
#include "sbjsmod.hxx"
#include <sbjsmod.hxx>
#include <basic/basmgr.hxx>
#include <sbintern.hxx>
#include <runtime.hxx>
......
......@@ -23,20 +23,20 @@
#include <svl/SfxBroadcaster.hxx>
#include <basic/sbx.hxx>
#include <basic/sbuno.hxx>
#include "sb.hxx"
#include <sb.hxx>
#include <sbjsmeth.hxx>
#include "sbjsmod.hxx"
#include "sbintern.hxx"
#include "image.hxx"
#include "opcodes.hxx"
#include "runtime.hxx"
#include "token.hxx"
#include "sbunoobj.hxx"
#include <sbjsmod.hxx>
#include <sbintern.hxx>
#include <image.hxx>
#include <opcodes.hxx>
#include <runtime.hxx>
#include <token.hxx>
#include <sbunoobj.hxx>
#include <sal/log.hxx>
#include <basic/basrdll.hxx>
#include "sbobjmod.hxx"
#include <sbobjmod.hxx>
#include <basic/vbahelper.hxx>
#include <cppuhelper/implbase.hxx>
#include <unotools/eventcfg.hxx>
......@@ -68,8 +68,8 @@
#include <ooo/vba/VbQueryClose.hpp>
#include <list>
#include <memory>
#include "sbxmod.hxx"
#include "parser.hxx"
#include <sbxmod.hxx>
#include <parser.hxx>
#include <limits>
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "basiccharclass.hxx"
#include <basiccharclass.hxx>
#include <unotools/charclass.hxx>
#include <vcl/svapp.hxx>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "buffer.hxx"
#include "parser.hxx"
#include <buffer.hxx>
#include <parser.hxx>
const static sal_uInt32 UP_LIMIT=0xFFFFFF00;
......
......@@ -19,9 +19,9 @@
#include <basic/sbx.hxx>
#include "image.hxx"
#include "codegen.hxx"
#include "parser.hxx"
#include <image.hxx>
#include <codegen.hxx>
#include <parser.hxx>
#include <cstddef>
#include <limits>
#include <algorithm>
......
......@@ -18,8 +18,8 @@
*/
#include <basic/sbx.hxx>
#include "sbunoobj.hxx"
#include "parser.hxx"
#include <sbunoobj.hxx>
#include <parser.hxx>
#include <svtools/miscopt.hxx>
#include <osl/diagnose.h>
#include <com/sun/star/reflection/theCoreReflection.hpp>
......
......@@ -18,9 +18,9 @@
*/
#include "codegen.hxx"
#include "expr.hxx"
#include "parser.hxx"
#include <codegen.hxx>
#include <expr.hxx>
#include <parser.hxx>
// Transform table for token operators and opcodes
......
......@@ -22,9 +22,9 @@
#include <algorithm>
#include <rtl/math.hxx>
#include "codegen.hxx"
#include "parser.hxx"
#include "expr.hxx"
#include <codegen.hxx>
#include <parser.hxx>
#include <expr.hxx>
SbiExprNode::SbiExprNode( SbiExprNode* l, SbiToken t, SbiExprNode* r ) :
......
......@@ -19,9 +19,9 @@
#include <memory>
#include "parser.hxx"
#include <parser.hxx>
#include <basic/sbx.hxx>
#include "expr.hxx"
#include <expr.hxx>
#include <o3tl/make_unique.hxx>
SbiExpression::SbiExpression( SbiParser* p, SbiExprType t,
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "parser.hxx"
#include "iosys.hxx"
#include <parser.hxx>
#include <iosys.hxx>
#include <memory>
// test if there's an I/O channel
......
......@@ -18,7 +18,7 @@
*/
#include "parser.hxx"
#include <parser.hxx>
#include <memory>
// Single-line IF and Multiline IF
......
......@@ -18,7 +18,7 @@
*/
#include <basic/sbx.hxx>
#include "parser.hxx"
#include <parser.hxx>
#include <com/sun/star/script/ModuleType.hpp>
#include <svtools/miscopt.hxx>
#include <rtl/character.hxx>
......
......@@ -19,9 +19,9 @@
#include <basic/sbx.hxx>
#include "parser.hxx"
#include "image.hxx"
#include "sbobjmod.hxx"
#include <parser.hxx>
#include <image.hxx>
#include <sbobjmod.hxx>
#include <svtools/miscopt.hxx>
#include <rtl/character.hxx>
#include <memory>
......
......@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "basiccharclass.hxx"
#include "scanner.hxx"
#include "sbintern.hxx"
#include <basiccharclass.hxx>
#include <scanner.hxx>
#include <sbintern.hxx>
#include <i18nlangtag/lang.h>
#include <comphelper/processfactory.hxx>
......
......@@ -19,7 +19,7 @@
#include <memory>
#include "parser.hxx"
#include <parser.hxx>
#include <osl/diagnose.h>
......
......@@ -21,9 +21,9 @@
#include <array>
#include <basic/sberrors.hxx>
#include "sal/macros.h"
#include "basiccharclass.hxx"
#include "token.hxx"
#include <sal/macros.h>
#include <basiccharclass.hxx>
#include <token.hxx>
struct TokenTable { SbiToken t; const char *s; };
......
......@@ -22,8 +22,8 @@
class SbiParser;
class SbModule;
#include "opcodes.hxx"
#include "buffer.hxx"
#include <opcodes.hxx>
#include <buffer.hxx>
#include <basic/codecompletecache.hxx>
class SbiCodeGen {
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX
#define INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX
#include "namecont.hxx"
#include <namecont.hxx>
#include <com/sun/star/resource/XStringResourceSupplier.hpp>
#include <com/sun/star/resource/XStringResourcePersistence.hpp>
......
......@@ -19,7 +19,7 @@
#ifndef INCLUDED_BASIC_SOURCE_INC_ERROBJECT_HXX
#define INCLUDED_BASIC_SOURCE_INC_ERROBJECT_HXX
#include "sbunoobj.hxx"
#include <sbunoobj.hxx>
#include <ooo/vba/XErrObject.hpp>
......
......@@ -22,8 +22,8 @@
#include <memory>
#include "opcodes.hxx"
#include "token.hxx"
#include <opcodes.hxx>
#include <token.hxx>
#include <vector>
class SbiExprNode;
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX
#define INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX
#include "sbintern.hxx"
#include <sbintern.hxx>
#include <rtl/ustring.hxx>
#include <filefmt.hxx>
#include <o3tl/typed_flags_set.hxx>
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX
#define INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX
#include "sbintern.hxx"
#include <sbintern.hxx>
// An opcode can have a length of 1, 3 or 5 bytes,
// depending on its numeric value (see below).
......
......@@ -20,9 +20,9 @@
#ifndef INCLUDED_BASIC_SOURCE_INC_PARSER_HXX
#define INCLUDED_BASIC_SOURCE_INC_PARSER_HXX
#include "expr.hxx"
#include "codegen.hxx"
#include "symtbl.hxx"
#include <expr.hxx>
#include <codegen.hxx>
#include <symtbl.hxx>
#include <vector>
......
......@@ -22,7 +22,7 @@
#include <basic/sbx.hxx>
#include "sb.hxx"
#include <sb.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Sequence.hxx>
......
......@@ -23,7 +23,7 @@
#include <basic/basicdllapi.h>
#include <basic/sbxfac.hxx>
#include <unotools/transliterationwrapper.hxx>
#include "sb.hxx"
#include <sb.hxx>
namespace utl
{
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_BASIC_SOURCE_INC_SCRIPTCONT_HXX
#define INCLUDED_BASIC_SOURCE_INC_SCRIPTCONT_HXX
#include "namecont.hxx"
#include <namecont.hxx>
#include <basic/basmgr.hxx>
#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
#include <comphelper/uno3.hxx>
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_BASIC_SOURCE_INC_TOKEN_HXX
#define INCLUDED_BASIC_SOURCE_INC_TOKEN_HXX
#include "scanner.hxx"
#include <scanner.hxx>
#include <basic/sbdef.hxx>
// The tokenizer is stand-alone, i. e. he can be used from everywhere.
......
......@@ -27,7 +27,7 @@
#include <basic/sbstar.hxx>
#include <basic/basrdll.hxx>
#include <unotools/resmgr.hxx>
#include "strings.hrc"
#include <strings.hrc>
#include <sbxbase.hxx>
struct BasicDLL::Impl
......
......@@ -23,9 +23,9 @@
#include <vcl/edit.hxx>
#include <vcl/dialog.hxx>
#include <vcl/svapp.hxx>
#include "runtime.hxx"
#include "stdobj.hxx"
#include "rtlproto.hxx"
#include <runtime.hxx>
#include <stdobj.hxx>
#include <rtlproto.hxx>
#include <memory>
class SvRTLInputBox : public ModalDialog
......
......@@ -26,7 +26,7 @@
#include <osl/file.hxx>
#include <tools/urlobj.hxx>
#include "runtime.hxx"
#include <runtime.hxx>
#include <rtl/byteseq.hxx>
#include <rtl/textenc.h>
......@@ -55,8 +55,8 @@ using namespace com::sun::star::ucb;
using namespace com::sun::star::io;
using namespace com::sun::star::bridge;
#include "iosys.hxx"
#include "sbintern.hxx"
#include <iosys.hxx>
#include <sbintern.hxx>
class SbiInputDialog : public ModalDialog {
......
......@@ -42,10 +42,10 @@
#include <rtl/string.hxx>
#include <rtl/strbuf.hxx>
#include "runtime.hxx"
#include "sbunoobj.hxx"
#include <runtime.hxx>
#include <sbunoobj.hxx>
#include <osl/file.hxx>
#include "errobject.hxx"
#include <errobject.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
......@@ -69,12 +69,12 @@ using namespace com::sun::star;
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
#include "date.hxx"
#include "stdobj.hxx"
#include "sbstdobj.hxx"
#include "rtlproto.hxx"
#include "image.hxx"
#include "iosys.hxx"
#include <date.hxx>
#include <stdobj.hxx>
#include <sbstdobj.hxx>
#include <rtlproto.hxx>
#include <image.hxx>
#include <iosys.hxx>
#include "ddectrl.hxx"
#include <sbintern.hxx>
#include <basic/vbahelper.hxx>
......@@ -85,8 +85,8 @@ using namespace com::sun::star::uno;
#include <stdlib.h>
#include <errno.h>
#include "sbobjmod.hxx"
#include "sbxmod.hxx"
#include <sbobjmod.hxx>
#include <sbxmod.hxx>
#ifdef _WIN32
#include <prewin.h>
......
......@@ -37,18 +37,18 @@
#include <tools/fract.hxx>
#include <osl/file.hxx>
#include <vcl/jobset.hxx>
#include "sbobjmod.hxx"
#include <sbobjmod.hxx>
#include <basic/sbuno.hxx>
#include "date.hxx"
#include "sbintern.hxx"
#include "runtime.hxx"
#include "stdobj.hxx"
#include "rtlproto.hxx"
#include <date.hxx>
#include <sbintern.hxx>
#include <runtime.hxx>
#include <stdobj.hxx>
#include <rtlproto.hxx>
#include "dllmgr.hxx"
#include <iosys.hxx>
#include "sbunoobj.hxx"
#include "propacc.hxx"
#include <sbunoobj.hxx>
#include <propacc.hxx>
#include <sal/log.hxx>
#include <eventatt.hxx>
......
......@@ -18,10 +18,10 @@
*/
#include "runtime.hxx"
#include "stdobj.hxx"
#include "rtlproto.hxx"
#include "errobject.hxx"
#include <runtime.hxx>
#include <stdobj.hxx>
#include <rtlproto.hxx>
#include <errobject.hxx>
#include <basegfx/numeric/ftools.hxx>
......
......@@ -53,18 +53,18 @@
#include <basic/sbuno.hxx>
#include "codegen.hxx"
#include <codegen.hxx>
#include "comenumwrapper.hxx"
#include "ddectrl.hxx"
#include "dllmgr.hxx"
#include "errobject.hxx"
#include "image.hxx"
#include "iosys.hxx"
#include "opcodes.hxx"
#include "runtime.hxx"
#include "sb.hxx"
#include "sbintern.hxx"
#include "sbunoobj.hxx"
#include <errobject.hxx>
#include <image.hxx>
#include <iosys.hxx>
#include <opcodes.hxx>
#include <runtime.hxx>
#include <sb.hxx>
#include <sbintern.hxx>
#include <sbunoobj.hxx>
#include <basic/codecompletecache.hxx>
#include <memory>
......
......@@ -18,12 +18,12 @@
*/
#include "runtime.hxx"
#include "stdobj.hxx"
#include "sbstdobj.hxx"
#include <runtime.hxx>
#include <stdobj.hxx>
#include <sbstdobj.hxx>
#include <sal/macros.h>
#include "rtlproto.hxx"
#include "sbintern.hxx"
#include <rtlproto.hxx>
#include <sbintern.hxx>
// The nArgs-field of a table entry is encrypted as follows:
// At the moment it is assumed that properties don't need any
// parameters!
......
......@@ -20,8 +20,8 @@
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
#include <svtools/transfer.hxx>
#include "runtime.hxx"
#include "sbstdobj.hxx"
#include <runtime.hxx>
#include <sbstdobj.hxx>
#define ATTR_IMP_TYPE 1
#define ATTR_IMP_WIDTH 2
......
......@@ -22,7 +22,7 @@
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <basic/sbx.hxx>
#include "runtime.hxx"
#include <runtime.hxx>
#include <boost/optional.hpp>
......
......@@ -25,7 +25,7 @@
#include <basic/sbx.hxx>
#include <basic/sbxfac.hxx>
#include "sbxbase.hxx"
#include <sbxbase.hxx>
#include <rtl/instance.hxx>
#include <rtl/ustring.hxx>
......
......@@ -26,7 +26,7 @@
#include <basic/sbx.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"
#include "math.h"
#include <math.h>
#include <comphelper/processfactory.hxx>
#include <memory>
......
......@@ -22,7 +22,7 @@
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
#include "runtime.hxx"
#include <runtime.hxx>
double ImpGetDouble( const SbxValues* p )
{
......
......@@ -35,13 +35,13 @@
#include <string.h>
#include "sbxres.hxx"
#include "sbxbase.hxx"
#include <sbxbase.hxx>
#include <basic/sbxfac.hxx>
#include <basic/sbxform.hxx>
#include "date.hxx"