Remove empty newlines in #include blocks.

This makes clang-format useful on those.

Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.
This commit is contained in:
Emmanuel Gil Peyrot 2016-09-21 00:21:23 +09:00
parent 396a8d91a4
commit ebdae19fd2
289 changed files with 233 additions and 750 deletions

View File

@ -50,6 +50,8 @@ IncludeCategories:
Priority: 1
- Regex: '^\<(boost|catch|dynarmic|glad|inih|nihstro)/'
Priority: 3
- Regex: '^\<(SDL|SoundTouch|Q)'
Priority: 3
- Regex: '^\<'
Priority: 2
IndentCaseLabels: false

View File

@ -2,16 +2,14 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "audio_core/audio_core.h"
#include <memory>
#include <string>
#include "audio_core/audio_core.h"
#include "audio_core/hle/dsp.h"
#include "audio_core/hle/pipe.h"
#include "audio_core/null_sink.h"
#include "audio_core/sink.h"
#include "audio_core/sink_details.h"
#include "core/core_timing.h"
#include "core/hle/kernel/vm_manager.h"
#include "core/hle/service/dsp_dsp.h"

View File

@ -2,13 +2,11 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "audio_core/codec.h"
#include <array>
#include <cstddef>
#include <cstring>
#include <vector>
#include "audio_core/codec.h"
#include "common/assert.h"
#include "common/common_types.h"
#include "common/math_util.h"

View File

