From 7684ddcfd8c2c5fe069425ed420ed73342f2d9e5 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 5 May 2014 00:20:54 -0400 Subject: Clean up file headers. This change rewrites and simplifies the copyright headers at the top of all source files: * Remove "Emacs style mode select" line; this line was included in the headers for the originally released source files and appears to be to set the file type for old versions of Emacs. I'm not sure entirely why it was required but I don't think it is any more. * Remove "You should have received a copy of..." text from copyright header. This refers to the old 59 Temple Place address where the FSF headquarters used to be located and is no longer correct. Rather than change to the new address, just remove the paragraph as it is superfluous anyway. This fixes #311. * Remove ---- separator lines so that the file headers are barer and more simplified. --- src/setup/compatibility.c | 9 +-------- src/setup/compatibility.h | 9 +-------- src/setup/display.c | 9 +-------- src/setup/display.h | 9 +-------- src/setup/execute.c | 9 +-------- src/setup/execute.h | 9 +-------- src/setup/joystick.c | 9 +-------- src/setup/joystick.h | 9 +-------- src/setup/keyboard.c | 9 +-------- src/setup/keyboard.h | 9 +-------- src/setup/mainmenu.c | 9 +-------- src/setup/mode.c | 9 +-------- src/setup/mode.h | 9 +-------- src/setup/mouse.c | 9 +-------- src/setup/mouse.h | 9 +-------- src/setup/multiplayer.c | 9 +-------- src/setup/multiplayer.h | 9 +-------- src/setup/sound.c | 9 +-------- src/setup/sound.h | 9 +-------- src/setup/txt_joybinput.c | 9 +-------- src/setup/txt_joybinput.h | 9 +-------- src/setup/txt_keyinput.c | 9 +-------- src/setup/txt_keyinput.h | 9 +-------- src/setup/txt_mouseinput.c | 9 +-------- src/setup/txt_mouseinput.h | 9 +-------- 25 files changed, 25 insertions(+), 200 deletions(-) (limited to 'src/setup') diff --git a/src/setup/compatibility.c b/src/setup/compatibility.c index 35b09580..83dabdc8 100644 --- a/src/setup/compatibility.c +++ b/src/setup/compatibility.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// // Sound control menu diff --git a/src/setup/compatibility.h b/src/setup/compatibility.h index 41c6ecd1..21636fc3 100644 --- a/src/setup/compatibility.h +++ b/src/setup/compatibility.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef SETUP_COMPATIBILITY_H #define SETUP_COMPATIBILITY_H diff --git a/src/setup/display.c b/src/setup/display.c index 4e2231d7..e712df94 100644 --- a/src/setup/display.c +++ b/src/setup/display.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include #include diff --git a/src/setup/display.h b/src/setup/display.h index a5c0c8bf..2d7e63ec 100644 --- a/src/setup/display.h +++ b/src/setup/display.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef SETUP_DISPLAY_H #define SETUP_DISPLAY_H diff --git a/src/setup/execute.c b/src/setup/execute.c index 9bc4f9ae..1fef6e44 100644 --- a/src/setup/execute.c +++ b/src/setup/execute.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// // Code for invoking Doom diff --git a/src/setup/execute.h b/src/setup/execute.h index 25f1f10a..d298b239 100644 --- a/src/setup/execute.h +++ b/src/setup/execute.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef TESTCONFIG_H #define TESTCONFIG_H diff --git a/src/setup/joystick.c b/src/setup/joystick.c index 654041f7..16e841bf 100644 --- a/src/setup/joystick.c +++ b/src/setup/joystick.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2007 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include #include diff --git a/src/setup/joystick.h b/src/setup/joystick.h index b6dd09b9..bfe3d179 100644 --- a/src/setup/joystick.h +++ b/src/setup/joystick.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef SETUP_JOYSTICK_H #define SETUP_JOYSTICK_H diff --git a/src/setup/keyboard.c b/src/setup/keyboard.c index 76880f49..2964606b 100644 --- a/src/setup/keyboard.c +++ b/src/setup/keyboard.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include "textscreen.h" #include "doomtype.h" diff --git a/src/setup/keyboard.h b/src/setup/keyboard.h index 5ca4bac6..5c595aeb 100644 --- a/src/setup/keyboard.h +++ b/src/setup/keyboard.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef SETUP_KEYBOARD_H #define SETUP_KEYBOARD_H diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c index 5b085065..a599812e 100644 --- a/src/setup/mainmenu.c +++ b/src/setup/mainmenu.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include #include diff --git a/src/setup/mode.c b/src/setup/mode.c index bc82c3d4..89f0f753 100644 --- a/src/setup/mode.c +++ b/src/setup/mode.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include #include diff --git a/src/setup/mode.h b/src/setup/mode.h index 624abbfc..0ae8a2cb 100644 --- a/src/setup/mode.h +++ b/src/setup/mode.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2008 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef SETUP_MODE_H #define SETUP_MODE_H diff --git a/src/setup/mouse.c b/src/setup/mouse.c index 76ded3dd..1d7ed68e 100644 --- a/src/setup/mouse.c +++ b/src/setup/mouse.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include diff --git a/src/setup/mouse.h b/src/setup/mouse.h index 70def18a..fd45f84a 100644 --- a/src/setup/mouse.h +++ b/src/setup/mouse.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef SETUP_MOUSE_H #define SETUP_MOUSE_H diff --git a/src/setup/multiplayer.c b/src/setup/multiplayer.c index 54a329d8..d833a495 100644 --- a/src/setup/multiplayer.c +++ b/src/setup/multiplayer.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include #include diff --git a/src/setup/multiplayer.h b/src/setup/multiplayer.h index afc8a2a8..9fa76db3 100644 --- a/src/setup/multiplayer.h +++ b/src/setup/multiplayer.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef SETUP_MULTIPLAYER_H #define SETUP_MULTIPLAYER_H diff --git a/src/setup/sound.c b/src/setup/sound.c index 661128ff..76fc0564 100644 --- a/src/setup/sound.c +++ b/src/setup/sound.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// // Sound control menu diff --git a/src/setup/sound.h b/src/setup/sound.h index b41c1b4b..c4a8ac60 100644 --- a/src/setup/sound.h +++ b/src/setup/sound.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef SETUP_SOUND_H #define SETUP_SOUND_H diff --git a/src/setup/txt_joybinput.c b/src/setup/txt_joybinput.c index ab56e229..adbbc947 100644 --- a/src/setup/txt_joybinput.c +++ b/src/setup/txt_joybinput.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include #include diff --git a/src/setup/txt_joybinput.h b/src/setup/txt_joybinput.h index 69ec4a1f..26a9f24c 100644 --- a/src/setup/txt_joybinput.h +++ b/src/setup/txt_joybinput.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2007 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef TXT_JOYB_INPUT_H #define TXT_JOYB_INPUT_H diff --git a/src/setup/txt_keyinput.c b/src/setup/txt_keyinput.c index 60fae1bf..5824c75a 100644 --- a/src/setup/txt_keyinput.c +++ b/src/setup/txt_keyinput.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include #include diff --git a/src/setup/txt_keyinput.h b/src/setup/txt_keyinput.h index 5df0b2e3..334d6c1c 100644 --- a/src/setup/txt_keyinput.h +++ b/src/setup/txt_keyinput.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef TXT_KEY_INPUT_H #define TXT_KEY_INPUT_H diff --git a/src/setup/txt_mouseinput.c b/src/setup/txt_mouseinput.c index a966c10f..b893c2e0 100644 --- a/src/setup/txt_mouseinput.c +++ b/src/setup/txt_mouseinput.c @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #include #include diff --git a/src/setup/txt_mouseinput.h b/src/setup/txt_mouseinput.h index ef3ec2aa..2b05c371 100644 --- a/src/setup/txt_mouseinput.h +++ b/src/setup/txt_mouseinput.h @@ -1,7 +1,5 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- // -// Copyright(C) 2006 Simon Howard +// Copyright(C) 2005-2014 Simon Howard // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,11 +11,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. -// #ifndef TXT_MOUSE_INPUT_H #define TXT_MOUSE_INPUT_H -- cgit v1.2.3