From 0c6d24e007e3075792e33410748b33e4ef9be310 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 8 Dec 2007 11:27:01 +0000 Subject: [PATCH] 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 | 7 ++-- retroshare-gui/src/config/rsharesettings.h | 7 ++-- retroshare-gui/src/control/bandwidthevent.h | 9 +++-- retroshare-gui/src/control/eventtype.h | 7 ++-- .../src/gui/Preferences/configpage.h | 7 ++-- .../src/gui/Preferences/configpagestack.cpp | 7 ++-- .../src/gui/Preferences/configpagestack.h | 7 ++-- retroshare-gui/src/gui/bwgraph/bwgraph.cpp | 7 ++-- retroshare-gui/src/gui/bwgraph/bwgraph.h | 7 ++-- retroshare-gui/src/gui/common/rwindow.cpp | 7 ++-- retroshare-gui/src/gui/common/rwindow.h | 9 +++-- retroshare-gui/src/gui/common/vmessagebox.cpp | 7 ++-- retroshare-gui/src/gui/common/vmessagebox.h | 7 ++-- retroshare-gui/src/gui/linetypes.h | 37 ++++++++++--------- retroshare-gui/src/gui/mainpage.h | 7 ++-- retroshare-gui/src/gui/mainpagestack.cpp | 7 ++-- retroshare-gui/src/gui/mainpagestack.h | 7 ++-- retroshare-gui/src/lang/languagesupport.cpp | 7 ++-- retroshare-gui/src/lang/languagesupport.h | 7 ++-- retroshare-gui/src/rshare.cpp | 9 +++-- retroshare-gui/src/rshare.h | 9 +++-- retroshare-gui/src/util/process.cpp | 7 ++-- retroshare-gui/src/util/process.h | 7 ++-- retroshare-gui/src/util/registry.cpp | 7 ++-- retroshare-gui/src/util/registry.h | 37 ++++++++++--------- retroshare-gui/src/util/win32.cpp | 7 ++-- retroshare-gui/src/util/win32.h | 7 ++-- 27 files changed, 142 insertions(+), 115 deletions(-) diff --git a/retroshare-gui/src/config/rsharesettings.cpp b/retroshare-gui/src/config/rsharesettings.cpp index 5e261e86a..37f7b32b9 100644 --- a/retroshare-gui/src/config/rsharesettings.cpp +++ b/retroshare-gui/src/config/rsharesettings.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * Retroshare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/config/rsharesettings.h b/retroshare-gui/src/config/rsharesettings.h index 778e66a96..732e738fc 100644 --- a/retroshare-gui/src/config/rsharesettings.h +++ b/retroshare-gui/src/config/rsharesettings.h @@ -1,7 +1,8 @@ /**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/control/bandwidthevent.h b/retroshare-gui/src/control/bandwidthevent.h index b876b2b3b..4ebbf9c90 100644 --- a/retroshare-gui/src/control/bandwidthevent.h +++ b/retroshare-gui/src/control/bandwidthevent.h @@ -1,7 +1,8 @@ /**************************************************************** - * RetroShare QT gui is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/control/eventtype.h b/retroshare-gui/src/control/eventtype.h index 26acbb941..aa785cce6 100644 --- a/retroshare-gui/src/control/eventtype.h +++ b/retroshare-gui/src/control/eventtype.h @@ -1,7 +1,8 @@ /**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/Preferences/configpage.h b/retroshare-gui/src/gui/Preferences/configpage.h index b40c8b56f..dd30fd068 100644 --- a/retroshare-gui/src/gui/Preferences/configpage.h +++ b/retroshare-gui/src/gui/Preferences/configpage.h @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/Preferences/configpagestack.cpp b/retroshare-gui/src/gui/Preferences/configpagestack.cpp index 04fa0726b..eb82be2be 100644 --- a/retroshare-gui/src/gui/Preferences/configpagestack.cpp +++ b/retroshare-gui/src/gui/Preferences/configpagestack.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/Preferences/configpagestack.h b/retroshare-gui/src/gui/Preferences/configpagestack.h index 46c7e4983..914d328f2 100644 --- a/retroshare-gui/src/gui/Preferences/configpagestack.h +++ b/retroshare-gui/src/gui/Preferences/configpagestack.h @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/bwgraph/bwgraph.cpp b/retroshare-gui/src/gui/bwgraph/bwgraph.cpp index 88462c094..657bcbbfe 100644 --- a/retroshare-gui/src/gui/bwgraph/bwgraph.cpp +++ b/retroshare-gui/src/gui/bwgraph/bwgraph.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2007, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/bwgraph/bwgraph.h b/retroshare-gui/src/gui/bwgraph/bwgraph.h index 804f4df69..9179771d4 100644 --- a/retroshare-gui/src/gui/bwgraph/bwgraph.h +++ b/retroshare-gui/src/gui/bwgraph/bwgraph.h @@ -1,7 +1,8 @@ /**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/common/rwindow.cpp b/retroshare-gui/src/gui/common/rwindow.cpp index f5e3f738b..697d92a10 100644 --- a/retroshare-gui/src/gui/common/rwindow.cpp +++ b/retroshare-gui/src/gui/common/rwindow.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/common/rwindow.h b/retroshare-gui/src/gui/common/rwindow.h index 789a5ebb3..f576c4ab8 100644 --- a/retroshare-gui/src/gui/common/rwindow.h +++ b/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. diff --git a/retroshare-gui/src/gui/common/vmessagebox.cpp b/retroshare-gui/src/gui/common/vmessagebox.cpp index 7158425c9..aa2314c66 100644 --- a/retroshare-gui/src/gui/common/vmessagebox.cpp +++ b/retroshare-gui/src/gui/common/vmessagebox.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * Vidalia is distributed under the following license: - * - * Copyright (C) 2006, Matt Edman, Justin Hipple + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/common/vmessagebox.h b/retroshare-gui/src/gui/common/vmessagebox.h index 9f9afa7fe..aaf706914 100644 --- a/retroshare-gui/src/gui/common/vmessagebox.h +++ b/retroshare-gui/src/gui/common/vmessagebox.h @@ -1,7 +1,8 @@ /**************************************************************** - * Vidalia is distributed under the following license: - * - * Copyright (C) 2006, Matt Edman, Justin Hipple + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/linetypes.h b/retroshare-gui/src/gui/linetypes.h index 7bdc30558..5d128db36 100644 --- a/retroshare-gui/src/gui/linetypes.h +++ b/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 - * - * 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. - * - * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * 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 + * 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 + * 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., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. ****************************************************************/ diff --git a/retroshare-gui/src/gui/mainpage.h b/retroshare-gui/src/gui/mainpage.h index e9469e1c6..20cad30f1 100644 --- a/retroshare-gui/src/gui/mainpage.h +++ b/retroshare-gui/src/gui/mainpage.h @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/mainpagestack.cpp b/retroshare-gui/src/gui/mainpagestack.cpp index 7c55e96de..778a446ac 100644 --- a/retroshare-gui/src/gui/mainpagestack.cpp +++ b/retroshare-gui/src/gui/mainpagestack.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/gui/mainpagestack.h b/retroshare-gui/src/gui/mainpagestack.h index e9b89ba8b..f8e9949da 100644 --- a/retroshare-gui/src/gui/mainpagestack.h +++ b/retroshare-gui/src/gui/mainpagestack.h @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/lang/languagesupport.cpp b/retroshare-gui/src/lang/languagesupport.cpp index cc9a5905e..d39f7d7e4 100644 --- a/retroshare-gui/src/lang/languagesupport.cpp +++ b/retroshare-gui/src/lang/languagesupport.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * Vidalia is distributed under the following license: - * - * Copyright (C) 2006, Matt Edman, Justin Hipple + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/lang/languagesupport.h b/retroshare-gui/src/lang/languagesupport.h index 37cd250a2..d489b49a4 100644 --- a/retroshare-gui/src/lang/languagesupport.h +++ b/retroshare-gui/src/lang/languagesupport.h @@ -1,7 +1,8 @@ /**************************************************************** - * Vidalia is distributed under the following license: - * - * Copyright (C) 2006, Crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp index 8fd575adc..7cc82946e 100644 --- a/retroshare-gui/src/rshare.cpp +++ b/retroshare-gui/src/rshare.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * Retroshare QT gui is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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. ****************************************************************/ diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h index b6bc40de2..a7dfc81e0 100644 --- a/retroshare-gui/src/rshare.h +++ b/retroshare-gui/src/rshare.h @@ -1,7 +1,8 @@ /**************************************************************** - * Retroshare QT Gui is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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. ****************************************************************/ diff --git a/retroshare-gui/src/util/process.cpp b/retroshare-gui/src/util/process.cpp index b35d1ea1e..0fab6b152 100644 --- a/retroshare-gui/src/util/process.cpp +++ b/retroshare-gui/src/util/process.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/util/process.h b/retroshare-gui/src/util/process.h index dce832be6..0bc583560 100644 --- a/retroshare-gui/src/util/process.h +++ b/retroshare-gui/src/util/process.h @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/util/registry.cpp b/retroshare-gui/src/util/registry.cpp index 4139bb29d..1e2dce6a6 100644 --- a/retroshare-gui/src/util/registry.cpp +++ b/retroshare-gui/src/util/registry.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/util/registry.h b/retroshare-gui/src/util/registry.h index 08b3ef00a..b5cc06f76 100644 --- a/retroshare-gui/src/util/registry.h +++ b/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 - * - * 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. - * - * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * 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 + * 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 + * 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., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. ****************************************************************/ diff --git a/retroshare-gui/src/util/win32.cpp b/retroshare-gui/src/util/win32.cpp index b1bc6b48b..f1a3e770d 100644 --- a/retroshare-gui/src/util/win32.cpp +++ b/retroshare-gui/src/util/win32.cpp @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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 diff --git a/retroshare-gui/src/util/win32.h b/retroshare-gui/src/util/win32.h index 4abbfa1a5..d03061b06 100644 --- a/retroshare-gui/src/util/win32.h +++ b/retroshare-gui/src/util/win32.h @@ -1,7 +1,8 @@ /**************************************************************** - * RShare is distributed under the following license: - * - * Copyright (C) 2006, crypton + * This file is distributed under the following license: + * + * 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