(UI/QT) Fix Travis OSX build hopefully

griffin/griffin_cpp.cpp

@@ -78,7 +78,6 @@ UI
 #include "../ui/drivers/qt/options/ui.cpp"
 #include "../ui/drivers/qt/options/achievements.cpp"
 #include "../ui/drivers/qt/options/network.cpp"
-#include "../ui/drivers/qt/moc_settingswidgets.cpp"
 #include "../ui/drivers/qt/options/moc_options.cpp"
 #endif
 #include "../ui/drivers/moc_ui_qt.cpp"

ui/drivers/qt/options/configuration.cpp

@@ -27,7 +27,8 @@ QWidget *ConfigurationPage::widget()
    QWidget          *widget    = new QWidget;
    FormLayout          *layout = new FormLayout;
    file_list_t           *list = (file_list_t*)calloc(1, sizeof(*list));
-   unsigned           count    = menu_displaylist_build_list(
+
+   menu_displaylist_build_list(
          list, DISPLAYLIST_CONFIGURATION_SETTINGS_LIST);
 
    for (i = 0; i < list->size; i++)

ui/drivers/qt/options/core.cpp

@@ -27,7 +27,8 @@ QWidget *CorePage::widget()
    QWidget          *widget    = new QWidget;
    FormLayout          *layout = new FormLayout;
    file_list_t           *list = (file_list_t*)calloc(1, sizeof(*list));
-   unsigned           count    = menu_displaylist_build_list(
+
+   menu_displaylist_build_list(
          list, DISPLAYLIST_CORE_SETTINGS_LIST);
 
    for (i = 0; i < list->size; i++)

ui/drivers/qt/options/directory.cpp

@@ -27,7 +27,8 @@ QWidget *DirectoryPage::widget()
    QWidget          *widget    = new QWidget;
    FormLayout          *layout = new FormLayout;
    file_list_t           *list = (file_list_t*)calloc(1, sizeof(*list));
-   unsigned           count    = menu_displaylist_build_list(
+
+   menu_displaylist_build_list(
          list, DISPLAYLIST_DIRECTORY_SETTINGS_LIST);
 
    for (i = 0; i < list->size; i++)

ui/drivers/qt/options/drivers.cpp

@@ -28,7 +28,8 @@ QWidget *DriversPage::widget()
    QWidget          *widget    = new QWidget;
    FormLayout          *layout = new FormLayout;
    file_list_t           *list = (file_list_t*)calloc(1, sizeof(*list));
-   unsigned           count    = menu_displaylist_build_list(
+
+   menu_displaylist_build_list(
          list, DISPLAYLIST_DRIVER_SETTINGS_LIST);
 
    for (i = 0; i < list->size; i++)

ui/drivers/qt/options/input.cpp

@@ -107,7 +107,6 @@ UserBindsPage::UserBindsPage(QObject *parent) :
 QWidget *UserBindsPage::widget()
 {
    unsigned p, retro_id;
-   unsigned count        = 0;
    unsigned max_users    = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
    QWidget *widget       = new QWidget;
    QGridLayout *layout   = new QGridLayout;

ui/drivers/qt/options/logging.cpp

@@ -27,7 +27,8 @@ QWidget *LoggingPage::widget()
    QWidget          *widget    = new QWidget;
    FormLayout          *layout = new FormLayout;
    file_list_t           *list = (file_list_t*)calloc(1, sizeof(*list));
-   unsigned           count    = menu_displaylist_build_list(
+
+   menu_displaylist_build_list(
          list, DISPLAYLIST_LOGGING_SETTINGS_LIST);
 
    for (i = 0; i < list->size; i++)

ui/drivers/qt/options/throttle.cpp

@@ -29,7 +29,8 @@ QWidget *FrameThrottlePage::widget()
    QWidget             *widget = new QWidget;
    FormLayout          *layout = new FormLayout;
    file_list_t           *list = (file_list_t*)calloc(1, sizeof(*list));
-   unsigned           count    = menu_displaylist_build_list(
+
+   menu_displaylist_build_list(
          list, DISPLAYLIST_FRAME_THROTTLE_SETTINGS_LIST);
 
    for (i = 0; i < list->size; i++)
@@ -59,7 +60,8 @@ QWidget *RewindPage::widget()
    QWidget             *widget = new QWidget;
    FormLayout          *layout = new FormLayout;
    file_list_t           *list = (file_list_t*)calloc(1, sizeof(*list));
-   unsigned           count    = menu_displaylist_build_list(
+
+   menu_displaylist_build_list(
          list, DISPLAYLIST_REWIND_SETTINGS_LIST);
 
    for (i = 0; i < list->size; i++)

ui/drivers/qt/options/ui.cpp

@@ -164,7 +164,8 @@ QWidget *QuickMenuPage::widget()
    QWidget            * widget = new QWidget;
    FormLayout          *layout = new FormLayout;
    file_list_t           *list = (file_list_t*)calloc(1, sizeof(*list));
-   unsigned           count    = menu_displaylist_build_list(
+
+   menu_displaylist_build_list(
          list, DISPLAYLIST_QUICK_MENU_VIEWS_SETTINGS_LIST);
 
    for (i = 0; i < list->size; i++)
@@ -193,10 +194,9 @@ QWidget *AppearancePage::widget()
    unsigned i;
    QWidget            * widget = new QWidget;
    FormLayout          *layout = new FormLayout;
-   rarch_setting_t *thumbnails = menu_setting_find_enum(
-         MENU_ENUM_LABEL_THUMBNAILS);
    file_list_t           *list = (file_list_t*)calloc(1, sizeof(*list));
-   unsigned           count    = menu_displaylist_build_list(
+
+   menu_displaylist_build_list(
          list, DISPLAYLIST_MENU_SETTINGS_LIST);
 
    /* TODO/FIXME - we haven't yet figured out how to 
@@ -233,6 +233,10 @@ QWidget *AppearancePage::widget()
    file_list_free(list);
 
 #if 0
+   {
+      rarch_setting_t *thumbnails = menu_setting_find_enum(
+            MENU_ENUM_LABEL_THUMBNAILS);
+
       layout->add(MENU_ENUM_LABEL_MENU_WALLPAPER);
       layout->add(MENU_ENUM_LABEL_DYNAMIC_WALLPAPER);
       layout->add(MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY);
@@ -285,6 +289,7 @@ QWidget *AppearancePage::widget()
       layout->add(MENU_ENUM_LABEL_MENU_RGUI_THUMBNAIL_DOWNSCALER);
       layout->add(MENU_ENUM_LABEL_MENU_TICKER_TYPE);
       layout->add(MENU_ENUM_LABEL_MENU_TICKER_SPEED);
+   }
 #endif
 
    widget->setLayout(layout);

ui/drivers/qt/ui_qt_window.cpp

@@ -2097,9 +2097,7 @@ void MainWindow::setCoreActions()
          QString coreName = hash["core_name"];
 
          if (coreName.isEmpty())
-         {
             coreName = "<n/a>";
-         }
          else
          {
             const char *detect_str = file_path_str(FILE_PATH_DETECT);
@@ -2882,9 +2880,8 @@ void MainWindow::onLoadCoreClicked(const QStringList &extensionFilters)
 
 void MainWindow::initContentTableWidget()
 {
-   QListWidgetItem *item = m_listWidget->currentItem();
    QString path;
-   int i = 0;
+   QListWidgetItem *item = m_listWidget->currentItem();
 
    if (!item)
       return;
@@ -2904,10 +2901,10 @@ void MainWindow::initContentTableWidget()
 
    if (path == ALL_PLAYLISTS_TOKEN)
    {
+      unsigned i;
       settings_t *settings = config_get_ptr();
       QDir playlistDir(settings->paths.directory_playlist);
       QStringList playlists;
-      int i = 0;
 
       for (i = 0; i < m_playlistFiles.count(); i++)
       {
@@ -2933,12 +2930,13 @@ void MainWindow::initContentTableWidget()
 
 void MainWindow::updateItemsCount()
 {
-   m_itemsCountLabel->setText(m_itemsCountLiteral.arg(m_proxyModel->rowCount()));
+   m_itemsCountLabel->setText(
+         m_itemsCountLiteral.arg(m_proxyModel->rowCount()));
 }
 
 void MainWindow::keyPressEvent(QKeyEvent *event)
 {
-/*
+#if 0
    if (event->key() == Qt::Key_F5)
    {
       event->accept();
@@ -2946,7 +2944,7 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
 
       return;
    }
-*/
+#endif
    QMainWindow::keyPressEvent(event);
 }
 

ui/drivers/ui_qt.cpp

@@ -97,7 +97,9 @@ void ThumbnailWidget::dragEnterEvent(QDragEnterEvent *event)
       event->acceptProposedAction();
 }
 
-/* Workaround for QTBUG-72844. Without it, you can't drop on this if you first drag over another widget that doesn't accept drops. */
+/* Workaround for QTBUG-72844. Without it, you can't 
+ * drop on this if you first drag over another 
+ * widget that doesn't accept drops. */
 void ThumbnailWidget::dragMoveEvent(QDragMoveEvent *event)
 {
    event->acceptProposedAction();
@@ -155,10 +157,10 @@ QSize ThumbnailLabel::sizeHint() const
 
 void ThumbnailLabel::paintEvent(QPaintEvent *event)
 {
-   int w = width();
-   int h = height();
    QStyleOption o;
    QPainter p;
+   int w = width();
+   int h = height();
 
    event->accept();
 
@@ -234,11 +236,14 @@ static void ui_companion_qt_deinit(void *data)
 
 static void* ui_companion_qt_init(void)
 {
-   ui_companion_qt_t *handle = (ui_companion_qt_t*)calloc(1, sizeof(*handle));
+   int i = 0;
+   QString initialPlaylist;
+   QRect desktopRect;
+   ui_companion_qt_t               *handle = (ui_companion_qt_t*)
+      calloc(1, sizeof(*handle));
    MainWindow                  *mainwindow = NULL;
    QHBoxLayout   *browserButtonsHBoxLayout = NULL;
    QVBoxLayout                     *layout = NULL;
-   QVBoxLayout *playlistViewsLayout = NULL;
    QVBoxLayout     *launchWithWidgetLayout = NULL;
    QHBoxLayout         *coreComboBoxLayout = NULL;
    QMenuBar                          *menu = NULL;
@@ -252,7 +257,6 @@ static void* ui_companion_qt_init(void)
    QMenu                      *updaterMenu = NULL;
 #endif
    QMenu                         *helpMenu = NULL;
-   QRect desktopRect;
    QDockWidget              *thumbnailDock = NULL;
    QDockWidget             *thumbnail2Dock = NULL;
    QDockWidget             *thumbnail3Dock = NULL;
@@ -281,15 +285,13 @@ static void* ui_companion_qt_init(void)
    QComboBox           *launchWithComboBox = NULL;
    QSettings                    *qsettings = NULL;
    QListWidget                 *listWidget = NULL;
-   QString initialPlaylist;
    bool                      foundPlaylist = false;
 
-   int i = 0;
-
    if (!handle)
       return NULL;
 
-   handle->app = static_cast<ui_application_qt_t*>(ui_application_qt.initialize());
+   handle->app     = static_cast<ui_application_qt_t*>
+      (ui_application_qt.initialize());
    handle->window  = static_cast<ui_window_qt_t*>(ui_window_qt.init());
 
    desktop         = qApp->desktop();