From a53b111182a427824dcd7721bbecbe43b7bb676f Mon Sep 17 00:00:00 2001 From: thez3ro Date: Fri, 9 Jun 2017 23:40:36 +0200 Subject: [PATCH] Update and fix copyright headers --- CMakeLists.txt | 1 + COPYING | 49 ++++++++++++++++++++---- cmake/FindLibGPGError.cmake | 14 +++++++ share/CMakeLists.txt | 1 + src/CMakeLists.txt | 1 + src/autotype/AutoType.cpp | 1 + src/autotype/AutoType.h | 1 + src/autotype/mac/AppKit.h | 1 + src/autotype/mac/AppKitImpl.h | 1 + src/autotype/mac/AppKitImpl.mm | 1 + src/autotype/mac/AutoTypeMac.cpp | 1 + src/autotype/mac/AutoTypeMac.h | 1 + src/autotype/windows/AutoTypeWindows.cpp | 1 + src/autotype/windows/AutoTypeWindows.h | 1 + src/autotype/xcb/AutoTypeXCB.cpp | 1 + src/autotype/xcb/AutoTypeXCB.h | 1 + src/cli/Clip.cpp | 2 +- src/cli/Clip.h | 2 +- src/cli/EntropyMeter.cpp | 21 +++++++--- src/cli/EntropyMeter.h | 2 +- src/cli/Extract.cpp | 2 +- src/cli/Extract.h | 2 +- src/cli/List.cpp | 2 +- src/cli/List.h | 2 +- src/cli/Merge.cpp | 2 +- src/cli/Merge.h | 2 +- src/cli/Show.cpp | 2 +- src/cli/Show.h | 2 +- src/cli/keepassxc-cli.cpp | 2 +- src/core/Config.cpp | 1 + src/core/Config.h | 1 + src/core/CsvParser.cpp | 1 + src/core/CsvParser.h | 1 + src/core/Database.cpp | 1 + src/core/Database.h | 1 + src/core/Entry.cpp | 1 + src/core/Entry.h | 1 + src/core/EntryAttributes.cpp | 1 + src/core/EntryAttributes.h | 1 + src/core/EntrySearcher.cpp | 1 + src/core/EntrySearcher.h | 1 + src/core/Group.cpp | 1 + src/core/Group.h | 1 + src/core/PassphraseGenerator.cpp | 2 +- src/core/PassphraseGenerator.h | 2 +- src/core/PasswordGenerator.cpp | 1 + src/core/PasswordGenerator.h | 1 + src/core/Tools.cpp | 1 + src/core/Tools.h | 1 + src/format/KeePass2Reader.cpp | 2 +- src/gui/AboutDialog.cpp | 1 + src/gui/AboutDialog.h | 1 + src/gui/Application.cpp | 1 + src/gui/Application.h | 1 + src/gui/ChangeMasterKeyWidget.cpp | 1 + src/gui/ChangeMasterKeyWidget.h | 1 + src/gui/CloneDialog.cpp | 2 +- src/gui/CloneDialog.h | 2 +- src/gui/DatabaseOpenWidget.cpp | 1 + src/gui/DatabaseOpenWidget.h | 1 + src/gui/DatabaseTabWidget.cpp | 1 + src/gui/DatabaseTabWidget.h | 1 + src/gui/DatabaseWidget.cpp | 3 +- src/gui/DatabaseWidget.h | 3 +- src/gui/EditWidget.cpp | 1 + src/gui/EditWidget.h | 1 + src/gui/EditWidgetIcons.cpp | 1 + src/gui/EditWidgetIcons.h | 1 + src/gui/MainWindow.cpp | 1 + src/gui/MainWindow.h | 1 + src/gui/MessageWidget.cpp | 1 + src/gui/MessageWidget.h | 1 + src/gui/PasswordEdit.cpp | 1 + src/gui/PasswordEdit.h | 1 + src/gui/PasswordGeneratorWidget.cpp | 1 + src/gui/PasswordGeneratorWidget.h | 1 + src/gui/SearchWidget.cpp | 1 + src/gui/SearchWidget.h | 1 + src/gui/SettingsWidget.cpp | 1 + src/gui/SettingsWidget.h | 1 + src/gui/SetupTotpDialog.cpp | 1 + src/gui/SetupTotpDialog.h | 1 + src/gui/TotpDialog.cpp | 1 + src/gui/TotpDialog.h | 1 + src/gui/UnlockDatabaseDialog.cpp | 2 +- src/gui/UnlockDatabaseDialog.h | 2 +- src/gui/WelcomeWidget.cpp | 1 + src/gui/WelcomeWidget.h | 1 + src/gui/csvImport/CsvImportWidget.cpp | 1 + src/gui/csvImport/CsvImportWidget.h | 1 + src/gui/csvImport/CsvImportWizard.cpp | 1 + src/gui/csvImport/CsvImportWizard.h | 1 + src/gui/csvImport/CsvParserModel.cpp | 1 + src/gui/csvImport/CsvParserModel.h | 1 + src/gui/entry/EditEntryWidget.cpp | 1 + src/gui/entry/EditEntryWidget.h | 1 + src/http/AccessControlDialog.cpp | 29 ++++++++------ src/http/AccessControlDialog.h | 29 ++++++++------ src/http/EntryConfig.cpp | 29 ++++++++------ src/http/EntryConfig.h | 29 ++++++++------ src/http/HttpPasswordGeneratorWidget.cpp | 31 +++++++-------- src/http/HttpPasswordGeneratorWidget.h | 31 +++++++-------- src/http/HttpSettings.cpp | 29 ++++++++------ src/http/HttpSettings.h | 29 ++++++++------ src/http/OptionDialog.cpp | 29 ++++++++------ src/http/OptionDialog.h | 29 ++++++++------ src/http/Protocol.cpp | 29 ++++++++------ src/http/Protocol.h | 29 ++++++++------ src/http/Server.cpp | 29 ++++++++------ src/http/Server.h | 29 ++++++++------ src/http/Service.cpp | 29 ++++++++------ src/http/Service.h | 29 ++++++++------ src/keys/ChallengeResponseKey.h | 1 + src/keys/CompositeKey.cpp | 1 + src/keys/CompositeKey.h | 1 + src/keys/YkChallengeResponseKey.cpp | 1 + src/keys/YkChallengeResponseKey.h | 2 +- src/keys/drivers/YubiKey.cpp | 1 + src/keys/drivers/YubiKey.h | 1 + src/keys/drivers/YubiKeyStub.cpp | 1 + src/main.cpp | 1 + src/totp/totp.cpp | 1 + src/totp/totp.h | 1 + tests/TestAutoType.cpp | 1 + tests/TestAutoType.h | 1 + tests/TestCsvParser.cpp | 1 + tests/TestCsvParser.h | 1 + tests/TestDatabase.cpp | 1 + tests/TestDatabase.h | 1 + tests/TestGroup.cpp | 1 + tests/TestGroup.h | 1 + tests/TestKeys.cpp | 1 + tests/TestKeys.h | 1 + tests/TestSymmetricCipher.cpp | 1 + tests/TestSymmetricCipher.h | 1 + tests/TestTotp.cpp | 1 + tests/TestTotp.h | 1 + tests/TestYkChallengeResponseKey.cpp | 1 + tests/TestYkChallengeResponseKey.h | 1 + tests/gui/TemporaryFile.cpp | 1 + tests/gui/TemporaryFile.h | 1 + tests/gui/TestGui.cpp | 1 + tests/gui/TestGui.h | 1 + 143 files changed, 466 insertions(+), 234 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 881e0bdb..2f3677d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2010 Felix Geyer +# Copyright (C) 2017 KeePassXC Team # # 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 diff --git a/COPYING b/COPYING index d3638401..cffc5756 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ -KeePassX - http://www.keepassx.org/ -Copyright (C) 2010-2012 Felix Geyer +KeePassXC - http://www.keepassxc.org/ +Copyright (C) 2016-2017 KeePassXC Team 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 @@ -14,9 +14,9 @@ GNU General Public License for more details. -------------------------------------------------------------------- Format-Specification: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: KeePassX -Upstream-Contact: Felix Geyer -Source: http://www.keepassx.org/ +Upstream-Name: KeePassXC +Upstream-Contact: KeePassXC Team +Source: http://www.keepassxc.org/ Copyright: 2010-2012, Felix Geyer 2011-2012, Florian Geyer @@ -27,14 +27,38 @@ Copyright: 2010-2012, Felix Geyer 2000-2008, Tom Sato 2013, Laszlo Papp 2013, David Faure - 2016, KeePassXC Team + 2016-2017, KeePassXC Team License: GPL-2 or GPL-3 +Comment: The "KeePassXC Team" in every copyright notice is formed by the following people: + - droidmonkey + - phoerious + - TheZ3ro + - louib + - weslly + Every other contributor is listed on https://github.com/keepassxreboot/keepassxc/graphs/contributors + Files: cmake/GNUInstallDirs.cmake Copyright: 2011 Nikita Krupen'ko 2011 Kitware, Inc. License: BSD-3-clause +Files: cmake/CodeCoverage.cmake +Copyright: 2012 - 2015, Lars Bilke +License: BSD-3-clause + +Files: cmake/FindYubiKey.cmake +Copyright: 2014 Kyle Manna +License: GPL-2 or GPL-3 + +Files: cmake/GenerateProductVersion.cmake +Copyright: 2015 halex2005 +License: MIT + +Files: cmake/CodeCoverage.cmake +Copyright: 2012 - 2015, Lars Bilke +License: BSD-3-clause + Files: share/icons/application/*/apps/keepassxc.png share/icons/application/scalable/apps/keepassxc.svgz share/icons/application/*/apps/keepassxc-dark.png @@ -138,18 +162,25 @@ Files: share/icons/application/*/actions/application-exit.png share/icons/application/*/actions/document-encrypt.png share/icons/application/*/actions/document-new.png share/icons/application/*/actions/document-open.png + share/icons/application/*/actions/document-properties.png share/icons/application/*/actions/document-save.png share/icons/application/*/actions/document-save-as.png share/icons/application/*/actions/edit-clear-locationbar-ltr.png share/icons/application/*/actions/edit-clear-locationbar-rtl.png + share/icons/application/*/actions/key-enter.png share/icons/application/*/actions/password-generator.png share/icons/application/*/actions/password-copy.png share/icons/application/*/actions/password-show-*.png share/icons/application/*/actions/system-search.png share/icons/application/*/actions/username-copy.png + share/icons/application/*/actions/view-history.png + share/icons/application/*/apps/internet-web-browser.png + share/icons/application/*/apps/preferences-desktop-icons.png + share/icons/application/*/categories/preferences-other.png share/icons/application/*/status/dialog-error.png share/icons/application/*/status/dialog-information.png share/icons/application/*/status/dialog-warning.png + share/icons/application/*/status/security-high.png share/icons/svg/*.svgz Copyright: 2007, Nuno Pinheiro 2007, David Vignoni @@ -196,11 +227,13 @@ Copyright: 2009-2010, Iowa State University License: Boost-1.0 Files: src/zxcvbn/zxcvbn.* - src/utils/entropy-meter.cpp Copyright: 2015, Tony Evans - 2016, KeePassXC Team License: BSD 3-clause +Files: src/http/qhttp/* +Copyright: 2014, Amir Zamani +License: MIT + Files: src/gui/KMessageWidget.h src/gui/KMessageWidget.cpp Copyright: 2011 Aurélien Gâteau diff --git a/cmake/FindLibGPGError.cmake b/cmake/FindLibGPGError.cmake index fe9ef912..c1e1b868 100644 --- a/cmake/FindLibGPGError.cmake +++ b/cmake/FindLibGPGError.cmake @@ -1,3 +1,17 @@ +# Copyright (C) 2017 KeePassXC Team +# +# 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 or (at your option) +# version 3 of the License. +# +# 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, see . find_path(GPGERROR_INCLUDE_DIR gpg-error.h) diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt index 7d01a1c4..a609add7 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2011 Felix Geyer +# Copyright (C) 2017 KeePassXC Team # # 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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1c890e16..5d01721b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2010 Felix Geyer +# Copyright (C) 2017 KeePassXC Team # # 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 diff --git a/src/autotype/AutoType.cpp b/src/autotype/AutoType.cpp index 6a066d4c..927d6822 100644 --- a/src/autotype/AutoType.cpp +++ b/src/autotype/AutoType.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/AutoType.h b/src/autotype/AutoType.h index ea5c9561..6f4a815f 100644 --- a/src/autotype/AutoType.h +++ b/src/autotype/AutoType.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/mac/AppKit.h b/src/autotype/mac/AppKit.h index 114038d6..f1eced5b 100644 --- a/src/autotype/mac/AppKit.h +++ b/src/autotype/mac/AppKit.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Lennart Glauer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/mac/AppKitImpl.h b/src/autotype/mac/AppKitImpl.h index 1b57d7b1..f370096f 100644 --- a/src/autotype/mac/AppKitImpl.h +++ b/src/autotype/mac/AppKitImpl.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Lennart Glauer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/mac/AppKitImpl.mm b/src/autotype/mac/AppKitImpl.mm index ad600cb9..45704438 100644 --- a/src/autotype/mac/AppKitImpl.mm +++ b/src/autotype/mac/AppKitImpl.mm @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Lennart Glauer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/mac/AutoTypeMac.cpp b/src/autotype/mac/AutoTypeMac.cpp index b0e1360f..7056c731 100644 --- a/src/autotype/mac/AutoTypeMac.cpp +++ b/src/autotype/mac/AutoTypeMac.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Lennart Glauer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/mac/AutoTypeMac.h b/src/autotype/mac/AutoTypeMac.h index 82f8b0eb..c554fa6e 100644 --- a/src/autotype/mac/AutoTypeMac.h +++ b/src/autotype/mac/AutoTypeMac.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Lennart Glauer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/windows/AutoTypeWindows.cpp b/src/autotype/windows/AutoTypeWindows.cpp index 81baeefa..2dfc7a26 100644 --- a/src/autotype/windows/AutoTypeWindows.cpp +++ b/src/autotype/windows/AutoTypeWindows.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Lennart Glauer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/windows/AutoTypeWindows.h b/src/autotype/windows/AutoTypeWindows.h index 6ffae4d1..88b9a9fd 100644 --- a/src/autotype/windows/AutoTypeWindows.h +++ b/src/autotype/windows/AutoTypeWindows.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Lennart Glauer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/xcb/AutoTypeXCB.cpp b/src/autotype/xcb/AutoTypeXCB.cpp index e1539612..436cd5b5 100644 --- a/src/autotype/xcb/AutoTypeXCB.cpp +++ b/src/autotype/xcb/AutoTypeXCB.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2012 Felix Geyer * Copyright (C) 2000-2008 Tom Sato + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/autotype/xcb/AutoTypeXCB.h b/src/autotype/xcb/AutoTypeXCB.h index 186d0eb8..34e539cf 100644 --- a/src/autotype/xcb/AutoTypeXCB.h +++ b/src/autotype/xcb/AutoTypeXCB.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2012 Felix Geyer * Copyright (C) 2000-2008 Tom Sato + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/Clip.cpp b/src/cli/Clip.cpp index f587b3f1..106fed6c 100644 --- a/src/cli/Clip.cpp +++ b/src/cli/Clip.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/Clip.h b/src/cli/Clip.h index 94418409..cb72e429 100644 --- a/src/cli/Clip.h +++ b/src/cli/Clip.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/EntropyMeter.cpp b/src/cli/EntropyMeter.cpp index ffaecc8e..a62cd307 100644 --- a/src/cli/EntropyMeter.cpp +++ b/src/cli/EntropyMeter.cpp @@ -1,10 +1,19 @@ /* -Part of this code come from zxcvbn-c example. -Copyright (c) 2015, Tony Evans -Copyright (c) 2016, KeePassXC Team - -See zxcvbn/zxcvbn.cpp for complete COPYRIGHT Notice -*/ + * Copyright (C) 2017 KeePassXC Team + * + * 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 or (at your option) + * version 3 of the License. + * + * 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, see . + */ #include "EntropyMeter.h" diff --git a/src/cli/EntropyMeter.h b/src/cli/EntropyMeter.h index 5034b966..d160115b 100644 --- a/src/cli/EntropyMeter.h +++ b/src/cli/EntropyMeter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/Extract.cpp b/src/cli/Extract.cpp index 74fa33da..0c8a3960 100644 --- a/src/cli/Extract.cpp +++ b/src/cli/Extract.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/Extract.h b/src/cli/Extract.h index 9a6638e4..e1b0672e 100644 --- a/src/cli/Extract.h +++ b/src/cli/Extract.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/List.cpp b/src/cli/List.cpp index 8dd250b3..685ef8ec 100644 --- a/src/cli/List.cpp +++ b/src/cli/List.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/List.h b/src/cli/List.h index 76f086c6..18528bd7 100644 --- a/src/cli/List.h +++ b/src/cli/List.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/Merge.cpp b/src/cli/Merge.cpp index ca2c7101..738f0ee4 100644 --- a/src/cli/Merge.cpp +++ b/src/cli/Merge.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/Merge.h b/src/cli/Merge.h index dd9b8a4c..95da7af8 100644 --- a/src/cli/Merge.h +++ b/src/cli/Merge.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/Show.cpp b/src/cli/Show.cpp index 59c0219a..b9d6bed0 100644 --- a/src/cli/Show.cpp +++ b/src/cli/Show.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/Show.h b/src/cli/Show.h index aa06b5c9..630b18f8 100644 --- a/src/cli/Show.h +++ b/src/cli/Show.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/cli/keepassxc-cli.cpp b/src/cli/keepassxc-cli.cpp index cc09f8a9..0d261eb4 100644 --- a/src/cli/keepassxc-cli.cpp +++ b/src/cli/keepassxc-cli.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Config.cpp b/src/core/Config.cpp index f0a369c3..c8d23b36 100644 --- a/src/core/Config.cpp +++ b/src/core/Config.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Config.h b/src/core/Config.h index 1fb937cf..2ee3f4dc 100644 --- a/src/core/Config.h +++ b/src/core/Config.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/CsvParser.cpp b/src/core/CsvParser.cpp index 7f0443aa..70493804 100644 --- a/src/core/CsvParser.cpp +++ b/src/core/CsvParser.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/CsvParser.h b/src/core/CsvParser.h index 48be0558..3ab31bf6 100644 --- a/src/core/CsvParser.h +++ b/src/core/CsvParser.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Database.cpp b/src/core/Database.cpp index 64fc3469..0572f5d7 100644 --- a/src/core/Database.cpp +++ b/src/core/Database.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Database.h b/src/core/Database.h index 37745e84..8e62e535 100644 --- a/src/core/Database.h +++ b/src/core/Database.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp index 418e2a81..a8cc6d3b 100644 --- a/src/core/Entry.cpp +++ b/src/core/Entry.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Entry.h b/src/core/Entry.h index cdb826ec..91a0012a 100644 --- a/src/core/Entry.h +++ b/src/core/Entry.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/EntryAttributes.cpp b/src/core/EntryAttributes.cpp index c689f8ad..a5143aa0 100644 --- a/src/core/EntryAttributes.cpp +++ b/src/core/EntryAttributes.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/EntryAttributes.h b/src/core/EntryAttributes.h index 58f1db61..40fc5dec 100644 --- a/src/core/EntryAttributes.h +++ b/src/core/EntryAttributes.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/EntrySearcher.cpp b/src/core/EntrySearcher.cpp index df05711a..deaefa1a 100644 --- a/src/core/EntrySearcher.cpp +++ b/src/core/EntrySearcher.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Florian Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/EntrySearcher.h b/src/core/EntrySearcher.h index 4e8d4eab..da51eebc 100644 --- a/src/core/EntrySearcher.h +++ b/src/core/EntrySearcher.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Florian Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Group.cpp b/src/core/Group.cpp index 0c83fa30..0bebfcb0 100644 --- a/src/core/Group.cpp +++ b/src/core/Group.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Group.h b/src/core/Group.h index 9b1f0209..7c76e412 100644 --- a/src/core/Group.h +++ b/src/core/Group.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/PassphraseGenerator.cpp b/src/core/PassphraseGenerator.cpp index ba403389..1af61479 100644 --- a/src/core/PassphraseGenerator.cpp +++ b/src/core/PassphraseGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/PassphraseGenerator.h b/src/core/PassphraseGenerator.h index e814a587..3be2d583 100644 --- a/src/core/PassphraseGenerator.h +++ b/src/core/PassphraseGenerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/PasswordGenerator.cpp b/src/core/PasswordGenerator.cpp index 0fa5198f..cdff204a 100644 --- a/src/core/PasswordGenerator.cpp +++ b/src/core/PasswordGenerator.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/PasswordGenerator.h b/src/core/PasswordGenerator.h index 8ec82c0a..5a5c7a3f 100644 --- a/src/core/PasswordGenerator.h +++ b/src/core/PasswordGenerator.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp index a1bfcb0c..b9e4be8e 100644 --- a/src/core/Tools.cpp +++ b/src/core/Tools.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2012 Felix Geyer * Copyright (C) 2017 Lennart Glauer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/core/Tools.h b/src/core/Tools.h index ba55054a..b6fa49c0 100644 --- a/src/core/Tools.h +++ b/src/core/Tools.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp index ffe4e94f..b0d78072 100644 --- a/src/format/KeePass2Reader.cpp +++ b/src/format/KeePass2Reader.cpp @@ -198,7 +198,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke QByteArray headerHash = CryptoHash::hash(headerStream.storedData(), CryptoHash::Sha256); if (headerHash != xmlReader.headerHash()) { raiseError("Header doesn't match hash"); - return Q_NULLPTR; + return nullptr; } } diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp index 636b284f..6204e5c8 100644 --- a/src/gui/AboutDialog.cpp +++ b/src/gui/AboutDialog.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/AboutDialog.h b/src/gui/AboutDialog.h index b69a14db..9d0c1c35 100644 --- a/src/gui/AboutDialog.h +++ b/src/gui/AboutDialog.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp index 1ae94ac8..7c369cf1 100644 --- a/src/gui/Application.cpp +++ b/src/gui/Application.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2012 Tobias Tangemann * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/Application.h b/src/gui/Application.h index 1a1b0ee8..5cb10e75 100644 --- a/src/gui/Application.h +++ b/src/gui/Application.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2012 Tobias Tangemann * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/ChangeMasterKeyWidget.cpp b/src/gui/ChangeMasterKeyWidget.cpp index 616b0ee0..ef4b61ef 100644 --- a/src/gui/ChangeMasterKeyWidget.cpp +++ b/src/gui/ChangeMasterKeyWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/ChangeMasterKeyWidget.h b/src/gui/ChangeMasterKeyWidget.h index b3e09727..2825d8d5 100644 --- a/src/gui/ChangeMasterKeyWidget.h +++ b/src/gui/ChangeMasterKeyWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/CloneDialog.cpp b/src/gui/CloneDialog.cpp index b6ff30bd..5985e26a 100644 --- a/src/gui/CloneDialog.cpp +++ b/src/gui/CloneDialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/CloneDialog.h b/src/gui/CloneDialog.h index 094b0fe7..a925bb47 100644 --- a/src/gui/CloneDialog.h +++ b/src/gui/CloneDialog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp index f7d43247..18b4b2b6 100644 --- a/src/gui/DatabaseOpenWidget.cpp +++ b/src/gui/DatabaseOpenWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/DatabaseOpenWidget.h b/src/gui/DatabaseOpenWidget.h index caba70a6..49d3fb83 100644 --- a/src/gui/DatabaseOpenWidget.h +++ b/src/gui/DatabaseOpenWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index 2c14ace1..03817461 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h index ea8f6003..85b3f3af 100644 --- a/src/gui/DatabaseTabWidget.h +++ b/src/gui/DatabaseTabWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index eb3a32e2..b8e4f053 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -1,5 +1,6 @@ -/* +/* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h index aa1c8344..73bc2122 100644 --- a/src/gui/DatabaseWidget.h +++ b/src/gui/DatabaseWidget.h @@ -1,5 +1,6 @@ -/* +/* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/EditWidget.cpp b/src/gui/EditWidget.cpp index e2c157ed..cf3568d1 100644 --- a/src/gui/EditWidget.cpp +++ b/src/gui/EditWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/EditWidget.h b/src/gui/EditWidget.h index 4ea37621..442365b9 100644 --- a/src/gui/EditWidget.h +++ b/src/gui/EditWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp index 7b46728c..a68bda05 100644 --- a/src/gui/EditWidgetIcons.cpp +++ b/src/gui/EditWidgetIcons.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/EditWidgetIcons.h b/src/gui/EditWidgetIcons.h index 745914bc..3cc191d7 100644 --- a/src/gui/EditWidgetIcons.h +++ b/src/gui/EditWidgetIcons.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 45061871..7027d94c 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h index fffc634a..caf3f585 100644 --- a/src/gui/MainWindow.h +++ b/src/gui/MainWindow.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/MessageWidget.cpp b/src/gui/MessageWidget.cpp index 9360a6e6..de981b92 100644 --- a/src/gui/MessageWidget.cpp +++ b/src/gui/MessageWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Pedro Alves + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/MessageWidget.h b/src/gui/MessageWidget.h index a6c9425d..03ebee3e 100644 --- a/src/gui/MessageWidget.h +++ b/src/gui/MessageWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Pedro Alves + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/PasswordEdit.cpp b/src/gui/PasswordEdit.cpp index 095a4e14..54b0ca28 100644 --- a/src/gui/PasswordEdit.cpp +++ b/src/gui/PasswordEdit.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/PasswordEdit.h b/src/gui/PasswordEdit.h index d527432d..d5439f1a 100644 --- a/src/gui/PasswordEdit.h +++ b/src/gui/PasswordEdit.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp index 8e369775..3753071d 100644 --- a/src/gui/PasswordGeneratorWidget.cpp +++ b/src/gui/PasswordGeneratorWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/PasswordGeneratorWidget.h b/src/gui/PasswordGeneratorWidget.h index b552e112..13010646 100644 --- a/src/gui/PasswordGeneratorWidget.h +++ b/src/gui/PasswordGeneratorWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/SearchWidget.cpp b/src/gui/SearchWidget.cpp index 2142a96f..3e987df9 100644 --- a/src/gui/SearchWidget.cpp +++ b/src/gui/SearchWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Jonathan White + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/SearchWidget.h b/src/gui/SearchWidget.h index 5a33b451..9f0e0d11 100644 --- a/src/gui/SearchWidget.h +++ b/src/gui/SearchWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Jonathan White + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp index d903c2de..e8fe9fcb 100644 --- a/src/gui/SettingsWidget.cpp +++ b/src/gui/SettingsWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/SettingsWidget.h b/src/gui/SettingsWidget.h index 7037b2e3..f2fc9f2d 100644 --- a/src/gui/SettingsWidget.h +++ b/src/gui/SettingsWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/SetupTotpDialog.cpp b/src/gui/SetupTotpDialog.cpp index b088e821..5521773b 100644 --- a/src/gui/SetupTotpDialog.cpp +++ b/src/gui/SetupTotpDialog.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com> + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/SetupTotpDialog.h b/src/gui/SetupTotpDialog.h index 416e19a5..243a05f9 100644 --- a/src/gui/SetupTotpDialog.h +++ b/src/gui/SetupTotpDialog.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com> + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/TotpDialog.cpp b/src/gui/TotpDialog.cpp index 05821087..17cc1120 100644 --- a/src/gui/TotpDialog.cpp +++ b/src/gui/TotpDialog.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com> + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/TotpDialog.h b/src/gui/TotpDialog.h index 66754dd2..33eac665 100644 --- a/src/gui/TotpDialog.h +++ b/src/gui/TotpDialog.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com> + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/UnlockDatabaseDialog.cpp b/src/gui/UnlockDatabaseDialog.cpp index c3c62c5a..3aca54cf 100644 --- a/src/gui/UnlockDatabaseDialog.cpp +++ b/src/gui/UnlockDatabaseDialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 KeePassXC Team + * Copyright (C) 2016 KeePassXC Team * * 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 diff --git a/src/gui/UnlockDatabaseDialog.h b/src/gui/UnlockDatabaseDialog.h index 732395ef..55830c97 100644 --- a/src/gui/UnlockDatabaseDialog.h +++ b/src/gui/UnlockDatabaseDialog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 KeePassXC Team + * Copyright (C) 2016 KeePassXC Team * * 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 diff --git a/src/gui/WelcomeWidget.cpp b/src/gui/WelcomeWidget.cpp index 96bf0a20..9dc23d52 100644 --- a/src/gui/WelcomeWidget.cpp +++ b/src/gui/WelcomeWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/WelcomeWidget.h b/src/gui/WelcomeWidget.h index 9f8d5d70..71ceda35 100644 --- a/src/gui/WelcomeWidget.h +++ b/src/gui/WelcomeWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/csvImport/CsvImportWidget.cpp b/src/gui/csvImport/CsvImportWidget.cpp index 93cba84c..1e49d283 100644 --- a/src/gui/csvImport/CsvImportWidget.cpp +++ b/src/gui/csvImport/CsvImportWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/csvImport/CsvImportWidget.h b/src/gui/csvImport/CsvImportWidget.h index 9215fd36..d006b44e 100644 --- a/src/gui/csvImport/CsvImportWidget.h +++ b/src/gui/csvImport/CsvImportWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/csvImport/CsvImportWizard.cpp b/src/gui/csvImport/CsvImportWizard.cpp index a1e1757b..06ee2311 100644 --- a/src/gui/csvImport/CsvImportWizard.cpp +++ b/src/gui/csvImport/CsvImportWizard.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/csvImport/CsvImportWizard.h b/src/gui/csvImport/CsvImportWizard.h index 1c99259c..317018d9 100644 --- a/src/gui/csvImport/CsvImportWizard.h +++ b/src/gui/csvImport/CsvImportWizard.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/csvImport/CsvParserModel.cpp b/src/gui/csvImport/CsvParserModel.cpp index efffda55..d4af2b78 100644 --- a/src/gui/csvImport/CsvParserModel.cpp +++ b/src/gui/csvImport/CsvParserModel.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/csvImport/CsvParserModel.h b/src/gui/csvImport/CsvParserModel.h index 8cab4d4f..b092092b 100644 --- a/src/gui/csvImport/CsvParserModel.h +++ b/src/gui/csvImport/CsvParserModel.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index c81214e4..aea0ac88 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h index 9277997e..2888d43a 100644 --- a/src/gui/entry/EditEntryWidget.h +++ b/src/gui/entry/EditEntryWidget.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/http/AccessControlDialog.cpp b/src/http/AccessControlDialog.cpp index 171a8f72..ef02215a 100644 --- a/src/http/AccessControlDialog.cpp +++ b/src/http/AccessControlDialog.cpp @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file AccessControlDialog.cpp - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #include "AccessControlDialog.h" #include "ui_AccessControlDialog.h" diff --git a/src/http/AccessControlDialog.h b/src/http/AccessControlDialog.h index 4ecef986..76392eff 100644 --- a/src/http/AccessControlDialog.h +++ b/src/http/AccessControlDialog.h @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file AccessControlDialog.h - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #ifndef ACCESSCONTROLDIALOG_H #define ACCESSCONTROLDIALOG_H diff --git a/src/http/EntryConfig.cpp b/src/http/EntryConfig.cpp index 3a7c17ea..309afafa 100644 --- a/src/http/EntryConfig.cpp +++ b/src/http/EntryConfig.cpp @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file EntryConfig.cpp - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #include "EntryConfig.h" #include diff --git a/src/http/EntryConfig.h b/src/http/EntryConfig.h index 40633162..d5e9876e 100644 --- a/src/http/EntryConfig.h +++ b/src/http/EntryConfig.h @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file EntryConfig.h - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #ifndef ENTRYCONFIG_H #define ENTRYCONFIG_H diff --git a/src/http/HttpPasswordGeneratorWidget.cpp b/src/http/HttpPasswordGeneratorWidget.cpp index 031ff30a..55e5b08f 100644 --- a/src/http/HttpPasswordGeneratorWidget.cpp +++ b/src/http/HttpPasswordGeneratorWidget.cpp @@ -1,19 +1,20 @@ /* - * Copyright (C) 2013 Felix Geyer - * - * 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 or (at your option) - * version 3 of the License. - * - * 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, see . - */ +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #include "HttpPasswordGeneratorWidget.h" #include "ui_HttpPasswordGeneratorWidget.h" diff --git a/src/http/HttpPasswordGeneratorWidget.h b/src/http/HttpPasswordGeneratorWidget.h index f9907600..8ef6091b 100644 --- a/src/http/HttpPasswordGeneratorWidget.h +++ b/src/http/HttpPasswordGeneratorWidget.h @@ -1,19 +1,20 @@ /* - * Copyright (C) 2013 Felix Geyer - * - * 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 or (at your option) - * version 3 of the License. - * - * 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, see . - */ +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #ifndef KEEPASSX_HTTPPASSWORDGENERATORWIDGET_H #define KEEPASSX_HTTPPASSWORDGENERATORWIDGET_H diff --git a/src/http/HttpSettings.cpp b/src/http/HttpSettings.cpp index e51f87cf..60a35940 100644 --- a/src/http/HttpSettings.cpp +++ b/src/http/HttpSettings.cpp @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file HttpSettings.cpp - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #include "HttpSettings.h" #include "core/Config.h" diff --git a/src/http/HttpSettings.h b/src/http/HttpSettings.h index bea5648c..a4aee1a6 100644 --- a/src/http/HttpSettings.h +++ b/src/http/HttpSettings.h @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file HttpSettings.h - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #ifndef HTTPSETTINGS_H #define HTTPSETTINGS_H diff --git a/src/http/OptionDialog.cpp b/src/http/OptionDialog.cpp index fd30f874..9fb66bd6 100644 --- a/src/http/OptionDialog.cpp +++ b/src/http/OptionDialog.cpp @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file OptionDialog.cpp - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #include "OptionDialog.h" #include "ui_OptionDialog.h" diff --git a/src/http/OptionDialog.h b/src/http/OptionDialog.h index ad535fdb..6139f929 100644 --- a/src/http/OptionDialog.h +++ b/src/http/OptionDialog.h @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file OptionDialog.h - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #ifndef OPTIONDIALOG_H #define OPTIONDIALOG_H diff --git a/src/http/Protocol.cpp b/src/http/Protocol.cpp index 4fcdace6..d6d5557a 100644 --- a/src/http/Protocol.cpp +++ b/src/http/Protocol.cpp @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file Response.cpp - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #include "Protocol.h" #include diff --git a/src/http/Protocol.h b/src/http/Protocol.h index e20d19c3..ff48fe58 100644 --- a/src/http/Protocol.h +++ b/src/http/Protocol.h @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file Response.h - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #ifndef RESPONSE_H #define RESPONSE_H diff --git a/src/http/Server.cpp b/src/http/Server.cpp index 5304c7f0..faac7be2 100644 --- a/src/http/Server.cpp +++ b/src/http/Server.cpp @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file Server.cpp - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #include #include diff --git a/src/http/Server.h b/src/http/Server.h index 8421de06..08cdfa24 100644 --- a/src/http/Server.h +++ b/src/http/Server.h @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file Server.h - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #ifndef SERVER_H #define SERVER_H diff --git a/src/http/Service.cpp b/src/http/Service.cpp index b2ae0a80..639898da 100644 --- a/src/http/Service.cpp +++ b/src/http/Service.cpp @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file Service.cpp - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #include #include diff --git a/src/http/Service.h b/src/http/Service.h index b6ee5bea..d60d884b 100644 --- a/src/http/Service.h +++ b/src/http/Service.h @@ -1,15 +1,20 @@ -/** - *************************************************************************** - * @file Service.h - * - * @brief - * - * Copyright (C) 2013 - * - * @author Francois Ferrand - * @date 4/2013 - *************************************************************************** - */ +/* +* Copyright (C) 2013 Francois Ferrand +* Copyright (C) 2017 KeePassXC Team +* +* 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 or (at your option) +* version 3 of the License. +* +* 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, see . +*/ #ifndef SERVICE_H #define SERVICE_H diff --git a/src/keys/ChallengeResponseKey.h b/src/keys/ChallengeResponseKey.h index ac8c8165..698846a0 100644 --- a/src/keys/ChallengeResponseKey.h +++ b/src/keys/ChallengeResponseKey.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Kyle Manna +* Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp index 6114fd36..3b1a82a2 100644 --- a/src/keys/CompositeKey.cpp +++ b/src/keys/CompositeKey.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer +* Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/keys/CompositeKey.h b/src/keys/CompositeKey.h index 50b2f699..12e2d955 100644 --- a/src/keys/CompositeKey.h +++ b/src/keys/CompositeKey.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer +* Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/keys/YkChallengeResponseKey.cpp b/src/keys/YkChallengeResponseKey.cpp index dcd58335..cfb4a1df 100644 --- a/src/keys/YkChallengeResponseKey.cpp +++ b/src/keys/YkChallengeResponseKey.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Kyle Manna +* Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/keys/YkChallengeResponseKey.h b/src/keys/YkChallengeResponseKey.h index 8c566ca4..66d821a6 100644 --- a/src/keys/YkChallengeResponseKey.h +++ b/src/keys/YkChallengeResponseKey.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2011 Felix Geyer +* Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/keys/drivers/YubiKey.cpp b/src/keys/drivers/YubiKey.cpp index dfbc57c6..6fb44ec8 100644 --- a/src/keys/drivers/YubiKey.cpp +++ b/src/keys/drivers/YubiKey.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Kyle Manna +* Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/keys/drivers/YubiKey.h b/src/keys/drivers/YubiKey.h index 8a755213..1467b9fd 100644 --- a/src/keys/drivers/YubiKey.h +++ b/src/keys/drivers/YubiKey.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Kyle Manna +* Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/keys/drivers/YubiKeyStub.cpp b/src/keys/drivers/YubiKeyStub.cpp index 15eef27a..9f6314f0 100644 --- a/src/keys/drivers/YubiKeyStub.cpp +++ b/src/keys/drivers/YubiKeyStub.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Kyle Manna +* Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/main.cpp b/src/main.cpp index baa3df42..4368f7d5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/totp/totp.cpp b/src/totp/totp.cpp index f85c76f0..51af0e08 100644 --- a/src/totp/totp.cpp +++ b/src/totp/totp.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com> + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/src/totp/totp.h b/src/totp/totp.h index 260babc2..642b4f9a 100644 --- a/src/totp/totp.h +++ b/src/totp/totp.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com> + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestAutoType.cpp b/tests/TestAutoType.cpp index a3ed8cbe..be73efd4 100644 --- a/tests/TestAutoType.cpp +++ b/tests/TestAutoType.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestAutoType.h b/tests/TestAutoType.h index fb09a278..0cd4a5bd 100644 --- a/tests/TestAutoType.h +++ b/tests/TestAutoType.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestCsvParser.cpp b/tests/TestCsvParser.cpp index 93bcf006..57bc683a 100644 --- a/tests/TestCsvParser.cpp +++ b/tests/TestCsvParser.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestCsvParser.h b/tests/TestCsvParser.h index 0aa3d01e..0cf8b94d 100644 --- a/tests/TestCsvParser.h +++ b/tests/TestCsvParser.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Enrico Mariotti + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestDatabase.cpp b/tests/TestDatabase.cpp index a70ada19..284ba4bf 100644 --- a/tests/TestDatabase.cpp +++ b/tests/TestDatabase.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Vladimir Svyatski + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestDatabase.h b/tests/TestDatabase.h index dc9609d7..46deb58a 100644 --- a/tests/TestDatabase.h +++ b/tests/TestDatabase.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Vladimir Svyatski + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestGroup.cpp b/tests/TestGroup.cpp index a706bada..d2a8465b 100644 --- a/tests/TestGroup.cpp +++ b/tests/TestGroup.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestGroup.h b/tests/TestGroup.h index a0ed9282..9b36ebab 100644 --- a/tests/TestGroup.h +++ b/tests/TestGroup.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestKeys.cpp b/tests/TestKeys.cpp index d5b35b1f..dea0436f 100644 --- a/tests/TestKeys.cpp +++ b/tests/TestKeys.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestKeys.h b/tests/TestKeys.h index 683f0768..06ed3b0a 100644 --- a/tests/TestKeys.h +++ b/tests/TestKeys.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestSymmetricCipher.cpp b/tests/TestSymmetricCipher.cpp index 3edf735b..4f78693d 100644 --- a/tests/TestSymmetricCipher.cpp +++ b/tests/TestSymmetricCipher.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestSymmetricCipher.h b/tests/TestSymmetricCipher.h index 8259af62..00998950 100644 --- a/tests/TestSymmetricCipher.h +++ b/tests/TestSymmetricCipher.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestTotp.cpp b/tests/TestTotp.cpp index e5da3c64..e22c2567 100644 --- a/tests/TestTotp.cpp +++ b/tests/TestTotp.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com> + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestTotp.h b/tests/TestTotp.h index 9871aaf2..d197294d 100644 --- a/tests/TestTotp.h +++ b/tests/TestTotp.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Weslly Honorato <weslly@protonmail.com> + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/TestYkChallengeResponseKey.cpp b/tests/TestYkChallengeResponseKey.cpp index 40eda3bf..558920f4 100644 --- a/tests/TestYkChallengeResponseKey.cpp +++ b/tests/TestYkChallengeResponseKey.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Kyle Manna + * Copyright (C) 2017 KeePassXC Team * * * This program is free software: you can redistribute it and/or modify diff --git a/tests/TestYkChallengeResponseKey.h b/tests/TestYkChallengeResponseKey.h index 309e014d..2bc344ec 100644 --- a/tests/TestYkChallengeResponseKey.h +++ b/tests/TestYkChallengeResponseKey.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Kyle Manna + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/gui/TemporaryFile.cpp b/tests/gui/TemporaryFile.cpp index 879a558a..7c7a1c5d 100644 --- a/tests/gui/TemporaryFile.cpp +++ b/tests/gui/TemporaryFile.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Danny Su + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/gui/TemporaryFile.h b/tests/gui/TemporaryFile.h index b16e2161..f1cff3ef 100644 --- a/tests/gui/TemporaryFile.h +++ b/tests/gui/TemporaryFile.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Danny Su + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp index aed557a5..5f969b03 100644 --- a/tests/gui/TestGui.cpp +++ b/tests/gui/TestGui.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 diff --git a/tests/gui/TestGui.h b/tests/gui/TestGui.h index e5d41fb6..904e5f21 100644 --- a/tests/gui/TestGui.h +++ b/tests/gui/TestGui.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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