Rename more occurences

Mehrbod2002 · Feb 2, 2022 · d4c1130 · d4c1130
1 parent a0d89c0
commit d4c1130
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 24 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
-# SixtyFPS license
+# Slint License
 
-SixtyFPS is available under either a [commercial license](LICENSES/LicenseRef-SixtyFPS-commercial.md)
+Slint is available under either a [commercial license](LICENSES/LicenseRef-SixtyFPS-commercial.md)
 or at your choice under [GPL 3.0](LICENSES/GPL-3.0-only.txt).
 
 Third party licenses listed in the `LICENSES` folder also apply to parts of the product.
diff --git a/api/cpp/docs/index.rst b/api/cpp/docs/index.rst
@@ -87,10 +87,10 @@ is compiled to native code.
 Developing
 ==========
 
-You can create and edit `.60` files using our `Slint Visual Studio Code Extension <https://marketplace.visualstudio.com/items?itemName=SixtyFPS.sixtyfps-vscode>`_,
+You can create and edit `.slint` files using our `Slint Visual Studio Code Extension <https://marketplace.visualstudio.com/items?itemName=Slint.slint>`_,
 which features syntax highlighting and live design preview.
 
 For a quick edit and preview cycle, you can also use the :code:`slint-viewer` command line tool, which can be installed using :code:`cargo install slint-viewer`,
-if you have `Cargo <https://marketplace.visualstudio.com/items?itemName=SixtyFPS.sixtyfps-vscode>`_ installed.
+if you have `Cargo <https://marketplace.visualstudio.com/items?itemName=Slint.slint>`_ installed.
 
 In the next section you will learn how to install the Slint C++ library and the CMake build system integration.
diff --git a/docs/tutorial/cpp/src/getting_started.md b/docs/tutorial/cpp/src/getting_started.md
@@ -34,11 +34,11 @@ slint_target_sources(memory_game memory.slint)
 This should look familiar to people familiar with CMake. We see that this CMakeLists.txt
 references a `main.cpp`, which we will add later, and it also has a line
 `slint_target_sources(memory_game memory.slint)`, which is a Slint function used to
-add the `memory.60` file to the target. We must then create, in the same directory,
-the `memory.60` file. Let's just fill it with a hello world for now:
+add the `memory.slint` file to the target. We must then create, in the same directory,
+the `memory.slint` file. Let's just fill it with a hello world for now:
 
 ```slint
-{{#include memory.60:main_window}}
+{{#include memory.slint:main_window}}
 ```
 
 What's still missing is the `main.cpp`:
