fly/flightgear
1
0
Fork 0
Code Activity

Add our own version of pu.h and use it to prevent bug #2362 on all systems. This can be done since pu.h is to be considered in code freeze forever anyhow.

Browse source
This commit is contained in:
Erik Hofman 2020-09-01 10:12:42 +02:00
parent ad2bf3cd09
commit 0451816a82
16 changed files with 1630 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/GUI/CanvasWidget.hxx
View file

@ -20,7 +20,7 @@
#define CANVASWIDGET_HXX_
#include <Main/fg_props.hxx>
#include <plib/pu.h>
#include "pu.h"
#include <simgear/canvas/canvas_fwd.hxx>

3
src/GUI/FGFontCache.cxx
View file

@ -19,8 +19,7 @@
// this is our one in 3rdparty
#include "fnt.h"
#include <plib/pu.h>
#include "pu.h"
#include <simgear/props/props.hxx>
#include <simgear/misc/sg_dir.hxx>

2
src/GUI/FGPUIMenuBar.cxx
View file

@ -4,7 +4,6 @@
#include <string.h>
#include <iostream>
#include <plib/pu.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/structure/SGBinding.hxx>
#include <simgear/props/props_io.hxx>
@ -15,6 +14,7 @@
#include "new_gui.hxx"
#include "FGPUIMenuBar.hxx"
#include "pu.h"
using std::vector;
using std::string;

2
src/GUI/MapWidget.hxx
View file

@ -7,8 +7,8 @@
#include <simgear/props/props.hxx>
#include <Navaids/positioned.hxx>
#include <plib/pu.h>
#include "pu.h"
#include "FGPUIDialog.hxx"
// forward decls

2
src/GUI/QQuickDrawable.cxx
View file

@ -64,7 +64,7 @@
#include <simgear/structure/commands.hxx>
#if defined(HAVE_PUI)
#include <plib/pu.h>
#include "pu.h"
#endif
using namespace osgGA;

3
src/GUI/WaypointList.hxx
View file

@ -9,8 +9,7 @@
#include <simgear/timing/timestamp.hxx>
#include <simgear/misc/strutils.hxx>
#include <plib/pu.h>
#include "pu.h"
#include "FGPUIDialog.hxx" // for GUI_ID
// forward decls

3
src/GUI/fonts.cxx
View file

@ -2,8 +2,7 @@
#include <config.h>
#endif
#include <plib/pu.h>
#include "pu.h"
#include "fnt.h"

2
src/GUI/gui.cxx
View file

@ -39,8 +39,6 @@
#include <simgear/props/props.hxx>
#include <simgear/props/props_io.hxx>
#include <plib/pu.h>
#include <Main/main.hxx>
#include <Main/globals.hxx>
#include <Main/locale.hxx>

4
src/GUI/gui.h
View file

@ -29,10 +29,10 @@
# include <config.h>
#endif
#include <plib/pu.h>
#include <simgear/structure/exception.hxx>
#include "pu.h"
#define TR_HIRES_SNAP 1
namespace osg

2
src/GUI/layout-props.cxx
View file

@ -2,9 +2,9 @@
# include <config.h>
#endif
#include <plib/pu.h>
#include <simgear/props/props.hxx>
#include "pu.h"
#include "layout.hxx"
// This file contains the code implementing the LayoutWidget class in

2
src/GUI/new_gui.cxx
View file

@ -11,7 +11,7 @@
#include <cstring>
#include <sys/types.h>
#include <plib/pu.h>
#include "pu.h"
#include <simgear/compiler.h>
#include <simgear/structure/exception.hxx>

1615
src/GUI/pu.h Normal file
View file

File diff suppressed because it is too large Load diff

2
src/Main/fg_os_common.cxx
View file

@ -21,7 +21,7 @@
#include <config.h>
#endif
#include <plib/pu.h>
#include <GUI/pu.h>
#include <osg/GraphicsContext>
#include <Viewer/renderer.hxx>

3
src/Model/panelnode.cxx
View file

@ -20,8 +20,7 @@
#include <simgear/scene/util/SGSceneUserData.hxx>
#include <simgear/scene/util/SGNodeMasks.hxx>
#include <plib/pu.h>
#include <GUI/pu.h>
#include <Main/fg_os.hxx>
#include <Cockpit/panel.hxx>
#include <Cockpit/panel_io.hxx>

2
src/Viewer/FGEventHandler.cxx
View file

@ -7,7 +7,7 @@
#include <osg/Viewport>
#include <osgViewer/Viewer>
#include <plib/pu.h>
#include <GUI/pu.h>
#include <Main/fg_props.hxx>
#include "CameraGroup.hxx"
#include "FGEventHandler.hxx"

3
src/Viewer/PUICamera.cxx
View file

@ -34,10 +34,9 @@
#include <osgUtil/CullVisitor>
#include <osgViewer/Viewer>
#include <plib/pu.h>
#include <simgear/scene/util/SGNodeMasks.hxx>
#include <GUI/pu.h>
#include <Main/fg_props.hxx>
#include <Main/globals.hxx>
#include <Main/locale.hxx>