More copyright header fixes

12 files changed, 26 insertions, 27 deletions

diff --git a/src/gui/itemlinkhandler.cpp b/src/gui/itemlinkhandler.cpp
index 97c0b94f..4060b303 100644
--- a/src/gui/itemlinkhandler.cpp
+++ b/src/gui/itemlinkhandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2009 The Mana World Development Team
+ *  Copyright (C) 2009  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  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 The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/itemlinkhandler.h b/src/gui/itemlinkhandler.h
index cd6fd900..c04afa9e 100644
--- a/src/gui/itemlinkhandler.h
+++ b/src/gui/itemlinkhandler.h
@@ -1,26 +1,26 @@
 /*
  *  The Mana World
- *  Copyright 2009 The Mana World Development Team
+ *  Copyright (C) 2009  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  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 The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef ITEM_LINK_HANDLER_H_
-#define ITEM_LINK_HANDLER_H_
+#ifndef ITEM_LINK_HANDLER_H
+#define ITEM_LINK_HANDLER_H
 
 #include "linkhandler.h"
 
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index 9fed040e..282349dc 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index b08c6d73..7b09fb96 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -1,6 +1,6 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef SHORTCUTCONTAINER_H__
-#define SHORTCUTCONTAINER_H__
+#ifndef SHORTCUTCONTAINER_H
+#define SHORTCUTCONTAINER_H
 
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 6219d98e..92837603 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -1,6 +1,6 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 4aba73dd..1e6dc821 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -1,6 +1,6 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index ad48460d..96200add 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -15,7 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index 25a63da9..fc02bf0a 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -15,7 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/party.cpp b/src/party.cpp
index 5cebdf35..ae8df175 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -1,6 +1,6 @@
 /*
  *  The Mana World
- *  Copyright 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
  *
  *  This file is part of The Mana World.
  *
diff --git a/src/party.h b/src/party.h
index 2b3b72b7..0f58b14b 100644
--- a/src/party.h
+++ b/src/party.h
@@ -1,6 +1,6 @@
 /*
  *  The Mana World
- *  Copyright 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
  *
  *  This file is part of The Mana World.
  *
diff --git a/src/textparticle.h b/src/textparticle.h
index cdf99d8f..76c247bf 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TEXTPARTICLE_H
-#define _TEXTPARTICLE_H
+#ifndef TEXTPARTICLE_H
+#define TEXTPARTICLE_H
 
 #include "guichanfwd.h"
 #include "particle.h"
diff --git a/tools/tmxcopy/map.hpp b/tools/tmxcopy/map.hpp
index 89ae1405..2ca9061a 100644
--- a/tools/tmxcopy/map.hpp
+++ b/tools/tmxcopy/map.hpp
@@ -1,20 +1,19 @@
 /*
  *  TMXCopy
- *  Copyright 2007 Philipp Sehmisch
+ *  Copyright (C) 2007  Philipp Sehmisch
  *
- *
- *  TMXCopy is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  TMXCopy is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  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 TMXCopy; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */