From a562e7593785f22920925bbb44725c1184c5c1c6 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 13 Apr 2016 15:34:27 +0200 Subject: [PATCH] Fixed copy/paste job-gone-wrong: GPL2->GPL3 header updates. --- src/libtomahawk/GlobalActionManager.cpp | 13 ++++--- src/libtomahawk/GlobalActionManager.h | 36 +++++++++---------- src/libtomahawk/database/LocalCollection.cpp | 35 +++++++++--------- src/libtomahawk/database/LocalCollection.h | 35 +++++++++--------- src/libtomahawk/resolvers/ScriptAccount.cpp | 11 +++--- src/libtomahawk/resolvers/ScriptAccount.h | 8 ++--- src/libtomahawk/resolvers/ScriptPlugin.cpp | 5 +-- src/libtomahawk/resolvers/ScriptPlugin.h | 4 +-- .../resolvers/ScriptPluginFactory.cpp | 5 +-- .../resolvers/ScriptPluginFactory.h | 4 +-- src/libtomahawk/resolvers/SyncScriptJob.cpp | 5 +-- src/libtomahawk/resolvers/SyncScriptJob.h | 4 +-- .../plugins/ScriptCollectionFactory.cpp | 5 +-- .../plugins/ScriptCollectionFactory.h | 4 +-- .../plugins/ScriptInfoPluginFactory.cpp | 5 +-- .../plugins/ScriptInfoPluginFactory.h | 4 +-- src/libtomahawk/utils/LinkGenerator.cpp | 14 ++++---- src/libtomahawk/utils/LinkGenerator.h | 7 ++-- src/libtomahawk/utils/LinkGeneratorPlugin.cpp | 5 +-- src/libtomahawk/utils/LinkGeneratorPlugin.h | 4 +-- src/libtomahawk/utils/ShortLinkHelper.cpp | 10 +++--- src/libtomahawk/utils/ShortLinkHelper.h | 10 +++--- src/libtomahawk/utils/ShortLinkHelper_p.h | 10 +++--- .../utils/TomaHkLinkGeneratorPlugin.cpp | 15 ++++---- .../utils/TomaHkLinkGeneratorPlugin.h | 4 +-- src/libtomahawk/utils/XspfGenerator.cpp | 35 +++++++++--------- src/libtomahawk/utils/XspfGenerator.h | 35 +++++++++--------- .../sourcetree/items/CategoryItems.cpp | 28 +++++++-------- src/tomahawk/sourcetree/items/CategoryItems.h | 26 +++++++------- .../sourcetree/items/GenericPageItems.cpp | 26 +++++++------- .../sourcetree/items/GenericPageItems.h | 26 +++++++------- .../sourcetree/items/LovedTracksItem.cpp | 27 +++++++------- .../sourcetree/items/LovedTracksItem.h | 27 +++++++------- .../sourcetree/items/SourceTreeItem.cpp | 34 +++++++++--------- .../sourcetree/items/SourceTreeItem.h | 34 +++++++++--------- 35 files changed, 283 insertions(+), 277 deletions(-) diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index d8131397e..9390da1e8 100644 --- a/src/libtomahawk/GlobalActionManager.cpp +++ b/src/libtomahawk/GlobalActionManager.cpp @@ -1,14 +1,14 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2011 Leo Franchi - * Copyright (C) 2011, Jeff Mitchell - * Copyright (C) 2011-2014, Christian Muehlhaeuser - * Copyright (C) 2013, Uwe L. Korn - * Copyright (C) 2013, Teo Mrnjavac + * Copyright 2011, Leo Franchi + * Copyright 2011-2016, Christian Muehlhaeuser + * Copyright 2011, Jeff Mitchell + * Copyright 2013, Uwe L. Korn + * Copyright 2013, Teo Mrnjavac * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, @@ -20,7 +20,6 @@ * along with Tomahawk. If not, see . */ - #include "GlobalActionManager.h" #include "accounts/AccountManager.h" diff --git a/src/libtomahawk/GlobalActionManager.h b/src/libtomahawk/GlobalActionManager.h index e955e49c9..66a180d29 100644 --- a/src/libtomahawk/GlobalActionManager.h +++ b/src/libtomahawk/GlobalActionManager.h @@ -1,21 +1,21 @@ -/* - Copyright (C) 2011 Leo Franchi - - 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. -*/ - +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Leo Franchi + * Copyright 2011-2016, Christian Muehlhaeuser + * + * Tomahawk 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 3 of the License, or + * (at your option) any later version. + * + * Tomahawk 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 Tomahawk. If not, see . + */ #ifndef GLOBALACTIONMANAGER_H #define GLOBALACTIONMANAGER_H diff --git a/src/libtomahawk/database/LocalCollection.cpp b/src/libtomahawk/database/LocalCollection.cpp index 78a2bb606..7508d0efa 100644 --- a/src/libtomahawk/database/LocalCollection.cpp +++ b/src/libtomahawk/database/LocalCollection.cpp @@ -1,21 +1,20 @@ -/* - Copyright (C) 2011 Leo Franchi - - 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. -*/ - +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Leo Franchi + * + * Tomahawk 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 3 of the License, or + * (at your option) any later version. + * + * Tomahawk 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 Tomahawk. If not, see . + */ #include "LocalCollection.h" diff --git a/src/libtomahawk/database/LocalCollection.h b/src/libtomahawk/database/LocalCollection.h index 7641ffb37..c078377b1 100644 --- a/src/libtomahawk/database/LocalCollection.h +++ b/src/libtomahawk/database/LocalCollection.h @@ -1,21 +1,20 @@ -/* - Copyright (C) 2011 Leo Franchi - - 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. -*/ - +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Leo Franchi + * + * Tomahawk 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 3 of the License, or + * (at your option) any later version. + * + * Tomahawk 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 Tomahawk. If not, see . + */ #ifndef LOCALCOLLECTION_H #define LOCALCOLLECTION_H diff --git a/src/libtomahawk/resolvers/ScriptAccount.cpp b/src/libtomahawk/resolvers/ScriptAccount.cpp index 2b80da6eb..f073b9ef0 100644 --- a/src/libtomahawk/resolvers/ScriptAccount.cpp +++ b/src/libtomahawk/resolvers/ScriptAccount.cpp @@ -1,12 +1,12 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2011 Leo Franchi - * Copyright (C) 2014 Dominik Schmidt - * Copyright (C) 2015, Christian Muehlhaeuser + * Copyright 2011, Leo Franchi + * Copyright 2014, Dominik Schmidt + * Copyright 2015-2016, Christian Muehlhaeuser * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ + #include "ScriptAccount.h" #include "ScriptObject.h" @@ -31,11 +32,11 @@ #include "ScriptLinkGeneratorPlugin.h" #include "ScriptInfoPlugin.h" -// TODO: #include "../Artist.h" #include "../Album.h" #include "../Result.h" #include "../Track.h" + #include diff --git a/src/libtomahawk/resolvers/ScriptAccount.h b/src/libtomahawk/resolvers/ScriptAccount.h index e87d9eb73..42632841c 100644 --- a/src/libtomahawk/resolvers/ScriptAccount.h +++ b/src/libtomahawk/resolvers/ScriptAccount.h @@ -1,12 +1,12 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2011 Leo Franchi - * Copyright (C) 2014 Dominik Schmidt - * Copyright (C) 2015, Christian Muehlhaeuser + * Copyright 2011, Leo Franchi + * Copyright 2014, Dominik Schmidt + * Copyright 2015-2016, Christian Muehlhaeuser * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/resolvers/ScriptPlugin.cpp b/src/libtomahawk/resolvers/ScriptPlugin.cpp index 0c6da590e..135e45b99 100644 --- a/src/libtomahawk/resolvers/ScriptPlugin.cpp +++ b/src/libtomahawk/resolvers/ScriptPlugin.cpp @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2014 Dominik Schmidt + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ + #include "ScriptPlugin.h" diff --git a/src/libtomahawk/resolvers/ScriptPlugin.h b/src/libtomahawk/resolvers/ScriptPlugin.h index e4c132db9..3036f3731 100644 --- a/src/libtomahawk/resolvers/ScriptPlugin.h +++ b/src/libtomahawk/resolvers/ScriptPlugin.h @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2014 Dominik Schmidt + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/resolvers/ScriptPluginFactory.cpp b/src/libtomahawk/resolvers/ScriptPluginFactory.cpp index 73f224e81..8fa255f48 100644 --- a/src/libtomahawk/resolvers/ScriptPluginFactory.cpp +++ b/src/libtomahawk/resolvers/ScriptPluginFactory.cpp @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2015 Dominik Schmidt + * Copyright 2015, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, @@ -15,4 +15,5 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ + #include "ScriptPluginFactory.h" diff --git a/src/libtomahawk/resolvers/ScriptPluginFactory.h b/src/libtomahawk/resolvers/ScriptPluginFactory.h index 04247e746..66ba72f55 100644 --- a/src/libtomahawk/resolvers/ScriptPluginFactory.h +++ b/src/libtomahawk/resolvers/ScriptPluginFactory.h @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2015 Dominik Schmidt + * Copyright 2015, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/resolvers/SyncScriptJob.cpp b/src/libtomahawk/resolvers/SyncScriptJob.cpp index 9f2506300..0334bfa5d 100644 --- a/src/libtomahawk/resolvers/SyncScriptJob.cpp +++ b/src/libtomahawk/resolvers/SyncScriptJob.cpp @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2014 Dominik Schmidt + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ + #include "SyncScriptJob.h" #include "../Typedefs.h" diff --git a/src/libtomahawk/resolvers/SyncScriptJob.h b/src/libtomahawk/resolvers/SyncScriptJob.h index 8f09e9f82..bfa314c53 100644 --- a/src/libtomahawk/resolvers/SyncScriptJob.h +++ b/src/libtomahawk/resolvers/SyncScriptJob.h @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2014 Dominik Schmidt + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/resolvers/plugins/ScriptCollectionFactory.cpp b/src/libtomahawk/resolvers/plugins/ScriptCollectionFactory.cpp index 2c5116119..5b9da2423 100644 --- a/src/libtomahawk/resolvers/plugins/ScriptCollectionFactory.cpp +++ b/src/libtomahawk/resolvers/plugins/ScriptCollectionFactory.cpp @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2015 Dominik Schmidt + * Copyright 2015, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ + #include "ScriptCollectionFactory.h" #include "SourceList.h" diff --git a/src/libtomahawk/resolvers/plugins/ScriptCollectionFactory.h b/src/libtomahawk/resolvers/plugins/ScriptCollectionFactory.h index 6da32da55..9cc7fd570 100644 --- a/src/libtomahawk/resolvers/plugins/ScriptCollectionFactory.h +++ b/src/libtomahawk/resolvers/plugins/ScriptCollectionFactory.h @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2015 Dominik Schmidt + * Copyright 2015, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/resolvers/plugins/ScriptInfoPluginFactory.cpp b/src/libtomahawk/resolvers/plugins/ScriptInfoPluginFactory.cpp index d5feaae6f..5e44385b8 100644 --- a/src/libtomahawk/resolvers/plugins/ScriptInfoPluginFactory.cpp +++ b/src/libtomahawk/resolvers/plugins/ScriptInfoPluginFactory.cpp @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2015 Dominik Schmidt + * Copyright 2015, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ + #include "ScriptInfoPluginFactory.h" #include "SourceList.h" diff --git a/src/libtomahawk/resolvers/plugins/ScriptInfoPluginFactory.h b/src/libtomahawk/resolvers/plugins/ScriptInfoPluginFactory.h index 4681546d7..962f85ad0 100644 --- a/src/libtomahawk/resolvers/plugins/ScriptInfoPluginFactory.h +++ b/src/libtomahawk/resolvers/plugins/ScriptInfoPluginFactory.h @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2015 Dominik Schmidt + * Copyright 2015, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/utils/LinkGenerator.cpp b/src/libtomahawk/utils/LinkGenerator.cpp index 58dadf61e..4224c9d54 100644 --- a/src/libtomahawk/utils/LinkGenerator.cpp +++ b/src/libtomahawk/utils/LinkGenerator.cpp @@ -1,15 +1,15 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2011 Leo Franchi - * Copyright (C) 2011, Jeff Mitchell - * Copyright (C) 2011-2014, Christian Muehlhaeuser - * Copyright (C) 2013, Uwe L. Korn - * Copyright (C) 2013, Teo Mrnjavac - * Copyright (C) 2014, Dominik Schmidt + * Copyright 2011, Leo Franchi + * Copyright 2011, Jeff Mitchell + * Copyright 2011-2016, Christian Muehlhaeuser + * Copyright 2013, Uwe L. Korn + * Copyright 2013, Teo Mrnjavac + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/utils/LinkGenerator.h b/src/libtomahawk/utils/LinkGenerator.h index 76f6cd036..d600e7090 100644 --- a/src/libtomahawk/utils/LinkGenerator.h +++ b/src/libtomahawk/utils/LinkGenerator.h @@ -1,11 +1,12 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2011 Leo Franchi - * Copyright (C) 2014 Dominik Schmidt + * Copyright 2011, Leo Franchi + * Copyright 2011-2016, Christian Muehlhaeuser + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/utils/LinkGeneratorPlugin.cpp b/src/libtomahawk/utils/LinkGeneratorPlugin.cpp index 8501265b7..af6c5b883 100644 --- a/src/libtomahawk/utils/LinkGeneratorPlugin.cpp +++ b/src/libtomahawk/utils/LinkGeneratorPlugin.cpp @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2014 Dominik Schmidt + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ + #include "LinkGeneratorPlugin.h" #include "LinkGenerator.h" diff --git a/src/libtomahawk/utils/LinkGeneratorPlugin.h b/src/libtomahawk/utils/LinkGeneratorPlugin.h index 68c89b675..057cb2236 100644 --- a/src/libtomahawk/utils/LinkGeneratorPlugin.h +++ b/src/libtomahawk/utils/LinkGeneratorPlugin.h @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2014 Dominik Schmidt + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/utils/ShortLinkHelper.cpp b/src/libtomahawk/utils/ShortLinkHelper.cpp index 5372f311e..8ec2cb1fd 100644 --- a/src/libtomahawk/utils/ShortLinkHelper.cpp +++ b/src/libtomahawk/utils/ShortLinkHelper.cpp @@ -1,13 +1,13 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2011 Leo Franchi - * Copyright (C) 2011, Jeff Mitchell - * Copyright (C) 2011-2012, Christian Muehlhaeuser - * Copyright (C) 2013, Uwe L. Korn + * Copyright 2011, Leo Franchi + * Copyright 2011, Jeff Mitchell + * Copyright 2011-2016, Christian Muehlhaeuser + * Copyright 2013, Uwe L. Korn * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/utils/ShortLinkHelper.h b/src/libtomahawk/utils/ShortLinkHelper.h index a73467bf8..449cfb7ab 100644 --- a/src/libtomahawk/utils/ShortLinkHelper.h +++ b/src/libtomahawk/utils/ShortLinkHelper.h @@ -1,13 +1,13 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2011 Leo Franchi - * Copyright (C) 2011, Jeff Mitchell - * Copyright (C) 2011-2012, Christian Muehlhaeuser - * Copyright (C) 2013, Uwe L. Korn + * Copyright 2011, Leo Franchi + * Copyright 2011, Jeff Mitchell + * Copyright 2011-2016, Christian Muehlhaeuser + * Copyright 2013, Uwe L. Korn * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/utils/ShortLinkHelper_p.h b/src/libtomahawk/utils/ShortLinkHelper_p.h index eae31f064..372055633 100644 --- a/src/libtomahawk/utils/ShortLinkHelper_p.h +++ b/src/libtomahawk/utils/ShortLinkHelper_p.h @@ -1,13 +1,13 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2011 Leo Franchi - * Copyright (C) 2011, Jeff Mitchell - * Copyright (C) 2011-2012, Christian Muehlhaeuser - * Copyright (C) 2013, Uwe L. Korn + * Copyright 2011, Leo Franchi + * Copyright 2011, Jeff Mitchell + * Copyright 2011-2016, Christian Muehlhaeuser + * Copyright 2013, Uwe L. Korn * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.cpp b/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.cpp index caa7f1108..eb0274926 100644 --- a/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.cpp +++ b/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.cpp @@ -1,15 +1,15 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2011 Leo Franchi - * Copyright (C) 2011, Jeff Mitchell - * Copyright (C) 2011-2014, Christian Muehlhaeuser - * Copyright (C) 2013, Uwe L. Korn - * Copyright (C) 2013, Teo Mrnjavac - * Copyright (C) 2014 Dominik Schmidt + * Copyright 2011, Leo Franchi + * Copyright 2011, Jeff Mitchell + * Copyright 2011-2016, Christian Muehlhaeuser + * Copyright 2013, Uwe L. Korn + * Copyright 2013, Teo Mrnjavac + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, @@ -20,6 +20,7 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ + #include "TomaHkLinkGeneratorPlugin.h" #include "../playlist/dynamic/GeneratorInterface.h" diff --git a/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.h b/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.h index 316761cee..30205b152 100644 --- a/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.h +++ b/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.h @@ -1,10 +1,10 @@ /* === This file is part of Tomahawk Player - === * - * Copyright (C) 2014 Dominik Schmidt + * Copyright 2014, Dominik Schmidt * * Tomahawk 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 + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * Tomahawk is distributed in the hope that it will be useful, diff --git a/src/libtomahawk/utils/XspfGenerator.cpp b/src/libtomahawk/utils/XspfGenerator.cpp index 77c97a572..9c39c8112 100644 --- a/src/libtomahawk/utils/XspfGenerator.cpp +++ b/src/libtomahawk/utils/XspfGenerator.cpp @@ -1,21 +1,20 @@ -/* - Copyright (C) 2011 Leo Franchi - - 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. -*/ - +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Leo Franchi + * + * Tomahawk 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 3 of the License, or + * (at your option) any later version. + * + * Tomahawk 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 Tomahawk. If not, see . + */ #include "XspfGenerator.h" diff --git a/src/libtomahawk/utils/XspfGenerator.h b/src/libtomahawk/utils/XspfGenerator.h index f5867c1f3..bba49ce39 100644 --- a/src/libtomahawk/utils/XspfGenerator.h +++ b/src/libtomahawk/utils/XspfGenerator.h @@ -1,21 +1,20 @@ -/* - Copyright (C) 2011 Leo Franchi - - 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. -*/ - +/* === This file is part of Tomahawk Player - === + * + * Copyright 2011, Leo Franchi + * + * Tomahawk 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 3 of the License, or + * (at your option) any later version. + * + * Tomahawk 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 Tomahawk. If not, see . + */ #ifndef XSPFGENERATOR_H #define XSPFGENERATOR_H diff --git a/src/tomahawk/sourcetree/items/CategoryItems.cpp b/src/tomahawk/sourcetree/items/CategoryItems.cpp index c830ff9c6..baecad6d2 100644 --- a/src/tomahawk/sourcetree/items/CategoryItems.cpp +++ b/src/tomahawk/sourcetree/items/CategoryItems.cpp @@ -1,20 +1,20 @@ -/* - * Copyright 2010-2011, Leo Franchi - * Copyright 2010-2011, Jeff Mitchell +/* === This file is part of Tomahawk Player - === * - * 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. + * Copyright 2010-2011, Leo Franchi + * Copyright 2010-2011, Jeff Mitchell * - * 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. + * Tomahawk 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 3 of the License, or + * (at your option) any later version. * - * 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. + * Tomahawk 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 Tomahawk. If not, see . */ #include "CategoryItems.h" diff --git a/src/tomahawk/sourcetree/items/CategoryItems.h b/src/tomahawk/sourcetree/items/CategoryItems.h index 1f63ed63c..6f2e58ac0 100644 --- a/src/tomahawk/sourcetree/items/CategoryItems.h +++ b/src/tomahawk/sourcetree/items/CategoryItems.h @@ -1,19 +1,19 @@ -/* - * Copyright 2010-2011, Leo Franchi +/* === This file is part of Tomahawk Player - === * - * 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. + * Copyright 2010-2011, Leo Franchi * - * 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. + * Tomahawk 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 3 of the License, or + * (at your option) any later version. * - * 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. + * Tomahawk 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 Tomahawk. If not, see . */ #ifndef CATEGORY_ITEM_H diff --git a/src/tomahawk/sourcetree/items/GenericPageItems.cpp b/src/tomahawk/sourcetree/items/GenericPageItems.cpp index 2966438ea..a215b55bb 100644 --- a/src/tomahawk/sourcetree/items/GenericPageItems.cpp +++ b/src/tomahawk/sourcetree/items/GenericPageItems.cpp @@ -1,19 +1,19 @@ -/* - * Copyright 2010-2011, Leo Franchi +/* === This file is part of Tomahawk Player - === * - * 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. + * Copyright 2010-2011, Leo Franchi * - * 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. + * Tomahawk 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 3 of the License, or + * (at your option) any later version. * - * 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. + * Tomahawk 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 Tomahawk. If not, see . */ #include "GenericPageItems.h" diff --git a/src/tomahawk/sourcetree/items/GenericPageItems.h b/src/tomahawk/sourcetree/items/GenericPageItems.h index 393fc1cc6..19cc380c8 100644 --- a/src/tomahawk/sourcetree/items/GenericPageItems.h +++ b/src/tomahawk/sourcetree/items/GenericPageItems.h @@ -1,19 +1,19 @@ -/* - * Copyright 2010-2011, Leo Franchi +/* === This file is part of Tomahawk Player - === * - * 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. + * Copyright 2010-2011, Leo Franchi * - * 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. + * Tomahawk 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 3 of the License, or + * (at your option) any later version. * - * 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. + * Tomahawk 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 Tomahawk. If not, see . */ #ifndef GENERIC_PAGE_ITEM_H diff --git a/src/tomahawk/sourcetree/items/LovedTracksItem.cpp b/src/tomahawk/sourcetree/items/LovedTracksItem.cpp index 5ba9b4af5..7892a2ff0 100644 --- a/src/tomahawk/sourcetree/items/LovedTracksItem.cpp +++ b/src/tomahawk/sourcetree/items/LovedTracksItem.cpp @@ -1,19 +1,20 @@ -/* - * Copyright 2012, Christopher Reichert +/* === This file is part of Tomahawk Player - === * - * 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. + * Copyright 2012, Christopher Reichert + * Copyright 2012-2016, Christian Muehlhaeuser * - * 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. + * Tomahawk 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 3 of the License, or + * (at your option) any later version. * - * 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. + * Tomahawk 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 Tomahawk. If not, see . */ #include "LovedTracksItem.h" diff --git a/src/tomahawk/sourcetree/items/LovedTracksItem.h b/src/tomahawk/sourcetree/items/LovedTracksItem.h index 8136c90ae..fef1a2f82 100644 --- a/src/tomahawk/sourcetree/items/LovedTracksItem.h +++ b/src/tomahawk/sourcetree/items/LovedTracksItem.h @@ -1,19 +1,20 @@ -/* - * Copyright 2012, Christopher Reichert +/* === This file is part of Tomahawk Player - === * - * 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. + * Copyright 2012, Christopher Reichert + * Copyright 2012-2016, Christian Muehlhaeuser * - * 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. + * Tomahawk 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 3 of the License, or + * (at your option) any later version. * - * 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. + * Tomahawk 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 Tomahawk. If not, see . */ #ifndef LOVED_TRACKS_ITEM_H diff --git a/src/tomahawk/sourcetree/items/SourceTreeItem.cpp b/src/tomahawk/sourcetree/items/SourceTreeItem.cpp index 18db77459..b97a13f5e 100644 --- a/src/tomahawk/sourcetree/items/SourceTreeItem.cpp +++ b/src/tomahawk/sourcetree/items/SourceTreeItem.cpp @@ -1,20 +1,20 @@ -/* - Copyright 2010-2011, Leo Franchi - - 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. -*/ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Leo Franchi + * + * Tomahawk 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 3 of the License, or + * (at your option) any later version. + * + * Tomahawk 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 Tomahawk. If not, see . + */ #include "SourceTreeItem.h" diff --git a/src/tomahawk/sourcetree/items/SourceTreeItem.h b/src/tomahawk/sourcetree/items/SourceTreeItem.h index c74a6cc78..673d97d02 100644 --- a/src/tomahawk/sourcetree/items/SourceTreeItem.h +++ b/src/tomahawk/sourcetree/items/SourceTreeItem.h @@ -1,20 +1,20 @@ -/* - Copyright 2010-2011, Leo Franchi - - 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. -*/ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Leo Franchi + * + * Tomahawk 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 3 of the License, or + * (at your option) any later version. + * + * Tomahawk 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 Tomahawk. If not, see . + */ #ifndef SOURCETREEITEM_H #define SOURCETREEITEM_H