small renaming

2025-07-15 14:55:46 +00:00 · 2017-09-13 02:02:51 +03:00
parent f68d607da8
commit cdb05844ae
97 changed files with 271 additions and 150 deletions
--- a/sources/queued-server/src/QueuedServer.cpp
+++ b/sources/queued-server/src/QueuedServer.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedServer.h
+++ b/sources/queued-server/src/QueuedServer.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServer.cpp
+++ b/sources/queued-server/src/QueuedTcpServer.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServer.h
+++ b/sources/queued-server/src/QueuedTcpServer.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelper.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelper.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelper.h
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelper.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@ -99,12 +99,9 @@ QVariantHash QueuedTcpServerResponseHelperApi1::getData(
        else if (_type == "POST")
            output = QueuedTcpServerResponseHelperTask::addOrEditTask(
                _arg.toLongLong(), _data, _token);
-<<<<<<< HEAD
        else if (_type == "PUT")
            output = QueuedTcpServerResponseHelperTask::startOrStopTask(
                _arg.toLongLong(), _token);
-=======
->>>>>>> baa20af363cb4b97cb6f7b36f833cf40f34cc61d
        else
            output = {{"code", 405}};
        break;
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.h
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperAuth.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperAuth.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperAuth.h
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperAuth.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperOption.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperOption.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperOption.h
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperOption.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperPermissions.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperPermissions.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperPermissions.h
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperPermissions.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperPlugins.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperPlugins.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperPlugins.h
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperPlugins.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperTask.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperTask.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperTask.h
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperTask.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperUser.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperUser.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperUser.h
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperUser.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerThread.cpp
+++ b/sources/queued-server/src/QueuedTcpServerThread.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/QueuedTcpServerThread.h
+++ b/sources/queued-server/src/QueuedTcpServerThread.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
--- a/sources/queued-server/src/main.cpp
+++ b/sources/queued-server/src/main.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Evgeniy Alekseev
+ * Copyright (c) 2017 Queued team
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal