Fix some Atlas header includes

iwyu 0.26 now want's full declaration of TYPE in case of
std::vector<TYPE>, which is good as it allows the header to be
self standing.

There are some other changes suggested in part of the headers not being
updated when they should have been and some due to changes in iwyu
itself.

Ref: #8086
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2026-06-11 17:54:24 +02:00
parent 7f4377c086
commit fa9584fdc0
No known key found for this signature in database
31 changed files with 19 additions and 43 deletions

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -18,7 +18,9 @@
#include "AtlasObject.h" #include "AtlasObject.h"
#include "AtlasObjectImpl.h" #include "AtlasObjectImpl.h"
#include <assert.h> #include <cassert>
#include <cstddef>
#include <iterator>
#include <sstream> #include <sstream>
#define ATSMARTPTR_IMPL(T) \ #define ATSMARTPTR_IMPL(T) \

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -18,6 +18,7 @@
#include "AtlasObject.h" #include "AtlasObject.h"
#include <string> #include <string>
#include <utility>
#ifdef _MSC_VER #ifdef _MSC_VER
// Avoid complaints about unreachable code; the optimiser is realising // Avoid complaints about unreachable code; the optimiser is realising

View file

@ -18,6 +18,7 @@
#ifndef INCLUDED_EDITABLELISTCTRL #ifndef INCLUDED_EDITABLELISTCTRL
#define INCLUDED_EDITABLELISTCTRL #define INCLUDED_EDITABLELISTCTRL
#include "tools/atlas/AtlasObject/AtlasObject.h"
#include "tools/atlas/AtlasUI/General/IAtlasSerialiser.h" #include "tools/atlas/AtlasUI/General/IAtlasSerialiser.h"
#include <vector> #include <vector>
@ -27,8 +28,6 @@
#include <wx/toolbar.h> #include <wx/toolbar.h>
#include <wx/validate.h> #include <wx/validate.h>
class AtIter;
class AtObj;
class FieldEditCtrl; class FieldEditCtrl;
class wxPoint; class wxPoint;
class wxRect; class wxRect;

View file

