Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 17 insertions, 17 deletions

diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
index 06c39edc..cb405324 100644
--- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
+++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
@@ -145,5 +145,5 @@ Enabling progressive will cause the image to be displayed by the browser even wh
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui
index 19da5d15..697a3e30 100644
--- a/filters/chalk/pdf/pdfimportwidgetbase.ui
+++ b/filters/chalk/pdf/pdfimportwidgetbase.ui
@@ -308,7 +308,7 @@
     <tabstop>intWidth</tabstop>
     <tabstop>intHeight</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui
index 405db2fe..ec5e0ba8 100644
--- a/filters/chalk/png/kis_wdg_options_png.ui
+++ b/filters/chalk/png/kis_wdg_options_png.ui
@@ -179,5 +179,5 @@ You can uncheck the box if you are not using transparency and you want to make t
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui
index d6080a01..26115762 100644
--- a/filters/chalk/raw/wdgrawimport.ui
+++ b/filters/chalk/raw/wdgrawimport.ui
@@ -492,5 +492,5 @@
     <tabstop>bnPreview</tabstop>
     <tabstop>radioAutomatic</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui
index 3ffc1bd4..d840dc8d 100644
--- a/filters/chalk/tiff/kis_wdg_options_tiff.ui
+++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui
@@ -732,7 +732,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
     <tabstop>kComboBoxFaxMode</tabstop>
     <tabstop>compressionLevelPixarLog</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc
index 07b6a145..cf1152c6 100644
--- a/filters/chalk/xcf/xcf/xcf-load.cc
+++ b/filters/chalk/xcf/xcf/xcf-load.cc
@@ -756,11 +756,11 @@ xcf_load_channel_props (XcfInfo * info,
 
 	case PROP_SHOW_MASKED:
         {
-	    bool show_tqmasked;
+	    bool show_masked;
 
 	    info->cp +=
-                xcf_read_int32 (info->fp, (TQ_INT32 *) & show_tqmasked, 1);
-	    gimp_channel_set_show_tqmasked (*channel, show_tqmasked);
+                xcf_read_int32 (info->fp, (TQ_INT32 *) & show_masked, 1);
+	    gimp_channel_set_show_masked (*channel, show_masked);
         }
         break;
 
@@ -833,7 +833,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage)
     KisLayer *layer;
     GimpLayerMask *layer_tqmask;
     TQ_INT32 hierarchy_offset;
-    TQ_INT32 layer_tqmask_offset;
+    TQ_INT32 layer_mask_offset;
     bool apply_tqmask = TRUE;
     bool edit_tqmask = FALSE;
     bool show_tqmask = FALSE;
@@ -887,7 +887,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage)
 
     /* read the hierarchy and layer tqmask offsets */
     info->cp += xcf_read_int32 (info->fp, &hierarchy_offset, 1);
-    info->cp += xcf_read_int32 (info->fp, &layer_tqmask_offset, 1);
+    info->cp += xcf_read_int32 (info->fp, &layer_mask_offset, 1);
 
     /* read in the hierarchy */
     if (!xcf_seek_pos (info, hierarchy_offset, NULL))
@@ -897,9 +897,9 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage)
         goto error;
 
     /* read in the layer tqmask */
-    if (layer_tqmask_offset != 0)
+    if (layer_mask_offset != 0)
     {
-        if (!xcf_seek_pos (info, layer_tqmask_offset, NULL))
+        if (!xcf_seek_pos (info, layer_mask_offset, NULL))
             goto error;
 
         layer_tqmask = xcf_load_layer_tqmask (info, gimage);
@@ -998,7 +998,7 @@ xcf_load_layer_tqmask (XcfInfo * info, KisImage * gimage)
     info->cp += xcf_read_string (info->fp, &name, 1);
 
     /* create a new layer tqmask */
-    layer_tqmask = gimp_layer_tqmask_new (gimage, width, height, name, &color);
+    layer_tqmask = gimp_layer_mask_new (gimage, width, height, name, &color);
     g_free (name);
     if (!layer_tqmask)
         return NULL;
diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc
index 50e5fb17..c9043738 100644
--- a/filters/chalk/xcf/xcf/xcf-save.cc
+++ b/filters/chalk/xcf/xcf/xcf-save.cc
@@ -585,7 +585,7 @@ xcf_save_channel_props (XcfInfo     *info,
     xcf_check_error (xcf_save_prop (info, gimage, PROP_LINKED, error,
                                     gimp_item_get_linked (GIMP_ITEM (channel))));
     xcf_check_error (xcf_save_prop (info, gimage, PROP_SHOW_MASKED, error,
-                                    channel->show_tqmasked));
+                                    channel->show_masked));
 
     gimp_rgb_get_uchar (&channel->color, &col[0], &col[1], &col[2]);
     xcf_check_error (xcf_save_prop (info, gimage, PROP_COLOR, error, col));
@@ -774,14 +774,14 @@ xcf_save_prop (XcfInfo   *info,
 
     case PROP_SHOW_MASKED:
     {
-	TQ_INT32 show_tqmasked;
+	TQ_INT32 show_masked;
 
-	show_tqmasked = va_arg (args, TQ_INT32);
+	show_masked = va_arg (args, TQ_INT32);
 	size = 4;
 
         xcf_write_prop_type_check_error (info, prop_type);
 	xcf_write_int32_check_error (info, &size, 1);
-	xcf_write_int32_check_error (info, &show_tqmasked, 1);
+	xcf_write_int32_check_error (info, &show_masked, 1);
     }
     break;