80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix Qt 6.4 builds.

Browse Source 
Cast from char* to QVariant was removed, use const char* instead.
This commit is contained in:
ts-korhonen
2022-10-14 14:44:36 +03:00
parent 42a03528fd
commit 0dabf88baf
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/disk/hdd.c
View File

@@ -442,16 +442,16 @@ hdd_preset_get_num()
return sizeof(hdd_speed_presets) / sizeof(hdd_preset_t); return sizeof(hdd_speed_presets) / sizeof(hdd_preset_t);
} }
char * const char *
hdd_preset_getname(int preset) hdd_preset_getname(int preset)
{ {
return (char *) hdd_speed_presets[preset].name; return hdd_speed_presets[preset].name;
} }
char * const char *
hdd_preset_get_internal_name(int preset) hdd_preset_get_internal_name(int preset)
{ {
return (char *) hdd_speed_presets[preset].internal_name; return hdd_speed_presets[preset].internal_name;
} }
int int

16
src/include/86box/hdd.h
View File

@@ -203,13 +203,13 @@ extern int image_is_hdi(const char *s);
extern int image_is_hdx(const char *s, int check_signature); extern int image_is_hdx(const char *s, int check_signature);
extern int image_is_vhd(const char *s, int check_signature); extern int image_is_vhd(const char *s, int check_signature);
extern double hdd_timing_write(hard_disk_t *hdd, uint32_t addr, uint32_t len); extern double hdd_timing_write(hard_disk_t *hdd, uint32_t addr, uint32_t len);
extern double hdd_timing_read(hard_disk_t *hdd, uint32_t addr, uint32_t len); extern double hdd_timing_read(hard_disk_t *hdd, uint32_t addr, uint32_t len);
extern double hdd_seek_get_time(hard_disk_t *hdd, uint32_t dst_addr, uint8_t operation, uint8_t continuous, double max_seek_time); extern double hdd_seek_get_time(hard_disk_t *hdd, uint32_t dst_addr, uint8_t operation, uint8_t continuous, double max_seek_time);
int hdd_preset_get_num(); int hdd_preset_get_num();
char *hdd_preset_getname(int preset); const char *hdd_preset_getname(int preset);
extern char *hdd_preset_get_internal_name(int preset); extern const char *hdd_preset_get_internal_name(int preset);
extern int hdd_preset_get_from_internal_name(char *s); extern int hdd_preset_get_from_internal_name(char *s);
extern void hdd_preset_apply(int hdd_id); extern void hdd_preset_apply(int hdd_id);
#endif /*EMU_HDD_H*/ #endif /*EMU_HDD_H*/