diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-21 08:52:38 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-21 09:15:56 +0200 |
commit | 84fbbe26297652d994d203bde543ec252c2d801a (patch) | |
tree | 5f6fcc088dab9d53ee30e64b47fce2e04c8fb13c /src/citra | |
parent | Remove empty newlines in #include blocks. (diff) | |
download | yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.gz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.bz2 yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.lz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.xz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.zst yuzu-84fbbe26297652d994d203bde543ec252c2d801a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/citra/config.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/config.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/configure_audio.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/configure_dialog.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/configure_input.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/graphics.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/graphics_breakpoint_observer.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/graphics_breakpoints.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/graphics_cmdlists.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/graphics_surface.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/graphics_tracing.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/graphics_vertex_shader.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/profiler.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/debugger/registers.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/game_list.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/hotkeys.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/util/spinbox.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/util/util.cpp | 2 |
20 files changed, 20 insertions, 20 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 58aef7a9a..05eabfa3d 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "config.h" #include <memory> #include <SDL.h> #include <inih/cpp/INIReader.h> #include "citra/default_ini.h" #include "common/file_util.h" #include "common/logging/log.h" +#include "config.h" #include "core/settings.h" Config::Config() { diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp index e3648572f..0b46ca6bb 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "citra_qt/config.h" #include <QSettings> +#include "citra_qt/config.h" #include "citra_qt/ui_settings.h" #include "common/file_util.h" diff --git a/src/citra_qt/configure_audio.cpp b/src/citra_qt/configure_audio.cpp index ba976252e..3cdd4c780 100644 --- a/src/citra_qt/configure_audio.cpp +++ b/src/citra_qt/configure_audio.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "citra_qt/configure_audio.h" #include "audio_core/sink_details.h" +#include "citra_qt/configure_audio.h" #include "core/settings.h" #include "ui_configure_audio.h" diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp index d6a4e8af1..446ad04a1 100644 --- a/src/citra_qt/configure_dialog.cpp +++ b/src/citra_qt/configure_dialog.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "citra_qt/configure_dialog.h" #include "citra_qt/config.h" +#include "citra_qt/configure_dialog.h" #include "core/settings.h" #include "ui_configure.h" diff --git a/src/citra_qt/configure_input.cpp b/src/citra_qt/configure_input.cpp index 7039301e3..d321db71f 100644 --- a/src/citra_qt/configure_input.cpp +++ b/src/citra_qt/configure_input.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "citra_qt/configure_input.h" #include <memory> #include <utility> #include <QTimer> +#include "citra_qt/configure_input.h" ConfigureInput::ConfigureInput(QWidget* parent) : QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()) { diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index 14bd1c77c..c66f2b96a 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "citra_qt/debugger/callstack.h" #include <QStandardItemModel> +#include "citra_qt/debugger/callstack.h" #include "common/common_types.h" #include "common/symbols.h" #include "core/arm/arm_interface.h" diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 7a5d3e2f1..1ee6bbd6a 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "citra_qt/debugger/disassembler.h" #include <QShortcut> #include "citra_qt/bootmanager.h" +#include "citra_qt/debugger/disassembler.h" #include "citra_qt/hotkeys.h" #include "citra_qt/util/util.h" #include "common/break_points.h" diff --git a/src/citra_qt/debugger/graphics.cpp b/src/citra_qt/debugger/graphics.cpp index 31b54e855..ef6712bfa 100644 --- a/src/citra_qt/debugger/graphics.cpp +++ b/src/citra_qt/debugger/graphics.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "citra_qt/debugger/graphics.h" #include <QListView> +#include "citra_qt/debugger/graphics.h" #include "citra_qt/util/util.h" extern GraphicsDebugger g_debugger; diff --git a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp b/src/citra_qt/debugger/graphics_breakpoint_observer.cpp index ad11552d7..e01d3440e 100644 --- a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp +++ b/src/citra_qt/debugger/graphics_breakpoint_observer.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "citra_qt/debugger/graphics_breakpoint_observer.h" #include <QMetaType> +#include "citra_qt/debugger/graphics_breakpoint_observer.h" BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context, const QString& title, QWidget* parent) diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp index e1d1b4911..d2a036dfa 100644 --- a/src/citra_qt/debugger/graphics_breakpoints.cpp +++ b/src/citra_qt/debugger/graphics_breakpoints.cpp @@ -2,12 +2,12 @@ // 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" diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp index 35be9b9bd..8a784d108 100644 --- a/src/citra_qt/debugger/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics_cmdlists.cpp @@ -2,7 +2,6 @@ // 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> @@ -14,6 +13,7 @@ #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" diff --git a/src/citra_qt/debugger/graphics_surface.cpp b/src/citra_qt/debugger/graphics_surface.cpp index 496fce59d..906daaa50 100644 --- a/src/citra_qt/debugger/graphics_surface.cpp +++ b/src/citra_qt/debugger/graphics_surface.cpp @@ -2,7 +2,6 @@ // 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> @@ -12,6 +11,7 @@ #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" diff --git a/src/citra_qt/debugger/graphics_tracing.cpp b/src/citra_qt/debugger/graphics_tracing.cpp index 944150b8e..5c6b74034 100644 --- a/src/citra_qt/debugger/graphics_tracing.cpp +++ b/src/citra_qt/debugger/graphics_tracing.cpp @@ -2,7 +2,6 @@ // 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> @@ -13,6 +12,7 @@ #include <QMessageBox> #include <QPushButton> #include <boost/range/algorithm/copy.hpp> +#include "citra_qt/debugger/graphics_tracing.h" #include "common/common_types.h" #include "core/hw/gpu.h" #include "core/hw/lcd.h" diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index 3b3ffe5c6..0b4320da5 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp @@ -2,7 +2,6 @@ // 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> @@ -15,6 +14,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" diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp index 39d2d6e39..cee10403d 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/citra_qt/debugger/profiler.cpp @@ -2,10 +2,10 @@ // 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" diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index 13842dac3..0b644432f 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "citra_qt/debugger/registers.h" #include <QTreeWidgetItem> +#include "citra_qt/debugger/registers.h" #include "citra_qt/util/util.h" #include "core/arm/arm_interface.h" #include "core/core.h" diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index 16d31be77..07bc35308 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "game_list.h" #include <QHeaderView> #include <QThreadPool> #include <QVBoxLayout> @@ -10,6 +9,7 @@ #include "common/logging/log.h" #include "common/string_util.h" #include "core/loader/loader.h" +#include "game_list.h" #include "game_list_p.h" #include "ui_settings.h" diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp index 9037f20f2..158ed506f 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/citra_qt/hotkeys.cpp @@ -2,11 +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 { diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp index 0bda21502..feb0ea1b3 100644 --- a/src/citra_qt/util/spinbox.cpp +++ b/src/citra_qt/util/spinbox.cpp @@ -28,10 +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 "citra_qt/util/spinbox.h" #include "common/assert.h" CSpinBox::CSpinBox(QWidget* parent) diff --git a/src/citra_qt/util/util.cpp b/src/citra_qt/util/util.cpp index e77d3796c..02be92bbd 100644 --- a/src/citra_qt/util/util.cpp +++ b/src/citra_qt/util/util.cpp @@ -2,9 +2,9 @@ // 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"); |