@@ -47,7 +47,7 @@ What's still missing is the `main.cpp`:
 {{#include main_initial.cpp:main}}
 ```
 
-To recap, we now have a directory with a `CMakeLists.txt`, `memory.60` and `main.cpp`.
+To recap, we now have a directory with a `CMakeLists.txt`, `memory.slint` and `main.cpp`.
 
 We can now compile and run this program:
 

diff --git a/docs/tutorial/cpp/src/main_game_logic.cpp b/docs/tutorial/cpp/src/main_game_logic.cpp
@@ -4,7 +4,7 @@
 // clang-format off
 // main.cpp
 
-#include "memory_game_logic.h" // generated header from memory_game_logic.60
+#include "memory_game_logic.h" // generated header from memory_game_logic.slint
 
 #include <random> // Added
 

diff --git a/docs/tutorial/cpp/src/main_initial.cpp b/docs/tutorial/cpp/src/main_initial.cpp
@@ -4,7 +4,7 @@
 // ANCHOR: main
 // main.cpp
 
-#include "memory.h" // generated header from memory.60
+#include "memory.h" // generated header from memory.slint
 
 int main()
 {

diff --git a/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp b/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp
@@ -3,7 +3,7 @@
 
 // main.cpp
 
-#include "memory_tiles_from_cpp.h" // generated header from memory_tiles_from_cpp.60
+#include "memory_tiles_from_cpp.h" // generated header from memory_tiles_from_cpp.slint
 // ANCHOR: main
 // ...
 

diff --git a/docs/tutorial/cpp/src/memory.slint b/docs/tutorial/cpp/src/memory.slint
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
 
 // ANCHOR: main_window
-// memory.60
+// memory.slint
 MainWindow := Window {
     Text {
         text: "hello world";

diff --git a/docs/tutorial/cpp/src/polishing_the_tile.md b/docs/tutorial/cpp/src/polishing_the_tile.md
@@ -16,7 +16,7 @@ more in detail:
 In order to make our tile extensible, the hard-coded icon name is replaced with an *icon*
 property that can be set from the outside when instantiating the element. For the final polish, we add a
 *solved* property that we use to animate the color to a shade of green when we've found a pair, later. We
-replace the code inside the `memory.60` file with the following:
+replace the code inside the `memory.slint` file with the following:
 
 ```slint
 {{#include ../../rust/src/main_polishing_the_tile.rs:tile}}

diff --git a/examples/bash/sysinfo_linux.sh b/examples/bash/sysinfo_linux.sh
@@ -19,7 +19,7 @@ swap_total_kb=`sed -n -e "s,SwapTotal:\s\+\(.*\)\s\+.\+,\1,p"< /proc/meminfo`
 swap_free_kb=`sed -n -e "s,SwapFree:\s\+\(.*\)\s\+.\+,\1,p"< /proc/meminfo`
 swap_used_kb=$((swap_total_kb - swap_free_kb))
 
-slint-viewer `dirname $0`/sysinfo.60 --load-data - <<EOT
+slint-viewer `dirname $0`/sysinfo.slint --load-data - <<EOT
 {
     "os_name": "$os_name",
     "uptime": "$uptime",

diff --git a/examples/bash/sysinfo_macos.sh b/examples/bash/sysinfo_macos.sh
@@ -22,7 +22,7 @@ swap_free_mb=`sysctl -n vm.swapusage | sed -n -e 's,.*free = \(.*\)\..*M.*$,\1,p
 swap_free_kb=$((swap_free_mb * 1024))
 partitions=`df -lk | tail -n+2 | sed 's/\([^ ]*\)  *\([^ ]*\)  *\([^ ]*\)  *\([^ ]*\)  *\([^ ]*\)  *\([^ ]*\)  *\([^ ]*\)  *\([^ ]*\)  *\([^ ]*.*\)/{ "dev": "\1", "mnt": "\9", "total": \2, "free": \4 },/' | sed '$s/,$//'`
 
-slint-viewer `dirname $0`/sysinfo.60 --load-data - <<EOT
+slint-viewer `dirname $0`/sysinfo.slint --load-data - <<EOT
 {
     "os_name": "$os_name",
     "uptime": "$uptime",

diff --git a/examples/slide_puzzle/README.md b/examples/slide_puzzle/README.md
@@ -23,7 +23,7 @@ Comparison with the flutter demo (as of commit ecd7f7d
 
 | . | Slint | Flutter |
 | --- | ---| --- |
-| UI files | slide_puzzle.60 | src/puzzle_controls.dart src/puzzle_flow_delegate.dart src/puzzle_home_state.dart src/shared_theme.dart src/theme_plaster.dart src/themes.dart src/theme_seattle.dart src/theme_simple.dart src/widgets/decoration_image_plus.dart src/widgets/material_interior_alt.dart |
+| UI files | slide_puzzle.slint | src/puzzle_controls.dart src/puzzle_flow_delegate.dart src/puzzle_home_state.dart src/shared_theme.dart src/theme_plaster.dart src/themes.dart src/theme_seattle.dart src/theme_simple.dart src/widgets/decoration_image_plus.dart src/widgets/material_interior_alt.dart |
 | Line of codes for the UI | 444 | 1140 |
 | Lines of code for the UI without empty lines and comments | 386 | 831 |
 | Logic files | main.rs | main.dart src/flutter.dart src/app_state.dart src/core/body.dart src/core/point_int.dart src/core/puzzle_animator.dart src/core/puzzle.dart src/core/puzzle_proxy.dart src/core/puzzle_simple.dart src/core/puzzle_smart.dart src/core/util.dart |

diff --git a/internal/compiler/load_builtins.rs b/internal/compiler/load_builtins.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
 
 /*!
-    Parse the contents of builtins.60 and fill the builtin type registry
+    Parse the contents of builtins.slint and fill the builtin type registry
 */
 
 use std::cell::RefCell;
@@ -15,7 +15,7 @@ use crate::object_tree::{self, *};
 use crate::parser::{identifier_text, syntax_nodes, SyntaxKind, SyntaxNode};
 use crate::typeregister::TypeRegister;
 
-/// Parse the contents of builtins.60 and fill the builtin type registry
+/// Parse the contents of builtins.slint and fill the builtin type registry
 /// `register` is the register to fill with the builtin types.
 /// At this point, it really should already contain the basic Types (string, int, ...)
 pub fn load_builtins(register: &mut TypeRegister) {

diff --git a/internal/compiler/passes/apply_default_properties_from_style.rs b/internal/compiler/passes/apply_default_properties_from_style.rs
@@ -11,7 +11,7 @@ use crate::langtype::Type;
 use crate::object_tree::Component;
 use std::rc::Rc;
 
-/// Ideally we would be able to write this in builtin.60,  but the StyleMetrics is not available there
+/// Ideally we would be able to write this in builtins.slint,  but the StyleMetrics is not available there
 pub fn apply_default_properties_from_style(
     root_component: &Rc<Component>,
     style_metrics: &Rc<Component>,

diff --git a/internal/compiler/tests/syntax/basic/easing_not_called.slint b/internal/compiler/tests/syntax/basic/easing_not_called.slint
@@ -1,7 +1,7 @@
 // Copyright © SixtyFPS GmbH <[email protected]>
 // SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
 
-// Cannot be put in the easing.60 test because it is in a different pass
+// Cannot be put in the easing.slint test because it is in a different pass
 
 X := Rectangle {
     property <int> g; animate g { easing: cubic-bezier; }

diff --git a/internal/compiler/tests/syntax/basic/linear-gradient.slint b/internal/compiler/tests/syntax/basic/linear-gradient.slint
@@ -1,8 +1,6 @@
 // Copyright © SixtyFPS GmbH <[email protected]>
 // SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
 
-// Cannot be put in the easing.60 test because it is in a different pass
-
 X := Rectangle {
     property<brush> g1: @linear-gradient();
 //                      ^error{Expected angle expression}

diff --git a/tools/lsp/sublime/Slint.sublime-syntax b/tools/lsp/sublime/Slint.sublime-syntax
@@ -6,7 +6,7 @@
 # See http://www.sublimetext.com/docs/3/syntax.html
 name: Slint
 file_extensions:
-  - '60'
+  - 'slint'
 scope: source.slint
 
 contexts:

diff --git a/vscode_extension/package.json b/vscode_extension/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Slint",
 	"description": "Slint Language extension",
 	"version": "0.2.0",
-	"publisher": "SixtyFPS",
+	"publisher": "Slint",
 	"icon": "extension-logo.png",
 	"license": "GPL-3.0",
 	"repository": {