From 8fc14dfda2574598cbb2853b973d24c4c8dee1d1 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 24 Feb 2011 19:12:03 +0100 Subject: Finally found time to update copyrights... ;) --- src/adblock/adblockhostmatcher.cpp | 2 +- src/adblock/adblockhostmatcher.h | 2 +- src/adblock/adblockmanager.cpp | 2 +- src/adblock/adblockmanager.h | 2 +- src/adblock/adblocknetworkreply.cpp | 29 ++------------------------- src/adblock/adblocknetworkreply.h | 29 ++------------------------- src/adblock/adblockrule.cpp | 34 ++++---------------------------- src/adblock/adblockrule.h | 31 ++--------------------------- src/adblock/adblockrulefallbackimpl.cpp | 2 +- src/adblock/adblockrulefallbackimpl.h | 2 +- src/adblock/adblockruleimpl.h | 2 +- src/adblock/adblockruletextmatchimpl.cpp | 2 +- src/adblock/adblockruletextmatchimpl.h | 4 +++- 13 files changed, 21 insertions(+), 122 deletions(-) (limited to 'src/adblock') diff --git a/src/adblock/adblockhostmatcher.cpp b/src/adblock/adblockhostmatcher.cpp index 75387974..c0b25726 100644 --- a/src/adblock/adblockhostmatcher.cpp +++ b/src/adblock/adblockhostmatcher.cpp @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2010 by Benjamin Poulain +* Copyright (C) 2010-2011 by Benjamin Poulain * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblockhostmatcher.h b/src/adblock/adblockhostmatcher.h index 0a15bd4e..74b32c3c 100644 --- a/src/adblock/adblockhostmatcher.h +++ b/src/adblock/adblockhostmatcher.h @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2010 by Benjamin Poulain +* Copyright (C) 2010-2011 by Benjamin Poulain * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index 8f51fd1a..a96475e2 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2010 by Andrea Diamantini +* Copyright (C) 2010-2011 by Andrea Diamantini * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h index 69548994..1f716c6d 100644 --- a/src/adblock/adblockmanager.h +++ b/src/adblock/adblockmanager.h @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2010 by Andrea Diamantini +* Copyright (C) 2010-2011 by Andrea Diamantini * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblocknetworkreply.cpp b/src/adblock/adblocknetworkreply.cpp index 24f3a86f..41eb04de 100644 --- a/src/adblock/adblocknetworkreply.cpp +++ b/src/adblock/adblocknetworkreply.cpp @@ -1,33 +1,8 @@ -/* - * Copyright (c) 2009, Benjamin C. Meyer - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ============================================================ +/* ============================================================ * * This file is a part of the rekonq project * + * Copyright (c) 2009 by Benjamin C. Meyer * Copyright (C) 2010 by Andrea Diamantini * * diff --git a/src/adblock/adblocknetworkreply.h b/src/adblock/adblocknetworkreply.h index 1507abd6..9b5c48da 100644 --- a/src/adblock/adblocknetworkreply.h +++ b/src/adblock/adblocknetworkreply.h @@ -1,33 +1,8 @@ -/* - * Copyright (c) 2009, Benjamin C. Meyer - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ============================================================ +/* ============================================================ * * This file is a part of the rekonq project * + * Copyright (c) 2009 by Benjamin C. Meyer * Copyright (C) 2010 by Andrea Diamantini * * diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp index 7fdb3e10..3cd50020 100644 --- a/src/adblock/adblockrule.cpp +++ b/src/adblock/adblockrule.cpp @@ -1,36 +1,10 @@ -/* - * Copyright (c) 2009, Zsombor Gegesy - * Copyright (c) 2009, Benjamin C. Meyer - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * ============================================================ +/* ============================================================ * * This file is a part of the rekonq project * - * Copyright (C) 2010 by Andrea Diamantini + * Copyright (c) 2009 by Zsombor Gegesy + * Copyright (c) 2009 by Benjamin C. Meyer + * Copyright (C) 2010-2011 by Andrea Diamantini * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h index f8d6bf39..076c6272 100644 --- a/src/adblock/adblockrule.h +++ b/src/adblock/adblockrule.h @@ -1,35 +1,8 @@ /* - * Copyright (c) 2009, Benjamin C. Meyer - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * ============================================================ - * * This file is a part of the rekonq project * - * Copyright (C) 2010 by Andrea Diamantini + * Copyright (c) 2009 by Benjamin C. Meyer + * Copyright (C) 2010-2011 by Andrea Diamantini * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblockrulefallbackimpl.cpp b/src/adblock/adblockrulefallbackimpl.cpp index ae0e14d1..dfe732df 100644 --- a/src/adblock/adblockrulefallbackimpl.cpp +++ b/src/adblock/adblockrulefallbackimpl.cpp @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2010 by Benjamin Poulain +* Copyright (C) 2010-2011 by Benjamin Poulain * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblockrulefallbackimpl.h b/src/adblock/adblockrulefallbackimpl.h index ec10ee51..bf842513 100644 --- a/src/adblock/adblockrulefallbackimpl.h +++ b/src/adblock/adblockrulefallbackimpl.h @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2010 by Benjamin Poulain +* Copyright (C) 2010-2011 by Benjamin Poulain * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblockruleimpl.h b/src/adblock/adblockruleimpl.h index d7f51c19..2344b698 100644 --- a/src/adblock/adblockruleimpl.h +++ b/src/adblock/adblockruleimpl.h @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2010 by Benjamin Poulain +* Copyright (C) 2010-2011 by Benjamin Poulain * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblockruletextmatchimpl.cpp b/src/adblock/adblockruletextmatchimpl.cpp index 04fb040b..0ca2d40a 100644 --- a/src/adblock/adblockruletextmatchimpl.cpp +++ b/src/adblock/adblockruletextmatchimpl.cpp @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2010 by Benjamin Poulain +* Copyright (C) 2010-2011 by Benjamin Poulain * * * This program is free software; you can redistribute it and/or diff --git a/src/adblock/adblockruletextmatchimpl.h b/src/adblock/adblockruletextmatchimpl.h index eefea625..3a89c2ba 100644 --- a/src/adblock/adblockruletextmatchimpl.h +++ b/src/adblock/adblockruletextmatchimpl.h @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2010 by Benjamin Poulain +* Copyright (C) 2010-2011 by Benjamin Poulain * * * This program is free software; you can redistribute it and/or @@ -23,6 +23,7 @@ * * ============================================================ */ + #ifndef ADBLOCKRULETEXTMATCHIMPL_H #define ADBLOCKRULETEXTMATCHIMPL_H @@ -31,6 +32,7 @@ // Qt Includes #include + // Simple rule to find a string in the URL class AdBlockRuleTextMatchImpl : public AdBlockRuleImpl { -- cgit v1.2.1