@ -23,7 +23,6 @@
#include <wx/string.h> #include <wx/string.h>
class EditableListCtrl; class EditableListCtrl;
class wxClassInfo;
class EditCommand_Dialog : public AtlasWindowCommand class EditCommand_Dialog : public AtlasWindowCommand
{ {

View file

@ -20,7 +20,6 @@
#include <wx/validate.h> #include <wx/validate.h>
class wxButton; class wxButton;
class wxClassInfo;
class wxRect; class wxRect;
class wxString; class wxString;
class wxTextCtrl; class wxTextCtrl;

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -24,7 +24,6 @@
#include "tools/atlas/GameInterface/Messages.h" #include "tools/atlas/GameInterface/Messages.h"
#include "tools/atlas/GameInterface/Shareable.h" #include "tools/atlas/GameInterface/Shareable.h"
#include <string>
#include <wx/button.h> #include <wx/button.h>
#include <wx/clntdata.h> #include <wx/clntdata.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>

View file

@ -25,7 +25,6 @@
#include <wx/event.h> #include <wx/event.h>
#include <wx/object.h> #include <wx/object.h>
class wxClassInfo;
class wxPanel; class wxPanel;
class wxSize; class wxSize;
class wxString; class wxString;

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -25,12 +25,11 @@
#include "tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h" #include "tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h"
#include "tools/atlas/AtlasUI/General/Datafile.h" #include "tools/atlas/AtlasUI/General/Datafile.h"
#include <boost/signals2/optional_last_value.hpp>
#include <cassert> #include <cassert>
#include <list>
#include <string> #include <string>
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/bmpbndl.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/chartype.h> #include <wx/chartype.h>
#include <wx/config.h> #include <wx/config.h>

View file

@ -22,7 +22,6 @@
#include "tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h" #include "tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h"
#include "tools/atlas/AtlasUI/General/IAtlasSerialiser.h" #include "tools/atlas/AtlasUI/General/IAtlasSerialiser.h"
#include <boost/function.hpp>
#include <boost/signals2/signal.hpp> #include <boost/signals2/signal.hpp>
#include <wx/event.h> #include <wx/event.h>
#include <wx/filename.h> #include <wx/filename.h>
@ -30,7 +29,6 @@
#include <wx/object.h> #include <wx/object.h>
#include <wx/string.h> #include <wx/string.h>
class wxClassInfo;
class wxMenu; class wxMenu;
class wxMenuBar; class wxMenuBar;
class wxMenuItem; class wxMenuItem;

View file

@ -26,7 +26,6 @@
#include <wx/string.h> #include <wx/string.h>
class IAtlasSerialiser; class IAtlasSerialiser;
class wxClassInfo;
class AtlasWindowCommand : public wxCommand class AtlasWindowCommand : public wxCommand
{ {

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -40,7 +40,6 @@
#include "tools/atlas/GameInterface/SharedTypes.h" #include "tools/atlas/GameInterface/SharedTypes.h"
#include <cstddef> #include <cstddef>
#include <list>
#include <string> #include <string>
#include <utility> #include <utility>
#include <wx/busyinfo.h> #include <wx/busyinfo.h>

View file

@ -29,9 +29,7 @@
#include "tools/atlas/GameInterface/Shareable.h" #include "tools/atlas/GameInterface/Shareable.h"
#include "tools/atlas/GameInterface/SharedTypes.h" #include "tools/atlas/GameInterface/SharedTypes.h"
#include <cmath>
#include <cstddef> #include <cstddef>
#include <list>
#include <numbers> #include <numbers>
#include <string> #include <string>
#include <vector> #include <vector>

View file

@ -25,7 +25,6 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <list>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/control.h> #include <wx/control.h>
#include <wx/dcclient.h> #include <wx/dcclient.h>

View file

@ -33,7 +33,6 @@
#include <algorithm> #include <algorithm>
#include <cstdint> #include <cstdint>
#include <ctime> #include <ctime>
#include <list>
#include <map> #include <map>
#include <random> #include <random>
#include <set> #include <set>

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -35,7 +35,6 @@
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
#include <list>
#include <string> #include <string>
#include <vector> #include <vector>
#include <wx/arrstr.h> #include <wx/arrstr.h>

View file

@ -23,7 +23,6 @@
#include "tools/atlas/AtlasUI/General/Observable.h" #include "tools/atlas/AtlasUI/General/Observable.h"
#include <cstddef> #include <cstddef>
#include <list>
#include <set> #include <set>
#include <wx/arrstr.h> #include <wx/arrstr.h>
#include <wx/combobox.h> #include <wx/combobox.h>

View file

@ -31,7 +31,7 @@
#include "tools/atlas/GameInterface/SharedTypes.h" #include "tools/atlas/GameInterface/SharedTypes.h"
#include <climits> #include <climits>
#include <list> #include <cstddef>
#include <string> #include <string>
#include <vector> #include <vector>
#include <wx/arrstr.h> #include <wx/arrstr.h>

View file

@ -18,7 +18,6 @@
#include "tools/atlas/AtlasUI/ScenarioEditor/Sections/Common/Sidebar.h" #include "tools/atlas/AtlasUI/ScenarioEditor/Sections/Common/Sidebar.h"
#include "tools/atlas/GameInterface/SharedMemory.h" #include "tools/atlas/GameInterface/SharedMemory.h"
#include <cstdlib>
#include <wx/dynarray.h> #include <wx/dynarray.h>
#include <wx/event.h> #include <wx/event.h>
#include <wx/string.h> #include <wx/string.h>

View file

@ -34,13 +34,13 @@
#include <chrono> #include <chrono>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <list>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <wx/arrstr.h> #include <wx/arrstr.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/bmpbndl.h>
#include <wx/bmpbuttn.h> #include <wx/bmpbuttn.h>
#include <wx/bookctrl.h> #include <wx/bookctrl.h>
#include <wx/busyinfo.h> #include <wx/busyinfo.h>

View file

@ -28,7 +28,6 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <list>
#include <numbers> #include <numbers>
#include <vector> #include <vector>
#include <wx/event.h> #include <wx/event.h>

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -27,7 +27,6 @@
#include "tools/atlas/GameInterface/SharedTypes.h" #include "tools/atlas/GameInterface/SharedTypes.h"
#include <cstddef> #include <cstddef>
#include <list>
#include <string> #include <string>
ObjectSettings::ObjectSettings(Observable<std::vector<AtlasMessage::ObjectID> >& selectedObjects, int view) ObjectSettings::ObjectSettings(Observable<std::vector<AtlasMessage::ObjectID> >& selectedObjects, int view)

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -25,7 +25,6 @@
#include "tools/atlas/GameInterface/MessagePasser.h" #include "tools/atlas/GameInterface/MessagePasser.h"
#include "tools/atlas/GameInterface/Messages.h" #include "tools/atlas/GameInterface/Messages.h"
#include <list>
#include <vector> #include <vector>
#include <wx/object.h> #include <wx/object.h>
#include <wx/string.h> #include <wx/string.h>

View file

@ -28,7 +28,6 @@
#include "tools/atlas/GameInterface/Shareable.h" #include "tools/atlas/GameInterface/Shareable.h"
#include "tools/atlas/GameInterface/SharedTypes.h" #include "tools/atlas/GameInterface/SharedTypes.h"
#include <list>
#include <string> #include <string>
#include <wx/event.h> #include <wx/event.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>

View file

@ -25,9 +25,7 @@
#include "tools/atlas/GameInterface/Messages.h" #include "tools/atlas/GameInterface/Messages.h"
#include "tools/atlas/GameInterface/SharedTypes.h" #include "tools/atlas/GameInterface/SharedTypes.h"
#include <cmath>
#include <ctime> #include <ctime>
#include <list>
#include <numbers> #include <numbers>
#include <random> #include <random>
#include <string> #include <string>

View file

@ -31,7 +31,6 @@
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
#include <limits> #include <limits>
#include <list>
#include <string> #include <string>
#include <vector> #include <vector>
#include <wx/chartype.h> #include <wx/chartype.h>

View file

@ -57,7 +57,6 @@
#include "renderer/SceneRenderer.h" #include "renderer/SceneRenderer.h"
#include "renderer/SkyManager.h" #include "renderer/SkyManager.h"
#include "renderer/WaterManager.h" #include "renderer/WaterManager.h"
#include "renderer/backend/IDevice.h"
#include "renderer/backend/IDeviceCommandContext.h" #include "renderer/backend/IDeviceCommandContext.h"
#include "renderer/backend/IFramebuffer.h" #include "renderer/backend/IFramebuffer.h"
#include "renderer/backend/ISwapChain.h" #include "renderer/backend/ISwapChain.h"

View file

@ -41,7 +41,6 @@
#include "tools/atlas/GameInterface/Shareable.h" #include "tools/atlas/GameInterface/Shareable.h"
#include "tools/atlas/GameInterface/SharedTypes.h" #include "tools/atlas/GameInterface/SharedTypes.h"
#include <cmath>
#include <numbers> #include <numbers>
#include <string> #include <string>
#include <vector> #include <vector>

View file

@ -21,7 +21,6 @@
#include "gui/GUIManager.h" #include "gui/GUIManager.h"
#include "lib/debug.h" #include "lib/debug.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/input.h" #include "lib/input.h"
#include "lib/sysdep/os.h" #include "lib/sysdep/os.h"
#include "lib/timer.h" #include "lib/timer.h"
@ -34,7 +33,7 @@
#include "ps/VideoMode.h" #include "ps/VideoMode.h"
#include "renderer/Renderer.h" #include "renderer/Renderer.h"
#include "renderer/SceneRenderer.h" #include "renderer/SceneRenderer.h"
#include "renderer/backend/IDevice.h" #include "scriptinterface/ScriptForward.h"
#include "scriptinterface/ScriptInterface.h" #include "scriptinterface/ScriptInterface.h"
#include "tools/atlas/GameInterface/ActorViewer.h" #include "tools/atlas/GameInterface/ActorViewer.h"
#include "tools/atlas/GameInterface/CommandProc.h" #include "tools/atlas/GameInterface/CommandProc.h"
@ -47,6 +46,7 @@
#include <SDL.h> #include <SDL.h>
#include <SDL_error.h> #include <SDL_error.h>
#include <SDL_events.h>
#include <SDL_video.h> #include <SDL_video.h>
#include <memory> #include <memory>
#include <optional> #include <optional>

View file

@ -74,6 +74,7 @@
#include <cstdint> #include <cstdint>
#include <exception> #include <exception>
#include <iterator> #include <iterator>
#include <js/Array.h>
#include <js/RootingAPI.h> #include <js/RootingAPI.h>
#include <js/TypeDecls.h> #include <js/TypeDecls.h>
#include <js/Value.h> #include <js/Value.h>

View file

@ -20,7 +20,6 @@
#include "MessageHandler.h" #include "MessageHandler.h"
#include "gui/CGUI.h" #include "gui/CGUI.h"
#include "gui/GUIManager.h" #include "gui/GUIManager.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/input.h" #include "lib/input.h"
#include "lib/path.h" #include "lib/path.h"
#include "lib/types.h" #include "lib/types.h"

View file

@ -36,7 +36,6 @@
#include "renderer/DebugRenderer.h" #include "renderer/DebugRenderer.h"
#include "renderer/Renderer.h" #include "renderer/Renderer.h"
#include "renderer/SceneRenderer.h" #include "renderer/SceneRenderer.h"
#include "renderer/backend/IDevice.h"
#include "renderer/backend/ISwapChain.h" #include "renderer/backend/ISwapChain.h"
#include "simulation2/Simulation2.h" #include "simulation2/Simulation2.h"
#include "simulation2/components/ICmpParticleManager.h" #include "simulation2/components/ICmpParticleManager.h"