move some headers inside modules
Change-Id: I2baa9e9334850cf72e8ea1e96a2177a1c052e589 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115868 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/python2
|
||||
#!/usr/bin/python3
|
||||
|
||||
# Look for headers inside include/ that can be moved into their respective modules.
|
||||
# Not 100% accurate
|
||||
@@ -11,18 +11,18 @@ a = subprocess.Popen("git ls-files include/", stdout=subprocess.PIPE, shell=True
|
||||
with a.stdout as txt:
|
||||
for line in txt:
|
||||
header = line[8:].strip();
|
||||
if "README" in header: continue
|
||||
if header == "version.hrc": continue
|
||||
if b"README" in header: continue
|
||||
if header == b"version.hrc": continue
|
||||
# ignore URE headers
|
||||
if header.startswith("IwyuFilter_include.yaml"): continue
|
||||
if header.startswith("cppu/"): continue
|
||||
if header.startswith("cppuhelper/"): continue
|
||||
if header.startswith("osl/"): continue
|
||||
if header.startswith("sal/"): continue
|
||||
if header.startswith("salhelper/"): continue
|
||||
if header.startswith("uno/"): continue
|
||||
if header.startswith(b"IwyuFilter_include.yaml"): continue
|
||||
if header.startswith(b"cppu/"): continue
|
||||
if header.startswith(b"cppuhelper/"): continue
|
||||
if header.startswith(b"osl/"): continue
|
||||
if header.startswith(b"sal/"): continue
|
||||
if header.startswith(b"salhelper/"): continue
|
||||
if header.startswith(b"uno/"): continue
|
||||
# these are direct copies of mozilla code
|
||||
if header.startswith("onlineupdate/mozilla/"): continue
|
||||
if header.startswith(b"onlineupdate/mozilla/"): continue
|
||||
headerSet.add(header)
|
||||
|
||||
headerSetUnused = headerSet.copy()
|
||||
@@ -30,24 +30,24 @@ headerSetOnlyInOwnModule = headerSet.copy()
|
||||
a = subprocess.Popen("git grep '^#include <'", stdout=subprocess.PIPE, shell=True)
|
||||
with a.stdout as txt:
|
||||
for line in txt:
|
||||
idx1 = line.find("#include <")
|
||||
idx2 = line.find(">", idx1 + 10)
|
||||
idx1 = line.find(b"#include <")
|
||||
idx2 = line.find(b">", idx1 + 10)
|
||||
include = line[idx1 + 10 : idx2]
|
||||
headerSetUnused.discard(include)
|
||||
#
|
||||
idx1 = line.find("/")
|
||||
idx1 = line.find(b"/")
|
||||
includedFromModule = line[0 : idx1]
|
||||
idx1 = include.find("/")
|
||||
idx1 = include.find(b"/")
|
||||
module = include[0 : idx1]
|
||||
if module != includedFromModule:
|
||||
headerSetOnlyInOwnModule.discard(include)
|
||||
|
||||
print "completely unused"
|
||||
print "----------------------------"
|
||||
print("completely unused")
|
||||
print("----------------------------")
|
||||
for x in sorted(headerSetUnused):
|
||||
print x
|
||||
print ""
|
||||
print "only used in own module"
|
||||
print "----------------------------"
|
||||
print(x)
|
||||
print("")
|
||||
print("only used in own module")
|
||||
print("----------------------------")
|
||||
for x in sorted(headerSetOnlyInOwnModule):
|
||||
print x
|
||||
print(x)
|
||||
|
||||
@@ -449,10 +449,6 @@ excludelist:
|
||||
include/svtools/dialogclosedlistener.hxx:
|
||||
# base class has to be a complete type
|
||||
- com/sun/star/ui/dialogs/XDialogClosedListener.hpp
|
||||
include/svtools/framestatuslistener.hxx:
|
||||
# base class has to be a complete type
|
||||
- com/sun/star/frame/XFrameActionListener.hpp
|
||||
- com/sun/star/frame/XStatusListener.hpp
|
||||
include/svtools/genericunodialog.hxx:
|
||||
# base class has to be a complete type
|
||||
- com/sun/star/lang/XInitialization.hpp
|
||||
|
||||
@@ -17,8 +17,7 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX
|
||||
#define INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX
|
||||
#pragma once
|
||||
|
||||
#include <svtools/popupwindowcontroller.hxx>
|
||||
|
||||
@@ -39,6 +38,4 @@ public:
|
||||
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -17,8 +17,7 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_SFX2_INC_EMOJIPOPUP_HXX
|
||||
#define INCLUDED_SFX2_INC_EMOJIPOPUP_HXX
|
||||
#pragma once
|
||||
|
||||
#include <svtools/popupwindowcontroller.hxx>
|
||||
|
||||
@@ -39,6 +38,4 @@ public:
|
||||
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <comphelper/dispatchcommand.hxx>
|
||||
#include <officecfg/Office/Common.hxx>
|
||||
#include <charmapcontrol.hxx>
|
||||
#include <sfx2/charmappopup.hxx>
|
||||
#include <charmappopup.hxx>
|
||||
#include <sfx2/viewfrm.hxx>
|
||||
#include <sfx2/strings.hrc>
|
||||
#include <sfx2/sfxresid.hxx>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
#include <emojicontrol.hxx>
|
||||
#include <sfx2/emojipopup.hxx>
|
||||
#include <emojipopup.hxx>
|
||||
#include <emojiview.hxx>
|
||||
#include <sfx2/thumbnailviewitem.hxx>
|
||||
#include <rtl/ustrbuf.hxx>
|
||||
|
||||
@@ -16,7 +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 .
|
||||
*/
|
||||
#include <sfx2/emojipopup.hxx>
|
||||
#include <emojipopup.hxx>
|
||||
#include <emojicontrol.hxx>
|
||||
#include <vcl/toolbox.hxx>
|
||||
|
||||
|
||||
@@ -16,7 +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 .
|
||||
*/
|
||||
#include <sfx2/charmappopup.hxx>
|
||||
#include <charmappopup.hxx>
|
||||
#include <charmapcontrol.hxx>
|
||||
#include <vcl/toolbox.hxx>
|
||||
|
||||
|
||||
@@ -5789,7 +5789,6 @@ include/svtools/embedtransfer.hxx
|
||||
include/svtools/extcolorcfg.hxx
|
||||
include/svtools/filechangedchecker.hxx
|
||||
include/svtools/fontsubstconfig.hxx
|
||||
include/svtools/framestatuslistener.hxx
|
||||
include/svtools/genericunodialog.hxx
|
||||
include/svtools/helpids.h
|
||||
include/svtools/helpopt.hxx
|
||||
@@ -11254,6 +11253,7 @@ svl/source/undo/undo.cxx
|
||||
svl/source/uno/pathservice.cxx
|
||||
svl/unx/source/svdde/ddedummy.cxx
|
||||
svtools/inc/strings.hxx
|
||||
svtools/inc/framestatuslistener.hxx
|
||||
svtools/inc/table/defaultinputhandler.hxx
|
||||
svtools/inc/table/gridtablerenderer.hxx
|
||||
svtools/inc/table/tablecontrol.hxx
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
---
|
||||
assumeFilename: svtools/source/control/ruler.cxx
|
||||
excludelist:
|
||||
svtools/inc/framestatuslistener.hxx:
|
||||
# base class has to be a complete type
|
||||
- com/sun/star/frame/XFrameActionListener.hpp
|
||||
- com/sun/star/frame/XStatusListener.hpp
|
||||
svtools/source/control/accessibleruler.hxx:
|
||||
# base class has to be a complete type
|
||||
- com/sun/star/accessibility/XAccessible.hpp
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <vcl/taskpanelist.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
|
||||
#include <svtools/framestatuslistener.hxx>
|
||||
#include <framestatuslistener.hxx>
|
||||
#include <svtools/toolbarmenu.hxx>
|
||||
|
||||
using namespace ::com::sun::star::uno;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#include <svtools/framestatuslistener.hxx>
|
||||
#include <framestatuslistener.hxx>
|
||||
#include <com/sun/star/frame/XDispatchProvider.hpp>
|
||||
#include <com/sun/star/lang/DisposedException.hpp>
|
||||
#include <com/sun/star/util/URLTransformer.hpp>
|
||||
|
||||
@@ -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_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
|
||||
#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
|
||||
#pragma once
|
||||
|
||||
#include <svtools/popupwindowcontroller.hxx>
|
||||
|
||||
@@ -44,6 +43,4 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -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_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
|
||||
#define INCLUDED_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
|
||||
#pragma once
|
||||
|
||||
#include <svtools/popupwindowcontroller.hxx>
|
||||
|
||||
@@ -42,6 +41,4 @@ public:
|
||||
|
||||
} // end of namespace svx
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -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_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
|
||||
#define INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
|
||||
#pragma once
|
||||
|
||||
#include <svtools/popupwindowcontroller.hxx>
|
||||
|
||||
@@ -42,6 +41,4 @@ public:
|
||||
|
||||
} // end of namespace svx
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -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_SVX_DSTRIBUT_ENUM_HXX
|
||||
#define INCLUDED_SVX_DSTRIBUT_ENUM_HXX
|
||||
#pragma once
|
||||
|
||||
enum class SvxDistributeHorizontal
|
||||
{
|
||||
@@ -37,6 +36,4 @@ enum class SvxDistributeVertical
|
||||
Bottom
|
||||
};
|
||||
|
||||
#endif // INCLUDED_SVX_DSTRIBUT_ENUM_HXX
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -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_SVX_LAYCTRL_HXX
|
||||
#define INCLUDED_SVX_LAYCTRL_HXX
|
||||
#pragma once
|
||||
|
||||
#include <svtools/popupwindowcontroller.hxx>
|
||||
|
||||
@@ -60,6 +59,4 @@ public:
|
||||
void InsertColumns(const css::uno::Sequence<css::beans::PropertyValue>& rArgs);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -17,8 +17,7 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_SVX_LBOXCTRL_HXX
|
||||
#define INCLUDED_SVX_LBOXCTRL_HXX
|
||||
#pragma once
|
||||
|
||||
#include <rtl/ustring.hxx>
|
||||
#include <vector>
|
||||
@@ -55,6 +54,4 @@ public:
|
||||
void SetInfo(sal_Int32 nCount);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -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_SVX_VERTTEXTTBXCTRL_HXX
|
||||
#define INCLUDED_SVX_VERTTEXTTBXCTRL_HXX
|
||||
#pragma once
|
||||
|
||||
#include <com/sun/star/lang/XServiceInfo.hpp>
|
||||
|
||||
@@ -72,6 +71,4 @@ public:
|
||||
virtual OUString SAL_CALL getImplementationName() override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <svx/gallerybinaryengine.hxx>
|
||||
#include <svx/galleryobjectcollection.hxx>
|
||||
#include <svx/gallery1.hxx>
|
||||
#include <svx/galleryobjectbinarystorage.hxx>
|
||||
#include <galleryobjectbinarystorage.hxx>
|
||||
#include <osl/thread.hxx>
|
||||
#include "codec.hxx"
|
||||
#include "gallerydrawmodel.hxx"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#include <svx/galleryobjectbinarystorage.hxx>
|
||||
#include <galleryobjectbinarystorage.hxx>
|
||||
#include <tools/urlobj.hxx>
|
||||
|
||||
void GalleryObjectBinaryStorage::setURL(INetURLObject aURL) { m_aURL = aURL; }
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#include <svx/galleryobjectxmlstorage.hxx>
|
||||
#include <galleryobjectxmlstorage.hxx>
|
||||
#include <tools/urlobj.hxx>
|
||||
|
||||
void GalleryObjectXMLStorage::setURL(INetURLObject aURL) { m_aURL = aURL; }
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <svx/galtheme.hxx>
|
||||
#include <svx/svdpage.hxx>
|
||||
#include <svx/galleryobjectcollection.hxx>
|
||||
#include <svx/galleryobjectbinarystorage.hxx>
|
||||
#include <galleryobjectbinarystorage.hxx>
|
||||
#include <galobj.hxx>
|
||||
#include <svx/gallery1.hxx>
|
||||
#include "gallerydrawmodel.hxx"
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <svl/intitem.hxx>
|
||||
#include <svl/itempool.hxx>
|
||||
|
||||
#include <svx/ParaLineSpacingPopup.hxx>
|
||||
#include <ParaLineSpacingPopup.hxx>
|
||||
|
||||
#define DEFAULT_LINE_SPACING 200
|
||||
#define FIX_DIST_DEF 283
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include "ParaLineSpacingControl.hxx"
|
||||
|
||||
#include <svx/ParaLineSpacingPopup.hxx>
|
||||
#include <ParaLineSpacingPopup.hxx>
|
||||
#include <vcl/toolbox.hxx>
|
||||
|
||||
using namespace svx;
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <sfx2/app.hxx>
|
||||
#include <sfx2/dispatch.hxx>
|
||||
#include <sfx2/viewfrm.hxx>
|
||||
#include <svx/TextCharacterSpacingPopup.hxx>
|
||||
#include <TextCharacterSpacingPopup.hxx>
|
||||
#include <svl/itempool.hxx>
|
||||
#include <helpids.h>
|
||||
|
||||
|
||||
@@ -16,7 +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 .
|
||||
*/
|
||||
#include <svx/TextCharacterSpacingPopup.hxx>
|
||||
#include <TextCharacterSpacingPopup.hxx>
|
||||
#include "TextCharacterSpacingControl.hxx"
|
||||
#include <vcl/toolbox.hxx>
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <svx/svxids.hrc>
|
||||
#include <sfx2/dispatch.hxx>
|
||||
#include <sfx2/viewfrm.hxx>
|
||||
#include <svx/TextUnderlinePopup.hxx>
|
||||
#include <TextUnderlinePopup.hxx>
|
||||
#include <editeng/editids.hrc>
|
||||
#include <editeng/udlnitem.hxx>
|
||||
#include <helpids.h>
|
||||
|
||||
@@ -16,7 +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 .
|
||||
*/
|
||||
#include <svx/TextUnderlinePopup.hxx>
|
||||
#include <TextUnderlinePopup.hxx>
|
||||
#include "TextUnderlineControl.hxx"
|
||||
#include <vcl/toolbox.hxx>
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
#include <vector>
|
||||
#include <vcl/graph.hxx>
|
||||
#include <svx/svxids.hrc>
|
||||
#include <svx/dstribut_enum.hxx>
|
||||
#include <dstribut_enum.hxx>
|
||||
#include <osl/diagnose.h>
|
||||
|
||||
using namespace com::sun::star;
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <vcl/toolbox.hxx>
|
||||
|
||||
#include <svx/strings.hrc>
|
||||
#include <svx/layctrl.hxx>
|
||||
#include <layctrl.hxx>
|
||||
#include <svx/dialmgr.hxx>
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#include <svtools/colorcfg.hxx>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <sfx2/bindings.hxx>
|
||||
#include <svtools/toolbarmenu.hxx>
|
||||
#include <svx/dialmgr.hxx>
|
||||
#include <svx/lboxctrl.hxx>
|
||||
#include <lboxctrl.hxx>
|
||||
#include <tools/urlobj.hxx>
|
||||
|
||||
#include <svx/strings.hrc>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
#include <svx/verttexttbxctrl.hxx>
|
||||
#include <verttexttbxctrl.hxx>
|
||||
#include <svl/languageoptions.hxx>
|
||||
#include <vcl/toolbox.hxx>
|
||||
#include <vcl/weld.hxx>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <sal/config.h>
|
||||
#include <sal/log.hxx>
|
||||
|
||||
#include <vcl/SwapFile.hxx>
|
||||
#include <SwapFile.hxx>
|
||||
|
||||
#include <comphelper/fileformat.h>
|
||||
#include <o3tl/make_shared.hxx>
|
||||
|
||||
Reference in New Issue
Block a user