octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4889 from jroweboy/autouic 

Remove qt5_wrap_ui macro usage
This commit is contained in:
James Rowe 2019-08-16 19:36:23 -06:00 committed by GitHub
parent 00eeaf0e9c 7fe9a094a5
commit 6f0b009497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 55 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/citra_qt/CMakeLists.txt
View File

@ -1,5 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
if (POLICY CMP0071)
@ -10,6 +11,7 @@ add_executable(citra-qt
Info.plist
aboutdialog.cpp
aboutdialog.h
aboutdialog.ui
applets/mii_selector.cpp
applets/mii_selector.h
applets/swkbd.cpp
@ -28,33 +30,49 @@ add_executable(citra-qt
camera/qt_multimedia_camera.h
cheats.cpp
cheats.h
cheats.ui
citra-qt.rc
compatdb.cpp
compatdb.h
compatdb.ui
configuration/config.cpp
configuration/config.h
configuration/configure.ui
configuration/configure_audio.cpp
configuration/configure_audio.h
configuration/configure_audio.ui
configuration/configure_camera.cpp
configuration/configure_camera.h
configuration/configure_camera.ui
configuration/configure_debug.cpp
configuration/configure_debug.h
configuration/configure_debug.ui
configuration/configure_dialog.cpp
configuration/configure_dialog.h
configuration/configure_general.cpp
configuration/configure_general.h
configuration/configure_general.ui
configuration/configure_graphics.cpp
configuration/configure_graphics.h
configuration/configure_graphics.ui
configuration/configure_hotkeys.cpp
configuration/configure_hotkeys.h
configuration/configure_hotkeys.ui
configuration/configure_input.cpp
configuration/configure_input.h
configuration/configure_input.ui
configuration/configure_motion_touch.cpp
configuration/configure_motion_touch.h
configuration/configure_motion_touch.ui
configuration/configure_system.cpp
configuration/configure_system.h
configuration/configure_system.ui
configuration/configure_ui.cpp
configuration/configure_ui.h
configuration/configure_ui.ui
configuration/configure_web.cpp
configuration/configure_web.h
configuration/configure_web.ui
debugger/console.h
debugger/console.cpp
debugger/graphics/graphics.cpp
@ -78,6 +96,7 @@ add_executable(citra-qt
debugger/profiler.h
debugger/registers.cpp
debugger/registers.h
debugger/registers.ui
debugger/wait_tree.cpp
debugger/wait_tree.h
discord.h
@ -90,26 +109,33 @@ add_executable(citra-qt
hotkeys.h
main.cpp
main.h
multiplayer/chat_room.h
main.ui
multiplayer/chat_room.cpp
multiplayer/chat_room.h
multiplayer/chat_room.ui
multiplayer/client_room.h
multiplayer/client_room.cpp
multiplayer/direct_connect.h
multiplayer/client_room.ui
multiplayer/direct_connect.cpp
multiplayer/host_room.h
multiplayer/direct_connect.h
multiplayer/direct_connect.ui
multiplayer/host_room.cpp
multiplayer/lobby.h
multiplayer/lobby_p.h
multiplayer/host_room.h
multiplayer/host_room.ui
multiplayer/lobby.cpp
multiplayer/message.h
multiplayer/lobby.h
multiplayer/lobby.ui
multiplayer/lobby_p.h
multiplayer/message.cpp
multiplayer/message.h
multiplayer/moderation_dialog.cpp
multiplayer/moderation_dialog.h
multiplayer/moderation_dialog.ui
multiplayer/state.cpp
multiplayer/state.h
multiplayer/validation.h
ui_settings.cpp
ui_settings.h
uisettings.cpp
uisettings.h
updater/updater.cpp
updater/updater.h
updater/updater_p.h
@ -121,34 +147,6 @@ add_executable(citra-qt
util/spinbox.h
util/util.cpp
util/util.h
compatdb.cpp
compatdb.h
)
set(UIS
configuration/configure.ui
configuration/configure_audio.ui
configuration/configure_camera.ui
configuration/configure_debug.ui
configuration/configure_general.ui
configuration/configure_graphics.ui
configuration/configure_hotkeys.ui
configuration/configure_input.ui
configuration/configure_motion_touch.ui
configuration/configure_system.ui
configuration/configure_ui.ui
configuration/configure_web.ui
debugger/registers.ui
multiplayer/direct_connect.ui
multiplayer/lobby.ui
multiplayer/chat_room.ui
multiplayer/client_room.ui
multiplayer/host_room.ui
multiplayer/moderation_dialog.ui
aboutdialog.ui
cheats.ui
main.ui
compatdb.ui
)
file(GLOB COMPAT_LIST
@ -157,8 +155,6 @@ file(GLOB COMPAT_LIST
file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*)
file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*)
qt5_wrap_ui(UI_HDRS ${UIS})
if (ENABLE_QT_TRANSLATION)
set(CITRA_QT_LANGUAGES "${PROJECT_SOURCE_DIR}/dist/languages" CACHE PATH "Path to the translation bundle for the Qt frontend")
option(GENERATE_QT_TRANSLATION "Generate en.ts as the translation source file" OFF)
@ -197,8 +193,6 @@ target_sources(citra-qt
${COMPAT_LIST}
${ICONS}
${THEMES}
${UI_HDRS}
${UIS}
${LANGUAGES}
)

2
src/citra_qt/configuration/config.cpp
View File

@ -8,7 +8,7 @@
#include <QKeySequence>
#include <QSettings>
#include "citra_qt/configuration/config.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "common/file_util.h"
#include "core/hle/service/service.h"
#include "input_common/main.h"

2
src/citra_qt/configuration/configure_camera.cpp
View File

@ -10,7 +10,7 @@
#include <QMessageBox>
#include <QWidget>
#include "citra_qt/configuration/configure_camera.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "core/core.h"
#include "core/settings.h"
#include "ui_configure_camera.h"

2
src/citra_qt/configuration/configure_debug.cpp
View File

@ -6,7 +6,7 @@
#include <QUrl>
#include "citra_qt/configuration/configure_debug.h"
#include "citra_qt/debugger/console.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "common/file_util.h"
#include "common/logging/backend.h"
#include "common/logging/filter.h"

2
src/citra_qt/configuration/configure_general.cpp
View File

@ -4,7 +4,7 @@
#include <QMessageBox>
#include "citra_qt/configuration/configure_general.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "core/core.h"
#include "core/settings.h"
#include "ui_configure_general.h"

2
src/citra_qt/configuration/configure_system.cpp
View File

@ -5,7 +5,7 @@
#include <cstring>
#include <QMessageBox>
#include "citra_qt/configuration/configure_system.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "core/core.h"
#include "core/hle/service/cfg/cfg.h"
#include "core/hle/service/ptm/ptm.h"

2
src/citra_qt/configuration/configure_ui.cpp
View File

@ -4,7 +4,7 @@
#include <QDirIterator>
#include "citra_qt/configuration/configure_ui.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "ui_configure_ui.h"
ConfigureUi::ConfigureUi(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureUi) {

2
src/citra_qt/configuration/configure_web.cpp
View File

@ -6,7 +6,7 @@
#include <QMessageBox>
#include <QtConcurrent/QtConcurrentRun>
#include "citra_qt/configuration/configure_web.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "core/settings.h"
#include "core/telemetry_session.h"
#include "ui_configure_web.h"

2
src/citra_qt/debugger/console.cpp
View File

@ -9,7 +9,7 @@
#endif
#include "citra_qt/debugger/console.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "common/logging/backend.h"
namespace Debugger {

2
src/citra_qt/discord_impl.cpp
View File

@ -6,7 +6,7 @@
#include <string>
#include <discord_rpc.h>
#include "citra_qt/discord_impl.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "common/common_types.h"
#include "core/core.h"

2
src/citra_qt/game_list.cpp
View File

@ -26,7 +26,7 @@
#include "citra_qt/game_list_p.h"
#include "citra_qt/game_list_worker.h"
#include "citra_qt/main.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "common/common_paths.h"
#include "common/logging/log.h"
#include "core/file_sys/archive_extsavedata.h"

2
src/citra_qt/game_list.h
View File

@ -9,7 +9,7 @@
#include <QWidget>
#include "citra_qt/compatibility_list.h"
#include "common/common_types.h"
#include "ui_settings.h"
#include "uisettings.h"
class GameListWorker;
class GameListDir;

2
src/citra_qt/game_list_p.h
View File

@ -15,7 +15,7 @@
#include <QStandardItem>
#include <QString>
#include <QWidget>
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "citra_qt/util/util.h"
#include "common/file_util.h"
#include "common/logging/log.h"

2
src/citra_qt/game_list_worker.cpp
View File

@ -12,7 +12,7 @@
#include "citra_qt/game_list.h"
#include "citra_qt/game_list_p.h"
#include "citra_qt/game_list_worker.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "common/common_paths.h"
#include "common/file_util.h"
#include "core/hle/service/am/am.h"

2
src/citra_qt/hotkeys.cpp
View File

@ -6,7 +6,7 @@
#include <QShortcut>
#include <QtGlobal>
#include "citra_qt/hotkeys.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
HotkeyRegistry::HotkeyRegistry() = default;
HotkeyRegistry::~HotkeyRegistry() = default;

2
src/citra_qt/main.cpp
View File

@ -45,7 +45,7 @@
#include "citra_qt/hotkeys.h"
#include "citra_qt/main.h"
#include "citra_qt/multiplayer/state.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "citra_qt/updater/updater.h"
#include "citra_qt/util/clickable_label.h"
#include "common/common_paths.h"

2
src/citra_qt/multiplayer/direct_connect.cpp
View File

@ -14,7 +14,7 @@
#include "citra_qt/multiplayer/message.h"
#include "citra_qt/multiplayer/state.h"
#include "citra_qt/multiplayer/validation.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "core/hle/service/cfg/cfg.h"
#include "core/settings.h"
#include "network/network.h"

2
src/citra_qt/multiplayer/host_room.cpp
View File

@ -17,7 +17,7 @@
#include "citra_qt/multiplayer/message.h"
#include "citra_qt/multiplayer/state.h"
#include "citra_qt/multiplayer/validation.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "common/logging/log.h"
#include "core/announce_multiplayer_session.h"
#include "core/hle/service/cfg/cfg.h"

2
src/citra_qt/multiplayer/lobby.cpp
View File

@ -13,7 +13,7 @@
#include "citra_qt/multiplayer/message.h"
#include "citra_qt/multiplayer/state.h"
#include "citra_qt/multiplayer/validation.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "common/logging/log.h"
#include "core/hle/service/cfg/cfg.h"
#include "core/settings.h"

2
src/citra_qt/multiplayer/state.cpp
View File

@ -14,7 +14,7 @@
#include "citra_qt/multiplayer/lobby.h"
#include "citra_qt/multiplayer/message.h"
#include "citra_qt/multiplayer/state.h"
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "citra_qt/util/clickable_label.h"
#include "common/announce_multiplayer_room.h"
#include "common/logging/log.h"

2
src/citra_qt/ui_settings.cpp → src/citra_qt/uisettings.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "ui_settings.h"
#include "uisettings.h"
namespace UISettings {

0
src/citra_qt/ui_settings.h → src/citra_qt/uisettings.h
View File

2
src/citra_qt/updater/updater.cpp
View File

@ -11,7 +11,7 @@
#include <QFileInfo>
#include <QTimer>
#include <QXmlStreamReader>
#include "citra_qt/ui_settings.h"
#include "citra_qt/uisettings.h"
#include "citra_qt/updater/updater.h"
#include "citra_qt/updater/updater_p.h"
#include "common/logging/log.h"