@ -6,7 +6,6 @@
#include <array>
#include <vector>
#include "common/common_types.h"
namespace Codec {

View File

@ -6,7 +6,6 @@
#include <algorithm>
#include <array>
#include "common/common_types.h"
namespace DSP {

View File

@ -2,10 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "audio_core/hle/dsp.h"
#include <array>
#include <memory>
#include "audio_core/hle/dsp.h"
#include "audio_core/hle/mixers.h"
#include "audio_core/hle/pipe.h"
#include "audio_core/hle/source.h"

View File

@ -8,9 +8,7 @@
#include <cstddef>
#include <memory>
#include <type_traits>
#include "audio_core/hle/common.h"
#include "common/bit_field.h"
#include "common/common_funcs.h"
#include "common/common_types.h"

View File

@ -2,13 +2,11 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "audio_core/hle/filter.h"
#include <array>
#include <cstddef>
#include "audio_core/hle/common.h"
#include "audio_core/hle/dsp.h"
#include "audio_core/hle/filter.h"
#include "common/common_types.h"
#include "common/math_util.h"

View File

@ -5,10 +5,8 @@
#pragma once
#include <array>
#include "audio_core/hle/common.h"
#include "audio_core/hle/dsp.h"
#include "common/common_types.h"
namespace DSP {

View File

@ -7,7 +7,6 @@
#include "audio_core/hle/common.h"
#include "audio_core/hle/dsp.h"
#include "audio_core/hle/mixers.h"
#include "common/assert.h"
#include "common/logging/log.h"
#include "common/math_util.h"

View File

@ -5,7 +5,6 @@
#pragma once
#include <array>
#include "audio_core/hle/common.h"
#include "audio_core/hle/dsp.h"

View File

@ -2,16 +2,13 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "audio_core/hle/pipe.h"
#include <array>
#include <vector>
#include "audio_core/hle/dsp.h"
#include "audio_core/hle/pipe.h"
#include "common/assert.h"
#include "common/common_types.h"
#include "common/logging/log.h"
#include "core/hle/service/dsp_dsp.h"
namespace DSP {

View File

@ -6,7 +6,6 @@
#include <cstddef>
#include <vector>
#include "common/common_types.h"
namespace DSP {

View File

@ -2,17 +2,14 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "audio_core/hle/source.h"
#include <algorithm>
#include <array>
#include "audio_core/codec.h"
#include "audio_core/hle/common.h"
#include "audio_core/hle/source.h"
#include "audio_core/interpolate.h"
#include "common/assert.h"
#include "common/logging/log.h"
#include "core/memory.h"
namespace DSP {

View File

@ -7,13 +7,11 @@
#include <array>
#include <queue>
#include <vector>
#include "audio_core/codec.h"
#include "audio_core/hle/common.h"
#include "audio_core/hle/dsp.h"
#include "audio_core/hle/filter.h"
#include "audio_core/interpolate.h"
#include "common/common_types.h"
namespace DSP {

View File

@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include "audio_core/interpolate.h"
#include "common/assert.h"
#include "common/math_util.h"

View File

@ -6,7 +6,6 @@
#include <array>
#include <vector>
#include "common/common_types.h"
namespace AudioInterp {

View File

@ -5,7 +5,6 @@
#pragma once
#include <cstddef>
#include "audio_core/audio_core.h"
#include "audio_core/sink.h"

View File

@ -2,15 +2,12 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <list>
#include <vector>
#include <SDL.h>
#include "audio_core/audio_core.h"
#include "audio_core/sdl2_sink.h"
#include <list>
#include <numeric>
#include <vector>
#include <SDL.h>
#include "audio_core/audio_core.h"
#include "common/assert.h"
#include "common/logging/log.h"

View File

@ -6,7 +6,6 @@
#include <cstddef>
#include <memory>
#include "audio_core/sink.h"
namespace AudioCore {

View File

@ -5,7 +5,6 @@
#pragma once
#include <vector>
#include "common/common_types.h"
namespace AudioCore {

View File

@ -2,12 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "audio_core/sink_details.h"
#include <memory>
#include <vector>
#include "audio_core/null_sink.h"
#include "audio_core/sink_details.h"
#ifdef HAVE_SDL2
#include "audio_core/sdl2_sink.h"
#endif

View File

@ -2,15 +2,12 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "audio_core/time_stretch.h"
#include <chrono>
#include <cmath>
#include <vector>
#include <SoundTouch.h>
#include "audio_core/audio_core.h"
#include "audio_core/time_stretch.h"
#include "common/common_types.h"
#include "common/logging/log.h"
#include "common/math_util.h"

View File

@ -5,7 +5,6 @@
#include <cstddef>
#include <memory>
#include <vector>
#include "common/common_types.h"
namespace AudioCore {

View File

@ -21,22 +21,19 @@
#include <Windows.h>
#endif
#include "citra/config.h"
#include "citra/emu_window/emu_window_sdl2.h"
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "common/scope_exit.h"
#include "common/string_util.h"
#include "core/core.h"
#include "core/gdbstub/gdbstub.h"
#include "core/loader/loader.h"
#include "core/settings.h"
#include "core/system.h"
#include "citra/config.h"
#include "citra/emu_window/emu_window_sdl2.h"
#include "video_core/video_core.h"
static void PrintHelp(const char* argv0) {

View File

@ -2,21 +2,15 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "config.h"
#include <memory>
#include <inih/cpp/INIReader.h>
#include <SDL.h>
#include <inih/cpp/INIReader.h>
#include "citra/default_ini.h"
#include "common/file_util.h"
#include "common/logging/log.h"
#include "core/settings.h"
#include "config.h"
Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.
sdl2_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "sdl2-config.ini";

View File

@ -6,7 +6,6 @@
#include <memory>
#include <string>
#include <inih/cpp/INIReader.h>
class Config {

View File

@ -5,22 +5,16 @@
#include <algorithm>
#include <cstdlib>
#include <string>
#define SDL_MAIN_HANDLED
#include <SDL.h>
#include <glad/glad.h>
#include "citra/emu_window/emu_window_sdl2.h"
#include "common/key_map.h"
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "common/string_util.h"
#include "core/hle/service/hid/hid.h"
#include "core/settings.h"
#include "citra/emu_window/emu_window_sdl2.h"
#include "video_core/video_core.h"
void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) {

View File

@ -5,7 +5,6 @@
#pragma once
#include <utility>
#include "common/emu_window.h"
struct SDL_Window;

View File

@ -9,16 +9,13 @@
#endif
#include "citra_qt/bootmanager.h"
#include "common/key_map.h"
#include "common/microprofile.h"
#include "common/scm_rev.h"
#include "common/string_util.h"
#include "core/core.h"
#include "core/settings.h"
#include "core/system.h"
#include "video_core/debug_utils/debug_utils.h"
#include "video_core/video_core.h"

View File

@ -5,10 +5,8 @@
#include <atomic>
#include <condition_variable>
#include <mutex>
#include <QGLWidget>
#include <QThread>
#include "common/emu_window.h"
#include "common/thread.h"

View File

@ -2,11 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <QSettings>
#include "citra_qt/config.h"
#include <QSettings>
#include "citra_qt/ui_settings.h"
#include "common/file_util.h"
Config::Config() {

View File

@ -4,9 +4,8 @@
#pragma once
#include <QVariant>
#include <string>
#include <QVariant>
#include "core/settings.h"
class QSettings;

View File

@ -2,12 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "audio_core/sink_details.h"
#include "citra_qt/configure_audio.h"
#include "ui_configure_audio.h"
#include "audio_core/sink_details.h"
#include "core/settings.h"
#include "ui_configure_audio.h"
ConfigureAudio::ConfigureAudio(QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::ConfigureAudio>()) {

View File

@ -4,8 +4,8 @@
#pragma once
#include <QWidget>
#include <memory>
#include <QWidget>
namespace Ui {
class ConfigureAudio;

View File

@ -3,9 +3,8 @@
// Refer to the license.txt file included.
#include "citra_qt/configure_debug.h"
#include "ui_configure_debug.h"
#include "core/settings.h"
#include "ui_configure_debug.h"
ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureDebug) {
ui->setupUi(this);

View File

@ -4,8 +4,8 @@
#pragma once
#include <QWidget>
#include <memory>
#include <QWidget>
namespace Ui {
class ConfigureDebug;

View File

@ -4,9 +4,8 @@
#include "citra_qt/configure_dialog.h"
#include "citra_qt/config.h"
#include "ui_configure.h"
#include "core/settings.h"
#include "ui_configure.h"
ConfigureDialog::ConfigureDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ConfigureDialog) {
ui->setupUi(this);

View File

@ -4,8 +4,8 @@
#pragma once
#include <QDialog>
#include <memory>
#include <QDialog>
namespace Ui {
class ConfigureDialog;

View File

@ -4,10 +4,9 @@
#include "citra_qt/configure_general.h"
#include "citra_qt/ui_settings.h"
#include "ui_configure_general.h"
#include "core/settings.h"
#include "core/system.h"
#include "ui_configure_general.h"
ConfigureGeneral::ConfigureGeneral(QWidget* parent)
: QWidget(parent), ui(new Ui::ConfigureGeneral) {

View File

@ -4,8 +4,8 @@
#pragma once
#include <QWidget>
#include <memory>
#include <QWidget>
namespace Ui {
class ConfigureGeneral;

View File

@ -3,10 +3,9 @@
// Refer to the license.txt file included.
#include "citra_qt/configure_graphics.h"
#include "ui_configure_graphics.h"
#include "core/settings.h"
#include "core/system.h"
#include "ui_configure_graphics.h"
ConfigureGraphics::ConfigureGraphics(QWidget* parent)
: QWidget(parent), ui(new Ui::ConfigureGraphics) {

View File

@ -4,8 +4,8 @@
#pragma once
#include <QWidget>
#include <memory>
#include <QWidget>
namespace Ui {
class ConfigureGraphics;

View File

@ -2,11 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <QTimer>
#include "citra_qt/configure_input.h"
#include <memory>
#include <utility>
#include "citra_qt/configure_input.h"
#include <QTimer>
ConfigureInput::ConfigureInput(QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()) {

View File

@ -4,9 +4,9 @@
#pragma once
#include <memory>
#include <QKeyEvent>
#include <QWidget>
#include "citra_qt/config.h"
#include "core/settings.h"
#include "ui_configure_input.h"

View File

@ -4,11 +4,10 @@
#include "citra_qt/configure_system.h"
#include "citra_qt/ui_settings.h"
#include "ui_configure_system.h"
#include "core/hle/service/cfg/cfg.h"
#include "core/hle/service/fs/archive.h"
#include "core/system.h"
#include "ui_configure_system.h"
static const std::array<int, 12> days_in_month = {{
31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,

View File

@ -4,8 +4,8 @@
#pragma once
#include <QWidget>
#include <memory>
#include <QWidget>
namespace Ui {
class ConfigureSystem;

View File

@ -2,13 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <QStandardItemModel>
#include "citra_qt/debugger/callstack.h"
#include <QStandardItemModel>
#include "common/common_types.h"
#include "common/symbols.h"
#include "core/arm/arm_interface.h"
#include "core/arm/disassembler/arm_disasm.h"
#include "core/core.h"

View File

@ -2,16 +2,13 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <QShortcut>
#include "citra_qt/bootmanager.h"
#include "citra_qt/debugger/disassembler.h"
#include <QShortcut>
#include "citra_qt/bootmanager.h"
#include "citra_qt/hotkeys.h"
#include "citra_qt/util/util.h"
#include "common/break_points.h"
#include "common/symbols.h"
#include "core/arm/arm_interface.h"
#include "core/arm/disassembler/arm_disasm.h"
#include "core/core.h"

View File

@ -6,11 +6,9 @@
#include <QAbstractListModel>
#include <QDockWidget>
#include "ui_disassembler.h"
#include "common/break_points.h"
#include "common/common_types.h"
#include "ui_disassembler.h"
class QAction;
class EmuThread;

View File

@ -2,9 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <QListView>
#include "citra_qt/debugger/graphics.h"
#include <QListView>
#include "citra_qt/util/util.h"
extern GraphicsDebugger g_debugger;

View File

@ -6,7 +6,6 @@
#include <QAbstractListModel>
#include <QDockWidget>
#include "video_core/gpu_debugger.h"
class GPUCommandStreamItemModel : public QAbstractListModel,

View File

@ -2,9 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <QMetaType>
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
#include <QMetaType>
BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context,
const QString& title, QWidget* parent)

View File

@ -5,7 +5,6 @@
#pragma once
#include <QDockWidget>
#include "video_core/debug_utils/debug_utils.h"
/**

View File

@ -2,15 +2,13 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "citra_qt/debugger/graphics_breakpoints.h"
#include <QLabel>
#include <QMetaType>
#include <QPushButton>
#include <QTreeView>
#include <QVBoxLayout>
#include "citra_qt/debugger/graphics_breakpoints.h"
#include "citra_qt/debugger/graphics_breakpoints_p.h"
#include "common/assert.h"
BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent)

View File

@ -5,9 +5,7 @@
#pragma once
#include <memory>
#include <QDockWidget>
#include "video_core/debug_utils/debug_utils.h"
class QLabel;

View File

@ -5,9 +5,7 @@
#pragma once
#include <memory>
#include <QAbstractListModel>
#include "video_core/debug_utils/debug_utils.h"
class BreakPointModel : public QAbstractListModel {

View File

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "citra_qt/debugger/graphics_cmdlists.h"
#include <QApplication>
#include <QClipboard>
#include <QComboBox>
@ -13,13 +14,9 @@
#include <QSpinBox>
#include <QTreeView>
#include <QVBoxLayout>
#include "citra_qt/debugger/graphics_cmdlists.h"
#include "citra_qt/util/spinbox.h"
#include "citra_qt/util/util.h"
#include "common/vector_math.h"
#include "video_core/debug_utils/debug_utils.h"
#include "video_core/pica.h"
#include "video_core/pica_state.h"

View File

@ -6,7 +6,6 @@
#include <QAbstractListModel>
#include <QDockWidget>
#include "video_core/debug_utils/debug_utils.h"
#include "video_core/gpu_debugger.h"

View File

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "citra_qt/debugger/graphics_surface.h"
#include <QBoxLayout>
#include <QComboBox>
#include <QDebug>
@ -11,15 +12,10 @@
#include <QPushButton>
#include <QScrollArea>
#include <QSpinBox>
#include "citra_qt/debugger/graphics_surface.h"
#include "citra_qt/util/spinbox.h"
#include "common/color.h"
#include "core/hw/gpu.h"
#include "core/memory.h"
#include "video_core/pica.h"
#include "video_core/pica_state.h"
#include "video_core/utils.h"

View File

@ -4,10 +4,9 @@
#pragma once
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
#include <QLabel>
#include <QPushButton>
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
class QComboBox;
class QSpinBox;

View File

@ -2,29 +2,22 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "citra_qt/debugger/graphics_tracing.h"
#include <algorithm>
#include <array>
#include <iterator>
#include <memory>
#include <boost/range/algorithm/copy.hpp>
#include <QBoxLayout>
#include <QComboBox>
#include <QFileDialog>
#include <QMessageBox>
#include <QPushButton>
#include "citra_qt/debugger/graphics_tracing.h"
#include <boost/range/algorithm/copy.hpp>
#include "common/common_types.h"
#include "core/hw/gpu.h"
#include "core/hw/lcd.h"
#include "core/tracer/recorder.h"
#include "nihstro/float24.h"
#include "video_core/pica.h"
#include "video_core/pica_state.h"

View File

@ -2,9 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "citra_qt/debugger/graphics_vertex_shader.h"
#include <iomanip>
#include <sstream>
#include <QBoxLayout>
#include <QFileDialog>
#include <QFormLayout>
@ -15,10 +15,7 @@
#include <QSignalMapper>
#include <QSpinBox>
#include <QTreeView>
#include "citra_qt/debugger/graphics_vertex_shader.h"
#include "citra_qt/util/util.h"
#include "video_core/pica.h"
#include "video_core/pica_state.h"
#include "video_core/shader/shader.h"

View File

@ -5,11 +5,9 @@
#pragma once
#include <QAbstractTableModel>
#include <QTreeView>
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
#include "nihstro/parser_shbin.h"
#include "video_core/shader/shader.h"
class QLabel;

View File

@ -2,13 +2,11 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "citra_qt/debugger/profiler.h"
#include <QMouseEvent>
#include <QPainter>
#include <QString>
#include "citra_qt/debugger/profiler.h"
#include "citra_qt/util/util.h"
#include "common/common_types.h"
#include "common/microprofile.h"
#include "common/profiler_reporting.h"

View File

@ -7,11 +7,9 @@
#include <QAbstractItemModel>
#include <QDockWidget>
#include <QTimer>
#include "ui_profiler.h"
#include "common/microprofile.h"
#include "common/profiler_reporting.h"
#include "ui_profiler.h"
class ProfilerModel : public QAbstractItemModel {
Q_OBJECT

View File

@ -2,11 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <QTreeWidgetItem>
#include "citra_qt/debugger/registers.h"
#include <QTreeWidgetItem>
#include "citra_qt/util/util.h"
#include "core/arm/arm_interface.h"
#include "core/core.h"

View File

@ -2,9 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "ui_registers.h"
#include <QDockWidget>
#include "ui_registers.h"
class QTreeWidget;
class QTreeWidgetItem;

View File

@ -2,19 +2,16 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "game_list.h"
#include <QHeaderView>
#include <QThreadPool>
#include <QVBoxLayout>
#include "game_list.h"
#include "game_list_p.h"
#include "ui_settings.h"
#include "core/loader/loader.h"
#include "common/common_paths.h"
#include "common/logging/log.h"
#include "common/string_util.h"
#include "core/loader/loader.h"
#include "game_list_p.h"
#include "ui_settings.h"
GameList::GameList(QWidget* parent) {
QVBoxLayout* layout = new QVBoxLayout;

View File

@ -5,18 +5,14 @@
#pragma once
#include <atomic>
#include <QImage>
#include <QRunnable>
#include <QStandardItem>
#include <QString>
#include "citra_qt/util/util.h"
#include "common/color.h"
#include "common/string_util.h"
#include "core/loader/smdh.h"
#include "video_core/utils.h"
/**

View File

@ -2,13 +2,11 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "citra_qt/hotkeys.h"
#include <map>
#include <QKeySequence>
#include <QShortcut>
#include <QtGlobal>
#include "citra_qt/hotkeys.h"
#include "citra_qt/ui_settings.h"
struct Hotkey {

View File

@ -5,25 +5,15 @@
#include <clocale>
#include <memory>
#include <thread>
#include <glad/glad.h>
#define QT_NO_OPENGL
#include <QDesktopWidget>
#include <QFileDialog>
#include <QMessageBox>
#include <QtGui>
#include "qhexedit.h"
#include "citra_qt/bootmanager.h"
#include "citra_qt/config.h"
#include "citra_qt/configure_dialog.h"
#include "citra_qt/game_list.h"
#include "citra_qt/hotkeys.h"
#include "citra_qt/main.h"
#include "citra_qt/ui_settings.h"
// Debugger
#include "citra_qt/debugger/callstack.h"
#include "citra_qt/debugger/disassembler.h"
#include "citra_qt/debugger/graphics.h"
@ -35,7 +25,10 @@
#include "citra_qt/debugger/profiler.h"
#include "citra_qt/debugger/ramview.h"
#include "citra_qt/debugger/registers.h"
#include "citra_qt/game_list.h"
#include "citra_qt/hotkeys.h"
#include "citra_qt/main.h"
#include "citra_qt/ui_settings.h"
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h"
@ -45,14 +38,13 @@
#include "common/scm_rev.h"
#include "common/scope_exit.h"
#include "common/string_util.h"
#include "core/arm/disassembler/load_symbol_map.h"
#include "core/core.h"
#include "core/gdbstub/gdbstub.h"
#include "core/loader/loader.h"
#include "core/settings.h"
#include "core/system.h"
#include "qhexedit.h"
#include "video_core/video_core.h"
GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {

View File

@ -5,9 +5,8 @@
#ifndef _CITRA_QT_MAIN_HXX_
#define _CITRA_QT_MAIN_HXX_
#include <QMainWindow>
#include <memory>
#include <QMainWindow>
#include "ui_main.h"
class Config;

View File

@ -4,12 +4,11 @@
#pragma once
#include <vector>
#include <QByteArray>
#include <QString>
#include <QStringList>
#include <vector>
namespace UISettings {
using ContextualShortcut = std::pair<QString, int>;

View File

@ -28,11 +28,10 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "citra_qt/util/spinbox.h"
#include <cstdlib>
#include <QLineEdit>
#include <QRegExpValidator>
#include <cstdlib>
#include "citra_qt/util/spinbox.h"
#include "common/assert.h"
CSpinBox::CSpinBox(QWidget* parent)

View File

@ -2,11 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "citra_qt/util/util.h"
#include <array>
#include <cmath>
#include "citra_qt/util/util.h"
QFont GetMonospaceFont() {
QFont font("monospace");
// Automatic fallback to a monospace font on on platforms without a font called "monospace"

View File

@ -5,7 +5,6 @@
#pragma once
#include <cstdlib>
#include "common/common_funcs.h"
#include "common/logging/log.h"
@ -54,4 +53,4 @@ __declspec(noinline, noreturn)
#endif
#define UNIMPLEMENTED() DEBUG_ASSERT_MSG(false, "Unimplemented code!")
#define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__)
#define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__)

View File

@ -33,7 +33,6 @@
#include <cstddef>
#include <limits>
#include <type_traits>
#include "common/common_funcs.h"
/*

View File

@ -3,10 +3,9 @@
// Refer to the license.txt file included.
#include "common/break_points.h"
#include "common/logging/log.h"
#include <algorithm>
#include <sstream>
#include "common/logging/log.h"
bool BreakPoints::IsAddressBreakPoint(u32 iAddress) const {
auto cond = [&iAddress](const TBreakPoint& bp) { return bp.iAddress == iAddress; };

View File

@ -6,7 +6,6 @@
#include <string>
#include <vector>
#include "common/common_types.h"
class DebugInterface;

View File

@ -35,7 +35,6 @@
#include <type_traits>
#include <utility>
#include <vector>
#include "common/assert.h"
#include "common/common_types.h"
#include "common/logging/log.h"

View File

@ -5,7 +5,6 @@
#pragma once
#include <cstddef>
#include "common/common_types.h"
#include "common/memory_util.h"

View File

@ -7,7 +7,6 @@
#if !defined(ARCHITECTURE_x86_64) && !defined(_M_ARM)
#include <cstdlib> // for exit
#endif
#include "common_types.h"
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))

View File

@ -2,13 +2,11 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "emu_window.h"
#include <algorithm>
#include <cmath>
#include "common/assert.h"
#include "common/key_map.h"
#include "emu_window.h"
#include "video_core/video_core.h"
void EmuWindow::ButtonPressed(Service::HID::PadState pad) {

View File

@ -6,10 +6,8 @@
#include <tuple>
#include <utility>
#include "common/common_types.h"
#include "common/math_util.h"
#include "core/hle/service/hid/hid.h"
/**

View File

@ -16,7 +16,6 @@
#include <shellapi.h>
#include <shlobj.h> // for SHGetFolderPath
#include <tchar.h>
#include "common/string_util.h"
// 64 bit offsets for windows

View File

@ -11,9 +11,7 @@
#include <string>
#include <type_traits>
#include <vector>
#include "common/common_types.h"
#ifdef _MSC_VER
#include "common/string_util.h"
#endif

View File

@ -5,7 +5,6 @@
#if defined(_MSC_VER)
#include <stdlib.h>
#endif
#include "common_funcs.h"
#include "common_types.h"
#include "hash.h"

View File

@ -2,10 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <map>
#include "common/emu_window.h"
#include "common/key_map.h"
#include <map>
#include "common/emu_window.h"
namespace KeyMap {

View File

@ -2,13 +2,12 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/logging/backend.h"
#include <algorithm>
#include <array>
#include <cstdio>
#include "common/assert.h"
#include "common/common_funcs.h" // snprintf compatibility define
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h"
#include "common/logging/text_formatter.h"

View File

@ -8,7 +8,6 @@
#include <cstdarg>
#include <string>
#include <utility>
#include "common/logging/log.h"
namespace Log {

View File

@ -2,10 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <algorithm>
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include <algorithm>
#include "common/logging/backend.h"
#include "common/string_util.h"
namespace Log {

View File

@ -7,7 +7,6 @@
#include <array>
#include <cstddef>
#include <string>
#include "common/logging/log.h"
namespace Log {

View File

@ -10,12 +10,11 @@
#include <Windows.h>
#endif
#include "common/assert.h"
#include "common/common_funcs.h"
#include "common/logging/backend.h"
#include "common/logging/log.h"
#include "common/logging/text_formatter.h"
#include "common/assert.h"
#include "common/common_funcs.h"
#include "common/string_util.h"
namespace Log {

View File

@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include <cstddef>
#ifdef _WIN32
#include <windows.h>
#else

View File

@ -5,7 +5,6 @@
#include <algorithm>
#include <cstddef>
#include <vector>
#include "common/assert.h"
#include "common/profiler_reporting.h"
#include "common/synchronized_wrapper.h"

View File

@ -7,7 +7,6 @@
#include <chrono>
#include <cstddef>
#include <vector>
#include "common/synchronized_wrapper.h"
namespace Common {

View File

@ -2,17 +2,15 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/string_util.h"
#include <cctype>
#include <cerrno>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <boost/range/algorithm/transform.hpp>
#include "common/common_paths.h"
#include "common/logging/log.h"
#include "common/string_util.h"
#ifdef _MSC_VER
#include <Windows.h>
#include <codecvt>

View File

@ -10,7 +10,6 @@
#include <sstream>
#include <string>
#include <vector>
#include "common/common_types.h"
namespace Common {

View File

@ -24,9 +24,7 @@
#elif defined(__FreeBSD__)
#include <sys/endian.h>
#endif
#include <cstring>
#include "common/common_types.h"
// GCC 4.6+

Some files were not shown because too many files have changed in this diff Show More