Merge pull request #8007 from orbea/qt

Fix qt with CXX_BUILD.

ui/drivers/qt/coreinfodialog.cpp

@@ -5,10 +5,15 @@
 #include "coreinfodialog.h"
 #include "../ui_qt.h"
 
-extern "C"
+#ifndef CXX_BUILD
-{
+extern "C" {
+#endif
+
 #include "../../../msg_hash.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 CoreInfoDialog::CoreInfoDialog(MainWindow *mainwindow, QWidget *parent) :
    QDialog(parent)
@@ -93,4 +98,3 @@ void CoreInfoDialog::showCoreInfo()
 
    show();
 }
-

ui/drivers/qt/coreoptionsdialog.cpp

@@ -20,7 +20,10 @@
 #include "coreoptionsdialog.h"
 #include "../ui_qt.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
 #include <file/file_path.h>
@@ -30,7 +33,10 @@ extern "C" {
 #include "../../../paths.h"
 #include "../../../file_path_special.h"
 #include "../../../managers/core_option_manager.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 CoreOptionsDialog::CoreOptionsDialog(QWidget *parent) :
    QDialog(parent)

ui/drivers/qt/filedropwidget.cpp

@@ -15,10 +15,16 @@
 #include "playlistentrydialog.h"
 #include "../ui_qt.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include "../../../file_path_special.h"
 #include "../../../configuration.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 FileDropWidget::FileDropWidget(QWidget *parent) :
    QWidget(parent)

ui/drivers/qt/playlistentrydialog.cpp

@@ -13,10 +13,16 @@
 #include "playlistentrydialog.h"
 #include "../ui_qt.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include "../../../core_info.h"
 #include "../../../file_path_special.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 inline static bool comp_string_lower(const QString &lhs, const QString &rhs)
 {

ui/drivers/qt/playlistthumbnaildownload.cpp

@@ -4,7 +4,10 @@
 
 #include "../ui_qt.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
 #include <file/archive_file.h>
@@ -13,7 +16,10 @@ extern "C" {
 #include "../../../config.def.h"
 #include "../../../configuration.h"
 #include "../../../version.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #define USER_AGENT "RetroArch-WIMP/" PACKAGE_VERSION
 #define PARTIAL_EXTENSION ".partial"

ui/drivers/qt/qt_playlist.cpp

@@ -15,7 +15,10 @@
 #include "../ui_qt.h"
 #include "playlistentrydialog.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <file/file_path.h>
 #include <file/archive_file.h>
 #include <lists/string_list.h>
@@ -27,7 +30,10 @@ extern "C" {
 #include "../../../configuration.h"
 #include "../../../core_info.h"
 #include "../../../verbosity.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 PlaylistModel::PlaylistModel(QObject *parent)
    : QAbstractListModel(parent)

ui/drivers/qt/shaderparamsdialog.cpp

@@ -19,7 +19,10 @@
 #include "shaderparamsdialog.h"
 #include "../ui_qt.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
 #include <file/file_path.h>
@@ -29,7 +32,10 @@ extern "C" {
 #include "../../../paths.h"
 #include "../../../file_path_special.h"
 #include "../../../menu/menu_shader.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 enum
 {

ui/drivers/qt/shaderparamsdialog.h

@@ -4,9 +4,15 @@
 #include <QDialog>
 #include <QPointer>
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include "../.././gfx/video_shader_parse.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 class QCloseEvent;
 class QResizeEvent;

ui/drivers/qt/thumbnaildownload.cpp

@@ -4,7 +4,10 @@
 
 #include "../ui_qt.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
 #include <file/archive_file.h>
@@ -13,7 +16,10 @@ extern "C" {
 #include "../../../config.def.h"
 #include "../../../configuration.h"
 #include "../../../version.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #undef USER_AGENT
 #define USER_AGENT "RetroArch-WIMP/" PACKAGE_VERSION

ui/drivers/qt/thumbnailpackdownload.cpp

@@ -4,7 +4,10 @@
 
 #include "../ui_qt.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
 #include <file/archive_file.h>
@@ -13,7 +16,10 @@ extern "C" {
 #include "../../../config.def.h"
 #include "../../../configuration.h"
 #include "../../../version.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #undef TEMP_EXTENSION
 #define USER_AGENT "RetroArch-WIMP/" PACKAGE_VERSION

ui/drivers/qt/ui_qt_application.cpp

@@ -17,7 +17,10 @@
 #include <QApplication>
 #include <QAbstractEventDispatcher>
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include "../../ui_companion_driver.h"
 #include "../../../retroarch.h"
 #include "../../../verbosity.h"
@@ -28,7 +31,10 @@ extern "C" {
 #ifdef Q_OS_UNIX
 #include <locale.h>
 #endif
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #include "../ui_qt.h"
 
@@ -174,7 +180,7 @@ static void ui_application_qt_run(void *args)
 }
 
 #ifdef HAVE_MAIN
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(CXX_BUILD)
 extern "C"
 #endif
 int main(int argc, char *argv[])

ui/drivers/qt/ui_qt_load_core_window.cpp

@@ -20,7 +20,10 @@
 #include <QFileDialog>
 #include <QDesktopWidget>
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include "../../../core_info.h"
 #include "../../../verbosity.h"
 #include "../../../configuration.h"
@@ -31,7 +34,10 @@ extern "C" {
 #include <string/stdstring.h>
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #define CORE_NAME_COLUMN 0
 #define CORE_VERSION_COLUMN 1

ui/drivers/qt/ui_qt_load_core_window.h

@@ -18,9 +18,15 @@
 #ifndef _QT_LOAD_CORE_WINDOW_H
 #define _QT_LOAD_CORE_WINDOW_H
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <retro_common_api.h>
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #include <QtWidgets>
 

ui/drivers/qt/ui_qt_window.cpp

@@ -49,7 +49,10 @@
 #include "playlistentrydialog.h"
 #include "viewoptionsdialog.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include "../../../version.h"
 #include "../../../verbosity.h"
 #include "../../../retroarch.h"
@@ -76,7 +79,10 @@ extern "C" {
 #include <openssl/ssl.h>
 #include <openssl/opensslv.h>
 #endif
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #include "../../../AUTHORS.h"
 

ui/drivers/qt/updateretroarch.cpp

@@ -4,14 +4,20 @@
 
 #include "../ui_qt.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
 #include <file/archive_file.h>
 #include "../../../tasks/tasks_internal.h"
 #include "../../../verbosity.h"
 #include "../../../config.def.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #define USER_AGENT "RetroArch-WIMP/1.0"
 #define PARTIAL_EXTENSION ".partial"

ui/drivers/qt/viewoptionsdialog.cpp

@@ -14,9 +14,15 @@
 #include "viewoptionsdialog.h"
 #include "../ui_qt.h"
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include "../../../msg_hash.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 ViewOptionsDialog::ViewOptionsDialog(MainWindow *mainwindow, QWidget *parent) :
    QDialog(mainwindow)

ui/drivers/ui_qt.cpp

@@ -14,7 +14,10 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
@@ -29,7 +32,10 @@ extern "C" {
 #include "../../verbosity.h"
 #include "../../msg_hash.h"
 #include "../../tasks/tasks_internal.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #include "ui_qt.h"
 #include "qt/filedropwidget.h"

ui/drivers/ui_qt.h

@@ -43,13 +43,19 @@
 #include <QSortFilterProxyModel>
 #include <QDir>
 
+#ifndef CXX_BUILD
 extern "C" {
+#endif
+
 #include <retro_assert.h>
 #include <retro_common_api.h>
 #include <queues/task_queue.h>
 #include "../ui_companion_driver.h"
 #include "../../gfx/video_driver.h"
+
+#ifndef CXX_BUILD
 }
+#endif
 
 #define ALL_PLAYLISTS_TOKEN "|||ALL|||"
 #define ICON_PATH "/xmb/dot-art/png/"