diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9c614dc0d12264e326bb42721661fa4fa61e8c7c..28e21f9c4f9eec42856ef9a5d081961dd9594fe5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,11 +19,12 @@ rules to keep in mind: The dependencies between the src's sub-folders are as follows: -| folder | the folders dependencies | -| :----------- | :----------------------- | -| src | *everything* | -| src/Lib | *nothing* | -| src/UI | src/Lib | +| folder | the folders dependencies | +| :---------------- | :----------------------- | +| src | *everything* | +| src/Lib | *nothing* | +| src/UI | src/Lib | +| src/UI/FakeVim | src/Lib/*Utils* | The ASS lib has no dependency other than the Utils. The Document lib has the Utils and ASS dependencies. @@ -31,6 +32,11 @@ the Utils and ASS dependencies. The C++ source files are `.cc` files and their corresponding header files are `.hh` files. +The *FakeVim* part is imported from QtCreator and uses its own +namespace. Its code can picks things from the `Vivy::Utils` namespace. +The rest of the code should use the FakeVim as defined and included in +the `UI/FakeVim/FakeVimTr.hh` header. + ### C++ Standard Here we use C++20, or at least we try. Even if the stl has some good diff --git a/LICENSE b/LICENSE index facd1aa4c8ca67be93e92073bcd04c289bd0f22c..0d83951c8886edbb2460138a64af42deac72bbc7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,504 +1,164 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - Vivy - Copyright (C) 2021 Elliu, Kubat - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random - Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/README.md b/README.md index ee2312464888bfaa77586c4d5e7b5c57191d8fc6..ab4f429f8d89ec471138afa5dab4be07aa38f61e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ compiler with `-DCMAKE_CXX_COMPILER` and you're good to go. ## Licence -This software is licenced under the LGPL v2.1 or latter. +This software is licenced under the LGPL v3.0 or latter. --- diff --git a/src/UI/FakeVim/HostOsInfo.cc b/src/Lib/HostOsInfo.cc similarity index 61% rename from src/UI/FakeVim/HostOsInfo.cc rename to src/Lib/HostOsInfo.cc index 1198e5697461ebe36667e4bc65c3af76502055f0..4951b7c5ef605b150267f43a56c8e274b6463e06 100644 --- a/src/UI/FakeVim/HostOsInfo.cc +++ b/src/Lib/HostOsInfo.cc @@ -1,28 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - #include "HostOsInfo.hh" #include <QCoreApplication> diff --git a/src/UI/FakeVim/HostOsInfo.hh b/src/Lib/HostOsInfo.hh similarity index 60% rename from src/UI/FakeVim/HostOsInfo.hh rename to src/Lib/HostOsInfo.hh index e0253a7bfa0272a2ed79bb7521a288c88efc439c..090135fcd2516c2c5c9f4e7e42d44b31dbf27daf 100644 --- a/src/UI/FakeVim/HostOsInfo.hh +++ b/src/Lib/HostOsInfo.hh @@ -1,38 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - #pragma once -#include "UtilsGlobal.hh" -#include "OsSpecificAspects.hh" +#include "Utils.hh" #include <QString> #ifdef Q_OS_WIN -#define QTC_HOST_EXE_SUFFIX QTC_WIN_EXE_SUFFIX +#define VIVY_HOST_EXE_SUFFIX VIVY_WIN_EXE_SUFFIX #else -#define QTC_HOST_EXE_SUFFIX "" +#define VIVY_HOST_EXE_SUFFIX "" #endif // Q_OS_WIN namespace Vivy::Utils diff --git a/src/Lib/Utils.cc b/src/Lib/Utils.cc index 5096a639cc0ba7a08d38423abca9c07172f7720f..cbce31685828d8155449a1de096616c39ef3899d 100644 --- a/src/Lib/Utils.cc +++ b/src/Lib/Utils.cc @@ -5,6 +5,73 @@ using namespace Vivy; +std::string & +Utils::ltrim(std::string &s, const char *t) +{ + s.erase(0, s.find_first_not_of(t)); + return s; +} + +std::string & +Utils::rtrim(std::string &s, const char *t) +{ + s.erase(s.find_last_not_of(t) + 1); + return s; +} + +std::string & +Utils::trim(std::string &s, const char *t) +{ + return Utils::ltrim(Utils::rtrim(s, t), t); +} + +QString +Utils::OsSpecificAspects::withExecutableSuffix(OsType osType, const QString &executable) +{ + QString finalName = executable; + if (osType == OsTypeWindows) + finalName += QLatin1String(VIVY_WIN_EXE_SUFFIX); + return finalName; +} + +Qt::CaseSensitivity +Utils::OsSpecificAspects::fileNameCaseSensitivity(OsType osType) +{ + return osType == OsTypeWindows || osType == OsTypeMac ? Qt::CaseInsensitive : Qt::CaseSensitive; +} + +Qt::CaseSensitivity +Utils::OsSpecificAspects::envVarCaseSensitivity(OsType osType) +{ + return fileNameCaseSensitivity(osType); +} + +QChar +Utils::OsSpecificAspects::pathListSeparator(OsType osType) +{ + return QLatin1Char(osType == OsTypeWindows ? ';' : ':'); +} + +Qt::KeyboardModifier +Utils::OsSpecificAspects::controlModifier(OsType osType) +{ + return osType == OsTypeMac ? Qt::MetaModifier : Qt::ControlModifier; +} + +QString +Utils::OsSpecificAspects::pathWithNativeSeparators(OsType osType, const QString &pathName) +{ + if (osType == OsTypeWindows) { + const int pos = pathName.indexOf('/'); + if (pos >= 0) { + QString n = pathName; + std::replace(std::begin(n) + pos, std::end(n), '/', '\\'); + return n; + } + } + return pathName; +} + bool Utils::detectDocumentType(const QFileInfo &file, DocumentType *const type) { @@ -198,3 +265,13 @@ Utils::getAnyDocumentFileSuffixFilter() noexcept getVideoFileSuffixFilter() + separator + getAssFileSuffixFilter() + separator; return ret; } + +void +Utils::writeAssertLocation(const char *msg) +{ + static bool goBoom = qEnvironmentVariableIsSet("QTC_FATAL_ASSERTS"); + if (goBoom) + qFatal("SOFT ASSERT made fatal: %s", msg); + else + qDebug("SOFT ASSERT: %s", msg); +} diff --git a/src/Lib/Utils.hh b/src/Lib/Utils.hh index 65d852436be3c07e8e3ac203bcd902ce3601f30c..0b087c021b5965da23692e9691fd3daccdf628c7 100644 --- a/src/Lib/Utils.hh +++ b/src/Lib/Utils.hh @@ -1,5 +1,4 @@ -#ifndef VIVY_UTILS_H -#define VIVY_UTILS_H +#pragma once #ifndef __cplusplus #error "This is a C++ header" @@ -15,7 +14,20 @@ #include <type_traits> #include <chrono> -#define VIVY_UNUSED __attribute__((unused)) +#include <qglobal.h> + +#define VIVY_WIN_EXE_SUFFIX ".exe" +#define VIVY_ASSERT_STRINGIFY_HELPER(x) #x +#define VIVY_ASSERT_STRINGIFY(x) VIVY_ASSERT_STRINGIFY_HELPER(x) +#define VIVY_ASSERT_STRING(cond) \ + ::Vivy::Utils::writeAssertLocation("\"" cond "\" in file " __FILE__ \ + ", line " VIVY_ASSERT_STRINGIFY(__LINE__)) + +#define VIVY_GUARD(cond) ((Q_LIKELY(cond)) ? true : (VIVY_ASSERT_STRING(#cond), false)) +#define VIVY_UNUSED __attribute__((unused)) +#define VIVY_EXPORT __attribute__((visibility("default"))) +#define VIVY_NO_EXPORT __attribute__((visibility("hidden"))) +#define VIVY_DEPRECATED __attribute__((__deprecated__)) // Use chrono instead of std::chrono... namespace chrono = std::chrono; @@ -50,6 +62,9 @@ concept PropertyConstViewable = requires(T element) namespace Vivy::Utils { +// Add more as needed. +enum OsType { OsTypeWindows, OsTypeLinux, OsTypeMac, OsTypeOtherUnix, OsTypeOther }; + static const QStringList audioFileSuffix = { "wave", "wav", "ogg", "mp3", "m4a", "opus", "mp2", "aiff", "flac", "alac" }; static const QStringList videoFileSuffix = { "mkv", "mp4", "mov", "avi", "av1", "m4v", "flv" }; @@ -66,25 +81,9 @@ const QString &getAnyDocumentFileSuffixFilter() noexcept; static constexpr std::size_t pointerAlignement = alignof(void *); -inline std::string & -ltrim(std::string &s, const char *t = " \t\n\r\f\v") -{ - s.erase(0, s.find_first_not_of(t)); - return s; -} - -inline std::string & -rtrim(std::string &s, const char *t = " \t\n\r\f\v") -{ - s.erase(s.find_last_not_of(t) + 1); - return s; -} - -inline std::string & -trim(std::string &s, const char *t = " \t\n\r\f\v") -{ - return ltrim(rtrim(s, t), t); -} +std::string <rim(std::string &s, const char *t = " \t\n\r\f\v"); +std::string &rtrim(std::string &s, const char *t = " \t\n\r\f\v"); +std::string &trim(std::string &s, const char *t = " \t\n\r\f\v"); template <typename T> inline void uniqAndSort(std::vector<T> &vec) noexcept @@ -164,6 +163,21 @@ bool detectDocumentType(const QFileInfo &, DocumentType *const); bool decodeLineToBoolean(const QString &item, const QString &error); int decodeLineToInteger(const QString &item, const QString &error); float decodeLineToFloating(const QString &item, const QString &error); + +void writeAssertLocation(const char *msg); + +struct OsSpecificAspects final { +private: + OsSpecificAspects() {} + +public: + static QString withExecutableSuffix(OsType osType, const QString &executable); + static Qt::CaseSensitivity fileNameCaseSensitivity(OsType osType); + static Qt::CaseSensitivity envVarCaseSensitivity(OsType osType); + static QChar pathListSeparator(OsType osType); + static Qt::KeyboardModifier controlModifier(OsType osType); + static QString pathWithNativeSeparators(OsType osType, const QString &pathName); +}; } namespace Vivy @@ -193,6 +207,7 @@ enum class VideoDocumentType : quint64 { // Ass document types enum class AssDocumentType : quint64 { ASS = Utils::toUnderlying(Utils::DocumentType::ASS) }; + } class QMenu; @@ -205,5 +220,3 @@ namespace Vivy class VivyApplication; class MainWindow; } - -#endif // VIVY_UTILS_H diff --git a/src/UI/FakeVim/FakeVimActions.cc b/src/UI/FakeVim/FakeVimActions.cc index 58cc429f9c29034f44ce0ef454ac9018d5c53958..1c36b444d5647feb830b9a31ad0ce16468ba748c 100644 --- a/src/UI/FakeVim/FakeVimActions.cc +++ b/src/UI/FakeVim/FakeVimActions.cc @@ -1,37 +1,7 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - #include "FakeVimActions.hh" #include "FakeVimHandler.hh" -// Please do not add any direct dependencies to other Qt Creator code here. -// Instead emit signals and let the FakeVimPlugin channel the information to -// Qt Creator. The idea is to keep this file here in a "clean" state that -// allows easy reuse with any QTextEdit or QPlainTextEdit derived class. - -#include "QtCAssert.hh" +#include "../../Lib/Utils.hh" #include <QDebug> namespace FakeVim::Internal diff --git a/src/UI/FakeVim/FakeVimActions.hh b/src/UI/FakeVim/FakeVimActions.hh index e15f5427348a81e58fda0bf3d1aa879ac500260b..b1cea03d6697830e2637ca2efbbca89ff8ecdf0e 100644 --- a/src/UI/FakeVim/FakeVimActions.hh +++ b/src/UI/FakeVim/FakeVimActions.hh @@ -1,28 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - #pragma once #define FAKEVIM_STANDALONE diff --git a/src/UI/FakeVim/FakeVimExport.hh b/src/UI/FakeVim/FakeVimExport.hh deleted file mode 100644 index f015281733b75376806917f823623d9ab6e2a0aa..0000000000000000000000000000000000000000 --- a/src/UI/FakeVim/FakeVimExport.hh +++ /dev/null @@ -1,42 +0,0 @@ - -#ifndef FAKEVIM_EXPORT_H -#define FAKEVIM_EXPORT_H - -#ifdef FAKEVIM_STATIC_DEFINE -#define FAKEVIM_EXPORT -#define FAKEVIM_NO_EXPORT -#else -#ifndef FAKEVIM_EXPORT -#ifdef fakevim_EXPORTS -/* We are building this library */ -#define FAKEVIM_EXPORT __attribute__((visibility("default"))) -#else -/* We are using this library */ -#define FAKEVIM_EXPORT __attribute__((visibility("default"))) -#endif -#endif - -#ifndef FAKEVIM_NO_EXPORT -#define FAKEVIM_NO_EXPORT __attribute__((visibility("hidden"))) -#endif -#endif - -#ifndef FAKEVIM_DEPRECATED -#define FAKEVIM_DEPRECATED __attribute__((__deprecated__)) -#endif - -#ifndef FAKEVIM_DEPRECATED_EXPORT -#define FAKEVIM_DEPRECATED_EXPORT FAKEVIM_EXPORT FAKEVIM_DEPRECATED -#endif - -#ifndef FAKEVIM_DEPRECATED_NO_EXPORT -#define FAKEVIM_DEPRECATED_NO_EXPORT FAKEVIM_NO_EXPORT FAKEVIM_DEPRECATED -#endif - -#if 0 /* DEFINE_NO_DEPRECATED */ -#ifndef FAKEVIM_NO_DEPRECATED -#define FAKEVIM_NO_DEPRECATED -#endif -#endif - -#endif /* FAKEVIM_EXPORT_H */ diff --git a/src/UI/FakeVim/FakeVimHandler.cc b/src/UI/FakeVim/FakeVimHandler.cc index da8defc7b4c4c2c40fd62e68125c9edcbaf3da0a..153b5a53ddf3c9ba9695da5e4da3c554f133e930 100644 --- a/src/UI/FakeVim/FakeVimHandler.cc +++ b/src/UI/FakeVim/FakeVimHandler.cc @@ -1,28 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - // // ATTENTION: // diff --git a/src/UI/FakeVim/FakeVimHandler.hh b/src/UI/FakeVim/FakeVimHandler.hh index 8be435a793275a30ba75fbb19382080b4b8b112a..ca837ab55ae31f3e78123439796b48c4f9444ba2 100644 --- a/src/UI/FakeVim/FakeVimHandler.hh +++ b/src/UI/FakeVim/FakeVimHandler.hh @@ -1,28 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - #pragma once #define FAKEVIM_STANDALONE diff --git a/src/UI/FakeVim/FakeVimTr.hh b/src/UI/FakeVim/FakeVimTr.hh index 79dfd3b602c866231dc43635e20a705c10a0bb68..b298d4f77421612544e68be9f83d66aca95fed24 100644 --- a/src/UI/FakeVim/FakeVimTr.hh +++ b/src/UI/FakeVim/FakeVimTr.hh @@ -1,28 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - #pragma once #include <QCoreApplication> diff --git a/src/UI/FakeVim/OsSpecificAspects.hh b/src/UI/FakeVim/OsSpecificAspects.hh deleted file mode 100644 index 63645ffccf0ab88ba3fc0389155058bc0cd53b57..0000000000000000000000000000000000000000 --- a/src/UI/FakeVim/OsSpecificAspects.hh +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include <QString> -#include <algorithm> - -#define QTC_WIN_EXE_SUFFIX ".exe" - -namespace Vivy::Utils -{ -// Add more as needed. -enum OsType { OsTypeWindows, OsTypeLinux, OsTypeMac, OsTypeOtherUnix, OsTypeOther }; - -struct OsSpecificAspects final { - static inline QString withExecutableSuffix(OsType osType, const QString &executable) - { - QString finalName = executable; - if (osType == OsTypeWindows) - finalName += QLatin1String(QTC_WIN_EXE_SUFFIX); - return finalName; - } - - static inline Qt::CaseSensitivity fileNameCaseSensitivity(OsType osType) - { - return osType == OsTypeWindows || osType == OsTypeMac ? Qt::CaseInsensitive - : Qt::CaseSensitive; - } - - static inline Qt::CaseSensitivity envVarCaseSensitivity(OsType osType) - { - return fileNameCaseSensitivity(osType); - } - - static inline QChar pathListSeparator(OsType osType) - { - return QLatin1Char(osType == OsTypeWindows ? ';' : ':'); - } - - static inline Qt::KeyboardModifier controlModifier(OsType osType) - { - return osType == OsTypeMac ? Qt::MetaModifier : Qt::ControlModifier; - } - - static inline QString pathWithNativeSeparators(OsType osType, const QString &pathName) - { - if (osType == OsTypeWindows) { - const int pos = pathName.indexOf('/'); - if (pos >= 0) { - QString n = pathName; - std::replace(std::begin(n) + pos, std::end(n), '/', '\\'); - return n; - } - } - return pathName; - } -}; -} diff --git a/src/UI/FakeVim/QtCAssert.cc b/src/UI/FakeVim/QtCAssert.cc deleted file mode 100644 index 78c56f242b7b5d2d0c125eaaead1d27c2efb0244..0000000000000000000000000000000000000000 --- a/src/UI/FakeVim/QtCAssert.cc +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "QtCAssert.hh" -#include <QByteArray> - -namespace Vivy::Utils -{ -void -writeAssertLocation(const char *msg) -{ - static bool goBoom = qEnvironmentVariableIsSet("QTC_FATAL_ASSERTS"); - if (goBoom) - qFatal("SOFT ASSERT made fatal: %s", msg); - else - qDebug("SOFT ASSERT: %s", msg); -} - -} diff --git a/src/UI/FakeVim/QtCAssert.hh b/src/UI/FakeVim/QtCAssert.hh deleted file mode 100644 index d827758a301c770f442bb71b33f0f0803796e376..0000000000000000000000000000000000000000 --- a/src/UI/FakeVim/QtCAssert.hh +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include "UtilsGlobal.hh" - -namespace Vivy::Utils -{ -void writeAssertLocation(const char *msg); -} - -#define QTC_ASSERT_STRINGIFY_HELPER(x) #x -#define QTC_ASSERT_STRINGIFY(x) QTC_ASSERT_STRINGIFY_HELPER(x) -#define QTC_ASSERT_STRING(cond) \ - ::Vivy::Utils::writeAssertLocation("\"" cond "\" in file " __FILE__ \ - ", line " QTC_ASSERT_STRINGIFY(__LINE__)) - -// The 'do {...} while (0)' idiom is not used for the main block here to be -// able to use 'break' and 'continue' as 'actions'. - -#define QTC_ASSERT(cond, action) \ - if (Q_LIKELY(cond)) { \ - } else { \ - QTC_ASSERT_STRING(#cond); \ - action; \ - } \ - do { \ - } while (0) -#define QTC_CHECK(cond) \ - if (Q_LIKELY(cond)) { \ - } else { \ - QTC_ASSERT_STRING(#cond); \ - } \ - do { \ - } while (0) -#define QTC_GUARD(cond) ((Q_LIKELY(cond)) ? true : (QTC_ASSERT_STRING(#cond), false)) diff --git a/src/UI/FakeVim/UtilsGlobal.hh b/src/UI/FakeVim/UtilsGlobal.hh deleted file mode 100644 index 80c5a5dd7089cdbfa2cc289a487e012bc744da1f..0000000000000000000000000000000000000000 --- a/src/UI/FakeVim/UtilsGlobal.hh +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include <qglobal.h> - -#if defined(UTILS_LIBRARY) -#define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT -#elif defined(QTCREATOR_UTILS_STATIC_LIB) // Abuse single files for manual tests -#define QTCREATOR_UTILS_EXPORT -#else -#define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT -#endif