bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix using strings deprecated in c++11

Browse Source
This commit is contained in:
Alexander Skovpen
2018-07-12 21:36:37 +03:00
committed by dukelsky
parent 3c52692ffc
commit a61ee2e300
37 changed files with 1035 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
goldlib/gall/gcharset.cpp
View File

@@ -112,11 +112,11 @@ const char *get_dos_charset(const char *cpfrom)
static const struct _cpmap {
char *from, *to;
} cpmap[] = {
{ "IBMPC", "CP850" },
{ "LATIN-1", "CP437" },
{ "KOI8", "CP866" },
{ "KOI8-R", "CP866" },
{ "KOI8-U", "CP1125" },
{ (char *)"IBMPC", (char *)"CP850" },
{ (char *)"LATIN-1", (char *)"CP437" },
{ (char *)"KOI8", (char *)"CP866" },
{ (char *)"KOI8-R", (char *)"CP866" },
{ (char *)"KOI8-U", (char *)"CP1125" },
{ NULL, NULL }
};

12
goldlib/gall/gfile.h
View File

@@ -273,15 +273,15 @@ class gnfile: gfile
gnfile& operator<< (uint8_t o) { Fwrite(&o, sizeof(o)); return *this; }
gnfile& operator<< (uint16_t o) { uint8_t o8;
o8 = uint8_t(o && 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t((o<<8) && 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t(o & 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t((o<<8) & 0xff); Fwrite(&o8, sizeof(o8));
return *this;
}
gnfile& operator<< (uint32_t o) { uint8_t o8;
o8 = uint8_t(o && 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t((o<<8) && 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t((o<<16) && 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t((o<<24) && 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t(o & 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t((o<<8) & 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t((o<<16) & 0xff); Fwrite(&o8, sizeof(o8));
o8 = uint8_t((o<<24) & 0xff); Fwrite(&o8, sizeof(o8));
return *this;
}
/*

2
goldlib/gall/gftnaddr.cpp
View File

@@ -157,7 +157,7 @@ char* ftn_addr::set(const char* str, char* dom, int domsizelimit) {
bool gotnode = false;
bool gotpoint = false;
bool gotdomain = false;
static char* nulchar = "";
static char* nulchar = (char *)"";
if(*str == '*')
set_all(ftn::wildcard_all);

14
goldlib/gall/gsnd.cpp
View File

@@ -289,7 +289,7 @@ int gsnd::close() {
#elif defined(GUTLOS_FUNCS)
if(file_open) {
g_send_mci_string("close noise wait", NULL);
g_send_mci_string((char *)"close noise wait", NULL);
file_open = false;
return 0;
}
@@ -316,8 +316,8 @@ int gsnd::play(uint sample_rate) {
NW(sample_rate);
if(file_open) {
g_send_mci_string("seek noise to start", NULL);
g_send_mci_string("play noise", NULL);
g_send_mci_string((char *)"seek noise to start", NULL);
g_send_mci_string((char *)"play noise", NULL);
return 0;
}
return 1;
@@ -342,7 +342,7 @@ int gsnd::stop() {
#elif defined(GUTLOS_FUNCS)
if(file_open) {
g_send_mci_string("stop noise wait", NULL);
g_send_mci_string((char *)"stop noise wait", NULL);
return 0;
}
return 1;
@@ -366,7 +366,7 @@ int gsnd::pause() {
#elif defined(GUTLOS_FUNCS)
if(file_open) {
g_send_mci_string("pause noise", NULL);
g_send_mci_string((char *)"pause noise", NULL);
return 0;
}
return 1;
@@ -390,7 +390,7 @@ int gsnd::resume() {
#elif defined(GUTLOS_FUNCS)
if(file_open) {
g_send_mci_string("resume noise", NULL);
g_send_mci_string((char *)"resume noise", NULL);
return 0;
}
return 1;
@@ -483,7 +483,7 @@ int gsnd::is_playing() {
if (file_open)
{
if(g_send_mci_string("status noise mode wait", return_buffer))
if(g_send_mci_string((char *)"status noise mode wait", return_buffer))
return strieql(return_buffer, "playing") or strieql(return_buffer, "seeking");
}

16
goldlib/gall/gtimutil.cpp
View File

@@ -72,29 +72,29 @@ int tzoffset()
// ------------------------------------------------------------------
char* __gampm[2] = {
"AM", "PM"
(char *)"AM", (char *)"PM"
};
char* __gsweekday[7] = {
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
(char *)"Sun", (char *)"Mon", (char *)"Tue", (char *)"Wed", (char *)"Thu", (char *)"Fri", (char *)"Sat"
};
char* __glweekday[7] = {
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
(char *)"Sunday", (char *)"Monday", (char *)"Tuesday", (char *)"Wednesday", (char *)"Thursday", (char *)"Friday", (char *)"Saturday"
};
char* __gsmonth[12] = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
(char *)"Jan", (char *)"Feb", (char *)"Mar", (char *)"Apr", (char *)"May", (char *)"Jun",
(char *)"Jul", (char *)"Aug", (char *)"Sep", (char *)"Oct", (char *)"Nov", (char *)"Dec"
};
char* __glmonth[12] = {
"January", "February", "March", "April", "May", "June",
"July", "August", "September", "October", "November", "December"
(char *)"January", (char *)"February", (char *)"March", (char *)"April", (char *)"May", (char *)"June",
(char *)"July", (char *)"August", (char *)"September", (char *)"October", (char *)"November", (char *)"December"
};
char* gampm[2] = {
"AM", "PM"
(char *)"AM", (char *)"PM"
};
char* gsweekday[7] = {