citra_qt: Removed autogenerated files from repo and fixed build issues.

12 years ago · 4e4a028ecd
13 changed files with 9 additions and 711 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,3 +25,6 @@ bin/
 # Generated source files
 src/common/scm_rev.cpp
 # Generated header files
 src/citra_qt/ui_*.h
--- a/src/citra_qt/citra_qt.vcxproj
+++ b/src/citra_qt/citra_qt.vcxproj
@ -168,7 +168,6 @@
  <ItemGroup>
    <ClInclude Include="config\controller_config.hxx" />
    <ClInclude Include="config\controller_config_util.hxx" />
    <ClInclude Include="ui_controller_config.h" />
    <ClInclude Include="version.h" />
  </ItemGroup>
  <ItemGroup>
--- a/src/citra_qt/citra_qt.vcxproj.filters
+++ b/src/citra_qt/citra_qt.vcxproj.filters
@ -95,9 +95,6 @@
    <ClInclude Include="config\controller_config_util.hxx">
      <Filter>config</Filter>
    </ClInclude>
    <ClInclude Include="ui_controller_config.h">
      <Filter>config</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <UIC Include="hotkeys.ui" />
--- a/src/citra_qt/debugger/callstack.hxx
+++ b/src/citra_qt/debugger/callstack.hxx
@ -1,5 +1,5 @@
 #include <QDockWidget>
 #include "../ui_callstack.h"
 #include "ui_callstack.h"
 class QStandardItemModel;
--- a/src/citra_qt/debugger/disassembler.hxx
+++ b/src/citra_qt/debugger/disassembler.hxx
@ -1,5 +1,5 @@
 #include <QDockWidget>
 #include "../ui_disassembler.h"
 #include "ui_disassembler.h"
 #include "common/common.h"
 #include "common/break_points.h"
--- a/src/citra_qt/debugger/registers.hxx
+++ b/src/citra_qt/debugger/registers.hxx
@ -1,4 +1,4 @@
 #include "../ui_registers.h"
 #include "ui_registers.h"
 #include <QDockWidget>
 #include <QTreeWidgetItem>
