nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

switch source tree from k&r to c99

Browse Source
This commit is contained in:
nhmall
2021-01-26 21:06:16 -05:00
parent a2a9cb7b4f
commit f963c5aca7
232 changed files with 12099 additions and 17782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/Qt/qt_bind.cpp
+7 -7
View File
@@ -346,7 +346,7 @@ void NetHackQtBind::qt_clear_nhwindow(winid wid)
window->Clear();
}
void NetHackQtBind::qt_display_nhwindow(winid wid, BOOLEAN_P block)
void NetHackQtBind::qt_display_nhwindow(winid wid, boolean block)
{
NetHackQtWindow* window=id_to_window[(int)wid];
if (window)
@@ -388,7 +388,7 @@ void NetHackQtBind::qt_putstr(winid wid, int attr, const QString& text)
window->PutStr(attr,text);
}
void NetHackQtBind::qt_display_file(const char *filename, BOOLEAN_P must_exist)
void NetHackQtBind::qt_display_file(const char *filename, boolean must_exist)
{
NetHackQtTextWindow* window=new NetHackQtTextWindow(mainWidget());
bool complain = false;
@@ -429,7 +429,7 @@ void NetHackQtBind::qt_start_menu(winid wid, unsigned long mbehavior UNUSED)
}
void NetHackQtBind::qt_add_menu(winid wid, const glyph_info *glyphinfo,
const ANY_P * identifier, CHAR_P ch, CHAR_P gch, int attr,
const ANY_P * identifier, char ch, char gch, int attr,
const char *str, unsigned itemflags)
{
NetHackQtWindow* window=id_to_window[(int)wid];
@@ -479,7 +479,7 @@ void NetHackQtBind::qt_cliparound_window(winid wid, int x, int y)
NetHackQtWindow* window=id_to_window[(int)wid];
window->ClipAround(x,y);
}
void NetHackQtBind::qt_print_glyph(winid wid,XCHAR_P x,XCHAR_P y,
void NetHackQtBind::qt_print_glyph(winid wid,xchar x,xchar y,
const glyph_info *glyphinfo,
const glyph_info *bkglyphinfo UNUSED)
{
@@ -647,7 +647,7 @@ char NetHackQtBind::qt_more()
}
char NetHackQtBind::qt_yn_function(const char *question_,
const char *choices, CHAR_P def)
const char *choices, char def)
{
QString question(QString::fromLatin1(question_));
QString message;
@@ -852,7 +852,7 @@ void NetHackQtBind::qt_preference_update(const char *optname)
#endif
}
char *NetHackQtBind::qt_getmsghistory(BOOLEAN_P init)
char *NetHackQtBind::qt_getmsghistory(boolean init)
{
NetHackQtMessageWindow *window = main->GetMessageWindow();
if (window)
@@ -860,7 +860,7 @@ char *NetHackQtBind::qt_getmsghistory(BOOLEAN_P init)
return NULL;
}
void NetHackQtBind::qt_putmsghistory(const char *msg, BOOLEAN_P is_restoring)
void NetHackQtBind::qt_putmsghistory(const char *msg, boolean is_restoring)
{
NetHackQtMessageWindow *window = main->GetMessageWindow();
if (!window)
win/Qt/qt_bind.h
+7 -7
View File
@@ -44,16 +44,16 @@ public:
static void qt_resume_nhwindows();
static winid qt_create_nhwindow(int type);
static void qt_clear_nhwindow(winid wid);
static void qt_display_nhwindow(winid wid, BOOLEAN_P block);
static void qt_display_nhwindow(winid wid, boolean block);
static void qt_destroy_nhwindow(winid wid);
static void qt_curs(winid wid, int x, int y);
static void qt_putstr(winid wid, int attr, const char *text);
static void qt_putstr(winid wid, int attr, const std::string& text);
static void qt_putstr(winid wid, int attr, const QString& text);
static void qt_display_file(const char *filename, BOOLEAN_P must_exist);
static void qt_display_file(const char *filename, boolean must_exist);
static void qt_start_menu(winid wid, unsigned long mbehavior);
static void qt_add_menu(winid wid, const glyph_info *glyphinfo,
const ANY_P * identifier, CHAR_P ch, CHAR_P gch, int attr,
const ANY_P * identifier, char ch, char gch, int attr,
const char *str, unsigned int itemflags);
static void qt_end_menu(winid wid, const char *prompt);
static int qt_select_menu(winid wid, int how, MENU_ITEM_P **menu_list);
@@ -63,7 +63,7 @@ public:
static void qt_cliparound(int x, int y);
static void qt_cliparound_window(winid wid, int x, int y);
static void qt_print_glyph(winid wid, XCHAR_P x, XCHAR_P y,
static void qt_print_glyph(winid wid, xchar x, xchar y,
const glyph_info *glyphingo,
const glyph_info *bkglyphinfo);
static void qt_raw_print(const char *str);
@@ -74,7 +74,7 @@ public:
static int qt_doprev_message();
static char qt_more();
static char qt_yn_function(const char *question,
const char *choices, CHAR_P def);
const char *choices, char def);
static void qt_getlin(const char *prompt, char *line);
static int qt_get_ext_cmd();
static void qt_number_pad(int);
@@ -83,8 +83,8 @@ public:
static void qt_end_screen();
static void qt_preference_update(const char *optname);
static char *qt_getmsghistory(BOOLEAN_P init);
static void qt_putmsghistory(const char *msg, BOOLEAN_P is_restoring);
static char *qt_getmsghistory(boolean init);
static void qt_putmsghistory(const char *msg, boolean is_restoring);
static void qt_outrip(winid wid, int how, time_t when);
static int qt_kbhit();
win/Qt/qt_main.cpp
+3 -3
View File
@@ -577,7 +577,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
QMenu* menu;
const char* name;
int flags;
int NDECL((*funct));
int (*funct)(void);
} item[] = {
{ game, 0, 3},
{ game, "Version", 3, doversion},
@@ -914,7 +914,7 @@ void NetHackQtMainWindow::CtrlV()
// add a toolbar button to invoke command 'name' via function '(*func)()'
void NetHackQtMainWindow::AddToolButton(QToolBar *toolbar, QSignalMapper *sm,
const char *name, int NDECL((*func)),
const char *name, int (*func)(void),
QPixmap xpm)
{
char actchar[2];
@@ -1084,7 +1084,7 @@ void NetHackQtMainWindow::doKeys(const QString& k)
}
// queue up the command name for a function, as if user had typed it
void NetHackQtMainWindow::FuncAsCommand(int NDECL((*func)))
void NetHackQtMainWindow::FuncAsCommand(int (*func)(void))
{
char cmdbuf[32];
Strcpy(cmdbuf, "#");
win/Qt/qt_main.h
+2 -2
View File
@@ -59,7 +59,7 @@ public:
void fadeHighlighting(bool before_key);
void FuncAsCommand(int NDECL((*func)));
void FuncAsCommand(int (*func)(void));
// this is unconditional in case qt_main.h comes before qt_set.h
void resizePaperDoll(bool); // ENHANCED_PAPERDOLL
#ifdef DYNAMIC_STATUSLINES
@@ -95,7 +95,7 @@ private slots:
private:
void ShowIfReady();
void AddToolButton(QToolBar *toolbar, QSignalMapper *sm,
const char *name, int NDECL((*func)), QPixmap xpm);
const char *name, int (*func)(void), QPixmap xpm);
#ifdef KDE
KMenuBar* menubar;