Rename a number of old tq methods that are no longer tq specific

35 files changed, 71 insertions, 71 deletions

diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
index 7d7cb3cb..8ff02c32 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Block Arrow - Chevron</name><!-- Block Arrow - Chevron, as seen in PowerPoint 97 -->
   <icon>arrow-chevron.png</icon>
@@ -32,4 +32,4 @@
     <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
index b0e44553..6e1388fe 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Down Arrow</name>
   <icon>arrow-down.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
index d536a6b6..a4f20839 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Notched Left Arrow</name>
   <icon>arrow-left-notched.png</icon>
@@ -40,4 +40,4 @@
     <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
index d2579d6d..54babdd8 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Left-Right-Up Arrow</name>
   <icon>arrow-left-right-up.png</icon>
@@ -76,4 +76,4 @@
     <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
index b2e85882..03b7787c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Left-Right Arrow</name>
   <icon>arrow-left-right.png</icon>
@@ -48,4 +48,4 @@
     <svg:polygon style="fill: default" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
index e70c0d2a..e3c0c008 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Assorted - Left-Up Arrow</name>
   <icon>arrow-left-up.png</icon>
@@ -56,4 +56,4 @@
     <svg:polygon style="fill: #ffffff" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
index e2e513af..8eb15cd4 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Left Arrow</name>
   <icon>arrow-left.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
index b99c3461..ef0f7f47 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Block Arrow - Pentagon</name><!-- Arrow Pentagon as seen in Powerpoint 97 -->
   <icon>arrow-pentagon.png</icon>
@@ -28,4 +28,4 @@
     <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
index 1886293b..6351e8dd 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Quad Arrow</name>
   <icon>arrow-quad.png</icon>
@@ -57,4 +57,4 @@
     <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
index 8738ffea..17d670fc 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Notched Right Arrow</name>
   <icon>arrow-right-notched.png</icon>
@@ -40,4 +40,4 @@
     <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
index be5bf79c..8e9fea1d 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Right Arrow</name>
   <icon>arrow-right.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
index 0549dbe8..8d418022 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Up-Down-Left Arrow</name>
   <icon>arrow-up-down-left.png</icon>
@@ -76,4 +76,4 @@
     <svg:polygon style="fill: default" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
index f0f8623e..e94d2d17 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Up-Down Arrow</name>
   <icon>arrow-up-down.png</icon>
@@ -48,4 +48,4 @@
     <svg:polygon style="fill: default" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
index 83222aa8..791f8a78 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Up Arrow</name>
   <icon>arrow-up.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
index ae10097e..26647def 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Perfect Circle</name>
   <icon>circle.png</icon>
@@ -18,4 +18,4 @@
     <svg:ellipse style="fill: default" cx="1.5" cy="2" rx="1" ry="1"/>
     <svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="1.5" cy="2" rx="1" ry="1"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
index 2b6a598c..2bc02249 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Maltese Cross</name><!-- St. John's Ambulance -->
   <icon>cross-maltese.png</icon>
@@ -41,4 +41,4 @@
     <svg:polygon style="fill: default" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
index 88d86baa..2aeef611 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Swiss Cross</name>
   <!-- Swiss flag has a white cross on red -->
@@ -59,4 +59,4 @@
     <svg:polygon style="fill: default" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
index a031d369..88948942 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Diamond</name>
   <icon>diamond.png</icon>
@@ -18,4 +18,4 @@
     <svg:polygon style="fill: default" points="1,0 2,1 1,2 0,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,1 1,2 0,1 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
index ecfac8e2..ea2c2400 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Heptagon</name>
   <icon>heptagon.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: #ffffff" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
index 71bedc8d..a21aa220 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Hexagon</name>
   <icon>hexagon.png</icon>
@@ -32,4 +32,4 @@
     <svg:polygon style="fill: default" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
index 794cd4b8..c0dceb97 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Octagon</name>
   <icon>octagon.png</icon>
@@ -25,4 +25,4 @@
     <svg:polygon style="fill: default" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
index b85fa737..1c37662b 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric -Qt::Horizontal Parallelogram</name>
   <icon>parallelogram-horizontal.png</icon>
@@ -24,4 +24,4 @@
     <svg:polygon style="fill: default" points="1,0 2,0 1,1 0,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,0 1,1 0,1 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