--- a/src/citra_qt/ui_callstack.h
+++ b/src/citra_qt/ui_callstack.h
@ -1,68 +0,0 @@
 /********************************************************************************
 ** Form generated from reading UI file 'callstack.ui'
 **
 ** Created by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 #ifndef UI_CALLSTACK_H
 #define UI_CALLSTACK_H
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QDockWidget>
 #include <QtGui/QHeaderView>
 #include <QtGui/QTreeView>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QWidget>
 QT_BEGIN_NAMESPACE
 class Ui_CallStack
 {
 public:
    QWidget *dockWidgetContents;
    QVBoxLayout *verticalLayout;
    QTreeView *treeView;
    void setupUi(QDockWidget *CallStack)
    {
        if (CallStack->objectName().isEmpty())
            CallStack->setObjectName(QString::fromUtf8("CallStack"));
        CallStack->resize(400, 300);
        dockWidgetContents = new QWidget();
        dockWidgetContents->setObjectName(QString::fromUtf8("dockWidgetContents"));
        verticalLayout = new QVBoxLayout(dockWidgetContents);
        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
        treeView = new QTreeView(dockWidgetContents);
        treeView->setObjectName(QString::fromUtf8("treeView"));
        treeView->setAlternatingRowColors(true);
        treeView->setRootIsDecorated(false);
        treeView->setItemsExpandable(false);
        verticalLayout->addWidget(treeView);
        CallStack->setWidget(dockWidgetContents);
        retranslateUi(CallStack);
        QMetaObject::connectSlotsByName(CallStack);
    } // setupUi
    void retranslateUi(QDockWidget *CallStack)
    {
        CallStack->setWindowTitle(QApplication::translate("CallStack", "Call stack", 0, QApplication::UnicodeUTF8));
    } // retranslateUi
 };
 namespace Ui {
    class CallStack: public Ui_CallStack {};
 } // namespace Ui
 QT_END_NAMESPACE
 #endif // UI_CALLSTACK_H
--- a/src/citra_qt/ui_controller_config.h
+++ b/src/citra_qt/ui_controller_config.h
@ -1,222 +0,0 @@
 /********************************************************************************
 ** Form generated from reading UI file 'controller_config.ui'
 **
 ** Created by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 #ifndef UI_CONTROLLER_CONFIG_H
 #define UI_CONTROLLER_CONFIG_H
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QCheckBox>
 #include <QtGui/QComboBox>
 #include <QtGui/QGridLayout>
 #include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
 #include <QtGui/QSpacerItem>
 #include <QtGui/QTabWidget>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QWidget>
 QT_BEGIN_NAMESPACE
 class Ui_ControllerConfig
 {
 public:
    QVBoxLayout *verticalLayout;
    QGridLayout *gridLayout;
    QComboBox *activeControllerCB;
    QSpacerItem *horizontalSpacer;
    QCheckBox *checkBox;
    QComboBox *inputSourceCB;
    QLabel *label_2;
    QLabel *label;
    QTabWidget *tabWidget;
    QWidget *mainStickTab;
    QGridLayout *gridLayout_3;
    QSpacerItem *verticalSpacer_2;
    QSpacerItem *verticalSpacer_3;
    QSpacerItem *horizontalSpacer_4;
    QSpacerItem *horizontalSpacer_3;
    QWidget *cStickTab;
    QGridLayout *gridLayout_4;
    QSpacerItem *horizontalSpacer_6;
    QSpacerItem *verticalSpacer_5;
    QSpacerItem *verticalSpacer_4;
    QSpacerItem *horizontalSpacer_5;
    QWidget *dPadTab;
    QGridLayout *gridLayout_5;
    QSpacerItem *horizontalSpacer_7;
    QSpacerItem *verticalSpacer_7;
    QSpacerItem *verticalSpacer_6;
    QSpacerItem *horizontalSpacer_8;
    QWidget *buttonsTab;
    QVBoxLayout *verticalLayout_2;
    void setupUi(QWidget *ControllerConfig)
    {
        if (ControllerConfig->objectName().isEmpty())
            ControllerConfig->setObjectName(QString::fromUtf8("ControllerConfig"));
        ControllerConfig->resize(503, 293);
        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
        sizePolicy.setHorizontalStretch(0);
        sizePolicy.setVerticalStretch(0);
        sizePolicy.setHeightForWidth(ControllerConfig->sizePolicy().hasHeightForWidth());
        ControllerConfig->setSizePolicy(sizePolicy);
        verticalLayout = new QVBoxLayout(ControllerConfig);
        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
        verticalLayout->setSizeConstraint(QLayout::SetFixedSize);
        gridLayout = new QGridLayout();
        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
        activeControllerCB = new QComboBox(ControllerConfig);
        activeControllerCB->setObjectName(QString::fromUtf8("activeControllerCB"));
        gridLayout->addWidget(activeControllerCB, 1, 1, 1, 1);
        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
        gridLayout->addItem(horizontalSpacer, 0, 2, 1, 1);
        checkBox = new QCheckBox(ControllerConfig);
        checkBox->setObjectName(QString::fromUtf8("checkBox"));
        gridLayout->addWidget(checkBox, 1, 2, 1, 1);
        inputSourceCB = new QComboBox(ControllerConfig);
        inputSourceCB->setObjectName(QString::fromUtf8("inputSourceCB"));
        gridLayout->addWidget(inputSourceCB, 0, 1, 1, 1);
        label_2 = new QLabel(ControllerConfig);
        label_2->setObjectName(QString::fromUtf8("label_2"));
        gridLayout->addWidget(label_2, 1, 0, 1, 1);
        label = new QLabel(ControllerConfig);
        label->setObjectName(QString::fromUtf8("label"));
        gridLayout->addWidget(label, 0, 0, 1, 1);
        verticalLayout->addLayout(gridLayout);
        tabWidget = new QTabWidget(ControllerConfig);
        tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
        mainStickTab = new QWidget();
        mainStickTab->setObjectName(QString::fromUtf8("mainStickTab"));
        gridLayout_3 = new QGridLayout(mainStickTab);
        gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3"));
        verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
        gridLayout_3->addItem(verticalSpacer_2, 2, 2, 1, 1);
        verticalSpacer_3 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
        gridLayout_3->addItem(verticalSpacer_3, 0, 2, 1, 1);
        horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
        gridLayout_3->addItem(horizontalSpacer_4, 1, 0, 1, 1);
        horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
        gridLayout_3->addItem(horizontalSpacer_3, 1, 4, 1, 1);
        tabWidget->addTab(mainStickTab, QString());
        cStickTab = new QWidget();
        cStickTab->setObjectName(QString::fromUtf8("cStickTab"));
        gridLayout_4 = new QGridLayout(cStickTab);
        gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4"));
        horizontalSpacer_6 = new QSpacerItem(40, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
        gridLayout_4->addItem(horizontalSpacer_6, 1, 0, 1, 1);
        verticalSpacer_5 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
        gridLayout_4->addItem(verticalSpacer_5, 0, 1, 1, 1);
        verticalSpacer_4 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
        gridLayout_4->addItem(verticalSpacer_4, 2, 1, 1, 1);
        horizontalSpacer_5 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
        gridLayout_4->addItem(horizontalSpacer_5, 1, 2, 1, 1);
        tabWidget->addTab(cStickTab, QString());
        dPadTab = new QWidget();
        dPadTab->setObjectName(QString::fromUtf8("dPadTab"));
        gridLayout_5 = new QGridLayout(dPadTab);
        gridLayout_5->setObjectName(QString::fromUtf8("gridLayout_5"));
        horizontalSpacer_7 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
        gridLayout_5->addItem(horizontalSpacer_7, 1, 2, 1, 1);
        verticalSpacer_7 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
        gridLayout_5->addItem(verticalSpacer_7, 0, 1, 1, 1);
        verticalSpacer_6 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
        gridLayout_5->addItem(verticalSpacer_6, 2, 1, 1, 1);
        horizontalSpacer_8 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
        gridLayout_5->addItem(horizontalSpacer_8, 1, 0, 1, 1);
        tabWidget->addTab(dPadTab, QString());
        buttonsTab = new QWidget();
        buttonsTab->setObjectName(QString::fromUtf8("buttonsTab"));
        verticalLayout_2 = new QVBoxLayout(buttonsTab);
        verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
        tabWidget->addTab(buttonsTab, QString());
        verticalLayout->addWidget(tabWidget);
        retranslateUi(ControllerConfig);
        tabWidget->setCurrentIndex(0);
        QMetaObject::connectSlotsByName(ControllerConfig);
    } // setupUi
    void retranslateUi(QWidget *ControllerConfig)
    {
        ControllerConfig->setWindowTitle(QApplication::translate("ControllerConfig", "Controller Configuration", 0, QApplication::UnicodeUTF8));
        activeControllerCB->clear();
        activeControllerCB->insertItems(0, QStringList()
         << QApplication::translate("ControllerConfig", "Controller 1", 0, QApplication::UnicodeUTF8)
         << QApplication::translate("ControllerConfig", "Controller 2", 0, QApplication::UnicodeUTF8)
         << QApplication::translate("ControllerConfig", "Controller 3", 0, QApplication::UnicodeUTF8)
         << QApplication::translate("ControllerConfig", "Controller 4", 0, QApplication::UnicodeUTF8)
        );
        checkBox->setText(QApplication::translate("ControllerConfig", "Enabled", 0, QApplication::UnicodeUTF8));
        inputSourceCB->clear();
        inputSourceCB->insertItems(0, QStringList()
         << QApplication::translate("ControllerConfig", "Keyboard", 0, QApplication::UnicodeUTF8)
         << QApplication::translate("ControllerConfig", "Joypad", 0, QApplication::UnicodeUTF8)
        );
        label_2->setText(QApplication::translate("ControllerConfig", "Active Controller:", 0, QApplication::UnicodeUTF8));
        label->setText(QApplication::translate("ControllerConfig", "Input Source:", 0, QApplication::UnicodeUTF8));
        tabWidget->setTabText(tabWidget->indexOf(mainStickTab), QApplication::translate("ControllerConfig", "Main Stick", 0, QApplication::UnicodeUTF8));
        tabWidget->setTabText(tabWidget->indexOf(cStickTab), QApplication::translate("ControllerConfig", "C-Stick", 0, QApplication::UnicodeUTF8));
        tabWidget->setTabText(tabWidget->indexOf(dPadTab), QApplication::translate("ControllerConfig", "D-Pad", 0, QApplication::UnicodeUTF8));
        tabWidget->setTabText(tabWidget->indexOf(buttonsTab), QApplication::translate("ControllerConfig", "Buttons", 0, QApplication::UnicodeUTF8));
    } // retranslateUi
 };
 namespace Ui {
    class ControllerConfig: public Ui_ControllerConfig {};
 } // namespace Ui
 QT_END_NAMESPACE
 #endif // UI_CONTROLLER_CONFIG_H
--- a/src/citra_qt/ui_disassembler.h
+++ b/src/citra_qt/ui_disassembler.h
@ -1,112 +0,0 @@
 /********************************************************************************
 ** Form generated from reading UI file 'disassembler.ui'
 **
 ** Created by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 #ifndef UI_DISASSEMBLER_H
 #define UI_DISASSEMBLER_H
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QDockWidget>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QHeaderView>
 #include <QtGui/QPushButton>
 #include <QtGui/QTreeView>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QWidget>
 QT_BEGIN_NAMESPACE
 class Ui_DockWidget
 {
 public:
    QWidget *dockWidgetContents;
    QVBoxLayout *verticalLayout;
    QHBoxLayout *horizontalLayout;
    QPushButton *button_step;
    QPushButton *button_pause;
    QPushButton *button_continue;
    QPushButton *pushButton;
    QPushButton *button_breakpoint;
    QTreeView *treeView;
    void setupUi(QDockWidget *DockWidget)
    {
        if (DockWidget->objectName().isEmpty())
            DockWidget->setObjectName(QString::fromUtf8("DockWidget"));
        DockWidget->resize(430, 401);
        dockWidgetContents = new QWidget();
        dockWidgetContents->setObjectName(QString::fromUtf8("dockWidgetContents"));
        verticalLayout = new QVBoxLayout(dockWidgetContents);
        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
        horizontalLayout = new QHBoxLayout();
        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
        button_step = new QPushButton(dockWidgetContents);
        button_step->setObjectName(QString::fromUtf8("button_step"));
        horizontalLayout->addWidget(button_step);
        button_pause = new QPushButton(dockWidgetContents);
        button_pause->setObjectName(QString::fromUtf8("button_pause"));
        horizontalLayout->addWidget(button_pause);
        button_continue = new QPushButton(dockWidgetContents);
        button_continue->setObjectName(QString::fromUtf8("button_continue"));
        horizontalLayout->addWidget(button_continue);
        pushButton = new QPushButton(dockWidgetContents);
        pushButton->setObjectName(QString::fromUtf8("pushButton"));
        horizontalLayout->addWidget(pushButton);
        button_breakpoint = new QPushButton(dockWidgetContents);
        button_breakpoint->setObjectName(QString::fromUtf8("button_breakpoint"));
        horizontalLayout->addWidget(button_breakpoint);
        verticalLayout->addLayout(horizontalLayout);
        treeView = new QTreeView(dockWidgetContents);
        treeView->setObjectName(QString::fromUtf8("treeView"));
        treeView->setAlternatingRowColors(true);
        treeView->setIndentation(20);
        treeView->setRootIsDecorated(false);
        treeView->header()->setVisible(false);
        verticalLayout->addWidget(treeView);
        DockWidget->setWidget(dockWidgetContents);
        retranslateUi(DockWidget);
        QMetaObject::connectSlotsByName(DockWidget);
    } // setupUi
    void retranslateUi(QDockWidget *DockWidget)
    {
        DockWidget->setWindowTitle(QApplication::translate("DockWidget", "Disassembly", 0, QApplication::UnicodeUTF8));
        button_step->setText(QApplication::translate("DockWidget", "Step", 0, QApplication::UnicodeUTF8));
        button_pause->setText(QApplication::translate("DockWidget", "Pause", 0, QApplication::UnicodeUTF8));
        button_continue->setText(QApplication::translate("DockWidget", "Continue", 0, QApplication::UnicodeUTF8));
        pushButton->setText(QApplication::translate("DockWidget", "Step Into", 0, QApplication::UnicodeUTF8));
        button_breakpoint->setText(QApplication::translate("DockWidget", "Set Breakpoint", 0, QApplication::UnicodeUTF8));
    } // retranslateUi
 };
 namespace Ui {
    class DockWidget: public Ui_DockWidget {};
 } // namespace Ui
 QT_END_NAMESPACE
 #endif // UI_DISASSEMBLER_H
--- a/src/citra_qt/ui_hotkeys.h
+++ b/src/citra_qt/ui_hotkeys.h
@ -1,77 +0,0 @@
 /********************************************************************************
 ** Form generated from reading UI file 'hotkeys.ui'
 **
 ** Created by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 #ifndef UI_HOTKEYS_H
 #define UI_HOTKEYS_H
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QDialog>
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QHeaderView>
 #include <QtGui/QTreeWidget>
 #include <QtGui/QVBoxLayout>
 QT_BEGIN_NAMESPACE
 class Ui_hotkeys
 {
 public:
    QVBoxLayout *verticalLayout;
    QTreeWidget *treeWidget;
    QDialogButtonBox *buttonBox;
    void setupUi(QDialog *hotkeys)
    {
        if (hotkeys->objectName().isEmpty())
            hotkeys->setObjectName(QString::fromUtf8("hotkeys"));
        hotkeys->resize(363, 388);
        verticalLayout = new QVBoxLayout(hotkeys);
        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
        treeWidget = new QTreeWidget(hotkeys);
        treeWidget->setObjectName(QString::fromUtf8("treeWidget"));
        treeWidget->setSelectionBehavior(QAbstractItemView::SelectItems);
        treeWidget->setHeaderHidden(false);
        verticalLayout->addWidget(treeWidget);
        buttonBox = new QDialogButtonBox(hotkeys);
        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
        buttonBox->setOrientation(Qt::Horizontal);
        buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset);
        verticalLayout->addWidget(buttonBox);
        retranslateUi(hotkeys);
        QObject::connect(buttonBox, SIGNAL(accepted()), hotkeys, SLOT(accept()));
        QObject::connect(buttonBox, SIGNAL(rejected()), hotkeys, SLOT(reject()));
        QMetaObject::connectSlotsByName(hotkeys);
    } // setupUi
    void retranslateUi(QDialog *hotkeys)
    {
        hotkeys->setWindowTitle(QApplication::translate("hotkeys", "Hotkey Settings", 0, QApplication::UnicodeUTF8));
        QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem();
        ___qtreewidgetitem->setText(2, QApplication::translate("hotkeys", "Context", 0, QApplication::UnicodeUTF8));
        ___qtreewidgetitem->setText(1, QApplication::translate("hotkeys", "Hotkey", 0, QApplication::UnicodeUTF8));
        ___qtreewidgetitem->setText(0, QApplication::translate("hotkeys", "Action", 0, QApplication::UnicodeUTF8));
    } // retranslateUi
 };
 namespace Ui {
    class hotkeys: public Ui_hotkeys {};
 } // namespace Ui
 QT_END_NAMESPACE
 #endif // UI_HOTKEYS_H
--- a/src/citra_qt/ui_main.h
+++ b/src/citra_qt/ui_main.h
@ -1,153 +0,0 @@
 /********************************************************************************
 ** Form generated from reading UI file 'main.ui'
 **
 ** Created by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 #ifndef UI_MAIN_H
 #define UI_MAIN_H
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QHeaderView>
 #include <QtGui/QMainWindow>
 #include <QtGui/QMenu>
 #include <QtGui/QMenuBar>
 #include <QtGui/QStatusBar>
 #include <QtGui/QWidget>
 QT_BEGIN_NAMESPACE
 class Ui_MainWindow
 {
 public:
    QAction *action_Load_File;
    QAction *action_Load_Symbol_Map;
    QAction *action_Exit;
    QAction *action_Start;
    QAction *action_Pause;
    QAction *action_Stop;
    QAction *action_About;
    QAction *action_Popout_Window_Mode;
    QAction *action_Hotkeys;
    QAction *action_Configure;
    QWidget *centralwidget;
    QHBoxLayout *horizontalLayout;
    QMenuBar *menubar;
    QMenu *menu_File;
    QMenu *menu_Emulation;
    QMenu *menu_View;
    QMenu *menu_Help;
    QStatusBar *statusbar;
    void setupUi(QMainWindow *MainWindow)
    {
        if (MainWindow->objectName().isEmpty())
            MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
        MainWindow->resize(1081, 730);
        QIcon icon;
        icon.addFile(QString::fromUtf8("src/pcafe/res/icon3_64x64.ico"), QSize(), QIcon::Normal, QIcon::Off);
        MainWindow->setWindowIcon(icon);
        MainWindow->setTabShape(QTabWidget::Rounded);
        MainWindow->setDockNestingEnabled(true);
        action_Load_File = new QAction(MainWindow);
        action_Load_File->setObjectName(QString::fromUtf8("action_Load_File"));
        action_Load_Symbol_Map = new QAction(MainWindow);
        action_Load_Symbol_Map->setObjectName(QString::fromUtf8("action_Load_Symbol_Map"));
        action_Exit = new QAction(MainWindow);
        action_Exit->setObjectName(QString::fromUtf8("action_Exit"));
        action_Start = new QAction(MainWindow);
        action_Start->setObjectName(QString::fromUtf8("action_Start"));
        action_Pause = new QAction(MainWindow);
        action_Pause->setObjectName(QString::fromUtf8("action_Pause"));
        action_Pause->setEnabled(false);
        action_Stop = new QAction(MainWindow);
        action_Stop->setObjectName(QString::fromUtf8("action_Stop"));
        action_Stop->setEnabled(false);
        action_About = new QAction(MainWindow);
        action_About->setObjectName(QString::fromUtf8("action_About"));
        action_Popout_Window_Mode = new QAction(MainWindow);
        action_Popout_Window_Mode->setObjectName(QString::fromUtf8("action_Popout_Window_Mode"));
        action_Popout_Window_Mode->setCheckable(true);
        action_Hotkeys = new QAction(MainWindow);
        action_Hotkeys->setObjectName(QString::fromUtf8("action_Hotkeys"));
        action_Configure = new QAction(MainWindow);
        action_Configure->setObjectName(QString::fromUtf8("action_Configure"));
        centralwidget = new QWidget(MainWindow);
        centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
        horizontalLayout = new QHBoxLayout(centralwidget);
        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
        MainWindow->setCentralWidget(centralwidget);
        menubar = new QMenuBar(MainWindow);
        menubar->setObjectName(QString::fromUtf8("menubar"));
        menubar->setGeometry(QRect(0, 0, 1081, 20));
        menu_File = new QMenu(menubar);
        menu_File->setObjectName(QString::fromUtf8("menu_File"));
        menu_Emulation = new QMenu(menubar);
        menu_Emulation->setObjectName(QString::fromUtf8("menu_Emulation"));
        menu_View = new QMenu(menubar);
        menu_View->setObjectName(QString::fromUtf8("menu_View"));
        menu_Help = new QMenu(menubar);
        menu_Help->setObjectName(QString::fromUtf8("menu_Help"));
        MainWindow->setMenuBar(menubar);
        statusbar = new QStatusBar(MainWindow);
        statusbar->setObjectName(QString::fromUtf8("statusbar"));
        MainWindow->setStatusBar(statusbar);
        menubar->addAction(menu_File->menuAction());
        menubar->addAction(menu_Emulation->menuAction());
        menubar->addAction(menu_View->menuAction());
        menubar->addAction(menu_Help->menuAction());
        menu_File->addAction(action_Load_File);
        menu_File->addAction(action_Load_Symbol_Map);
        menu_File->addSeparator();
        menu_File->addAction(action_Exit);
        menu_Emulation->addAction(action_Start);
        menu_Emulation->addAction(action_Pause);
        menu_Emulation->addAction(action_Stop);
        menu_Emulation->addSeparator();
        menu_Emulation->addAction(action_Configure);
        menu_View->addAction(action_Popout_Window_Mode);
        menu_View->addAction(action_Hotkeys);
        menu_Help->addAction(action_About);
        retranslateUi(MainWindow);
        QObject::connect(action_Exit, SIGNAL(triggered()), MainWindow, SLOT(close()));
        QObject::connect(action_Configure, SIGNAL(triggered()), MainWindow, SLOT(OnConfigure()));
        QMetaObject::connectSlotsByName(MainWindow);
    } // setupUi
    void retranslateUi(QMainWindow *MainWindow)
    {
        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Citra", 0, QApplication::UnicodeUTF8));
        action_Load_File->setText(QApplication::translate("MainWindow", "Load file...", 0, QApplication::UnicodeUTF8));
        action_Load_Symbol_Map->setText(QApplication::translate("MainWindow", "Load symbol map...", 0, QApplication::UnicodeUTF8));
        action_Exit->setText(QApplication::translate("MainWindow", "E&xit", 0, QApplication::UnicodeUTF8));
        action_Start->setText(QApplication::translate("MainWindow", "&Start", 0, QApplication::UnicodeUTF8));
        action_Pause->setText(QApplication::translate("MainWindow", "&Pause", 0, QApplication::UnicodeUTF8));
        action_Stop->setText(QApplication::translate("MainWindow", "&Stop", 0, QApplication::UnicodeUTF8));
        action_About->setText(QApplication::translate("MainWindow", "About Citra", 0, QApplication::UnicodeUTF8));
        action_Popout_Window_Mode->setText(QApplication::translate("MainWindow", "Popout window", 0, QApplication::UnicodeUTF8));
        action_Hotkeys->setText(QApplication::translate("MainWindow", "Configure &Hotkeys ...", 0, QApplication::UnicodeUTF8));
        action_Configure->setText(QApplication::translate("MainWindow", "Configure ...", 0, QApplication::UnicodeUTF8));
        menu_File->setTitle(QApplication::translate("MainWindow", "&File", 0, QApplication::UnicodeUTF8));
        menu_Emulation->setTitle(QApplication::translate("MainWindow", "&Emulation", 0, QApplication::UnicodeUTF8));
        menu_View->setTitle(QApplication::translate("MainWindow", "&View", 0, QApplication::UnicodeUTF8));
        menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", 0, QApplication::UnicodeUTF8));
    } // retranslateUi
 };
 namespace Ui {
    class MainWindow: public Ui_MainWindow {};
 } // namespace Ui
 QT_END_NAMESPACE
 #endif // UI_MAIN_H
--- a/src/citra_qt/ui_registers.h
+++ b/src/citra_qt/ui_registers.h
@ -1,69 +0,0 @@
 /********************************************************************************
 ** Form generated from reading UI file 'registers.ui'
 **
 ** Created by: Qt User Interface Compiler version 4.8.5
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 #ifndef UI_REGISTERS_H
 #define UI_REGISTERS_H
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QDockWidget>
 #include <QtGui/QHeaderView>
 #include <QtGui/QTreeWidget>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QWidget>
 QT_BEGIN_NAMESPACE
 class Ui_ARMRegisters
 {
 public:
    QWidget *dockWidgetContents;
    QVBoxLayout *verticalLayout;
    QTreeWidget *treeWidget;
    void setupUi(QDockWidget *ARMRegisters)
    {
        if (ARMRegisters->objectName().isEmpty())
            ARMRegisters->setObjectName(QString::fromUtf8("ARMRegisters"));
        ARMRegisters->resize(400, 300);
        dockWidgetContents = new QWidget();
        dockWidgetContents->setObjectName(QString::fromUtf8("dockWidgetContents"));
        verticalLayout = new QVBoxLayout(dockWidgetContents);
        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
        treeWidget = new QTreeWidget(dockWidgetContents);
        treeWidget->setObjectName(QString::fromUtf8("treeWidget"));
        treeWidget->setAlternatingRowColors(true);
        verticalLayout->addWidget(treeWidget);
        ARMRegisters->setWidget(dockWidgetContents);
        retranslateUi(ARMRegisters);
        QMetaObject::connectSlotsByName(ARMRegisters);
    } // setupUi
    void retranslateUi(QDockWidget *ARMRegisters)
    {
        ARMRegisters->setWindowTitle(QApplication::translate("ARMRegisters", "ARM registers", 0, QApplication::UnicodeUTF8));
        QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem();
        ___qtreewidgetitem->setText(1, QApplication::translate("ARMRegisters", "Value", 0, QApplication::UnicodeUTF8));
        ___qtreewidgetitem->setText(0, QApplication::translate("ARMRegisters", "Register", 0, QApplication::UnicodeUTF8));
    } // retranslateUi
 };
 namespace Ui {
    class ARMRegisters: public Ui_ARMRegisters {};
 } // namespace Ui
 QT_END_NAMESPACE
 #endif // UI_REGISTERS_H
--- a/vsprops/qt.props
+++ b/vsprops/qt.props
@ -7,7 +7,7 @@
    <QtBinaryDir>$(QTDIR)\bin\</QtBinaryDir>
  </PropertyGroup>
  <PropertyGroup>
    <IncludePath>$(QtIncludeDir);$(QtIncludeDir)QtGui;$(QtIncludeDir)QtCore;$(QtIncludeDir)Qt;$(QtIncludeDir)QtOpenGL;$(QtIncludeDir)QtANGLE;$(QtIncludeDir)QtWidgets;$(IncludePath)</IncludePath>
    <IncludePath>$(QtIncludeDir);$(QtIncludeDir)QtGui;$(QtIncludeDir)QtCore;$(QtIncludeDir)Qt;$(QtIncludeDir)QtOpenGL;$(QtIncludeDir)QtANGLE;$(QtIncludeDir)QtWidgets;$(ProjectDir);$(IncludePath)</IncludePath>
    <LibraryPath>$(QtLibraryDir);$(LibraryPath)</LibraryPath>
  </PropertyGroup>
  <ItemDefinitionGroup>