[UI][Qt] Fix FTBFS with LLVM CLANG.

diff --git a/source/src/qt/debugger/qt_debugger.cpp b/source/src/qt/debugger/qt_debugger.cpp
index 267dfed..874887c 100644 (file)
--- a/source/src/qt/debugger/qt_debugger.cpp
+++ b/source/src/qt/debugger/qt_debugger.cpp
@@ -71,7 +71,7 @@ void CSP_Debugger::closeEvent(QCloseEvent *event)
                debugger_thread_t *d_params = &debugger_thread_param;
                DEVICE *cpu = d_params->vm->get_cpu(d_params->cpu_index);
                uint32_t cpu_index = d_params->cpu_index;
-               DEBUGGER *debugger = (DEBUGGER *)cpu->get_debugger();
+//             DEBUGGER *debugger = (DEBUGGER *)cpu->get_debugger();
                if(emu->is_debugger_enabled(cpu_index)) {
                        emu->close_debugger();
                        //      debugger->now_debugging = false;

diff --git a/source/src/qt/gui/emu_thread_tmpl.cpp b/source/src/qt/gui/emu_thread_tmpl.cpp
index 69b3efa..661b723 100644 (file)
--- a/source/src/qt/gui/emu_thread_tmpl.cpp
+++ b/source/src/qt/gui/emu_thread_tmpl.cpp
@@ -491,7 +491,7 @@ QString EmuThreadClassBase::get_d88_file_path(int drive)
 void EmuThreadClassBase::set_emu_thread_to_fixed_cpu(int cpunum)
 {
 #if defined(Q_OS_LINUX)
-       if(thread_id <= 0) {
+       if(thread_id == (Qt::HANDLE)nullptr) {
                queue_fixed_cpu = cpunum;
                return;
        }

diff --git a/source/src/qt/gui/mainwidget_base.h b/source/src/qt/gui/mainwidget_base.h
index a23437a..14d9057 100644 (file)
--- a/source/src/qt/gui/mainwidget_base.h
+++ b/source/src/qt/gui/mainwidget_base.h
@@ -159,6 +159,7 @@ class Menu_LaserdiscClass;
 class CSP_DockDisks;
 class MOVIE_SAVER;
 class EmuThreadClassBase;
+class EmuThreadClass;
 class DLL_PREFIX Ui_MainWindowBase : public QMainWindow
 {
        Q_OBJECT

diff --git a/source/src/qt/gui/qt_dialogs.cpp b/source/src/qt/gui/qt_dialogs.cpp
index 8f91571..0e408dc 100644 (file)
--- a/source/src/qt/gui/qt_dialogs.cpp
+++ b/source/src/qt/gui/qt_dialogs.cpp
@@ -42,7 +42,7 @@ void CSP_DiskParams::_open_binary(QString s) {
 }
 
 
-CSP_CreateDiskDialog::CSP_CreateDiskDialog(bool *masks, QWidget *parent = 0) : QWidget(parent)
+CSP_CreateDiskDialog::CSP_CreateDiskDialog(bool *masks, QWidget *parent) : QWidget(parent)
 {
        __real_media_type = 0x00;
        dlg = new QFileDialog(NULL, Qt::Widget);

diff --git a/source/src/qt/osd_base.cpp b/source/src/qt/osd_base.cpp
index b854c49..331d03b 100644 (file)
--- a/source/src/qt/osd_base.cpp
+++ b/source/src/qt/osd_base.cpp
@@ -523,7 +523,7 @@ void OSD_BASE::set_dbg_completion_list(std::list<std::string> *p)
        if(p != NULL) {
                emit sig_clear_dbg_completion_list();
                for(auto n = p->begin(); n != p->end(); ++n) {
-                       emit sig_add_dbg_completion_list((*n).c_str());
+                       emit sig_add_dbg_completion_list((_TCHAR *)((*n).c_str()));
                }
                emit sig_apply_dbg_completion_list();
        }

diff --git a/source/src/qt/osd_wrapper.cpp b/source/src/qt/osd_wrapper.cpp
index 85666d0..aa70849 100644 (file)
--- a/source/src/qt/osd_wrapper.cpp
+++ b/source/src/qt/osd_wrapper.cpp
@@ -1036,7 +1036,7 @@ int OSD::add_video_frames()
                        for(int y = 0; y < vm_screen_buffer.pImage.height(); y++) {
                                scrntype_t *p = vm_screen_buffer.get_buffer(y);
                                if(p != NULL) {
-                                       if(p != vm_screen_buffer.pImage.scanLine(y)) {
+                                       if(p != (scrntype_t*)(vm_screen_buffer.pImage.scanLine(y))) {
                                                memcpy(vm_screen_buffer.pImage.scanLine(y), p, vm_screen_buffer.pImage.width() * sizeof(scrntype_t));
                                        }
                                } else {
@@ -1082,7 +1082,7 @@ int OSD::add_video_frames()
                        for(int y = 0; y < vm_screen_buffer.pImage.height(); y++) {
                                scrntype_t *p = vm_screen_buffer.get_buffer(y);
                                if(p != NULL) {
-                                       if(p != vm_screen_buffer.pImage.scanLine(y)) {
+                                       if(p != (scrntype_t*)(vm_screen_buffer.pImage.scanLine(y))) {
                                                memcpy(vm_screen_buffer.pImage.scanLine(y), p, vm_screen_buffer.pImage.width() * sizeof(scrntype_t));
                                        }
                                } else {