some fixes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@268 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/config/rsharesettings.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  Retroshare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006,  crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/config/rsharesettings.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RetroShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/control/bandwidthevent.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RetroShare QT gui is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006,  crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -17,7 +18,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
  *  Boston, MA  02110-1301, USA.
-  ****************************************************************/
+ ****************************************************************/
 
 
 #ifndef _BANDWIDTHEVENT_H

retroshare-gui/src/control/eventtype.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RetroShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/Preferences/configpage.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/Preferences/configpagestack.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/Preferences/configpagestack.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/bwgraph/bwgraph.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RetroShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2007, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/bwgraph/bwgraph.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RetroShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/common/rwindow.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RetroShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006,  crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/common/rwindow.h

@@ -1,9 +1,10 @@
 /****************************************************************
- *  RetroShare is distributed under the following license:
+ * This file is distributed under the following license:
+ *
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
- *  Copyright (C) 2007,  crypton
+ *  This program is free software; you can redistribute it and/or
- *
- *   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 (at your option) any later version.

retroshare-gui/src/gui/common/vmessagebox.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  Vidalia is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006,  Matt Edman, Justin Hipple
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/common/vmessagebox.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  Vidalia is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006,  Matt Edman, Justin Hipple
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/linetypes.h

@@ -1,22 +1,23 @@
-/****************************************************************
+/****************************************************************
- *  RShare QT Gui is distributed under the following license:
+ * This file is distributed under the following license:
  *
- *  Copyright (C) 2006,  crypton
+ * Copyright (c) 2006-2007, crypton
- *
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
- *  This program is free software; you can redistribute it and/or
+ *
- *  modify it under the terms of the GNU General Public License
+ *  This program is free software; you can redistribute it and/or
- *  as published by the Free Software Foundation; either version 2
+ *  modify it under the terms of the GNU General Public License
- *  of the License, or (at your option) any later version.
+ *  as published by the Free Software Foundation; either version 2
- *
+ *  of the License, or (at your option) any later version.
- *  This program is distributed in the hope that it will be useful,
+ *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  This program is distributed in the hope that it will be useful,
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  GNU General Public License for more details.
+ *  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
+ *  You should have received a copy of the GNU General Public License
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  along with this program; if not, write to the Free Software
- *  Boston, MA  02110-1301, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 
 

retroshare-gui/src/gui/mainpage.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/mainpagestack.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/gui/mainpagestack.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/lang/languagesupport.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  Vidalia is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006,  Matt Edman, Justin Hipple
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/lang/languagesupport.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  Vidalia is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006,  Crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/rshare.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  Retroshare QT gui is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006,  crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -15,7 +16,7 @@
  *
  *  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., 51 Franklin Street, Fifth Floor,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
  *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 

retroshare-gui/src/rshare.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  Retroshare QT Gui is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006,  crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -15,7 +16,7 @@
  *
  *  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., 51 Franklin Street, Fifth Floor,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
  *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 

retroshare-gui/src/util/process.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/util/process.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/util/registry.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/util/registry.h

@@ -1,22 +1,23 @@
-/****************************************************************
+/****************************************************************
- *  Vidalia is distributed under the following license:
+ * This file is distributed under the following license:
  *
- *  Copyright (C) 2006,  crypton
+ * Copyright (c) 2006-2007, crypton
- *
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
- *  This program is free software; you can redistribute it and/or
+ *
- *  modify it under the terms of the GNU General Public License
+ *  This program is free software; you can redistribute it and/or
- *  as published by the Free Software Foundation; either version 2
+ *  modify it under the terms of the GNU General Public License
- *  of the License, or (at your option) any later version.
+ *  as published by the Free Software Foundation; either version 2
- *
+ *  of the License, or (at your option) any later version.
- *  This program is distributed in the hope that it will be useful,
+ *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  This program is distributed in the hope that it will be useful,
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  GNU General Public License for more details.
+ *  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
+ *  You should have received a copy of the GNU General Public License
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  along with this program; if not, write to the Free Software
- *  Boston, MA  02110-1301, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 
 

retroshare-gui/src/util/win32.cpp

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

retroshare-gui/src/util/win32.h

@@ -1,7 +1,8 @@
 /****************************************************************
- *  RShare is distributed under the following license:
+ * This file is distributed under the following license:
- *
+ *
- *  Copyright (C) 2006, crypton
+ * Copyright (c) 2006-2007, crypton
+ * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License