Kaydet (Commit) 2bd7767d authored tarafından Thomas Arnhold's avatar Thomas Arnhold

Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360Reviewed-by: 's avatarThomas Arnhold <thomas@arnhold.org>
Tested-by: 's avatarThomas Arnhold <thomas@arnhold.org>
üst 3efddb09
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _INCLUDED_ANIMCORE_FACTREG_HXX_
#define _INCLUDED_ANIMCORE_FACTREG_HXX_
#ifndef INCLUDED_ANIMATIONS_SOURCE_ANIMCORE_FACTREG_HXX
#define INCLUDED_ANIMATIONS_SOURCE_ANIMCORE_FACTREG_HXX
namespace animcore {
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _AVMEDIA_MEDIACONTROL_HXX
#define _AVMEDIA_MEDIACONTROL_HXX
#ifndef INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX
#define INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX
#include <avmedia/mediaitem.hxx>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
#define __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
#ifndef INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX
#define INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
......@@ -136,6 +136,6 @@ class SoundHandler : // interfaces
} // namespace avmedia
#endif // #ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
#endif // INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _GSTCOMMON_HXX
#define _GSTCOMMON_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTCOMMON_HXX
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTCOMMON_HXX
#include <gst/gst.h>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _FRAMEGRABBER_HXX
#define _FRAMEGRABBER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX
#include "gstplayer.hxx"
#include <com/sun/star/media/XFrameGrabber.hpp>
......@@ -59,6 +59,6 @@ private:
} // namespace gst
} // namespace avmedia
#endif // _FRAMEGRABBER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _MANAGER_HXX
#define _MANAGER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
#include "gstcommon.hxx"
......@@ -53,6 +53,6 @@ private:
} // namespace gstreamer
} // namespace avmedia
#endif // _MANAGER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _PLAYER_HXX
#define _PLAYER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
#include <osl/conditn.hxx>
#include "gstcommon.hxx"
......@@ -104,6 +104,6 @@ protected:
} // namespace gstreamer
} // namespace avmedia
#endif // _PLAYER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _WINDOW_HXX
#define _WINDOW_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
#include "gstcommon.hxx"
#include <cppuhelper/interfacecontainer.h>
......@@ -96,6 +96,6 @@ private:
} // namespace gstreamer
} // namespace avmedia
#endif // _WINDOW_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _AVMEDIA_MEDIAMISC_HXX
#define _AVMEDIA_MEDIAMISC_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
#define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
class ResMgr;
......
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef OGL_FRAMEGRABBER_HXX
#define OGL_FRAMEGRABBER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
......@@ -43,6 +43,6 @@ private:
} // namespace ogl
} // namespace avmedia
#endif // OGL_FRAMEGRABBER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef OGL_MANAGER_HXX
#define OGL_MANAGER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
......@@ -39,6 +39,6 @@ private:
} // namespace ogl
} // namespace avmedia
#endif // OGL_MANAGER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef OGL_PLAYER_HXX
#define OGL_PLAYER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/basemutex.hxx>
......@@ -63,6 +63,6 @@ private:
} // namespace ogl
} // namespace avmedia
#endif // OGL_PLAYER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef OGL_WINDOW_HXX
#define OGL_WINDOW_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLWINDOW_HXX
#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLWINDOW_HXX
#include "oglplayer.hxx"
......@@ -76,6 +76,6 @@ private:
} // namespace ogl
} // namespace avmedia
#endif // OGL_WINDOW_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _FRAMEGRABBER_HXX
#define _FRAMEGRABBER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
#include "quicktimecommon.hxx"
......@@ -60,6 +60,6 @@ private:
} // namespace quicktime
} // namespace avmedia
#endif // _FRAMEGRABBER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _MANAGER_HXX
#define _MANAGER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
#include "quicktimecommon.hxx"
......@@ -53,6 +53,6 @@ private:
} // namespace quicktime
} // namespace avmedia
#endif // _MANAGER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _PLAYER_HXX
#define _PLAYER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
#include <osl/conditn.h>
#include "quicktimecommon.hxx"
......@@ -86,6 +86,6 @@ private:
} // namespace quicktime
} // namespace avmedia
#endif // _PLAYER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _QUICKTIMECOMMON_HXX
#define _QUICKTIMECOMMON_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_QUICKTIMECOMMON_HXX
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_QUICKTIMECOMMON_HXX
#ifdef MACOSX
#include <premac.h>
......@@ -28,9 +28,7 @@
#include <postmac.h>
#endif
#include <osl/mutex.hxx>
#ifndef __RTL_USTRING_
#include <rtl/ustring.hxx>
#endif
#include <tools/stream.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _WINDOW_HXX
#define _WINDOW_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
#include "quicktimecommon.hxx"
#include <cppuhelper/interfacecontainer.h>
......@@ -102,6 +102,6 @@ private:
} // namespace quicktime
} // namespace avmedia
#endif // _WINDOW_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _AVMEDIA_MEDIAEVENT_IMPL_HXX
#define _AVMEDIA_MEDIAEVENT_IMPL_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAEVENT_IMPL_HXX
#define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAEVENT_IMPL_HXX
#include <avmedia/mediawindow.hxx>
#include <cppuhelper/compbase4.hxx>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _AVMEDIA_MEDIAWINDOW_IMPL_HXX
#define _AVMEDIA_MEDIAWINDOW_IMPL_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX
#define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX
#include <svtools/transfer.hxx>
#include <vcl/syschild.hxx>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _VLCCOMMON_HXX
#define _VLCCOMMON_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCCOMMON_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCCOMMON_HXX
#include <osl/mutex.hxx>
#include <tools/stream.hxx>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _VLCFRAMEGRABBER_HXX
#define _VLCFRAMEGRABBER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
#include <boost/shared_ptr.hpp>
#include <com/sun/star/media/XFrameGrabber.hpp>
......@@ -55,4 +55,4 @@ public:
}
}
#endif // _VLCFRAMEGRABBER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _VLCMANAGER_HXX
#define _VLCMANAGER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/media/XManager.hpp>
#include "vlccommon.hxx"
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _VLCPLAYER_HXX
#define _VLCPLAYER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX
#include "vlccommon.hxx"
#include <boost/shared_ptr.hpp>
......
......@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _VLCWINDOW_HXX
#define _VLCWINDOW_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
#include "vlccommon.hxx"
......@@ -71,4 +71,4 @@ public:
}
}
#endif // _VLCWINDOW_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef _WRAPPER_COMMON_HXX
#define _WRAPPER_COMMON_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
namespace avmedia
{
......
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef _WRAPPER_EVENT_HANDLER_HXX
#define _WRAPPER_EVENT_HANDLER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
#include <boost/function.hpp>
#include <boost/noncopyable.hpp>
#include <salhelper/thread.hxx>
......@@ -37,6 +37,6 @@ namespace wrapper
}
}
#endif // _WRAPPER_EVENT_HANDLER_HXX
#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef _WRAPPER_EVENT_MANAGER_HXX
#define _WRAPPER_EVENT_MANAGER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
#include <boost/function.hpp>
#include <boost/noncopyable.hpp>
......
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/