OSDN Git Service

[VM][PASOPIA7] FIX FTBFS.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 23 Sep 2016 10:40:23 +0000 (19:40 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 23 Sep 2016 10:40:23 +0000 (19:40 +0900)
source/src/vm/pasopia7/joypac2.h
source/src/vm/pasopia7/kanjipac2.h
source/src/vm/pasopia7/pac2.cpp
source/src/vm/pasopia7/rampac2.h

index c6a099e..ae99062 100644 (file)
@@ -20,11 +20,7 @@ class JOYPAC2 : public PAC2DEV
 private:
        const uint32_t* joy;
 public:
-       JOYPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {
-#if defined(_USE_QT)
-               set_device_name(_T("JOY PAC2"));
-#endif
-       }
+       JOYPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {}
        ~JOYPAC2() {}
        
        // common functions
index 9bffe4f..6e2dae0 100644 (file)
@@ -21,11 +21,7 @@ private:
        uint8_t rom[0x20000];
        uint32_t ptr;
 public:
-       KANJIPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {
-#if defined(_USE_QT)
-               set_device_name(_T("KANJI PAC2"));
-#endif
-       }
+       KANJIPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {}
        ~KANJIPAC2() {}
        
        // common functions
index cb04d1e..3220028 100644 (file)
@@ -24,11 +24,6 @@ void PAC2::initialize()
        rampac2[1] = new RAMPAC2(vm, emu);
        kanji = new KANJIPAC2(vm, emu);
        joy = new JOYPAC2(vm, emu);
-#if defined(_USE_QT)
-       dummy->set_device_name(_T("DUMMY PAC2"));
-       rampac2[0]->set_device_name(_T("RAM PAC2 #1"));
-       rampac2[1]->set_device_name(_T("RAM PAC2 #2"));
-#endif
        
        rampac2[0]->initialize(1);
        rampac2[1]->initialize(2);
index 5c49438..e02e7f2 100644 (file)
@@ -24,11 +24,7 @@ private:
        bool opened, modified;
        
 public:
-       RAMPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {
-#if defined(_USE_QT)
-               set_device_name(_T("RAM PAC2"));
-#endif
-       }
+       RAMPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {}
        ~RAMPAC2() {}
        
        // common functions