From b49175884a6d3ea3da6bf6e179ca38b5c7c24e43 Mon Sep 17 00:00:00 2001 From: Rexy712 Date: Tue, 16 Jul 2019 14:50:16 -0700 Subject: [PATCH] Updated license notices and moved matrix.hpp to where it belongs --- doc/examples/commands.cpp | 4 ++-- doc/examples/join.cpp | 4 ++-- include/common.hpp | 18 ++++++++++++++++++ include/libav/frame.hpp | 18 ++++++++++++++++++ include/libav/libav.hpp | 18 ++++++++++++++++++ include/libav/packet.hpp | 18 ++++++++++++++++++ include/matrix/auth.hpp | 2 +- include/matrix/client.hpp | 2 +- include/matrix/client_base.hpp | 2 +- include/matrix/event_info.hpp | 2 +- include/matrix/fat_strings.hpp | 2 +- include/matrix/image_thumbnail_maker.hpp | 2 +- include/{ => matrix}/matrix.hpp | 5 +---- include/matrix/session.hpp | 2 +- include/matrix/session_info.hpp | 2 +- include/matrix/syncer.hpp | 2 +- include/matrix/upload_info.hpp | 2 +- include/matrix/url_list.hpp | 2 +- include/matrix/video_thumbnail_maker.hpp | 2 +- include/raii/curl_llist.hpp | 2 +- include/raii/curl_string.hpp | 2 +- include/raii/curler.hpp | 2 +- include/raii/filerd.hpp | 2 +- include/raii/rjp_ptr.hpp | 2 +- include/raii/rjp_string.hpp | 2 +- include/raii/static_string.hpp | 2 +- include/raii/string.hpp | 2 +- include/raii/string_base.hpp | 2 +- include/raii/util.hpp | 2 +- src/matrix/client.cpp | 2 +- src/matrix/client_base.cpp | 2 +- src/matrix/fat_strings.cpp | 2 +- src/matrix/session.cpp | 2 +- src/matrix/syncer.cpp | 2 +- src/matrix/url_list.cpp | 2 +- src/raii/curl_llist.cpp | 2 +- src/raii/curler.cpp | 2 +- src/raii/filerd.cpp | 2 +- src/raii/string_base.cpp | 2 +- src/raii/util.cpp | 2 +- src/test.cpp | 4 ++-- 41 files changed, 112 insertions(+), 43 deletions(-) rename include/{ => matrix}/matrix.hpp (90%) diff --git a/doc/examples/commands.cpp b/doc/examples/commands.cpp index 8f3bd79..f59c30c 100644 --- a/doc/examples/commands.cpp +++ b/doc/examples/commands.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix client + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify @@ -18,7 +18,7 @@ //example of a bot which responds to commands -#include "matrix.hpp" +#include "matrix/matrix.hpp" #include "raii/static_string.hpp" int main(){ diff --git a/doc/examples/join.cpp b/doc/examples/join.cpp index e8ab55f..b6f79ff 100644 --- a/doc/examples/join.cpp +++ b/doc/examples/join.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix client + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify @@ -18,7 +18,7 @@ //Example of a bot which accepts any invite that it is given -#include "matrix.hpp" +#include "matrix/matrix.hpp" int main(){ //auth information needed to initiate a session diff --git a/include/common.hpp b/include/common.hpp index 1343e67..9e42139 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -1,3 +1,21 @@ +/** + This file is a part of r0nk, atlas_moon, and rexy's matrix client + Copyright (C) 2019 rexy712 + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + #ifndef COMMON_HPP #define COMMON_HPP diff --git a/include/libav/frame.hpp b/include/libav/frame.hpp index a716639..4873998 100644 --- a/include/libav/frame.hpp +++ b/include/libav/frame.hpp @@ -1,3 +1,21 @@ +/** + This file is a part of r0nk, atlas_moon, and rexy's matrix client + Copyright (C) 2019 rexy712 + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + #ifndef LIBAV_FRAME_HPP #define LIBAV_FRAME_HPP diff --git a/include/libav/libav.hpp b/include/libav/libav.hpp index bd30b6b..bb6c7e9 100644 --- a/include/libav/libav.hpp +++ b/include/libav/libav.hpp @@ -1,3 +1,21 @@ +/** + This file is a part of r0nk, atlas_moon, and rexy's matrix client + Copyright (C) 2019 rexy712 + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + #ifndef LIBAV_LIBAV_HPP #define LIBAV_LIBAV_HPP diff --git a/include/libav/packet.hpp b/include/libav/packet.hpp index f74f5f7..03937e0 100644 --- a/include/libav/packet.hpp +++ b/include/libav/packet.hpp @@ -1,3 +1,21 @@ +/** + This file is a part of r0nk, atlas_moon, and rexy's matrix client + Copyright (C) 2019 rexy712 + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + #ifndef LIBAV_PACKET_HPP #define LIBAV_PACKET_HPP diff --git a/include/matrix/auth.hpp b/include/matrix/auth.hpp index b9d5539..563c145 100644 --- a/include/matrix/auth.hpp +++ b/include/matrix/auth.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/client.hpp b/include/matrix/client.hpp index 583cb4f..d376a7b 100644 --- a/include/matrix/client.hpp +++ b/include/matrix/client.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/client_base.hpp b/include/matrix/client_base.hpp index 63756d5..4c1c7db 100644 --- a/include/matrix/client_base.hpp +++ b/include/matrix/client_base.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/event_info.hpp b/include/matrix/event_info.hpp index 4863ad7..a98c0a7 100644 --- a/include/matrix/event_info.hpp +++ b/include/matrix/event_info.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/fat_strings.hpp b/include/matrix/fat_strings.hpp index e80d33d..4742be3 100644 --- a/include/matrix/fat_strings.hpp +++ b/include/matrix/fat_strings.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/image_thumbnail_maker.hpp b/include/matrix/image_thumbnail_maker.hpp index c23f46b..96bb3f5 100644 --- a/include/matrix/image_thumbnail_maker.hpp +++ b/include/matrix/image_thumbnail_maker.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix client + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix.hpp b/include/matrix/matrix.hpp similarity index 90% rename from include/matrix.hpp rename to include/matrix/matrix.hpp index 29896b7..e6ac037 100644 --- a/include/matrix.hpp +++ b/include/matrix/matrix.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify @@ -23,7 +23,4 @@ #include "matrix/syncer.hpp" #include "matrix/session.hpp" -#define HAS_FREEIMAGE -#define HAS_FFMPEG - #endif diff --git a/include/matrix/session.hpp b/include/matrix/session.hpp index d25966c..236f8dc 100644 --- a/include/matrix/session.hpp +++ b/include/matrix/session.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/session_info.hpp b/include/matrix/session_info.hpp index 51837f5..c4618a6 100644 --- a/include/matrix/session_info.hpp +++ b/include/matrix/session_info.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/syncer.hpp b/include/matrix/syncer.hpp index 0e0659b..60f7613 100644 --- a/include/matrix/syncer.hpp +++ b/include/matrix/syncer.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/upload_info.hpp b/include/matrix/upload_info.hpp index 063df59..0078f97 100644 --- a/include/matrix/upload_info.hpp +++ b/include/matrix/upload_info.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/url_list.hpp b/include/matrix/url_list.hpp index 003054e..57d69d6 100644 --- a/include/matrix/url_list.hpp +++ b/include/matrix/url_list.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/matrix/video_thumbnail_maker.hpp b/include/matrix/video_thumbnail_maker.hpp index f8bc366..9c17e7a 100644 --- a/include/matrix/video_thumbnail_maker.hpp +++ b/include/matrix/video_thumbnail_maker.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix client + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/curl_llist.hpp b/include/raii/curl_llist.hpp index 43f33e5..98a4a04 100644 --- a/include/raii/curl_llist.hpp +++ b/include/raii/curl_llist.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/curl_string.hpp b/include/raii/curl_string.hpp index 1488035..3cf6fa9 100644 --- a/include/raii/curl_string.hpp +++ b/include/raii/curl_string.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/curler.hpp b/include/raii/curler.hpp index 7512bd0..36f4edb 100644 --- a/include/raii/curler.hpp +++ b/include/raii/curler.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/filerd.hpp b/include/raii/filerd.hpp index 8389ceb..728e304 100644 --- a/include/raii/filerd.hpp +++ b/include/raii/filerd.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/rjp_ptr.hpp b/include/raii/rjp_ptr.hpp index 412a123..e40e247 100644 --- a/include/raii/rjp_ptr.hpp +++ b/include/raii/rjp_ptr.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/rjp_string.hpp b/include/raii/rjp_string.hpp index b2eb456..d79f529 100644 --- a/include/raii/rjp_string.hpp +++ b/include/raii/rjp_string.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/static_string.hpp b/include/raii/static_string.hpp index 25e1305..837ad46 100644 --- a/include/raii/static_string.hpp +++ b/include/raii/static_string.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/string.hpp b/include/raii/string.hpp index 4bd4732..cb05bd5 100644 --- a/include/raii/string.hpp +++ b/include/raii/string.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/string_base.hpp b/include/raii/string_base.hpp index 0c81f3d..23909ad 100644 --- a/include/raii/string_base.hpp +++ b/include/raii/string_base.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/include/raii/util.hpp b/include/raii/util.hpp index 4a3fe00..3516f2d 100644 --- a/include/raii/util.hpp +++ b/include/raii/util.hpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/matrix/client.cpp b/src/matrix/client.cpp index d28be78..199be04 100644 --- a/src/matrix/client.cpp +++ b/src/matrix/client.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix client + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/matrix/client_base.cpp b/src/matrix/client_base.cpp index abaf6c9..916ab09 100644 --- a/src/matrix/client_base.cpp +++ b/src/matrix/client_base.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/matrix/fat_strings.cpp b/src/matrix/fat_strings.cpp index 4a6990f..8acfd34 100644 --- a/src/matrix/fat_strings.cpp +++ b/src/matrix/fat_strings.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/matrix/session.cpp b/src/matrix/session.cpp index ba5c657..7f0cc5c 100644 --- a/src/matrix/session.cpp +++ b/src/matrix/session.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix client + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/matrix/syncer.cpp b/src/matrix/syncer.cpp index 91bbd5e..97e3557 100644 --- a/src/matrix/syncer.cpp +++ b/src/matrix/syncer.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix client + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/matrix/url_list.cpp b/src/matrix/url_list.cpp index 7b45d19..9cd9673 100644 --- a/src/matrix/url_list.cpp +++ b/src/matrix/url_list.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix client + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/raii/curl_llist.cpp b/src/raii/curl_llist.cpp index 8568cec..0f232b6 100644 --- a/src/raii/curl_llist.cpp +++ b/src/raii/curl_llist.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/raii/curler.cpp b/src/raii/curler.cpp index d2163a2..684556c 100644 --- a/src/raii/curler.cpp +++ b/src/raii/curler.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/raii/filerd.cpp b/src/raii/filerd.cpp index 745d36c..5788b64 100644 --- a/src/raii/filerd.cpp +++ b/src/raii/filerd.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/raii/string_base.cpp b/src/raii/string_base.cpp index 153fc5c..c9e86f2 100644 --- a/src/raii/string_base.cpp +++ b/src/raii/string_base.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/raii/util.cpp b/src/raii/util.cpp index e2708e6..481e6ac 100644 --- a/src/raii/util.cpp +++ b/src/raii/util.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix bot + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify diff --git a/src/test.cpp b/src/test.cpp index a835dca..0fb3b39 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -1,5 +1,5 @@ /** - This file is a part of rexy's matrix client + This file is a part of r0nk, atlas_moon, and rexy's matrix client Copyright (C) 2019 rexy712 This program is free software: you can redistribute it and/or modify @@ -18,7 +18,7 @@ //example of a client which responds to commands -#include "matrix.hpp" +#include "matrix/matrix.hpp" #include "raii/static_string.hpp" #include