index d5794080..0f344091 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric -Qt::Vertical Parallelogram</name>
   <icon>parallelogram-vertical.png</icon>
@@ -24,4 +24,4 @@
     <svg:polygon style="fill: default" points="0,1 1,0 1,1 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,0 1,1 0,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
index a3941127..89db85e7 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Pentagon</name>
   <icon>pentagon.png</icon>
@@ -28,4 +28,4 @@
     <svg:polygon style="fill: default" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/square.shape b/kivio/kiviopart/stencils/Dia/Assorted/square.shape
index e7be1a89..67d58bf4 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/square.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/square.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Perfect Square</name>
   <icon>square.png</icon>
@@ -26,4 +26,4 @@
     <svg:rect style="fill: default" x="4.5" y="2.45" width="1.5" height="1.55"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4.5" y="2.45" width="1.5" height="1.55"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
index 5d66851c..d57432a9 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Four Point Star</name>
   <icon>star4.png</icon>
@@ -25,4 +25,4 @@
     <svg:polygon style="fill: default" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
index 379b74c6..20d55b99 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Five Point Star</name>
   <!-- Eventually decided that it was better to get these done than worry about them being perfect -->
@@ -50,5 +50,5 @@
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,4.5 5,4.5 7,0 9,4.5 14,4.5 10,7.5 12,12.5 7,9 2,12.5 4,7.5 "/>
   </svg:svg>
   <!-- Alan Horkan was here 2002 -->
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
index 2c2f5cac..bbaf2853 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Six Point Star</name><!-- aka Star of David -->
   <icon>star6.png</icon>
@@ -56,4 +56,4 @@
     <svg:polygon style="fill: default" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
index adef753f..cb008f12 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Seven Point Star</name>
   <!-- It may not be a perfect Heptagon, but it looks good and it is at least Symmetrical.  -->
@@ -65,4 +65,4 @@
     <svg:polygon style="fill: default" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
index 80664b5f..b67bdb42 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Eight Point Star</name>
   <!-- The points all have Nintey Degree Angles -->
@@ -74,4 +74,4 @@
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1 6,2.5 7,3.5 6,4.5 6,6 4.5,6 3.5,7 2.5,6 1,6 1,4.5 "/>
   </svg:svg>
   <!-- Alan Horkan, 2002, horkana@tcd.ie -->
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
index 1e97b53b..c68e257c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Sharp Eight Point Star</name>
   <!-- Angles in this Star are much sharper, about Thirty degrees -->
@@ -73,5 +73,5 @@
     <svg:polygon style="fill: default" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
index b638e315..48ae7b4e 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Assorted - Sun</name>
   <icon>sun.png</icon>
@@ -94,7 +94,7 @@
     <point x="1.25" y="5.5"/>
   </connections>
   <aspectratio type="fixed"/>
-  <!-- I orignally used a nice warm gold colour #ffcc00, but tqshape files 
+  <!-- I orignally used a nice warm gold colour #ffcc00, but shape files 
 have to use default if you want to allow the user to change the fill colour -->
   <svg:svg>
     <svg:polygon style="fill: default" points="3.5,0 4,1 3,1 "/>
@@ -116,5 +116,5 @@ have to use default if you want to allow the user to change the fill colour -->
     <svg:polygon style="fill: default" points="2,5.5 1.5,5 1,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2,5.5 1.5,5 1,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
index 474317f5..fb971a58 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Trapezoid</name>
   <icon>trapezoid.png</icon>
@@ -18,4 +18,4 @@
     <svg:polygon style="fill: #ffffff" points="1,0 3,0 4,2 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 3,0 4,2 0,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
index 74245a0c..2708c5c0 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Isosceles Triangle</name><!-- Triangle with two sides of equal length -->
   <icon>triangle-isoceles.png</icon>
@@ -20,4 +20,4 @@
     <svg:polygon style="fill: default" points="5.5,4 6.5,6 4.5,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5.5,4 6.5,6 4.5,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
index 5d38874a..3d7097ac 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Right Angle Triangle</name>
   <icon>triangle-rightangle.png</icon>
@@ -18,5 +18,5 @@
     <svg:polygon style="fill: #ffffff" points="0,2 2,2 0,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2 2,2 0,0 "/>
   </svg:svg>
-</tqshape>
+</shape>