diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /kate/data | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kate/data')
| -rw-r--r-- | kate/data/css.xml | 4 | ||||
| -rw-r--r-- | kate/data/katepartreadonlyui.rc | 2 | ||||
| -rw-r--r-- | kate/data/katepartui.rc | 2 | ||||
| -rw-r--r-- | kate/data/scss.xml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kate/data/css.xml b/kate/data/css.xml index 02ab43036..f3e65d267 100644 --- a/kate/data/css.xml +++ b/kate/data/css.xml @@ -17,7 +17,7 @@ - Added CSS 3 properties "overflow-x", "overflow-y", "text-overflow", "box-shadow" and "outline-offset". - Added CSS 3 color values: "rgba", "hsl" and "hsla". - Added Gecko CSS properties: "-moz-border-*-colors". - - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-khtml-". + - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-tdehtml-". - Version 2.01, by Mathieu Bonnet: - Added CSS 3 property "border-radius". @@ -196,7 +196,7 @@ <item> -o-text-overflow </item> <!-- konq specific --> - <item> -khtml-background-size </item> + <item> -tdehtml-background-size </item> <item> konq_bgpos_x </item> <item> konq_bgpos_y </item> diff --git a/kate/data/katepartreadonlyui.rc b/kate/data/katepartreadonlyui.rc index 5c899dbfb..e1fff590e 100644 --- a/kate/data/katepartreadonlyui.rc +++ b/kate/data/katepartreadonlyui.rc @@ -77,7 +77,7 @@ </Menu> </MenuBar> -<Menu name="ktexteditor_popup" noMerge="1"> +<Menu name="tdetexteditor_popup" noMerge="1"> <Action name="edit_undo" group="popup_operations" /> <Action name="edit_redo" group="popup_operations" /> <Separator group="popup_operations" /> diff --git a/kate/data/katepartui.rc b/kate/data/katepartui.rc index 13908ad14..7a01434e2 100644 --- a/kate/data/katepartui.rc +++ b/kate/data/katepartui.rc @@ -92,7 +92,7 @@ </Menu> </MenuBar> -<Menu name="ktexteditor_popup" noMerge="0"> +<Menu name="tdetexteditor_popup" noMerge="0"> <Action name="edit_undo" group="popup_operations" /> <Action name="edit_redo" group="popup_operations" /> <Separator group="popup_operations" /> diff --git a/kate/data/scss.xml b/kate/data/scss.xml index 918f5c0b3..cfa6224cf 100644 --- a/kate/data/scss.xml +++ b/kate/data/scss.xml @@ -189,7 +189,7 @@ <item> -o-text-overflow </item> <!-- konq specific --> - <item> -khtml-background-size </item> + <item> -tdehtml-background-size </item> <item> konq_bgpos_x </item> <item> konq_bgpos_y </item> |