diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 04766b207afba7961d4d802313e426f5a2fbef63 (patch) | |
| tree | c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /filters | |
| parent | b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff) | |
| download | koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'filters')
216 files changed, 564 insertions, 564 deletions
diff --git a/filters/chalk/gmagick/magickexport.h b/filters/chalk/gmagick/magickexport.h index 6ea7e238..46a080f4 100644 --- a/filters/chalk/gmagick/magickexport.h +++ b/filters/chalk/gmagick/magickexport.h @@ -26,7 +26,7 @@ class MagickExport : public KoFilter { TQ_OBJECT public: - MagickExport(KoFilter *tqparent, const char *name, const TQStringList&); + MagickExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MagickExport(); public: diff --git a/filters/chalk/gmagick/magickimport.h b/filters/chalk/gmagick/magickimport.h index 3373f129..22bf3002 100644 --- a/filters/chalk/gmagick/magickimport.h +++ b/filters/chalk/gmagick/magickimport.h @@ -26,7 +26,7 @@ class MagickImport : public KoFilter { TQ_OBJECT public: - MagickImport(KoFilter *tqparent, const char *name, const TQStringList&); + MagickImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MagickImport(); public: diff --git a/filters/chalk/jpeg/kis_jpeg_export.h b/filters/chalk/jpeg/kis_jpeg_export.h index a0f47351..ea55c12c 100644 --- a/filters/chalk/jpeg/kis_jpeg_export.h +++ b/filters/chalk/jpeg/kis_jpeg_export.h @@ -26,7 +26,7 @@ class KisJPEGExport : public KoFilter { Q_OBJECT TQ_OBJECT public: - KisJPEGExport(KoFilter *tqparent, const char *name, const TQStringList&); + KisJPEGExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisJPEGExport(); public: virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/chalk/jpeg/kis_jpeg_import.h b/filters/chalk/jpeg/kis_jpeg_import.h index 4cfb62c2..a32c367f 100644 --- a/filters/chalk/jpeg/kis_jpeg_import.h +++ b/filters/chalk/jpeg/kis_jpeg_import.h @@ -25,7 +25,7 @@ class KisJPEGImport : public KoFilter { Q_OBJECT TQ_OBJECT public: - KisJPEGImport(KoFilter *tqparent, const char *name, const TQStringList&); + KisJPEGImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisJPEGImport(); public: virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/chalk/magick/magickexport.h b/filters/chalk/magick/magickexport.h index 6ea7e238..46a080f4 100644 --- a/filters/chalk/magick/magickexport.h +++ b/filters/chalk/magick/magickexport.h @@ -26,7 +26,7 @@ class MagickExport : public KoFilter { TQ_OBJECT public: - MagickExport(KoFilter *tqparent, const char *name, const TQStringList&); + MagickExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MagickExport(); public: diff --git a/filters/chalk/magick/magickimport.h b/filters/chalk/magick/magickimport.h index 3373f129..22bf3002 100644 --- a/filters/chalk/magick/magickimport.h +++ b/filters/chalk/magick/magickimport.h @@ -26,7 +26,7 @@ class MagickImport : public KoFilter { TQ_OBJECT public: - MagickImport(KoFilter *tqparent, const char *name, const TQStringList&); + MagickImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MagickImport(); public: diff --git a/filters/chalk/openexr/kis_openexr_export.h b/filters/chalk/openexr/kis_openexr_export.h index 56568e57..7f0c71f9 100644 --- a/filters/chalk/openexr/kis_openexr_export.h +++ b/filters/chalk/openexr/kis_openexr_export.h @@ -27,7 +27,7 @@ class KisOpenEXRExport : public KoFilter { TQ_OBJECT public: - KisOpenEXRExport(KoFilter *tqparent, const char *name, const TQStringList&); + KisOpenEXRExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisOpenEXRExport(); public: diff --git a/filters/chalk/openexr/kis_openexr_import.h b/filters/chalk/openexr/kis_openexr_import.h index f8cd5144..8bddb4f5 100644 --- a/filters/chalk/openexr/kis_openexr_import.h +++ b/filters/chalk/openexr/kis_openexr_import.h @@ -27,7 +27,7 @@ class KisOpenEXRImport : public KoFilter { TQ_OBJECT public: - KisOpenEXRImport(KoFilter *tqparent, const char *name, const TQStringList&); + KisOpenEXRImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisOpenEXRImport(); public: diff --git a/filters/chalk/pdf/kis_pdf_import.h b/filters/chalk/pdf/kis_pdf_import.h index ab4535b9..06e22288 100644 --- a/filters/chalk/pdf/kis_pdf_import.h +++ b/filters/chalk/pdf/kis_pdf_import.h @@ -26,7 +26,7 @@ class KisPDFImport : public KoFilter{ Q_OBJECT TQ_OBJECT public: - KisPDFImport(KoFilter *tqparent, const char *name, const TQStringList&); + KisPDFImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPDFImport(); public: virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/chalk/pdf/kis_pdf_import_widget.cpp b/filters/chalk/pdf/kis_pdf_import_widget.cpp index 6919876f..c395d9e9 100644 --- a/filters/chalk/pdf/kis_pdf_import_widget.cpp +++ b/filters/chalk/pdf/kis_pdf_import_widget.cpp @@ -30,8 +30,8 @@ #include <klistbox.h> #include <knuminput.h> -KisPDFImportWidget::KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * tqparent, const char * name) - : PDFImportWidgetBase(tqparent, name), m_pdfDoc(pdfDoc) +KisPDFImportWidget::KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * parent, const char * name) + : PDFImportWidgetBase(parent, name), m_pdfDoc(pdfDoc) { m_pages.push_back(0); // The first page is selected updateMaxCanvasSize(); diff --git a/filters/chalk/pdf/kis_pdf_import_widget.h b/filters/chalk/pdf/kis_pdf_import_widget.h index 8fe806a8..dc8900dd 100644 --- a/filters/chalk/pdf/kis_pdf_import_widget.h +++ b/filters/chalk/pdf/kis_pdf_import_widget.h @@ -31,7 +31,7 @@ class KisPDFImportWidget : public PDFImportWidgetBase Q_OBJECT TQ_OBJECT public: - KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * tqparent, const char * name = ""); + KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * parent, const char * name = ""); ~KisPDFImportWidget(); public: diff --git a/filters/chalk/png/kis_png_export.h b/filters/chalk/png/kis_png_export.h index d962523d..433b68e3 100644 --- a/filters/chalk/png/kis_png_export.h +++ b/filters/chalk/png/kis_png_export.h @@ -26,7 +26,7 @@ class KisPNGExport : public KoFilter { Q_OBJECT TQ_OBJECT public: - KisPNGExport(KoFilter *tqparent, const char *name, const TQStringList&); + KisPNGExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPNGExport(); public: virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/chalk/png/kis_png_import.h b/filters/chalk/png/kis_png_import.h index d0b8502a..3487d24d 100644 --- a/filters/chalk/png/kis_png_import.h +++ b/filters/chalk/png/kis_png_import.h @@ -25,7 +25,7 @@ class KisPNGImport : public KoFilter { Q_OBJECT TQ_OBJECT public: - KisPNGImport(KoFilter *tqparent, const char *name, const TQStringList&); + KisPNGImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPNGImport(); public: virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/chalk/raw/dcraw.c b/filters/chalk/raw/dcraw.c index e92c1d3c..b892a5ca 100644 --- a/filters/chalk/raw/dcraw.c +++ b/filters/chalk/raw/dcraw.c @@ -1146,12 +1146,12 @@ void CLASS rollei_load_raw() void CLASS phase_one_load_raw() { int row, col, a, b; - ushort *pixel, akey, bkey, tqmask; + ushort *pixel, akey, bkey, mask; fseek (ifp, nikon_curve_offset, SEEK_SET); akey = get2(); bkey = get2(); - tqmask = tiff_data_compression == 1 ? 0x5555:0x1354; + mask = tiff_data_compression == 1 ? 0x5555:0x1354; fseek (ifp, data_offset + top_margin*raw_width*2, SEEK_SET); pixel = calloc (raw_width, sizeof *pixel); merror (pixel, "phase_one_load_raw()"); @@ -1160,8 +1160,8 @@ void CLASS phase_one_load_raw() for (col=0; col < raw_width; col+=2) { a = pixel[col+0] ^ akey; b = pixel[col+1] ^ bkey; - pixel[col+0] = (a & tqmask) | (b & ~tqmask); - pixel[col+1] = (b & tqmask) | (a & ~tqmask); + pixel[col+0] = (a & mask) | (b & ~mask); + pixel[col+1] = (b & mask) | (a & ~mask); } for (col=0; col < width; col++) BAYER(row,col) = pixel[col+left_margin]; @@ -5731,7 +5731,7 @@ void CLASS write_psd (FILE *ofp) 0,3, /* mode (1=grey, 3=rgb) */ 0,0,0,0, /* color mode data */ 0,0,0,0, /* image resources */ - 0,0,0,0, /* layer/tqmask info */ + 0,0,0,0, /* layer/mask info */ 0,0 /* no compression */ }; int hw[2], psize, row, col, c; diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h index 35adb6e1..17fd576c 100644 --- a/filters/chalk/raw/kis_raw_import.h +++ b/filters/chalk/raw/kis_raw_import.h @@ -33,7 +33,7 @@ class KisRawImport : public KoFilter { TQ_OBJECT public: - KisRawImport(KoFilter *tqparent, const char *name, const TQStringList&); + KisRawImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisRawImport(); public: diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp index 345f7e7e..7a6ad9ca 100644 --- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp +++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp @@ -30,8 +30,8 @@ #include "kis_wdg_options_tiff.h" -KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, false, i18n("TIFF Export Options"), KDialogBase::Ok | KDialogBase::Cancel) +KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name) + : KDialogBase(parent, name, false, i18n("TIFF Export Options"), KDialogBase::Ok | KDialogBase::Cancel) { optionswdg = new KisWdgOptionsTIFF(this); activated(0); diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.h b/filters/chalk/tiff/kis_dlg_options_tiff.h index 5fd1e48e..519f2ceb 100644 --- a/filters/chalk/tiff/kis_dlg_options_tiff.h +++ b/filters/chalk/tiff/kis_dlg_options_tiff.h @@ -32,7 +32,7 @@ class KisDlgOptionsTIFF : public KDialogBase Q_OBJECT TQ_OBJECT public: - KisDlgOptionsTIFF(TQWidget *tqparent=0, const char *name=0); + KisDlgOptionsTIFF(TQWidget *parent=0, const char *name=0); ~KisDlgOptionsTIFF(); public slots: void activated ( int index ); diff --git a/filters/chalk/tiff/kis_tiff_export.h b/filters/chalk/tiff/kis_tiff_export.h index 113747c7..9efeb940 100644 --- a/filters/chalk/tiff/kis_tiff_export.h +++ b/filters/chalk/tiff/kis_tiff_export.h @@ -26,7 +26,7 @@ class KisTIFFExport : public KoFilter { Q_OBJECT TQ_OBJECT public: - KisTIFFExport(KoFilter *tqparent, const char *name, const TQStringList&); + KisTIFFExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisTIFFExport(); public: virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/chalk/tiff/kis_tiff_import.h b/filters/chalk/tiff/kis_tiff_import.h index 9fef7755..b9e33d06 100644 --- a/filters/chalk/tiff/kis_tiff_import.h +++ b/filters/chalk/tiff/kis_tiff_import.h @@ -25,7 +25,7 @@ class KisTIFFImport : public KoFilter { Q_OBJECT TQ_OBJECT public: - KisTIFFImport(KoFilter *tqparent, const char *name, const TQStringList&); + KisTIFFImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisTIFFImport(); public: virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc index 670bec0a..90d61755 100644 --- a/filters/chalk/xcf/xcf/xcf-load.cc +++ b/filters/chalk/xcf/xcf/xcf-load.cc @@ -43,7 +43,7 @@ //#include "core/gimpimage-guides.h" //#include "core/gimplayer.h" //#include "core/gimplayer-floating-sel.h" -//#include "core/gimplayertqmask.h" +//#include "core/gimplayermask.h" //#include "core/gimpparasitelist.h" //#include "core/gimpselection.h" //#include "core/gimptemplate.h" @@ -69,9 +69,9 @@ static bool xcf_load_image_props (XcfInfo * info, KisImage * gimage); static bool xcf_load_layer_props (XcfInfo * info, KisImage * gimage, KisLayer * layer, - bool * apply_tqmask, - bool * edit_tqmask, - bool * show_tqmask, + bool * apply_mask, + bool * edit_mask, + bool * show_mask, TQ_INT32 * text_layer_flags); static bool xcf_load_channel_props (XcfInfo * info, KisImage * gimage, @@ -81,7 +81,7 @@ static bool xcf_load_prop (XcfInfo * info, static KisLayer *xcf_load_layer (XcfInfo * info, KisImage * gimage); //static GimpChannel * xcf_load_channel (XcfInfo *info, // KisImage *gimage); -//static GimpLayerMask * xcf_load_layer_tqmask (XcfInfo *info, +//static GimpLayerMask * xcf_load_layer_mask (XcfInfo *info, // KisImage *gimage); static bool xcf_load_hierarchy (XcfInfo * info, TileManager * tiles); static bool xcf_load_level (XcfInfo * info, TileManager * tiles); @@ -210,7 +210,7 @@ xcf_load_image (XcfInfo * info) num_successful_elements++; /* add the channel to the image if its not the selection */ - if (channel != gimage->selection_tqmask) + if (channel != gimage->selection_mask) gimp_image_add_channel (gimage, channel, -1); /* restore the saved position so we'll be ready to @@ -547,9 +547,9 @@ static bool xcf_load_layer_props (XcfInfo * info, KisImage * gimage, KisLayer * layer, - bool * apply_tqmask, - bool * edit_tqmask, - bool * show_tqmask, TQ_INT32 * text_layer_flags) + bool * apply_mask, + bool * edit_mask, + bool * show_mask, TQ_INT32 * text_layer_flags) { PropType prop_type; TQ_INT32 prop_size; @@ -612,15 +612,15 @@ xcf_load_layer_props (XcfInfo * info, break; case PROP_APPLY_MASK: - info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) apply_tqmask, 1); + info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) apply_mask, 1); break; case PROP_EDIT_MASK: - info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) edit_tqmask, 1); + info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) edit_mask, 1); break; case PROP_SHOW_MASK: - info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) show_tqmask, 1); + info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) show_mask, 1); break; case PROP_OFFSETS: @@ -707,20 +707,20 @@ xcf_load_channel_props (XcfInfo * info, break; case PROP_SELECTION: - g_object_unref (gimage->selection_tqmask); - gimage->selection_tqmask = + g_object_unref (gimage->selection_mask); + gimage->selection_mask = gimp_selection_new (gimage, gimp_item_width (GIMP_ITEM (*channel)), gimp_item_height (GIMP_ITEM (*channel))); - g_object_ref (gimage->selection_tqmask); - gimp_item_sink (GIMP_ITEM (gimage->selection_tqmask)); + g_object_ref (gimage->selection_mask); + gimp_item_sink (GIMP_ITEM (gimage->selection_mask)); - tile_manager_unref (GIMP_DRAWABLE (gimage->selection_tqmask)->tiles); - GIMP_DRAWABLE (gimage->selection_tqmask)->tiles = + tile_manager_unref (GIMP_DRAWABLE (gimage->selection_mask)->tiles); + GIMP_DRAWABLE (gimage->selection_mask)->tiles = GIMP_DRAWABLE (*channel)->tiles; GIMP_DRAWABLE (*channel)->tiles = NULL; g_object_unref (*channel); - *channel = gimage->selection_tqmask; + *channel = gimage->selection_mask; (*channel)->boundary_known = FALSE; (*channel)->bounds_known = FALSE; break; @@ -831,12 +831,12 @@ static KisLayer * xcf_load_layer (XcfInfo * info, KisImage * gimage) { KisLayer *layer; - GimpLayerMask *layer_tqmask; + GimpLayerMask *layer_mask; TQ_INT32 hierarchy_offset; TQ_INT32 layer_mask_offset; - bool apply_tqmask = TRUE; - bool edit_tqmask = FALSE; - bool show_tqmask = FALSE; + bool apply_mask = TRUE; + bool edit_mask = FALSE; + bool show_mask = FALSE; bool active; bool floating; TQ_INT32 text_layer_flags = 0; @@ -866,7 +866,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage) /* read in the layer properties */ if (!xcf_load_layer_props (info, gimage, layer, - &apply_tqmask, &edit_tqmask, &show_tqmask, + &apply_mask, &edit_mask, &show_mask, &text_layer_flags)) goto error; @@ -885,7 +885,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage) info->floating_sel = layer; } - /* read the hierarchy and layer tqmask offsets */ + /* read the hierarchy and layer mask offsets */ info->cp += xcf_read_int32 (info->fp, &hierarchy_offset, 1); info->cp += xcf_read_int32 (info->fp, &layer_mask_offset, 1); @@ -896,21 +896,21 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage) if (!xcf_load_hierarchy (info, GIMP_DRAWABLE (layer)->tiles)) goto error; - /* read in the layer tqmask */ + /* read in the layer mask */ if (layer_mask_offset != 0) { if (!xcf_seek_pos (info, layer_mask_offset, NULL)) goto error; - layer_tqmask = xcf_load_layer_tqmask (info, gimage); - if (!layer_tqmask) + layer_mask = xcf_load_layer_mask (info, gimage); + if (!layer_mask) goto error; - layer_tqmask->apply_tqmask = apply_tqmask; - layer_tqmask->edit_tqmask = edit_tqmask; - layer_tqmask->show_tqmask = show_tqmask; + layer_mask->apply_mask = apply_mask; + layer_mask->edit_mask = edit_mask; + layer_mask->show_mask = show_mask; - gimp_layer_add_tqmask (layer, layer_tqmask, FALSE); + gimp_layer_add_mask (layer, layer_mask, FALSE); } /* attach the floating selection... */ @@ -955,7 +955,7 @@ xcf_load_channel (XcfInfo * info, KisImage * gimage) if (!xcf_load_channel_props (info, gimage, &channel)) goto error; - /* read the hierarchy and layer tqmask offsets */ + /* read the hierarchy and layer mask offsets */ info->cp += xcf_read_int32 (info->fp, &hierarchy_offset, 1); /* read in the hierarchy */ @@ -976,9 +976,9 @@ error: } static GimpLayerMask * -xcf_load_layer_tqmask (XcfInfo * info, KisImage * gimage) +xcf_load_layer_mask (XcfInfo * info, KisImage * gimage) { - GimpLayerMask *layer_tqmask; + GimpLayerMask *layer_mask; GimpChannel *channel; TQ_INT32 hierarchy_offset; TQ_INT32 width; @@ -997,35 +997,35 @@ xcf_load_layer_tqmask (XcfInfo * info, KisImage * gimage) info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) & height, 1); info->cp += xcf_read_string (info->fp, &name, 1); - /* create a new layer tqmask */ - layer_tqmask = gimp_layer_mask_new (gimage, width, height, name, &color); + /* create a new layer mask */ + layer_mask = gimp_layer_mask_new (gimage, width, height, name, &color); g_free (name); - if (!layer_tqmask) + if (!layer_mask) return NULL; - /* read in the layer_tqmask properties */ - channel = GIMP_CHANNEL (layer_tqmask); + /* read in the layer_mask properties */ + channel = GIMP_CHANNEL (layer_mask); if (!xcf_load_channel_props (info, gimage, &channel)) goto error; - /* read the hierarchy and layer tqmask offsets */ + /* read the hierarchy and layer mask offsets */ info->cp += xcf_read_int32 (info->fp, &hierarchy_offset, 1); /* read in the hierarchy */ if (!xcf_seek_pos (info, hierarchy_offset, NULL)) goto error; - if (!xcf_load_hierarchy (info, GIMP_DRAWABLE (layer_tqmask)->tiles)) + if (!xcf_load_hierarchy (info, GIMP_DRAWABLE (layer_mask)->tiles)) goto error; /* attach the floating selection... */ if (is_fs_drawable) - info->floating_sel_drawable = GIMP_DRAWABLE (layer_tqmask); + info->floating_sel_drawable = GIMP_DRAWABLE (layer_mask); - return layer_tqmask; + return layer_mask; error: - g_object_unref (layer_tqmask); + g_object_unref (layer_mask); return NULL; } diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc index c9043738..3544baf4 100644 --- a/filters/chalk/xcf/xcf/xcf-save.cc +++ b/filters/chalk/xcf/xcf/xcf-save.cc @@ -40,7 +40,7 @@ #include "core/gimpimage-guides.h" #include "core/gimplayer.h" #include "core/gimplayer-floating-sel.h" -#include "core/gimplayertqmask.h" +#include "core/gimplayermask.h" #include "core/gimplist.h" #include "core/gimpparasitelist.h" #include "core/gimpunit.h" @@ -293,7 +293,7 @@ xcf_save_image (XcfInfo *info, nchannels = (TQ_UINT32) gimp_container_num_tqchildren (gimage->channels); /* check and see if we have to save out the selection */ - have_selection = gimp_channel_bounds (gimp_image_get_tqmask (gimage), + have_selection = gimp_channel_bounds (gimp_image_get_mask (gimage), &t1, &t2, &t3, &t4); if (have_selection) nchannels += 1; @@ -365,7 +365,7 @@ xcf_save_image (XcfInfo *info, } else { - channel = gimage->selection_tqmask; + channel = gimage->selection_mask; have_selection = FALSE; } @@ -506,14 +506,14 @@ xcf_save_layer_props (XcfInfo *info, xcf_check_error (xcf_save_prop (info, gimage, PROP_LOCK_ALPHA, error, layer->lock_alpha)); - if (layer->tqmask) + if (layer->mask) { xcf_check_error (xcf_save_prop (info, gimage, PROP_APPLY_MASK, - error, layer->tqmask->apply_tqmask)); + error, layer->mask->apply_mask)); xcf_check_error (xcf_save_prop (info, gimage, PROP_EDIT_MASK, - error, layer->tqmask->edit_tqmask)); + error, layer->mask->edit_mask)); xcf_check_error (xcf_save_prop (info, gimage, PROP_SHOW_MASK, - error, layer->tqmask->show_tqmask)); + error, layer->mask->show_mask)); } else { @@ -575,7 +575,7 @@ xcf_save_channel_props (XcfInfo *info, if (channel == gimp_image_get_active_channel (gimage)) xcf_check_error (xcf_save_prop (info, gimage, PROP_ACTIVE_CHANNEL, error)); - if (channel == gimage->selection_tqmask) + if (channel == gimage->selection_mask) xcf_check_error (xcf_save_prop (info, gimage, PROP_SELECTION, error)); xcf_check_error (xcf_save_prop (info, gimage, PROP_OPACITY, error, @@ -735,40 +735,40 @@ xcf_save_prop (XcfInfo *info, case PROP_APPLY_MASK: { - TQ_INT32 apply_tqmask; + TQ_INT32 apply_mask; - apply_tqmask = va_arg (args, TQ_INT32); + apply_mask = 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, &apply_tqmask, 1); + xcf_write_int32_check_error (info, &apply_mask, 1); } break; case PROP_EDIT_MASK: { - TQ_INT32 edit_tqmask; + TQ_INT32 edit_mask; - edit_tqmask = va_arg (args, TQ_INT32); + edit_mask = 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, &edit_tqmask, 1); + xcf_write_int32_check_error (info, &edit_mask, 1); } break; case PROP_SHOW_MASK: { - TQ_INT32 show_tqmask; + TQ_INT32 show_mask; - show_tqmask = va_arg (args, TQ_INT32); + show_mask = 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_tqmask, 1); + xcf_write_int32_check_error (info, &show_mask, 1); } break; @@ -1120,14 +1120,14 @@ xcf_save_layer (XcfInfo *info, xcf_write_int32_check_error (info, &offset, 1); saved_pos = info->cp; - /* write out the layer tqmask */ - if (layer->tqmask) + /* write out the layer mask */ + if (layer->mask) { xcf_check_error (xcf_seek_end (info, error)); offset = info->cp; xcf_check_error (xcf_save_channel (info, - gimage, GIMP_CHANNEL(layer->tqmask), + gimage, GIMP_CHANNEL(layer->mask), error)); } else diff --git a/filters/chalk/xcf/xcfexport.h b/filters/chalk/xcf/xcfexport.h index b6acf737..b8f260fb 100644 --- a/filters/chalk/xcf/xcfexport.h +++ b/filters/chalk/xcf/xcfexport.h @@ -26,7 +26,7 @@ class XCFExport : public KoFilter { TQ_OBJECT public: - XCFExport(KoFilter *tqparent, const char *name, const TQStringList&); + XCFExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XCFExport(); public: diff --git a/filters/chalk/xcf/xcfimport.h b/filters/chalk/xcf/xcfimport.h index 038e7604..434566ba 100644 --- a/filters/chalk/xcf/xcfimport.h +++ b/filters/chalk/xcf/xcfimport.h @@ -26,7 +26,7 @@ class XCFImport : public KoFilter { TQ_OBJECT public: - XCFImport(KoFilter *tqparent, const char *name, const TQStringList&); + XCFImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XCFImport(); public: diff --git a/filters/generic_wrapper/generic_filter.h b/filters/generic_wrapper/generic_filter.h index 1fde2b95..7b47406b 100644 --- a/filters/generic_wrapper/generic_filter.h +++ b/filters/generic_wrapper/generic_filter.h @@ -33,7 +33,7 @@ class GenericFilter : public KoFilter TQ_OBJECT public: - GenericFilter(KoFilter *tqparent, const char *name, const TQStringList&); + GenericFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~GenericFilter() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, diff --git a/filters/karbon/ai/aiimport.h b/filters/karbon/ai/aiimport.h index 901eba6d..c305b536 100644 --- a/filters/karbon/ai/aiimport.h +++ b/filters/karbon/ai/aiimport.h @@ -33,7 +33,7 @@ class AiImport : public KoFilter TQ_OBJECT public: - AiImport( KoFilter* tqparent, const char* name, const TQStringList& ); + AiImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~AiImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/applixgraphics/applixgraphicimport.h b/filters/karbon/applixgraphics/applixgraphicimport.h index 4b25471d..3e42256e 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.h +++ b/filters/karbon/applixgraphics/applixgraphicimport.h @@ -29,7 +29,7 @@ class APPLIXGRAPHICImport : public KoFilter { TQ_OBJECT public: - APPLIXGRAPHICImport (KoFilter *tqparent, const char *name, const TQStringList&); + APPLIXGRAPHICImport (KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXGRAPHICImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/eps/epsexport.h b/filters/karbon/eps/epsexport.h index 939887c9..1313294e 100644 --- a/filters/karbon/eps/epsexport.h +++ b/filters/karbon/eps/epsexport.h @@ -43,7 +43,7 @@ class EpsExport : public KoFilter, private VVisitor TQ_OBJECT public: - EpsExport( KoFilter* tqparent, const char* name, const TQStringList& ); + EpsExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/eps/epsexportdlg.cc b/filters/karbon/eps/epsexportdlg.cc index df51b95b..220dbeba 100644 --- a/filters/karbon/eps/epsexportdlg.cc +++ b/filters/karbon/eps/epsexportdlg.cc @@ -29,8 +29,8 @@ #include "epsexportdlg.h" -EpsExportDlg::EpsExportDlg( TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "EPS Export" ), Ok | Cancel ) +EpsExportDlg::EpsExportDlg( TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "EPS Export" ), Ok | Cancel ) { TQVBox* page = makeVBoxMainWidget(); diff --git a/filters/karbon/eps/epsexportdlg.h b/filters/karbon/eps/epsexportdlg.h index 6850fc97..ac27c536 100644 --- a/filters/karbon/eps/epsexportdlg.h +++ b/filters/karbon/eps/epsexportdlg.h @@ -32,7 +32,7 @@ class EpsExportDlg : public KDialogBase TQ_OBJECT public: - EpsExportDlg( TQWidget* tqparent = 0L, const char* name = 0L ); + EpsExportDlg( TQWidget* parent = 0L, const char* name = 0L ); uint psLevel() const; bool exportHidden() const; diff --git a/filters/karbon/eps/epsimport.h b/filters/karbon/eps/epsimport.h index f5e17dfb..873dc169 100644 --- a/filters/karbon/eps/epsimport.h +++ b/filters/karbon/eps/epsimport.h @@ -33,7 +33,7 @@ class EpsImport : public KoFilter TQ_OBJECT public: - EpsImport( KoFilter* tqparent, const char* name, const TQStringList& ); + EpsImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/kontour/kontourimport.h b/filters/karbon/kontour/kontourimport.h index 9e9bc85a..e140f088 100644 --- a/filters/karbon/kontour/kontourimport.h +++ b/filters/karbon/kontour/kontourimport.h @@ -30,7 +30,7 @@ class KontourImport : public KoFilter TQ_OBJECT public: - KontourImport(KoFilter *tqparent, const char *name, const TQStringList&); + KontourImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KontourImport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc index ab48642d..88e4f10b 100644 --- a/filters/karbon/msod/msod.cc +++ b/filters/karbon/msod/msod.cc @@ -1061,8 +1061,8 @@ void Msod::walk(TQ_UINT32 bytes, TQDataStream &operands) } Msod::Options::Options( - Msod &tqparent) : - m_parent(tqparent) + Msod &parent) : + m_parent(parent) { m_pVertices = 0L; initialise(); diff --git a/filters/karbon/msod/msod.h b/filters/karbon/msod/msod.h index a1243aaa..f53146bf 100644 --- a/filters/karbon/msod/msod.h +++ b/filters/karbon/msod/msod.h @@ -221,7 +221,7 @@ private: class Options { public: - Options(Msod &tqparent); + Options(Msod &parent); ~Options(); void walk( TQ_UINT32 bytes, diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h index ec036bdf..162176de 100644 --- a/filters/karbon/msod/msodimport.h +++ b/filters/karbon/msod/msodimport.h @@ -34,7 +34,7 @@ class MSODImport : public: MSODImport( - KoFilter *tqparent, + KoFilter *parent, const char *name, const TQStringList&); virtual ~MSODImport(); @@ -66,7 +66,7 @@ protected: const TQPointArray &points); signals: - // Communication signals to the tqparent filters + // Communication signals to the parent filters void commSignalDelayStream( const char* delay ); void commSignalShapeID( unsigned int& tqshapeID ); diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc index ef90c93d..90320d7e 100644 --- a/filters/karbon/oodraw/oodrawimport.cc +++ b/filters/karbon/oodraw/oodrawimport.cc @@ -229,7 +229,7 @@ KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename } void -OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) +OoDrawImport::parseGroup( VGroup *parent, const TQDomElement& parentobject ) { // parse all objects for( TQDomNode object = parentobject.firstChild(); !object.isNull(); object = object.nextSibling() ) @@ -243,7 +243,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) if( name == "g" ) // polyline { storeObjectStyles( o ); - VGroup *group = new VGroup( tqparent ); + VGroup *group = new VGroup( parent ); appendPen( *group ); appendBrush( *group ); obj = group; @@ -257,7 +257,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) double w = KoUnit::parseValue( o.attributeNS( ooNS::svg, "width", TQString() ) ); double h = KoUnit::parseValue( o.attributeNS( ooNS::svg, "height", TQString() ) ); int corner = static_cast<int>( KoUnit::parseValue( o.attributeNS( ooNS::draw, "corner-radius", TQString() ) ) ); - VRectangle *rect = new VRectangle( tqparent, KoPoint( x, y ), w, h, corner ); + VRectangle *rect = new VRectangle( parent, KoPoint( x, y ), w, h, corner ); appendPen( *rect ); appendBrush( *rect ); obj = rect; @@ -282,7 +282,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( kind == "arc" ) type = VEllipse::arc; } - VEllipse *ellipse = new VEllipse( tqparent, KoPoint( x, y ), w, h, type, start, end ); + VEllipse *ellipse = new VEllipse( parent, KoPoint( x, y ), w, h, type, start, end ); appendPen( *ellipse ); // arc has no brush if( kind != "arc" ) @@ -292,7 +292,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( name == "line" ) // line { storeObjectStyles( o ); - VPath *line = new VPath( tqparent ); + VPath *line = new VPath( parent ); double x1 = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x1", TQString() ) ); double y1 = ymirror( KoUnit::parseValue( o.attributeNS( ooNS::svg, "y1", TQString() ) ) ); double x2 = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x2", TQString() ) ); @@ -306,7 +306,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( name == "polyline" ) // polyline { storeObjectStyles( o ); - VPath *polyline = new VPath( tqparent ); + VPath *polyline = new VPath( parent ); appendPoints( *polyline, o); appendPen( *polyline ); appendBrush( *polyline ); @@ -315,9 +315,9 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( name == "polygon" ) // polygon { storeObjectStyles( o ); - //VPolygon *polygon = new VPolygon( tqparent ); + //VPolygon *polygon = new VPolygon( parent ); //polygon->load( o ); - VPath *polygon = new VPath( tqparent ); + VPath *polygon = new VPath( parent ); appendPoints( *polygon, o ); appendPen( *polygon ); appendBrush( *polygon ); @@ -326,7 +326,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( name == "path" ) // path { storeObjectStyles( o ); - VPath *path = new VPath( tqparent ); + VPath *path = new VPath( parent ); path->loadSvgPath( o.attributeNS( ooNS::svg, "d", TQString() ) ); KoRect rect = parseViewBox( o ); double x = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x", TQString() ) ); @@ -353,8 +353,8 @@ appendImage( doc, e, pictureElement, o ); kdDebug() << "Unsupported object '" << name << "'" << endl; continue; } - if( tqparent && obj ) - tqparent->append( obj ); + if( parent && obj ) + parent->append( obj ); else if( obj ) m_document.append( obj ); } @@ -636,9 +636,9 @@ OoDrawImport::fillStyleStack( const TQDomElement& object ) void OoDrawImport::addStyles( const TQDomElement* style ) { - // this function is necessary as tqparent styles can have parents themself - if( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) - addStyles( m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )] ); + // this function is necessary as parent styles can have parents themself + if( style->hasAttributeNS( ooNS::style, "parent-style-name" ) ) + addStyles( m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )] ); m_styleStack.push( *style ); } diff --git a/filters/karbon/oodraw/oodrawimport.h b/filters/karbon/oodraw/oodrawimport.h index ea29b276..2b395f48 100644 --- a/filters/karbon/oodraw/oodrawimport.h +++ b/filters/karbon/oodraw/oodrawimport.h @@ -40,7 +40,7 @@ class OoDrawImport : public KoFilter Q_OBJECT TQ_OBJECT public: - OoDrawImport( KoFilter *tqparent, const char *name, const TQStringList & ); + OoDrawImport( KoFilter *parent, const char *name, const TQStringList & ); virtual ~OoDrawImport(); virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); @@ -58,7 +58,7 @@ private: void appendBrush( VObject &obj ); void appendPoints(VPath &path, const TQDomElement& object); void convert(); - void parseGroup( VGroup *tqparent, const TQDomElement& object ); + void parseGroup( VGroup *parent, const TQDomElement& object ); void parseColor( VColor &color, const TQString &s ); double ymirror( double y ); KoRect parseViewBox( const TQDomElement& object ); diff --git a/filters/karbon/png/pngexport.h b/filters/karbon/png/pngexport.h index 9fe9f7eb..3758daa3 100644 --- a/filters/karbon/png/pngexport.h +++ b/filters/karbon/png/pngexport.h @@ -30,7 +30,7 @@ class PngExport : public KoFilter, private VVisitor TQ_OBJECT public: - PngExport( KoFilter* tqparent, const char* name, const TQStringList& ); + PngExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~PngExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/svg/svgexport.h b/filters/karbon/svg/svgexport.h index 6a79fb07..6bfe5d98 100644 --- a/filters/karbon/svg/svgexport.h +++ b/filters/karbon/svg/svgexport.h @@ -49,7 +49,7 @@ class SvgExport : public KoFilter, private VVisitor TQ_OBJECT public: - SvgExport( KoFilter* tqparent, const char* name, const TQStringList& ); + SvgExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~SvgExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/svg/svgimport.h b/filters/karbon/svg/svgimport.h index 24857b65..e4e3f56a 100644 --- a/filters/karbon/svg/svgimport.h +++ b/filters/karbon/svg/svgimport.h @@ -42,7 +42,7 @@ class SvgImport : public KoFilter TQ_OBJECT public: - SvgImport(KoFilter *tqparent, const char *name, const TQStringList&); + SvgImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgImport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/karbon/wmf/wmfexport.h b/filters/karbon/wmf/wmfexport.h index 9d7bf9cb..e0c9be57 100644 --- a/filters/karbon/wmf/wmfexport.h +++ b/filters/karbon/wmf/wmfexport.h @@ -38,7 +38,7 @@ class WmfExport : public KoFilter, private VVisitor TQ_OBJECT public: - WmfExport( KoFilter *tqparent, const char *name, const TQStringList&); + WmfExport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WmfExport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/wmf/wmfimport.h b/filters/karbon/wmf/wmfimport.h index 45ddefec..21bcee74 100644 --- a/filters/karbon/wmf/wmfimport.h +++ b/filters/karbon/wmf/wmfimport.h @@ -33,7 +33,7 @@ class WMFImport : public KoFilter TQ_OBJECT public: - WMFImport( KoFilter *tqparent, const char *name, const TQStringList&); + WMFImport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WMFImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/xaml/xamlexport.h b/filters/karbon/xaml/xamlexport.h index cb762a8d..b1a0f4fd 100644 --- a/filters/karbon/xaml/xamlexport.h +++ b/filters/karbon/xaml/xamlexport.h @@ -47,7 +47,7 @@ class XAMLExport : public KoFilter, private VVisitor TQ_OBJECT public: - XAMLExport( KoFilter* tqparent, const char* name, const TQStringList& ); + XAMLExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XAMLExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/xaml/xamlimport.h b/filters/karbon/xaml/xamlimport.h index 83f11fc8..b61313b9 100644 --- a/filters/karbon/xaml/xamlimport.h +++ b/filters/karbon/xaml/xamlimport.h @@ -40,7 +40,7 @@ class XAMLImport : public KoFilter TQ_OBJECT public: - XAMLImport(KoFilter *tqparent, const char *name, const TQStringList&); + XAMLImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XAMLImport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc index d5a0c71b..3e9237fb 100644 --- a/filters/karbon/xcf/xcfexport.cc +++ b/filters/karbon/xcf/xcfexport.cc @@ -223,21 +223,21 @@ XcfExport::visitVLayer( VLayer& layer ) // False. *m_stream << static_cast<TQ_UINT32>( 0 ); - // Apply tqmask? + // Apply mask? *m_stream << static_cast<TQ_UINT32>( 11 ); // Property size in bytes. *m_stream << static_cast<TQ_UINT32>( 4 ); // False. *m_stream << static_cast<TQ_UINT32>( 0 ); - // Edit tqmask? + // Edit mask? *m_stream << static_cast<TQ_UINT32>( 12 ); // Property size in bytes. *m_stream << static_cast<TQ_UINT32>( 4 ); // False. *m_stream << static_cast<TQ_UINT32>( 0 ); - // Show tqmask? + // Show mask? *m_stream << static_cast<TQ_UINT32>( 13 ); // Property size in bytes. *m_stream << static_cast<TQ_UINT32>( 4 ); @@ -302,7 +302,7 @@ XcfExport::visitVLayer( VLayer& layer ) *m_stream << start; - // Append a zero offset to indicate end of layer tqmask offsets. + // Append a zero offset to indicate end of layer mask offsets. *m_stream << static_cast<TQ_UINT32>( 0 ); } diff --git a/filters/karbon/xcf/xcfexport.h b/filters/karbon/xcf/xcfexport.h index 0c60dd4e..82d86883 100644 --- a/filters/karbon/xcf/xcfexport.h +++ b/filters/karbon/xcf/xcfexport.h @@ -37,7 +37,7 @@ class XcfExport : public KoFilter, private VVisitor TQ_OBJECT public: - XcfExport( KoFilter* tqparent, const char* name, const TQStringList& ); + XcfExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XcfExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cc index 2932e05c..015c4006 100644 --- a/filters/karbon/xfig/xfigimport.cc +++ b/filters/karbon/xfig/xfigimport.cc @@ -134,7 +134,7 @@ int hexstrToInt (const char *str) { return value; } -XFIGImport::XFIGImport( KoFilter *tqparent, const char *name ) : KoFilter(tqparent, name) +XFIGImport::XFIGImport( KoFilter *parent, const char *name ) : KoFilter(parent, name) { fig_resolution = 1200.0 / 72.0; coordinate_system = 2; @@ -473,7 +473,7 @@ void XFIGImport::parsePolyline (istream& fin, GDocument* doc) { int arrow_type, arrow_style; float arrow_thickness, arrow_width, arrow_height; GObject::OutlineInfo oinfo; - oinfo.tqmask = GObject::OutlineInfo::Custom; + oinfo.mask = GObject::OutlineInfo::Custom; oinfo.startArrowId = oinfo.endArrowId = 0; if (forward_arrow > 0) { @@ -537,7 +537,7 @@ void XFIGImport::parseSpline (istream& fin, GDocument* doc) int arrow_type, arrow_style; float arrow_thickness, arrow_width, arrow_height; GObject::OutlineInfo oinfo; - oinfo.tqmask = GObject::OutlineInfo::Custom; + oinfo.mask = GObject::OutlineInfo::Custom; oinfo.startArrowId = oinfo.endArrowId = 0; if (forward_arrow > 0) { diff --git a/filters/karbon/xfig/xfigimport.h b/filters/karbon/xfig/xfigimport.h index 5cf9dddf..c084cc8d 100644 --- a/filters/karbon/xfig/xfigimport.h +++ b/filters/karbon/xfig/xfigimport.h @@ -43,7 +43,7 @@ class XFIGImport : public KoFilter TQ_OBJECT public: - XFIGImport( KoFilter *tqparent, const char *name ); + XFIGImport( KoFilter *parent, const char *name ); virtual ~XFIGImport(); virtual bool filterImport( const TQString &file, KoDocument *, diff --git a/filters/karbon/xfig/xfigimport_factory.cc b/filters/karbon/xfig/xfigimport_factory.cc index 79fb695c..d734b176 100644 --- a/filters/karbon/xfig/xfigimport_factory.cc +++ b/filters/karbon/xfig/xfigimport_factory.cc @@ -33,9 +33,9 @@ K_EXPORT_COMPONENT_FACTORY( libxfigimport, XFIGImportFactory ) KInstance *XFIGImportFactory::s_global = 0; XFIGImportFactory::XFIGImportFactory( - TQObject *tqparent, + TQObject *parent, const char *name) : - KLibFactory(tqparent, name) + KLibFactory(parent, name) { s_global = new KInstance("xfigimport"); } @@ -47,17 +47,17 @@ XFIGImportFactory::~XFIGImportFactory() } TQObject *XFIGImportFactory::createObject( - TQObject *tqparent, + TQObject *parent, const char *name, const char*, const TQStringList &) { - if (tqparent && !tqparent->inherits("KoFilter")) + if (parent && !parent->inherits("KoFilter")) { - kdDebug(30502) << "XFIGImportFactory: tqparent does not inherit KoFilter" << endl; + kdDebug(30502) << "XFIGImportFactory: parent does not inherit KoFilter" << endl; return 0L; } - XFIGImport *f = new XFIGImport((KoFilter*)tqparent, name); + XFIGImport *f = new XFIGImport((KoFilter*)parent, name); return f; } diff --git a/filters/karbon/xfig/xfigimport_factory.h b/filters/karbon/xfig/xfigimport_factory.h index b4fe1bac..10af74a0 100644 --- a/filters/karbon/xfig/xfigimport_factory.h +++ b/filters/karbon/xfig/xfigimport_factory.h @@ -34,10 +34,10 @@ class XFIGImportFactory : Q_OBJECT TQ_OBJECT public: - XFIGImportFactory(TQObject* tqparent = 0, const char* name = 0); + XFIGImportFactory(TQObject* parent = 0, const char* name = 0); virtual ~XFIGImportFactory(); - virtual TQObject* createObject(TQObject* tqparent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); static KInstance* global(); diff --git a/filters/kchart/bmp/bmpexport.h b/filters/kchart/bmp/bmpexport.h index ebba6b5d..fea800f5 100644 --- a/filters/kchart/bmp/bmpexport.h +++ b/filters/kchart/bmp/bmpexport.h @@ -28,7 +28,7 @@ class BmpExport : public ImageExport TQ_OBJECT public: - BmpExport(KoFilter *tqparent, const char *name, const TQStringList&); + BmpExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~BmpExport(); virtual bool saveImage( TQString fileName); virtual void extraImageAttribute(); diff --git a/filters/kchart/jpeg/jpegexport.h b/filters/kchart/jpeg/jpegexport.h index 2498fb31..af88462c 100644 --- a/filters/kchart/jpeg/jpegexport.h +++ b/filters/kchart/jpeg/jpegexport.h @@ -28,7 +28,7 @@ class JpegExport : public ImageExport TQ_OBJECT public: - JpegExport(KoFilter *tqparent, const char *name, const TQStringList&); + JpegExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~JpegExport(); virtual bool saveImage( TQString fileName); virtual void extraImageAttribute(); diff --git a/filters/kchart/libimageexport/imageexport.h b/filters/kchart/libimageexport/imageexport.h index 4aa0e5f4..825b0156 100644 --- a/filters/kchart/libimageexport/imageexport.h +++ b/filters/kchart/libimageexport/imageexport.h @@ -29,7 +29,7 @@ class ImageExport : public KoFilter TQ_OBJECT public: - ImageExport(KoFilter *tqparent, const char *name, const TQStringList&); + ImageExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~ImageExport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kchart/mng/mngexport.h b/filters/kchart/mng/mngexport.h index 025be07c..6d6b2209 100644 --- a/filters/kchart/mng/mngexport.h +++ b/filters/kchart/mng/mngexport.h @@ -28,7 +28,7 @@ class MngExport : public ImageExport TQ_OBJECT public: - MngExport(KoFilter *tqparent, const char *name, const TQStringList&); + MngExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MngExport(); virtual bool saveImage( TQString fileName); virtual void extraImageAttribute(); diff --git a/filters/kchart/png/pngexport.h b/filters/kchart/png/pngexport.h index 4953f44f..c3921b96 100644 --- a/filters/kchart/png/pngexport.h +++ b/filters/kchart/png/pngexport.h @@ -28,7 +28,7 @@ class PngExport : public ImageExport TQ_OBJECT public: - PngExport(KoFilter *tqparent, const char *name, const TQStringList&); + PngExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~PngExport(); virtual bool saveImage( TQString fileName); virtual void extraImageAttribute(); diff --git a/filters/kchart/svg/svgexport.h b/filters/kchart/svg/svgexport.h index 1ec2f61e..c04c0f22 100644 --- a/filters/kchart/svg/svgexport.h +++ b/filters/kchart/svg/svgexport.h @@ -28,7 +28,7 @@ class SvgExport : public KoFilter TQ_OBJECT public: - SvgExport(KoFilter *tqparent, const char *name, const TQStringList&); + SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kchart/xbm/xbmexport.h b/filters/kchart/xbm/xbmexport.h index a5b466d9..cf64f69e 100644 --- a/filters/kchart/xbm/xbmexport.h +++ b/filters/kchart/xbm/xbmexport.h @@ -28,7 +28,7 @@ class XbmExport : public ImageExport TQ_OBJECT public: - XbmExport(KoFilter *tqparent, const char *name, const TQStringList&); + XbmExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XbmExport(); virtual bool saveImage( TQString fileName); virtual void extraImageAttribute(); diff --git a/filters/kchart/xpm/xpmexport.h b/filters/kchart/xpm/xpmexport.h index 67acdc7a..2c50c216 100644 --- a/filters/kchart/xpm/xpmexport.h +++ b/filters/kchart/xpm/xpmexport.h @@ -28,7 +28,7 @@ class XpmExport : public ImageExport TQ_OBJECT public: - XpmExport(KoFilter *tqparent, const char *name, const TQStringList&); + XpmExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XpmExport(); virtual bool saveImage( TQString fileName); virtual void extraImageAttribute(); diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc index b280df1c..77488fa9 100644 --- a/filters/kformula/latex/latexexport.cc +++ b/filters/kformula/latex/latexexport.cc @@ -40,7 +40,7 @@ typedef KGenericFactory<LATEXExport, KoFilter> LATEXExportFactory; K_EXPORT_COMPONENT_FACTORY( libkfolatexexport, LATEXExportFactory( "kofficefilters" ) ) -LATEXExport::LATEXExport( KoFilter */*tqparent*/, const char */*name*/, const TQStringList& ) +LATEXExport::LATEXExport( KoFilter */*parent*/, const char */*name*/, const TQStringList& ) : KoFilter() { } diff --git a/filters/kformula/latex/latexexport.h b/filters/kformula/latex/latexexport.h index 1da761be..091ed125 100644 --- a/filters/kformula/latex/latexexport.h +++ b/filters/kformula/latex/latexexport.h @@ -30,7 +30,7 @@ class LATEXExport : public KoFilter Q_OBJECT TQ_OBJECT public: - LATEXExport( KoFilter *tqparent, const char *name, const TQStringList& ); + LATEXExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~LATEXExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc index 667c18ef..507c13a2 100644 --- a/filters/kformula/mathml/mathmlexport.cc +++ b/filters/kformula/mathml/mathmlexport.cc @@ -40,7 +40,7 @@ typedef KGenericFactory<MathMLExport, KoFilter> MathMLExportFactory; K_EXPORT_COMPONENT_FACTORY( libkfomathmlexport, MathMLExportFactory( "kofficefilters" ) ) -MathMLExport::MathMLExport( KoFilter */*tqparent*/, const char */*name*/, const TQStringList& ) +MathMLExport::MathMLExport( KoFilter */*parent*/, const char */*name*/, const TQStringList& ) : KoFilter() { } diff --git a/filters/kformula/mathml/mathmlexport.h b/filters/kformula/mathml/mathmlexport.h index 7f3eee19..a49b837b 100644 --- a/filters/kformula/mathml/mathmlexport.h +++ b/filters/kformula/mathml/mathmlexport.h @@ -30,7 +30,7 @@ class MathMLExport : public KoFilter Q_OBJECT TQ_OBJECT public: - MathMLExport( KoFilter *tqparent, const char *name, const TQStringList& ); + MathMLExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~MathMLExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kformula/mathml/mathmlimport.h b/filters/kformula/mathml/mathmlimport.h index b1d1152f..a4a28e18 100644 --- a/filters/kformula/mathml/mathmlimport.h +++ b/filters/kformula/mathml/mathmlimport.h @@ -33,7 +33,7 @@ class MathMLImport : public KoFilter Q_OBJECT TQ_OBJECT public: - MathMLImport(KoFilter *tqparent, const char *name, const TQStringList&); + MathMLImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MathMLImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc index b8d0f3d3..c6d3611e 100644 --- a/filters/kformula/png/pngexport.cc +++ b/filters/kformula/png/pngexport.cc @@ -40,7 +40,7 @@ typedef KGenericFactory<PNGExport, KoFilter> PNGExportFactory; K_EXPORT_COMPONENT_FACTORY( libkfopngexport, PNGExportFactory( "kofficefilters" ) ) -PNGExport::PNGExport( KoFilter */*tqparent*/, const char */*name*/, const TQStringList& ) +PNGExport::PNGExport( KoFilter */*parent*/, const char */*name*/, const TQStringList& ) : KoFilter() { } diff --git a/filters/kformula/png/pngexport.h b/filters/kformula/png/pngexport.h index 54c121e3..8dd3de34 100644 --- a/filters/kformula/png/pngexport.h +++ b/filters/kformula/png/pngexport.h @@ -30,7 +30,7 @@ class PNGExport : public KoFilter Q_OBJECT TQ_OBJECT public: - PNGExport( KoFilter *tqparent, const char *name, const TQStringList& ); + PNGExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~PNGExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc index e366882c..fb0407e0 100644 --- a/filters/kformula/png/pngexportdia.cc +++ b/filters/kformula/png/pngexportdia.cc @@ -39,8 +39,8 @@ #include "pngexportdia.h" #include <knuminput.h> -PNGExportDia::PNGExportDia( const TQDomDocument &dom, const TQString &outFile, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("PNG Export Filter Parameters" ), Ok|Cancel ), +PNGExportDia::PNGExportDia( const TQDomDocument &dom, const TQString &outFile, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("PNG Export Filter Parameters" ), Ok|Cancel ), _fileOut( outFile ) { kapp->restoreOverrideCursor(); diff --git a/filters/kformula/png/pngexportdia.h b/filters/kformula/png/pngexportdia.h index 4d04d429..4a1795be 100644 --- a/filters/kformula/png/pngexportdia.h +++ b/filters/kformula/png/pngexportdia.h @@ -41,7 +41,7 @@ class PNGExportDia : public KDialogBase TQ_OBJECT public: - PNGExportDia( const TQDomDocument &dom, const TQString &outFile, TQWidget *tqparent=0L, const char *name=0L ); + PNGExportDia( const TQDomDocument &dom, const TQString &outFile, TQWidget *parent=0L, const char *name=0L ); ~PNGExportDia(); public slots: diff --git a/filters/kformula/svg/svgexport.h b/filters/kformula/svg/svgexport.h index 98d4d8d4..65a5cef1 100644 --- a/filters/kformula/svg/svgexport.h +++ b/filters/kformula/svg/svgexport.h @@ -29,7 +29,7 @@ class SvgExport : public KoFilter TQ_OBJECT public: - SvgExport(KoFilter *tqparent, const char *name, const TQStringList&); + SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.cpp b/filters/kivio/imageexport/kivio_imageexportdialog.cpp index b4e8348b..8ce557f6 100644 --- a/filters/kivio/imageexport/kivio_imageexportdialog.cpp +++ b/filters/kivio/imageexport/kivio_imageexportdialog.cpp @@ -31,8 +31,8 @@ namespace Kivio { -ImageExportDialog::ImageExportDialog(TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, false, i18n("Export to Image"), Ok|Cancel) +ImageExportDialog::ImageExportDialog(TQWidget* parent, const char* name) + : KDialogBase(parent, name, false, i18n("Export to Image"), Ok|Cancel) { kapp->restoreOverrideCursor(); m_mainWidget = new ImageExportWidget(this); diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.h b/filters/kivio/imageexport/kivio_imageexportdialog.h index da005e0c..37615db7 100644 --- a/filters/kivio/imageexport/kivio_imageexportdialog.h +++ b/filters/kivio/imageexport/kivio_imageexportdialog.h @@ -32,7 +32,7 @@ class ImageExportDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ImageExportDialog(TQWidget* tqparent = 0, const char* name = 0); + ImageExportDialog(TQWidget* parent = 0, const char* name = 0); void setPageList(const TQStringList& pages); void setInitialDPI(const int dpi); diff --git a/filters/kpresenter/bmp/bmpexport.h b/filters/kpresenter/bmp/bmpexport.h index f266f636..7d8d3ba1 100644 --- a/filters/kpresenter/bmp/bmpexport.h +++ b/filters/kpresenter/bmp/bmpexport.h @@ -28,7 +28,7 @@ class BmpExport : public ImageExport TQ_OBJECT public: - BmpExport(KoFilter *tqparent, const char *name, const TQStringList&); + BmpExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~BmpExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/jpeg/jpegexport.h b/filters/kpresenter/jpeg/jpegexport.h index 518615df..18cb8dc8 100644 --- a/filters/kpresenter/jpeg/jpegexport.h +++ b/filters/kpresenter/jpeg/jpegexport.h @@ -28,7 +28,7 @@ class JpegExport : public ImageExport TQ_OBJECT public: - JpegExport(KoFilter *tqparent, const char *name, const TQStringList&); + JpegExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~JpegExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/kword/kprkword.h b/filters/kpresenter/kword/kprkword.h index 0ba4efa5..f4141a09 100644 --- a/filters/kpresenter/kword/kprkword.h +++ b/filters/kpresenter/kword/kprkword.h @@ -29,7 +29,7 @@ class KprKword : public KoFilter { TQ_OBJECT public: - KprKword(KoFilter *tqparent, const char *name, const TQStringList&); + KprKword(KoFilter *parent, const char *name, const TQStringList&); virtual ~KprKword() {} diff --git a/filters/kpresenter/libimageexport/imageexport.h b/filters/kpresenter/libimageexport/imageexport.h index 641a9010..23f45e28 100644 --- a/filters/kpresenter/libimageexport/imageexport.h +++ b/filters/kpresenter/libimageexport/imageexport.h @@ -29,7 +29,7 @@ class ImageExport : public KoFilter TQ_OBJECT public: - ImageExport(KoFilter *tqparent, const char *name, const TQStringList&); + ImageExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~ImageExport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py index e5716989..e2e5b50a 100755 --- a/filters/kpresenter/magicpoint/mgp2kpr.py +++ b/filters/kpresenter/magicpoint/mgp2kpr.py @@ -176,7 +176,7 @@ class MgpImporter: self.tqalignment="1" #left #print self.tqalignment - def __setBackground(self,tqparent): + def __setBackground(self,parent): pageElem=self.document.createElement("PAGE") elem=self.document.createElement("BACKTYPE") #color @@ -200,9 +200,9 @@ class MgpImporter: elem.setAttribute("color", self.color2) pageElem.appendChild(elem) - tqparent.appendChild(pageElem) + parent.appendChild(pageElem) - def __handlePage(self,tqparent,bgParent): + def __handlePage(self,parent,bgParent): if (self.pageCount!=-1): self.__setBackground(bgParent) #set the background for this page @@ -224,7 +224,7 @@ class MgpImporter: ### para comes here objElem.appendChild(self.textElem) - tqparent.appendChild(objElem) + parent.appendChild(objElem) self.useDefaults=1 self.__reset() @@ -314,7 +314,7 @@ class MgpImporter: length=PAGE_WIDTH - def __setPaper(self,tqparent): + def __setPaper(self,parent): paperElem=self.document.createElement("PAPER") paperElem.setAttribute("ptWidth", str(PAGE_WIDTH)) paperElem.setAttribute("ptHeight", str(Y_OFFSET)) @@ -330,7 +330,7 @@ class MgpImporter: paperElem.appendChild(borderElem) - tqparent.appendChild(paperElem) + parent.appendChild(paperElem) def convert(self, fileIn, fileOut=None): """Parses the Magicpoint document and returns a KPresenter XML document. diff --git a/filters/kpresenter/mng/mngexport.h b/filters/kpresenter/mng/mngexport.h index 6e5f9d4a..d19e6284 100644 --- a/filters/kpresenter/mng/mngexport.h +++ b/filters/kpresenter/mng/mngexport.h @@ -28,7 +28,7 @@ class MngExport : public ImageExport TQ_OBJECT public: - MngExport(KoFilter *tqparent, const char *name, const TQStringList&); + MngExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MngExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/ooimpress/ooimpressexport.h b/filters/kpresenter/ooimpress/ooimpressexport.h index 3b1e7b79..ac369192 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.h +++ b/filters/kpresenter/ooimpress/ooimpressexport.h @@ -34,7 +34,7 @@ class OoImpressExport : public KoFilter Q_OBJECT TQ_OBJECT public: - OoImpressExport( KoFilter * tqparent, const char * name, const TQStringList & ); + OoImpressExport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoImpressExport(); virtual KoFilter::ConversiontqStatus convert( const TQCString & from, diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc index cf853dea..1dab566d 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.cc +++ b/filters/kpresenter/ooimpress/ooimpressimport.cc @@ -1517,10 +1517,10 @@ TQDomElement OoImpressImport::parseTextBox( TQDomDocument& doc, const TQDomEleme return textObjectElement; } -void OoImpressImport::parseParagraphs( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& tqparent ) +void OoImpressImport::parseParagraphs( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& parent ) { TQDomElement t; - forEachElement( t, tqparent ) + forEachElement( t, parent ) { m_styleStack.save(); const TQString localName = t.localName(); @@ -1707,12 +1707,12 @@ TQDomElement OoImpressImport::parseParagraph( TQDomDocument& doc, const TQDomEle return p; } -void OoImpressImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent, +void OoImpressImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent, TQDomElement& outputParagraph, uint& pos) { - // Parse every child node of the tqparent + // Parse every child node of the parent // Can't use forEachElement here since we also care about text nodes - for( TQDomNode node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) + for( TQDomNode node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement ts = node.toElement(); TQString textData; @@ -2029,11 +2029,11 @@ void OoImpressImport::fillStyleStack( const TQDomElement& object, bool sticky ) void OoImpressImport::addStyles( const TQDomElement* style ) { kdDebug(30518)<<" addStyle :" << style->attributeNS( ooNS::style, "name", TQString() ) <<endl; - // this function is necessary as tqparent styles can have parents themself - if ( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) + // this function is necessary as parent styles can have parents themself + if ( style->hasAttributeNS( ooNS::style, "parent-style-name" ) ) { - //kdDebug(30518)<<"m_styles[style->attribute( style:tqparent-style-name )] :"<<m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )]<<endl; - addStyles( m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )] ); + //kdDebug(30518)<<"m_styles[style->attribute( style:parent-style-name )] :"<<m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )]<<endl; + addStyles( m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )] ); } //kdDebug(30518)<<" void OoImpressImport::addStyles( const TQDomElement* style ) :"<<style<<endl; m_styleStack.push( *style ); diff --git a/filters/kpresenter/ooimpress/ooimpressimport.h b/filters/kpresenter/ooimpress/ooimpressimport.h index 26d49420..596ca703 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.h +++ b/filters/kpresenter/ooimpress/ooimpressimport.h @@ -43,7 +43,7 @@ class OoImpressImport : public KoFilter Q_OBJECT TQ_OBJECT public: - OoImpressImport( KoFilter * tqparent, const char * name, const TQStringList & ); + OoImpressImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoImpressImport(); virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); @@ -91,7 +91,7 @@ private: void parseList( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& list ); void parseParagraphs( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& textBox ); TQDomElement parseParagraph( TQDomDocument& doc, const TQDomElement& paragraph ); - void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent, + void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent, TQDomElement& outputParagraph, uint& pos); bool parseSettings( TQDomDocument &doc, TQDomElement &helpLineElement, TQDomElement &attributeElement ); void parseHelpLine( TQDomDocument &doc,TQDomElement &helpLineElement, const TQString &text ); diff --git a/filters/kpresenter/ooimpress/stylefactory.cc b/filters/kpresenter/ooimpress/stylefactory.cc index 18ce339b..a25ba52a 100644 --- a/filters/kpresenter/ooimpress/stylefactory.cc +++ b/filters/kpresenter/ooimpress/stylefactory.cc @@ -1208,7 +1208,7 @@ void GraphicStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const style.setAttribute( "style:name", m_name ); style.setAttribute( "style:family", "graphics" ); if ( m_name != "standard" ) - style.setAttribute( "style:tqparent-style-name", "standard" ); + style.setAttribute( "style:parent-style-name", "standard" ); TQDomElement properties = doc.createElement( "style:properties" ); if ( !m_stroke.isNull() ) diff --git a/filters/kpresenter/png/pngexport.h b/filters/kpresenter/png/pngexport.h index 692aa76a..e86ac95f 100644 --- a/filters/kpresenter/png/pngexport.h +++ b/filters/kpresenter/png/pngexport.h @@ -28,7 +28,7 @@ class PngExport : public ImageExport TQ_OBJECT public: - PngExport(KoFilter *tqparent, const char *name, const TQStringList&); + PngExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~PngExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc index 6afdc659..4f41aac7 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.cc +++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc @@ -1455,7 +1455,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:name", styleName ); xmlWriter->addAttribute( "style:family", "graphic" ); - xmlWriter->addAttribute( "style:tqparent-style-name", "standard" ); + xmlWriter->addAttribute( "style:parent-style-name", "standard" ); xmlWriter->startElement( "style:graphic-properties" ); /* diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.h b/filters/kpresenter/powerpoint/import/powerpointimport.h index 5c3a73bc..ca3e7365 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.h +++ b/filters/kpresenter/powerpoint/import/powerpointimport.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - PowerPointImport ( TQObject *tqparent, const char* name, const TQStringList& ); + PowerPointImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~PowerPointImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp index daab8ff9..b905539d 100644 --- a/filters/kpresenter/powerpoint/libppt/pole.cpp +++ b/filters/kpresenter/powerpoint/libppt/pole.cpp @@ -113,7 +113,7 @@ class DirTree DirEntry* entry( unsigned index ); DirEntry* entry( const std::string& name, bool create=false ); int indexOf( DirEntry* e ); - int tqparent( unsigned index ); + int parent( unsigned index ); std::string fullName( unsigned index ); std::vector<unsigned> tqchildren( unsigned index ); void load( unsigned char* buffer, unsigned len ); @@ -503,7 +503,7 @@ int DirTree::indexOf( DirEntry* e ) return -1; } -int DirTree::tqparent( unsigned index ) +int DirTree::parent( unsigned index ) { // brute-force, basically we iterate for each entries, find its tqchildren // and check if one of the tqchildren is 'index' @@ -525,7 +525,7 @@ std::string DirTree::fullName( unsigned index ) std::string result = entry( index )->name; result.insert( 0, "/" ); - int p = tqparent( index ); + int p = parent( index ); DirEntry * _entry = 0; while( p > 0 ) { @@ -593,7 +593,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( !create ) return (DirEntry*)0; // create a new entry - unsigned tqparent = index; + unsigned parent = index; entries.push_back( DirEntry() ); index = entryCount()-1; DirEntry* e = entry( index ); @@ -604,8 +604,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) e->start = 0; e->child = End; e->prev = End; - e->next = entry(tqparent)->child; - entry(tqparent)->child = index; + e->next = entry(parent)->child; + entry(parent)->child = index; } } @@ -1102,7 +1102,7 @@ StreamIO::StreamIO( StorageIO* s, DirEntry* e) updateCache(); } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone StreamIO::~StreamIO() { delete[] cache_data; @@ -1248,8 +1248,8 @@ std::list<std::string> Storage::entries( const std::string& path ) DirEntry* e = dt->entry( path, false ); if( e && e->dir ) { - unsigned tqparent = dt->indexOf( e ); - std::vector<unsigned> tqchildren = dt->tqchildren( tqparent ); + unsigned parent = dt->indexOf( e ); + std::vector<unsigned> tqchildren = dt->tqchildren( parent ); for( unsigned i = 0; i < tqchildren.size(); i++ ) result.push_back( dt->entry( tqchildren[i] )->name ); } @@ -1270,7 +1270,7 @@ Stream::Stream( Storage* storage, const std::string& name ) io = storage->io->streamIO( name ); } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone Stream::~Stream() { delete io; diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp index 04fb4a40..bf3fc51f 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp @@ -394,12 +394,12 @@ Record* Record::create( unsigned type ) return record; } -void Record::setParent( Record* tqparent ) +void Record::setParent( Record* parent ) { - record_parent = tqparent; + record_parent = parent; } -const Record* Record::tqparent() const +const Record* Record::parent() const { return record_parent; } @@ -3088,10 +3088,10 @@ void StyleTextPropAtom::setData( unsigned /*size*/, const unsigned char* data, u atomData.charCount = charCount; atomData.depth = readU16(data+k); k += 2; - unsigned tqmask = readU32(data+6); + unsigned mask = readU32(data+6); k += 4; - if ( tqmask & 0xF ) + if ( mask & 0xF ) { int bulletFlag = readU16(data+k); k += 2; @@ -3100,99 +3100,99 @@ void StyleTextPropAtom::setData( unsigned /*size*/, const unsigned char* data, u atomData.bulletHardColor = ( bulletFlag & 4 ) ? 1 : 0; } - if ( tqmask & 0x0080 ) + if ( mask & 0x0080 ) { atomData.bulletChar = readU16(data+k); k += 2; } - if ( tqmask & 0x0010 ) + if ( mask & 0x0010 ) { atomData.bulletFont = readU16(data+k); k += 2; } - if ( tqmask & 0x0040 ) + if ( mask & 0x0040 ) { atomData.bulletHeight = readU16(data+k); k += 2; } - if ( tqmask & 0x0020 ) + if ( mask & 0x0020 ) { atomData.bulletColor = readU32(data+k); k += 4; } - if ( tqmask & 0x0F00 ) + if ( mask & 0x0F00 ) { - if ( tqmask & 0x800 ) + if ( mask & 0x800 ) { unsigned dummy = readU16(data+k); atomData.align = ( dummy & 3 ); k += 2; } - if ( tqmask & 0x400 ) + if ( mask & 0x400 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } - if ( tqmask & 0x200 ) + if ( mask & 0x200 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } - if ( tqmask & 0x100 ) + if ( mask & 0x100 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } } - if ( tqmask & 0x1000 ) + if ( mask & 0x1000 ) { atomData.lineFeed = readU16(data+k); k += 2; } - if ( tqmask & 0x2000 ) + if ( mask & 0x2000 ) { atomData.upperDist = readU16(data+k); k += 2; } - if ( tqmask & 0x4000 ) + if ( mask & 0x4000 ) { atomData.lowerDist = readU16(data+k); k += 2; } - if ( tqmask & 0x8000 ) + if ( mask & 0x8000 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } - if ( tqmask & 0x10000 ) + if ( mask & 0x10000 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } - if ( tqmask & 0xe0000 ) + if ( mask & 0xe0000 ) { unsigned dummy = readU16(data+k); - if ( tqmask & 0x20000 ) + if ( mask & 0x20000 ) atomData.asianLB1 = dummy & 1; - if ( tqmask & 0x40000 ) + if ( mask & 0x40000 ) atomData.asianLB2 = (dummy >> 1) & 1; - if ( tqmask & 0x80000 ) + if ( mask & 0x80000 ) atomData.asianLB3 = (dummy >> 2) & 1; k += 2; } - if ( tqmask & 0x200000 ) + if ( mask & 0x200000 ) { atomData.biDi = readU16(data+k); k += 2; @@ -5453,7 +5453,7 @@ int PPTReader::indexPersistence( unsigned long ofs ) return 0; } -void PPTReader::loadRecord( Record* tqparent ) +void PPTReader::loadRecord( Record* parent ) { // FIXME unsigned char buffer[65536]; @@ -5472,7 +5472,7 @@ void PPTReader::loadRecord( Record* tqparent ) Record* record = Record::create( type ); if( record ) { - record->setParent( tqparent ); + record->setParent( parent ); record->setPosition( pos ); record->setInstance( instance ); diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h index 66143a52..6eec1564 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.h +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h @@ -63,9 +63,9 @@ public: */ virtual bool isContainer() const { return false; } - void setParent( Record* tqparent ); + void setParent( Record* parent ); - const Record* tqparent() const; + const Record* parent() const; /** Sets the data for this record. @@ -2497,7 +2497,7 @@ protected: void loadDocument(); int indexPersistence( unsigned long offset ); - void loadRecord( Record* tqparent ); + void loadRecord( Record* parent ); void handleRecord( Record* record, int type ); void handleContainer( Container* container, int type, unsigned size ); diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h index a11b20c2..eafdd792 100644 --- a/filters/kpresenter/svg/svgexport.h +++ b/filters/kpresenter/svg/svgexport.h @@ -29,7 +29,7 @@ class SvgExport : public KoFilter TQ_OBJECT public: - SvgExport(KoFilter *tqparent, const char *name, const TQStringList&); + SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kpresenter/xbm/xbmexport.h b/filters/kpresenter/xbm/xbmexport.h index 9079f950..cb64945f 100644 --- a/filters/kpresenter/xbm/xbmexport.h +++ b/filters/kpresenter/xbm/xbmexport.h @@ -28,7 +28,7 @@ class XbmExport : public ImageExport TQ_OBJECT public: - XbmExport(KoFilter *tqparent, const char *name, const TQStringList&); + XbmExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XbmExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/xpm/xpmexport.h b/filters/kpresenter/xpm/xpmexport.h index 14b14b6c..f7a1c95c 100644 --- a/filters/kpresenter/xpm/xpmexport.h +++ b/filters/kpresenter/xpm/xpmexport.h @@ -28,7 +28,7 @@ class XpmExport : public ImageExport TQ_OBJECT public: - XpmExport(KoFilter *tqparent, const char *name, const TQStringList&); + XpmExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XpmExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc index ab3201c8..a75cccac 100644 --- a/filters/kspread/applixspread/applixspreadimport.cc +++ b/filters/kspread/applixspread/applixspreadimport.cc @@ -37,7 +37,7 @@ typedef KGenericFactory<APPLIXSPREADImport, KoFilter> APPLIXSPREADImportFactory; K_EXPORT_COMPONENT_FACTORY( libapplixspreadimport, APPLIXSPREADImportFactory( "kofficefilters" ) ) -APPLIXSPREADImport::APPLIXSPREADImport ( TQObject */*tqparent*/, const char* /*name*/, const TQStringList& ) +APPLIXSPREADImport::APPLIXSPREADImport ( TQObject */*parent*/, const char* /*name*/, const TQStringList& ) : KoFilter() { } diff --git a/filters/kspread/applixspread/applixspreadimport.h b/filters/kspread/applixspread/applixspreadimport.h index 048a22e7..78deb2ca 100644 --- a/filters/kspread/applixspread/applixspreadimport.h +++ b/filters/kspread/applixspread/applixspreadimport.h @@ -54,7 +54,7 @@ class APPLIXSPREADImport : public KoFilter { TQ_OBJECT public: - APPLIXSPREADImport ( TQObject *tqparent, const char* name, const TQStringList& ); + APPLIXSPREADImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~APPLIXSPREADImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index 47cb19fe..17e9cc65 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -41,8 +41,8 @@ #include <kmessagebox.h> #include <kcharsets.h> -CSVDialog::CSVDialog(TQWidget* tqparent, TQByteArray& fileArray, const TQString /*seperator*/) - : KDialogBase(tqparent, 0, true, TQString(), Ok|Cancel, No, true), +CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*seperator*/) + : KDialogBase(parent, 0, true, TQString(), Ok|Cancel, No, true), m_adjustRows(false), m_adjustCols(false), m_startRow(0), @@ -612,7 +612,7 @@ TQTextCodec* CSVDialog::getCodec(void) const { // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; - // ### TODO: what tqparent to use? + // ### TODO: what parent to use? KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); return 0; } diff --git a/filters/kspread/csv/csvdialog.h b/filters/kspread/csv/csvdialog.h index 685bbf37..eefb9407 100644 --- a/filters/kspread/csv/csvdialog.h +++ b/filters/kspread/csv/csvdialog.h @@ -42,7 +42,7 @@ public: POINTNUMBER ///< Number, which decimal symbol is a point/dot }; - CSVDialog(TQWidget* tqparent, TQByteArray& fileArray, const TQString seperator); + CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString seperator); ~CSVDialog(); int getRows(); diff --git a/filters/kspread/csv/csvexport.h b/filters/kspread/csv/csvexport.h index 53fd9efe..decdb81c 100644 --- a/filters/kspread/csv/csvexport.h +++ b/filters/kspread/csv/csvexport.h @@ -35,7 +35,7 @@ class CSVExport : public KoFilter TQ_OBJECT public: - CSVExport(KoFilter * tqparent, const char * name, const TQStringList &); + CSVExport(KoFilter * parent, const char * name, const TQStringList &); virtual ~CSVExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString & from, const TQCString & to ); diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index 268f322b..a4ef1347 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -48,8 +48,8 @@ using namespace KSpread; -CSVExportDialog::CSVExportDialog( TQWidget * tqparent ) - : KDialogBase( tqparent, 0, true, TQString(), Ok | Cancel, No, true ), +CSVExportDialog::CSVExportDialog( TQWidget * parent ) + : KDialogBase( parent, 0, true, TQString(), Ok | Cancel, No, true ), m_dialog( new ExportDialogUI( this ) ), m_delimiter( "," ), m_textquote('"') @@ -305,7 +305,7 @@ TQTextCodec* CSVExportDialog::getCodec(void) const { // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; - // ### TODO: what tqparent to use? + // ### TODO: what parent to use? KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); return 0; } diff --git a/filters/kspread/csv/csvexportdialog.h b/filters/kspread/csv/csvexportdialog.h index aa350f01..4683c040 100644 --- a/filters/kspread/csv/csvexportdialog.h +++ b/filters/kspread/csv/csvexportdialog.h @@ -36,7 +36,7 @@ class CSVExportDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - CSVExportDialog(TQWidget * tqparent); + CSVExportDialog(TQWidget * parent); ~CSVExportDialog(); TQChar getDelimiter() const; diff --git a/filters/kspread/csv/csvimport.h b/filters/kspread/csv/csvimport.h index 6f01a734..df14a756 100644 --- a/filters/kspread/csv/csvimport.h +++ b/filters/kspread/csv/csvimport.h @@ -28,7 +28,7 @@ class CSVFilter : public KoFilter { TQ_OBJECT public: - CSVFilter(KoFilter *tqparent, const char *name, const TQStringList&); + CSVFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~CSVFilter() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kspread/dbase/dbaseimport.h b/filters/kspread/dbase/dbaseimport.h index 8d074f1e..39a0ac0e 100644 --- a/filters/kspread/dbase/dbaseimport.h +++ b/filters/kspread/dbase/dbaseimport.h @@ -30,7 +30,7 @@ class DBaseImport : public KoFilter { public: - DBaseImport ( TQObject *tqparent, const char* name, const TQStringList& ); + DBaseImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~DBaseImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kspread/excel/excelexport.h b/filters/kspread/excel/excelexport.h index 946a1b09..029cdac1 100644 --- a/filters/kspread/excel/excelexport.h +++ b/filters/kspread/excel/excelexport.h @@ -13,7 +13,7 @@ class ExcelExport : public KoFilter { TQ_OBJECT public: - ExcelExport(KoFilter *tqparent, const char*name, const TQStringList&); + ExcelExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~ExcelExport() {} virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kspread/excel/import/excelimport.h b/filters/kspread/excel/import/excelimport.h index 77e7b747..5b733733 100644 --- a/filters/kspread/excel/import/excelimport.h +++ b/filters/kspread/excel/import/excelimport.h @@ -32,7 +32,7 @@ class ExcelImport : public KoFilter { public: - ExcelImport ( TQObject *tqparent, const char* name, const TQStringList& ); + ExcelImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~ExcelImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h index c114aa80..8cbdfd53 100644 --- a/filters/kspread/excel/sidewinder/excel.h +++ b/filters/kspread/excel/sidewinder/excel.h @@ -2777,7 +2777,7 @@ public: void setFormulaHidden( bool f ); /** - * Returns the index of the tqparent stlye of this format. + * Returns the index of the parent stlye of this format. * This refers to the index of the XFormat table which is constructed * from a series of XFormat records. * @@ -2786,7 +2786,7 @@ public: unsigned parentStyle() const; /** - * Sets the index of the tqparent stlye of this format. + * Sets the index of the parent stlye of this format. * This refers to the index of the XFormat table which is constructed * from a series of XFormat records. * diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp index fac4aa62..38fe8cb5 100644 --- a/filters/kspread/excel/sidewinder/pole.cpp +++ b/filters/kspread/excel/sidewinder/pole.cpp @@ -114,7 +114,7 @@ class DirTree DirEntry* entry( unsigned index ); DirEntry* entry( const std::string& name, bool create=false ); int indexOf( DirEntry* e ); - int tqparent( unsigned index ); + int parent( unsigned index ); std::string fullName( unsigned index ); std::vector<unsigned> tqchildren( unsigned index ); void load( unsigned char* buffer, unsigned len ); @@ -507,7 +507,7 @@ int DirTree::indexOf( DirEntry* e ) return -1; } -int DirTree::tqparent( unsigned index ) +int DirTree::parent( unsigned index ) { // brute-force, basically we iterate for each entries, find its tqchildren // and check if one of the tqchildren is 'index' @@ -529,7 +529,7 @@ std::string DirTree::fullName( unsigned index ) std::string result = entry( index )->name; result.insert( 0, "/" ); - int p = tqparent( index ); + int p = parent( index ); DirEntry * _entry = 0; while( p > 0 ) { @@ -597,7 +597,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( !create ) return (DirEntry*)0; // create a new entry - unsigned tqparent = index; + unsigned parent = index; entries.push_back( DirEntry() ); index = entryCount()-1; DirEntry* e = entry( index ); @@ -608,8 +608,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) e->start = 0; e->child = End; e->prev = End; - e->next = entry(tqparent)->child; - entry(tqparent)->child = index; + e->next = entry(parent)->child; + entry(parent)->child = index; } } @@ -1138,7 +1138,7 @@ StreamIO::StreamIO( StorageIO* s, DirEntry* e) updateCache(); } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone StreamIO::~StreamIO() { delete[] cache_data; @@ -1285,8 +1285,8 @@ std::list<std::string> Storage::entries( const std::string& path ) DirEntry* e = dt->entry( path, false ); if( e && e->dir ) { - unsigned tqparent = dt->indexOf( e ); - std::vector<unsigned> tqchildren = dt->tqchildren( tqparent ); + unsigned parent = dt->indexOf( e ); + std::vector<unsigned> tqchildren = dt->tqchildren( parent ); for( unsigned i = 0; i < tqchildren.size(); i++ ) result.push_back( dt->entry( tqchildren[i] )->name ); } @@ -1307,7 +1307,7 @@ Stream::Stream( Storage* storage, const std::string& name ) io = storage->io->streamIO( name ); } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone Stream::~Stream() { delete io; diff --git a/filters/kspread/gnumeric/gnumericexport.h b/filters/kspread/gnumeric/gnumericexport.h index 8cd89e38..392f0f72 100644 --- a/filters/kspread/gnumeric/gnumericexport.h +++ b/filters/kspread/gnumeric/gnumericexport.h @@ -34,7 +34,7 @@ class GNUMERICExport : public KoFilter { TQ_OBJECT public: - GNUMERICExport(KoFilter *tqparent, const char*name, const TQStringList&); + GNUMERICExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~GNUMERICExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kspread/gnumeric/gnumericimport.h b/filters/kspread/gnumeric/gnumericimport.h index f5a46d10..b7fbd4bd 100644 --- a/filters/kspread/gnumeric/gnumericimport.h +++ b/filters/kspread/gnumeric/gnumericimport.h @@ -36,7 +36,7 @@ class GNUMERICFilter : public KoFilter Q_OBJECT TQ_OBJECT public: - GNUMERICFilter(KoFilter *tqparent, const char *name, const TQStringList&); + GNUMERICFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~GNUMERICFilter() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc index 37720d6e..72dd6875 100644 --- a/filters/kspread/html/exportdialog.cc +++ b/filters/kspread/html/exportdialog.cc @@ -32,8 +32,8 @@ #include <exportdialog.h> #include <exportwidget.h> -ExportDialog::ExportDialog( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("Export Sheet to HTML"), Ok|Cancel, No, true ), m_mainwidget( new ExportWidget( this ) ) +ExportDialog::ExportDialog( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("Export Sheet to HTML"), Ok|Cancel, No, true ), m_mainwidget( new ExportWidget( this ) ) { kapp->restoreOverrideCursor(); diff --git a/filters/kspread/html/exportdialog.h b/filters/kspread/html/exportdialog.h index 38cac112..29645540 100644 --- a/filters/kspread/html/exportdialog.h +++ b/filters/kspread/html/exportdialog.h @@ -29,7 +29,7 @@ class ExportDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ExportDialog( TQWidget *tqparent = 0, const char *name = 0 ); + ExportDialog( TQWidget *parent = 0, const char *name = 0 ); ~ExportDialog(); void setSheets( const TQStringList & ); diff --git a/filters/kspread/html/htmlexport.h b/filters/kspread/html/htmlexport.h index afb20883..09f904d3 100644 --- a/filters/kspread/html/htmlexport.h +++ b/filters/kspread/html/htmlexport.h @@ -36,7 +36,7 @@ class HTMLExport : public KoFilter { Q_OBJECT TQ_OBJECT public: - HTMLExport(KoFilter *tqparent, const char*name, const TQStringList&); + HTMLExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~HTMLExport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc index 76a44e9a..15e8ee2a 100644 --- a/filters/kspread/kexi/kspread_kexiimport.cc +++ b/filters/kspread/kexi/kspread_kexiimport.cc @@ -61,7 +61,7 @@ K_EXPORT_COMPONENT_FACTORY( libkspreadkexiimport, KSpreadKexiImportFactory( "kof //============================================================================= -KSpreadKexiImport::KSpreadKexiImport(KoFilter *tqparent, const char *name, const TQStringList&) +KSpreadKexiImport::KSpreadKexiImport(KoFilter *parent, const char *name, const TQStringList&) { } diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h index 7da8d20f..aec65889 100644 --- a/filters/kspread/kexi/kspread_kexiimport.h +++ b/filters/kspread/kexi/kspread_kexiimport.h @@ -69,7 +69,7 @@ class KSpreadKexiImport : public KoFilter /** * Constructor. This constructor is usable with KGenericFactory. */ - KSpreadKexiImport(KoFilter *tqparent, const char *name, const TQStringList&); + KSpreadKexiImport(KoFilter *parent, const char *name, const TQStringList&); /** * Virtual destructor. diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc index 9d30ee38..9ddf240f 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.cc +++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc @@ -54,12 +54,12 @@ /** * Constructor - * @param tqparent Pointer to kspread view + * @param parent Pointer to kspread view * @param name Name of the dialog * @return None */ - KSpreadKexiImportDialog::KSpreadKexiImportDialog(TQWidget* tqparent, const char* name) - : KSpreadKexiImportDialogBase(tqparent,name) + KSpreadKexiImportDialog::KSpreadKexiImportDialog(TQWidget* parent, const char* name) + : KSpreadKexiImportDialogBase(parent,name) { connect(this->m_insertButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); connect(this->m_cancelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.h b/filters/kspread/kexi/kspread_kexiimportdialog.h index 81948f34..1476a25e 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.h +++ b/filters/kspread/kexi/kspread_kexiimportdialog.h @@ -68,7 +68,7 @@ public: * The dates in the dialog initialize to a complete calendar for the * current month. */ - KSpreadKexiImportDialog(TQWidget* tqparent = 0, const char* name = 0); + KSpreadKexiImportDialog(TQWidget* parent = 0, const char* name = 0); /** * Virtual destructor. diff --git a/filters/kspread/latex/export/format.h b/filters/kspread/latex/export/format.h index c0ab61aa..7025c371 100644 --- a/filters/kspread/latex/export/format.h +++ b/filters/kspread/latex/export/format.h @@ -77,7 +77,7 @@ class Format: public XmlParser * * Creates a new instance of Format. * - * @param Para the tqparent class of the format. + * @param Para the parent class of the format. */ Format(); diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc index 479bb547..a7f03f60 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc @@ -49,15 +49,15 @@ #endif*/ /* - * Constructs a KSpreadLatexExportDiaImpl which is a child of 'tqparent', with the + * Constructs a KSpreadLatexExportDiaImpl which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* tqparent, +KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* parent, const char* name_, bool modal, WFlags fl ) - : LatexExportDia( tqparent, name_, modal, fl ), _in( in ) + : LatexExportDia( parent, name_, modal, fl ), _in( in ) { int i = 0; diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h index 33bb6222..9e3e02d2 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h @@ -41,7 +41,7 @@ class KSpreadLatexExportDiaImpl : public LatexExportDia LatexExportIface* _iface; public: - KSpreadLatexExportDiaImpl( KoStore*, TQWidget* tqparent = 0, + KSpreadLatexExportDiaImpl( KoStore*, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); virtual ~KSpreadLatexExportDiaImpl(); diff --git a/filters/kspread/latex/export/latexexport.h b/filters/kspread/latex/export/latexexport.h index 5812d316..e7c0312b 100644 --- a/filters/kspread/latex/export/latexexport.h +++ b/filters/kspread/latex/export/latexexport.h @@ -35,7 +35,7 @@ class LATEXExport : public KoFilter TQ_OBJECT public: - LATEXExport(KoFilter *tqparent, const char *name, const TQStringList&); + LATEXExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kspread/latex/export/latexexportIface.cc b/filters/kspread/latex/export/latexexportIface.cc index 80ca013d..f99e6745 100644 --- a/filters/kspread/latex/export/latexexportIface.cc +++ b/filters/kspread/latex/export/latexexportIface.cc @@ -22,7 +22,7 @@ #include "kspreadlatexexportdiaImpl.h" /* - * Constructs a KWordLatexExportDia which is a child of 'tqparent', with the + * Constructs a KWordLatexExportDia which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc index 6a0376f4..9e37597c 100644 --- a/filters/kspread/opencalc/opencalcexport.cc +++ b/filters/kspread/opencalc/opencalcexport.cc @@ -402,7 +402,7 @@ bool OpenCalcExport::exportContent( KoStore * store, const Doc * ksdoc ) return true; } -void exportNamedExpr( TQDomDocument & doc, TQDomElement & tqparent, +void exportNamedExpr( TQDomDocument & doc, TQDomElement & parent, AreaList const & namedAreas ) { AreaList::const_iterator it = namedAreas.begin(); @@ -418,7 +418,7 @@ void exportNamedExpr( TQDomDocument & doc, TQDomElement & tqparent, namedRange.setAttribute( "table:base-cell-address", convertRefToBase( ref.sheet_name, ref.rect ) ); namedRange.setAttribute( "table:cell-range-address", convertRefToRange( ref.sheet_name, ref.rect ) ); - tqparent.appendChild( namedRange ); + parent.appendChild( namedRange ); ++it; } @@ -1026,14 +1026,14 @@ void OpenCalcExport::exportMasterStyles( TQDomDocument & doc, TQDomElement & mas } void OpenCalcExport::addText( TQString const & text, TQDomDocument & doc, - TQDomElement & tqparent ) + TQDomElement & parent ) { if (text.length() > 0 ) - tqparent.appendChild( doc.createTextNode( text ) ); + parent.appendChild( doc.createTextNode( text ) ); } void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, - TQDomElement & tqparent, const Doc * ksdoc ) + TQDomElement & parent, const Doc * ksdoc ) { TQString text; TQString var; @@ -1052,54 +1052,54 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, inVar = false; if ( var == "<page>" ) { - addText( text, doc, tqparent ); + addText( text, doc, parent ); TQDomElement page = doc.createElement( "text:page-number" ); page.appendChild( doc.createTextNode( "1" ) ); - tqparent.appendChild( page ); + parent.appendChild( page ); } else if ( var == "<pages>" ) { - addText( text, doc, tqparent ); + addText( text, doc, parent ); TQDomElement page = doc.createElement( "text:page-count" ); page.appendChild( doc.createTextNode( "99" ) ); - tqparent.appendChild( page ); + parent.appendChild( page ); } else if ( var == "<date>" ) { - addText( text, doc, tqparent ); + addText( text, doc, parent ); TQDomElement t = doc.createElement( "text:date" ); t.setAttribute( "text:date-value", "0-00-00" ); // todo: "style:data-style-name", "N2" t.appendChild( doc.createTextNode( TQDate::tqcurrentDate().toString() ) ); - tqparent.appendChild( t ); + parent.appendChild( t ); } else if ( var == "<time>" ) { - addText( text, doc, tqparent ); + addText( text, doc, parent ); TQDomElement t = doc.createElement( "text:time" ); t.appendChild( doc.createTextNode( TQTime::currentTime().toString() ) ); - tqparent.appendChild( t ); + parent.appendChild( t ); } else if ( var == "<file>" ) // filepath + name { - addText( text, doc, tqparent ); + addText( text, doc, parent ); TQDomElement t = doc.createElement( "text:file-name" ); t.setAttribute( "text:display", "full" ); t.appendChild( doc.createTextNode( "???" ) ); - tqparent.appendChild( t ); + parent.appendChild( t ); } else if ( var == "<name>" ) // filename { - addText( text, doc, tqparent ); + addText( text, doc, parent ); TQDomElement t = doc.createElement( "text:title" ); t.appendChild( doc.createTextNode( "???" ) ); - tqparent.appendChild( t ); + parent.appendChild( t ); } else if ( var == "<author>" ) { @@ -1108,7 +1108,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, text += authorPage->fullName(); - addText( text, doc, tqparent ); + addText( text, doc, parent ); } else if ( var == "<email>" ) { @@ -1117,7 +1117,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, text += authorPage->email(); - addText( text, doc, tqparent ); + addText( text, doc, parent ); } else if ( var == "<org>" ) { @@ -1126,21 +1126,21 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, text += authorPage->company(); - addText( text, doc, tqparent ); + addText( text, doc, parent ); } else if ( var == "<sheet>" ) { - addText( text, doc, tqparent ); + addText( text, doc, parent ); TQDomElement s = doc.createElement( "text:sheet-name" ); s.appendChild( doc.createTextNode( "???" ) ); - tqparent.appendChild( s ); + parent.appendChild( s ); } else { // no known variable: text += var; - addText( text, doc, tqparent ); + addText( text, doc, parent ); } text = ""; @@ -1156,7 +1156,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, if ( !text.isEmpty() || !var.isEmpty() ) { //we don't have var at the end =>store it - addText( text+var, doc, tqparent ); + addText( text+var, doc, parent ); } } diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h index 54748144..97832a9a 100644 --- a/filters/kspread/opencalc/opencalcexport.h +++ b/filters/kspread/opencalc/opencalcexport.h @@ -43,7 +43,7 @@ class OpenCalcExport : public KoFilter TQ_OBJECT public: - OpenCalcExport( KoFilter * tqparent, const char * name, const TQStringList & ); + OpenCalcExport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OpenCalcExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString & from, @@ -76,9 +76,9 @@ class OpenCalcExport : public KoFilter void maxRowCols( const KSpread::Sheet * sheet, int & maxCols, int & maxRows ); void convertPart( TQString const & part, TQDomDocument & doc, - TQDomElement & tqparent, const KSpread::Doc * ksdoc ); + TQDomElement & parent, const KSpread::Doc * ksdoc ); void addText( TQString const & text, TQDomDocument & doc, - TQDomElement & tqparent ); + TQDomElement & parent ); void createDefaultStyles(); TQString convertFormula( TQString const & formula ) const; diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index f52ffd0f..376a8f77 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -476,8 +476,8 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet * table, int row, cell = table->nonDefaultCell( columns, row ); TQString psName( "Default" ); - if ( e.hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) - psName = e.attributeNS( ooNS::style, "tqparent-style-name", TQString() ); + if ( e.hasAttributeNS( ooNS::style, "parent-style-name" ) ) + psName = e.attributeNS( ooNS::style, "parent-style-name", TQString() ); kdDebug(30518) << "Default style: " << psName << endl; Format * tqlayout = m_defaultStyles[psName]; @@ -2221,11 +2221,11 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style kdDebug(30518) << "** Reading Style: " << style.tagName() << "; " << style.attributeNS( ooNS::style, "name", TQString()) << endl; if ( style.localName() == "style" && style.namespaceURI()==ooNS::style) { - if ( style.hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) + if ( style.hasAttributeNS( ooNS::style, "parent-style-name" ) ) { Format * cp - = m_defaultStyles.find( style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) ); - kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) << endl; + = m_defaultStyles.find( style.attributeNS( ooNS::style, "parent-style-name", TQString() ) ); + kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl; if ( cp != 0 ) tqlayout->copy( *cp ); diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h index b7dca822..cd1f23b6 100644 --- a/filters/kspread/opencalc/opencalcimport.h +++ b/filters/kspread/opencalc/opencalcimport.h @@ -44,7 +44,7 @@ class OpenCalcImport : public KoFilter Q_OBJECT TQ_OBJECT public: - OpenCalcImport( KoFilter * tqparent, const char * name, const TQStringList & ); + OpenCalcImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OpenCalcImport(); virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cc index 2c81a2cc..f075713a 100644 --- a/filters/kspread/opencalc/opencalcstyleexport.cc +++ b/filters/kspread/opencalc/opencalcstyleexport.cc @@ -200,7 +200,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl TQDomElement ts = doc.createElement( "style:style" ); ts.setAttribute( "style:name", t->name ); ts.setAttribute( "style:family", "table-cell" ); - ts.setAttribute( "style:tqparent-style-name", "Default" ); + ts.setAttribute( "style:parent-style-name", "Default" ); if ( t->numberStyle.length() > 0 ) ts.setAttribute( "style:data-style-name", t->numberStyle ); diff --git a/filters/kspread/qpro/qproimport.h b/filters/kspread/qpro/qproimport.h index 031f5cdf..1c3c7d85 100644 --- a/filters/kspread/qpro/qproimport.h +++ b/filters/kspread/qpro/qproimport.h @@ -34,7 +34,7 @@ class QpImport : public KoFilter { TQ_OBJECT public: - QpImport(KoFilter* tqparent, const char* name, const TQStringList&); + QpImport(KoFilter* parent, const char* name, const TQStringList&); virtual ~QpImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kugar/kugarnop/kugarnopimport.h b/filters/kugar/kugarnop/kugarnopimport.h index acb77e95..03085410 100644 --- a/filters/kugar/kugarnop/kugarnopimport.h +++ b/filters/kugar/kugarnop/kugarnopimport.h @@ -26,7 +26,7 @@ class KugarNOPImport : public KoFilter TQ_OBJECT public: - KugarNOPImport( KoFilter *tqparent, const char *name, const TQStringList& ); + KugarNOPImport( KoFilter *parent, const char *name, const TQStringList& ); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index 96c5cc6d..717611cd 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -1221,7 +1221,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo) // ========================================================================================== -ABIWORDExport::ABIWORDExport(KoFilter */*tqparent*/, const char */*name*/, const TQStringList &) : +ABIWORDExport::ABIWORDExport(KoFilter */*parent*/, const char */*name*/, const TQStringList &) : KoFilter() { } diff --git a/filters/kword/abiword/abiwordexport.h b/filters/kword/abiword/abiwordexport.h index 85203f8b..550b7682 100644 --- a/filters/kword/abiword/abiwordexport.h +++ b/filters/kword/abiword/abiwordexport.h @@ -44,7 +44,7 @@ class ABIWORDExport : public KoFilter { TQ_OBJECT public: - ABIWORDExport(KoFilter *tqparent, const char *name, const TQStringList &); + ABIWORDExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~ABIWORDExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index 56524cd6..4815d02c 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -223,11 +223,11 @@ bool EndElementC (StackItem* stackItem, StackItem* stackCurrent) if (stackItem->elementType==ElementTypeContent) { stackItem->stackElementText.normalize(); - stackCurrent->pos=stackItem->pos; //Propagate the position back to the tqparent element + stackCurrent->pos=stackItem->pos; //Propagate the position back to the parent element } else if (stackItem->elementType==ElementTypeAnchorContent) { - stackCurrent->strTemp2+=stackItem->strTemp2; //Propagate the link name back to the tqparent element + stackCurrent->strTemp2+=stackItem->strTemp2; //Propagate the link name back to the parent element } else { @@ -313,7 +313,7 @@ static bool EndElementA (StackItem* stackItem, StackItem* stackCurrent, TQDomDoc // Now work on stackCurrent stackCurrent->stackElementFormatsPlural.appendChild(formatElement); - stackCurrent->pos++; //Propagate the position back to the tqparent element + stackCurrent->pos++; //Propagate the position back to the parent element return true; } @@ -784,7 +784,7 @@ static bool StartElementBR(StackItem* stackItem, StackItem* stackCurrent, formatElement.setAttribute("id",1); // Normal text! formatElement.setAttribute("pos",stackCurrent->pos); // Start position formatElement.setAttribute("len",1); - AddFormat(formatElement, stackCurrent, mainDocument); // Add the format of the tqparent <c> + AddFormat(formatElement, stackCurrent, mainDocument); // Add the format of the parent <c> stackCurrent->stackElementFormatsPlural.appendChild(formatElement); //Append to <FORMATS> } @@ -1753,7 +1753,7 @@ bool StructureParser::clearStackUntilParagraph(StackItemStack& auxilaryStack) } } -ABIWORDImport::ABIWORDImport(KoFilter */*tqparent*/, const char */*name*/, const TQStringList &) : +ABIWORDImport::ABIWORDImport(KoFilter */*parent*/, const char */*name*/, const TQStringList &) : KoFilter() { } diff --git a/filters/kword/abiword/abiwordimport.h b/filters/kword/abiword/abiwordimport.h index c48ac362..9ff4d764 100644 --- a/filters/kword/abiword/abiwordimport.h +++ b/filters/kword/abiword/abiwordimport.h @@ -46,7 +46,7 @@ class ABIWORDImport : public KoFilter { TQ_OBJECT public: - ABIWORDImport(KoFilter *tqparent, const char *name, const TQStringList &); + ABIWORDImport(KoFilter *parent, const char *name, const TQStringList &); ABIWORDImport(); virtual ~ABIWORDImport() {} diff --git a/filters/kword/amipro/amiproexport.h b/filters/kword/amipro/amiproexport.h index d4a0603e..c9e1f5d9 100644 --- a/filters/kword/amipro/amiproexport.h +++ b/filters/kword/amipro/amiproexport.h @@ -30,7 +30,7 @@ class AmiProExport : public KoFilter public: - AmiProExport(KoFilter *tqparent, const char *name, const TQStringList&); + AmiProExport(KoFilter *parent, const char *name, const TQStringList&); AmiProExport(); virtual ~AmiProExport() {} diff --git a/filters/kword/amipro/amiproimport.h b/filters/kword/amipro/amiproimport.h index 8d22270f..ad078543 100644 --- a/filters/kword/amipro/amiproimport.h +++ b/filters/kword/amipro/amiproimport.h @@ -32,7 +32,7 @@ class AmiProImport : public KoFilter public: - AmiProImport(KoFilter *tqparent, const char *name, const TQStringList&); + AmiProImport(KoFilter *parent, const char *name, const TQStringList&); AmiProImport(); virtual ~AmiProImport() {} diff --git a/filters/kword/applixword/applixwordimport.h b/filters/kword/applixword/applixwordimport.h index f82066ec..ccd80df7 100644 --- a/filters/kword/applixword/applixwordimport.h +++ b/filters/kword/applixword/applixwordimport.h @@ -47,7 +47,7 @@ class APPLIXWORDImport : public KoFilter { TQ_OBJECT public: - APPLIXWORDImport(KoFilter *tqparent, const char *name, const TQStringList&); + APPLIXWORDImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXWORDImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc index 1d408b18..138618b2 100644 --- a/filters/kword/ascii/ExportDialog.cc +++ b/filters/kword/ascii/ExportDialog.cc @@ -33,8 +33,8 @@ #include <ExportDialogUI.h> #include <ExportDialog.h> -AsciiExportDialog :: AsciiExportDialog(TQWidget* tqparent) - : KDialogBase(tqparent, 0, true, i18n("KWord's Plain Text Export Filter"), Ok|Cancel, No, true), +AsciiExportDialog :: AsciiExportDialog(TQWidget* parent) + : KDialogBase(parent, 0, true, i18n("KWord's Plain Text Export Filter"), Ok|Cancel, No, true), m_dialog(new ExportDialogUI(this)) { @@ -84,7 +84,7 @@ TQTextCodec* AsciiExportDialog::getCodec(void) const { // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; - // ### TODO: what tqparent to use? + // ### TODO: what parent to use? KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); return 0; } diff --git a/filters/kword/ascii/ExportDialog.h b/filters/kword/ascii/ExportDialog.h index 2d75df8e..eb3f526b 100644 --- a/filters/kword/ascii/ExportDialog.h +++ b/filters/kword/ascii/ExportDialog.h @@ -33,7 +33,7 @@ class AsciiExportDialog : public KDialogBase TQ_OBJECT public: - AsciiExportDialog(TQWidget* tqparent=NULL); + AsciiExportDialog(TQWidget* parent=NULL); ~AsciiExportDialog(void); TQString getEndOfLine(void) const; TQTextCodec* getCodec(void) const; diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc index 4bcccc58..adb345b1 100644 --- a/filters/kword/ascii/ImportDialog.cc +++ b/filters/kword/ascii/ImportDialog.cc @@ -33,8 +33,8 @@ #include <ImportDialogUI.h> #include <ImportDialog.h> -AsciiImportDialog :: AsciiImportDialog(TQWidget* tqparent) - : KDialogBase(tqparent, 0, true, i18n("KWord's Plain Text Import Filter"), Ok|Cancel, No, true), +AsciiImportDialog :: AsciiImportDialog(TQWidget* parent) + : KDialogBase(parent, 0, true, i18n("KWord's Plain Text Import Filter"), Ok|Cancel, No, true), m_dialog(new ImportDialogUI(this)) { @@ -83,7 +83,7 @@ TQTextCodec* AsciiImportDialog::getCodec(void) const { // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; - // ### TODO: what tqparent to use? + // ### TODO: what parent to use? KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); return 0; } diff --git a/filters/kword/ascii/ImportDialog.h b/filters/kword/ascii/ImportDialog.h index 929aa8fc..0cb97240 100644 --- a/filters/kword/ascii/ImportDialog.h +++ b/filters/kword/ascii/ImportDialog.h @@ -32,7 +32,7 @@ class AsciiImportDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - AsciiImportDialog(TQWidget* tqparent=NULL); + AsciiImportDialog(TQWidget* parent=NULL); ~AsciiImportDialog(void); TQTextCodec* getCodec(void) const; int getParagraphStrategy(void) const; diff --git a/filters/kword/ascii/asciiexport.h b/filters/kword/ascii/asciiexport.h index 88db0c8f..af1e2e04 100644 --- a/filters/kword/ascii/asciiexport.h +++ b/filters/kword/ascii/asciiexport.h @@ -28,7 +28,7 @@ class ASCIIExport : public KoFilter TQ_OBJECT public: - ASCIIExport(KoFilter* tqparent, const char* name, const TQStringList&); + ASCIIExport(KoFilter* parent, const char* name, const TQStringList&); virtual ~ASCIIExport() {} virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kword/ascii/asciiimport.h b/filters/kword/ascii/asciiimport.h index 6d315879..4d332776 100644 --- a/filters/kword/ascii/asciiimport.h +++ b/filters/kword/ascii/asciiimport.h @@ -61,7 +61,7 @@ class ASCIIImport : public KoFilter { TQ_OBJECT public: - ASCIIImport(KoFilter *tqparent, const char *name, const TQStringList &); + ASCIIImport(KoFilter *parent, const char *name, const TQStringList &); ASCIIImport(); virtual ~ASCIIImport() {} diff --git a/filters/kword/docbook/docbookexport.h b/filters/kword/docbook/docbookexport.h index 9a1611c8..cf7ec804 100644 --- a/filters/kword/docbook/docbookexport.h +++ b/filters/kword/docbook/docbookexport.h @@ -35,7 +35,7 @@ class DocBookExport : public KoFilter { TQ_OBJECT public: - DocBookExport (KoFilter *tqparent, const char *name, const TQStringList & ); + DocBookExport (KoFilter *parent, const char *name, const TQStringList & ); virtual ~DocBookExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/hancomword/hancomwordimport.h b/filters/kword/hancomword/hancomwordimport.h index 7cacd668..64d279a8 100644 --- a/filters/kword/hancomword/hancomwordimport.h +++ b/filters/kword/hancomword/hancomwordimport.h @@ -32,7 +32,7 @@ Q_OBJECT public: - HancomWordImport ( TQObject *tqparent, const char* name, const TQStringList& ); + HancomWordImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~HancomWordImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp index dfcb31f5..f712f0e1 100644 --- a/filters/kword/hancomword/pole.cpp +++ b/filters/kword/hancomword/pole.cpp @@ -115,7 +115,7 @@ class DirTree DirEntry* entry( unsigned index ); DirEntry* entry( const std::string& name, bool create=false ); int indexOf( DirEntry* e ); - int tqparent( unsigned index ); + int parent( unsigned index ); std::string fullName( unsigned index ); std::vector<unsigned> tqchildren( unsigned index ); void load( unsigned char* buffer, unsigned len ); @@ -505,7 +505,7 @@ int DirTree::indexOf( DirEntry* e ) return -1; } -int DirTree::tqparent( unsigned index ) +int DirTree::parent( unsigned index ) { // brute-force, basically we iterate for each entries, find its tqchildren // and check if one of the tqchildren is 'index' @@ -527,7 +527,7 @@ std::string DirTree::fullName( unsigned index ) std::string result = entry( index )->name; result.insert( 0, "/" ); - int p = tqparent( index ); + int p = parent( index ); DirEntry * _entry = 0; while( p > 0 ) { @@ -595,7 +595,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( !create ) return (DirEntry*)0; // create a new entry - unsigned tqparent = index; + unsigned parent = index; entries.push_back( DirEntry() ); index = entryCount()-1; DirEntry* e = entry( index ); @@ -606,8 +606,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) e->start = 0; e->child = End; e->prev = End; - e->next = entry(tqparent)->child; - entry(tqparent)->child = index; + e->next = entry(parent)->child; + entry(parent)->child = index; } } @@ -1102,7 +1102,7 @@ StreamIO::StreamIO( StorageIO* s, DirEntry* e) updateCache(); } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone StreamIO::~StreamIO() { delete[] cache_data; @@ -1248,8 +1248,8 @@ std::list<std::string> Storage::entries( const std::string& path ) DirEntry* e = dt->entry( path, false ); if( e && e->dir ) { - unsigned tqparent = dt->indexOf( e ); - std::vector<unsigned> tqchildren = dt->tqchildren( tqparent ); + unsigned parent = dt->indexOf( e ); + std::vector<unsigned> tqchildren = dt->tqchildren( parent ); for( unsigned i = 0; i < tqchildren.size(); i++ ) result.push_back( dt->entry( tqchildren[i] )->name ); } @@ -1270,7 +1270,7 @@ Stream::Stream( Storage* storage, const std::string& name ) io = storage->io->streamIO( name ); } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone Stream::~Stream() { delete io; diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc index 3f1d0b3e..20c7069b 100644 --- a/filters/kword/html/export/ExportDialog.cc +++ b/filters/kword/html/export/ExportDialog.cc @@ -37,8 +37,8 @@ #include <ExportDialogUI.h> #include <ExportDialog.h> -HtmlExportDialog :: HtmlExportDialog(TQWidget* tqparent) - : KDialogBase(tqparent, 0, true, i18n("KWord's HTML Export Filter"), Ok|Cancel, No, true), +HtmlExportDialog :: HtmlExportDialog(TQWidget* parent) + : KDialogBase(parent, 0, true, i18n("KWord's HTML Export Filter"), Ok|Cancel, No, true), m_dialog(new ExportDialogUI(this)) { @@ -105,7 +105,7 @@ TQTextCodec* HtmlExportDialog::getCodec(void) const { // Default: UTF-8 kdWarning(30503) << "Cannot find encoding:" << strCodec << endl; - // ### TODO: what tqparent to use? + // ### TODO: what parent to use? KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); return 0; } diff --git a/filters/kword/html/export/ExportDialog.h b/filters/kword/html/export/ExportDialog.h index 978f6e6b..0feb3045 100644 --- a/filters/kword/html/export/ExportDialog.h +++ b/filters/kword/html/export/ExportDialog.h @@ -39,7 +39,7 @@ public: CustomCSS }; - HtmlExportDialog(TQWidget* tqparent=NULL); + HtmlExportDialog(TQWidget* parent=NULL); ~HtmlExportDialog(void); bool isXHtml(void) const; TQTextCodec* getCodec(void) const; diff --git a/filters/kword/html/export/htmlexport.h b/filters/kword/html/export/htmlexport.h index c4e73292..5de5ef6a 100644 --- a/filters/kword/html/export/htmlexport.h +++ b/filters/kword/html/export/htmlexport.h @@ -36,7 +36,7 @@ class HTMLExport : public KoFilter { TQ_OBJECT public: - HTMLExport(KoFilter *tqparent, const char *name, const TQStringList &); + HTMLExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/html/import/htmlimport.h b/filters/kword/html/import/htmlimport.h index b383665b..f7c61a41 100644 --- a/filters/kword/html/import/htmlimport.h +++ b/filters/kword/html/import/htmlimport.h @@ -34,7 +34,7 @@ class HTMLImport : public KoFilter { TQ_OBJECT public: - HTMLImport(KoFilter *tqparent, const char *name, const TQStringList &); + HTMLImport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp index 23211ecc..56568be9 100644 --- a/filters/kword/html/import/kwdwriter.cpp +++ b/filters/kword/html/import/kwdwriter.cpp @@ -170,9 +170,9 @@ TQDomElement KWDWriter::currentLayout(TQDomElement paragraph) { TQDomElement KWDWriter::createTableCell(int tableno, int nrow, int ncol, int colspan, TQRect rect) { - TQDomElement tqparent=docroot().elementsByTagName("FRAMESETS").item(0).toElement(); + TQDomElement parent=docroot().elementsByTagName("FRAMESETS").item(0).toElement(); - TQDomElement fs=addFrameSet(tqparent,1,0, + TQDomElement fs=addFrameSet(parent,1,0, TQString("Table %1 - %2,%3").tqarg(tableno).tqarg(nrow).tqarg(ncol), 1); fs.setAttribute("grpMgr",TQString("Table %1").tqarg(tableno)); @@ -278,11 +278,11 @@ void KWDWriter::finishTable(int tableno,TQRect rect) { } -TQDomElement KWDWriter::addFrameSet(TQDomElement tqparent, int frametype, +TQDomElement KWDWriter::addFrameSet(TQDomElement parent, int frametype, int frameinfo, TQString name, int visible) { TQDomElement frameset=_doc->createElement("FRAMESET"); - tqparent.appendChild(frameset); + parent.appendChild(frameset); frameset.setAttribute("frameType",frametype); frameset.setAttribute("frameInfo",frameinfo); @@ -295,9 +295,9 @@ TQDomElement KWDWriter::addFrameSet(TQDomElement tqparent, int frametype, return frameset; } -TQDomElement KWDWriter::addParagraph(TQDomElement tqparent) { +TQDomElement KWDWriter::addParagraph(TQDomElement parent) { TQDomElement k; - return addParagraph(tqparent,k); + return addParagraph(parent,k); } void KWDWriter::appendKWordVariable(TQDomDocument& doc, TQDomElement& format, @@ -353,7 +353,7 @@ TQRect getRect(TQDomElement frameset) { } -TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement layoutToClone) { +TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToClone) { TQDomElement paragraph=_doc->createElement("PARAGRAPH"); TQDomElement formats=_doc->createElement("FORMATS"); @@ -369,7 +369,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement layoutT text.appendChild(t); paragraph.appendChild(formats); paragraph.appendChild(text); - tqparent.appendChild(paragraph); + parent.appendChild(paragraph); paragraph.appendChild(tqlayout); layoutAttribute(paragraph,"NAME","value","Standard"); return paragraph; diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h index 59694e8d..542a1748 100644 --- a/filters/kword/html/import/kwdwriter.h +++ b/filters/kword/html/import/kwdwriter.h @@ -44,9 +44,9 @@ public: /** - * adds a frameset to tqparent FIXME + * adds a frameset to parent FIXME **/ - TQDomElement addFrameSet(TQDomElement tqparent, int frametype=1, + TQDomElement addFrameSet(TQDomElement parent, int frametype=1, int frameinfo=0, TQString name=TQString(), int visible=1); @@ -114,8 +114,8 @@ public: /** * adds a paragraph **/ - TQDomElement addParagraph(TQDomElement tqparent); - TQDomElement addParagraph(TQDomElement tqparent, TQDomElement tqlayout); + TQDomElement addParagraph(TQDomElement parent); + TQDomElement addParagraph(TQDomElement parent, TQDomElement tqlayout); /** * adds/changes an attribute to/of the current format diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp index 58349af8..ebcf3f6a 100644 --- a/filters/kword/kword1.3/import/kword13import.cpp +++ b/filters/kword/kword1.3/import/kword13import.cpp @@ -38,7 +38,7 @@ typedef KGenericFactory<KWord13Import, KoFilter> KWord13ImportFactory; K_EXPORT_COMPONENT_FACTORY( libkwordkword1dot3import, KWord13ImportFactory( "kofficefilters" ) ) -KWord13Import::KWord13Import(KoFilter */*tqparent*/, const char */*name*/, const TQStringList &) +KWord13Import::KWord13Import(KoFilter */*parent*/, const char */*name*/, const TQStringList &) : KoFilter() { } diff --git a/filters/kword/kword1.3/import/kword13import.h b/filters/kword/kword1.3/import/kword13import.h index d5bebeb3..7d60dd89 100644 --- a/filters/kword/kword1.3/import/kword13import.h +++ b/filters/kword/kword1.3/import/kword13import.h @@ -36,7 +36,7 @@ class KWord13Import : public KoFilter { TQ_OBJECT public: - KWord13Import(KoFilter *tqparent, const char *name, const TQStringList &); + KWord13Import(KoFilter *parent, const char *name, const TQStringList &); virtual ~KWord13Import() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp index 2f6403af..e3958b45 100644 --- a/filters/kword/kword1.3/import/kword13parser.cpp +++ b/filters/kword/kword1.3/import/kword13parser.cpp @@ -158,7 +158,7 @@ bool KWord13Parser::startElementName( const TQString&, const TQXmlAttributes& at bool KWord13Parser::startElementFormat( const TQString&, const TQXmlAttributes& attributes, KWord13StackItem *stackItem ) { - // ### TODO: check tqparent? + // ### TODO: check parent? if ( stackItem->elementType == KWord13TypeIgnore ) { return true; @@ -230,7 +230,7 @@ bool KWord13Parser::startElementFormat( const TQString&, const TQXmlAttributes& bool KWord13Parser::startElementLayout( const TQString&, const TQXmlAttributes& attributes, KWord13StackItem *stackItem ) { - // ### TODO: check tqparent? + // ### TODO: check parent? if ( stackItem->elementType == KWord13TypeIgnore ) { return true; @@ -408,7 +408,7 @@ bool KWord13Parser::startElementDocumentAttributes( const TQString& name, const } else { - kdError(30520) << "Wrong tqparent!" << endl; + kdError(30520) << "Wrong parent!" << endl; return false; } } diff --git a/filters/kword/latex/export/anchor.h b/filters/kword/latex/export/anchor.h index 4e666669..3249857c 100644 --- a/filters/kword/latex/export/anchor.h +++ b/filters/kword/latex/export/anchor.h @@ -50,7 +50,7 @@ class Anchor: public Format /** * Creates a new instances of Anchor. * - * @param para the tqparent class. + * @param para the parent class. */ Anchor(Para* para = 0); //Anchor(TextZone); diff --git a/filters/kword/latex/export/footnote.h b/filters/kword/latex/export/footnote.h index 468de523..ba65e932 100644 --- a/filters/kword/latex/export/footnote.h +++ b/filters/kword/latex/export/footnote.h @@ -49,7 +49,7 @@ class Footnote: public Format * * Creates a new instances of Footnote. * - * @param Para is the tqparent class + * @param Para is the parent class */ Footnote(Para* para = 0); //Footnote(TextZone); diff --git a/filters/kword/latex/export/format.h b/filters/kword/latex/export/format.h index c7551767..c4c3e37a 100644 --- a/filters/kword/latex/export/format.h +++ b/filters/kword/latex/export/format.h @@ -68,7 +68,7 @@ class Format: public XmlParser * * Creates a new instance of Format. * - * @param Para the tqparent class of the format. + * @param Para the parent class of the format. */ Format(Para *para= 0): _id((EFormat) 0), _para(para) {} diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc index b5904248..079b38d3 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cc +++ b/filters/kword/latex/export/kwordlatexexportdia.cc @@ -50,15 +50,15 @@ #endif*/ /* - * Constructs a KWordLatexExportDia which is a child of 'tqparent', with the + * Constructs a KWordLatexExportDia which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* tqparent, +KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent, const char* name_, bool modal, WFlags fl ) - : LatexExportDia( tqparent, name_, modal, fl ),_in( in ) + : LatexExportDia( parent, name_, modal, fl ),_in( in ) { int i = 0; diff --git a/filters/kword/latex/export/kwordlatexexportdia.h b/filters/kword/latex/export/kwordlatexexportdia.h index 8aca29ed..af3d4cd5 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.h +++ b/filters/kword/latex/export/kwordlatexexportdia.h @@ -40,7 +40,7 @@ class KWordLatexExportDia : public LatexExportDia LatexExportIface* _iface; public: - KWordLatexExportDia( KoStore*, TQWidget* tqparent = 0, + KWordLatexExportDia( KoStore*, TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 ); virtual ~KWordLatexExportDia(); diff --git a/filters/kword/latex/export/latexexport.h b/filters/kword/latex/export/latexexport.h index 5812d316..e7c0312b 100644 --- a/filters/kword/latex/export/latexexport.h +++ b/filters/kword/latex/export/latexexport.h @@ -35,7 +35,7 @@ class LATEXExport : public KoFilter TQ_OBJECT public: - LATEXExport(KoFilter *tqparent, const char *name, const TQStringList&); + LATEXExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/latex/export/latexexportIface.cc b/filters/kword/latex/export/latexexportIface.cc index a50d7c61..102845b1 100644 --- a/filters/kword/latex/export/latexexportIface.cc +++ b/filters/kword/latex/export/latexexportIface.cc @@ -22,7 +22,7 @@ #include "kwordlatexexportdia.h" /* - * Constructs a KWordLatexExportDia which is a child of 'tqparent', with the + * Constructs a KWordLatexExportDia which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to diff --git a/filters/kword/latex/export/listtable.cc b/filters/kword/latex/export/listtable.cc index e5d29725..55cbf238 100644 --- a/filters/kword/latex/export/listtable.cc +++ b/filters/kword/latex/export/listtable.cc @@ -35,7 +35,7 @@ ListTable::ListTable() /*******************************************/ ListTable::~ListTable() { - /* Just call the tqparent destructor */ + /* Just call the parent destructor */ } /*******************************************/ diff --git a/filters/kword/latex/export/textzone.h b/filters/kword/latex/export/textzone.h index a9f5ff07..fbc09280 100644 --- a/filters/kword/latex/export/textzone.h +++ b/filters/kword/latex/export/textzone.h @@ -48,7 +48,7 @@ class TextZone: public TextFormat /** * Creates a new instance of TextZone. * - * @param para which is the tqparent class. + * @param para which is the parent class. */ TextZone(Para *para = 0); /** @@ -56,7 +56,7 @@ class TextZone: public TextFormat * Creates a new instance of TextZOne. * * @param text the text in this zone. - * @param para which is the tqparent class. + * @param para which is the parent class. */ TextZone(TQString text, Para *para = 0); diff --git a/filters/kword/latex/export/variablezone.h b/filters/kword/latex/export/variablezone.h index bb3c2ba9..a428984a 100644 --- a/filters/kword/latex/export/variablezone.h +++ b/filters/kword/latex/export/variablezone.h @@ -46,7 +46,7 @@ class VariableZone: public VariableFormat /** * Creates a new instance of VariableZone. * - * @param Para which is the tqparent class. + * @param Para which is the parent class. */ VariableZone(Para* para); @@ -54,7 +54,7 @@ class VariableZone: public VariableFormat * Creates a new instance of TextZOne. * * @param text the text in this zone. - * @param para which is the tqparent class. + * @param para which is the parent class. */ VariableZone(TQString text, Para* para); diff --git a/filters/kword/latex/import/lateximport.h b/filters/kword/latex/import/lateximport.h index a3cba4d0..949d7163 100644 --- a/filters/kword/latex/import/lateximport.h +++ b/filters/kword/latex/import/lateximport.h @@ -35,7 +35,7 @@ class LATEXImport : public KoFilter TQ_OBJECT public: - LATEXImport(KoFilter *tqparent, const char *name, const TQStringList&); + LATEXImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc index c6c28a77..9489d491 100644 --- a/filters/kword/latex/import/lateximportdia.cc +++ b/filters/kword/latex/import/lateximportdia.cc @@ -44,8 +44,8 @@ #include "generator/kwordgenerator.h" -LATEXImportDia::LATEXImportDia(KoStore* out, TQWidget *tqparent, const char *name) : - KDialogBase(tqparent, name, true, i18n("Latex Import Filter Parameters"), +LATEXImportDia::LATEXImportDia(KoStore* out, TQWidget *parent, const char *name) : + KDialogBase(parent, name, true, i18n("Latex Import Filter Parameters"), Ok|Cancel), DCOPObject("FilterConfigDia"), _out(out) { diff --git a/filters/kword/latex/import/lateximportdia.h b/filters/kword/latex/import/lateximportdia.h index 4f4c8c39..b6f83baa 100644 --- a/filters/kword/latex/import/lateximportdia.h +++ b/filters/kword/latex/import/lateximportdia.h @@ -60,7 +60,7 @@ class LATEXImportDia : public KDialogBase, public DCOPObject KoStore* _out; /* the zipped file containing all pictures, part, ... */ public: - LATEXImportDia(KoStore*, TQWidget *tqparent=0L, const char *name=0L); + LATEXImportDia(KoStore*, TQWidget *parent=0L, const char *name=0L); virtual ~LATEXImportDia() {} void createDialog(); diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp index 83dae4ab..6bd895b9 100644 --- a/filters/kword/msword/conversion.cpp +++ b/filters/kword/msword/conversion.cpp @@ -403,21 +403,21 @@ bool Conversion::isHeader( unsigned char type ) return false; } -int Conversion::headerMaskToHType( unsigned char tqmask ) +int Conversion::headerMaskToHType( unsigned char mask ) { - bool hasFirst = ( tqmask & wvWare::HeaderData::HeaderFirst ); + bool hasFirst = ( mask & wvWare::HeaderData::HeaderFirst ); // Odd is always there. We have even!=odd only if Even is there too. - bool hasEvenOdd = ( tqmask & wvWare::HeaderData::HeaderEven ); + bool hasEvenOdd = ( mask & wvWare::HeaderData::HeaderEven ); //kdDebug(30513) << k_funcinfo << " hasEvenOdd=" << hasEvenOdd << endl; if ( hasFirst ) return hasEvenOdd ? 1 : 2; return hasEvenOdd ? 3 : 0; } -int Conversion::headerMaskToFType( unsigned char tqmask ) +int Conversion::headerMaskToFType( unsigned char mask ) { - bool hasFirst = ( tqmask & wvWare::HeaderData::FooterFirst ); - bool hasEvenOdd = ( tqmask & wvWare::HeaderData::FooterEven ); + bool hasFirst = ( mask & wvWare::HeaderData::FooterFirst ); + bool hasEvenOdd = ( mask & wvWare::HeaderData::FooterEven ); // Odd is always there. We have even!=odd only if Even is there too. kdDebug(30513) << k_funcinfo << " hasEvenOdd=" << hasEvenOdd << endl; if ( hasFirst ) diff --git a/filters/kword/msword/conversion.h b/filters/kword/msword/conversion.h index 8a9781ce..fd30c69f 100644 --- a/filters/kword/msword/conversion.h +++ b/filters/kword/msword/conversion.h @@ -82,11 +82,11 @@ namespace Conversion // Convert wv2's Header Type to a KWord frameset name TQString headerTypeToFramesetName( unsigned char type ); - // Convert a tqmask of Header Types to the hType value for KWord - int headerMaskToHType( unsigned char tqmask ); + // Convert a mask of Header Types to the hType value for KWord + int headerMaskToHType( unsigned char mask ); - // Convert a tqmask of Header Types to the fType value for KWord - int headerMaskToFType( unsigned char tqmask ); + // Convert a mask of Header Types to the fType value for KWord + int headerMaskToFType( unsigned char mask ); // Convert wv2's FLD to KWord FIELD.subtype (or -1 if can't be handled) int fldToFieldType( const wvWare::FLD* fld ); diff --git a/filters/kword/msword/document.h b/filters/kword/msword/document.h index af527e2a..4ee62897 100644 --- a/filters/kword/msword/document.h +++ b/filters/kword/msword/document.h @@ -128,7 +128,7 @@ private: std::queue<SubDocument> m_subdocQueue; std::queue<KWord::Table> m_tableQueue; TQStringList m_pictureList; // for <PICTURES> - unsigned char m_headerFooters; // a tqmask of HeaderData::Type bits + unsigned char m_headerFooters; // a mask of HeaderData::Type bits bool m_bodyFound; int m_footNoteNumber; // number of footnote _framesets_ written out int m_endNoteNumber; // number of endnote _framesets_ written out diff --git a/filters/kword/msword/mswordimport.h b/filters/kword/msword/mswordimport.h index a961e071..73a568ff 100644 --- a/filters/kword/msword/mswordimport.h +++ b/filters/kword/msword/mswordimport.h @@ -30,7 +30,7 @@ class MSWordImport : public KoFilter Q_OBJECT TQ_OBJECT public: - MSWordImport( KoFilter* tqparent, const char* name, const TQStringList& ); + MSWordImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~MSWordImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index 1fea6625..07eb3da7 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -764,7 +764,7 @@ void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare:: } else { Q_ASSERT( ch < pap.ilvl ); // Can't see how level 1 would have a <0> in it... if ( ch < pap.ilvl ) - ++displayLevels; // we found a 'tqparent level', to be displayed + ++displayLevels; // we found a 'parent level', to be displayed prefix = TQString(); // get rid of previous prefixes } } else { // Normal character @@ -779,10 +779,10 @@ void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare:: // This is a hierarchical list numbering e.g. <0>.<1>. // (unless this is about a heading, in which case we've set numberingtype to 1 already // so it will indeed look like that). - // The question is whether the '.' is the suffix of the tqparent level already.. + // The question is whether the '.' is the suffix of the parent level already.. if ( depth > 0 && !prefix.isEmpty() && m_listSuffixes[ depth - 1 ] == prefix ) { - prefix = TQString(); // it's already the tqparent's suffix -> remove it - kdDebug(30513) << "depth=" << depth << " tqparent suffix is " << prefix << " -> clearing" << endl; + prefix = TQString(); // it's already the parent's suffix -> remove it + kdDebug(30513) << "depth=" << depth << " parent suffix is " << prefix << " -> clearing" << endl; } } if ( isHeading ) diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc index de8fece1..460677cb 100644 --- a/filters/kword/mswrite/ImportDialog.cc +++ b/filters/kword/mswrite/ImportDialog.cc @@ -35,8 +35,8 @@ #include <tqcombobox.h> #include <tqcheckbox.h> -MSWriteImportDialog :: MSWriteImportDialog(TQWidget* tqparent) - : KDialogBase(tqparent, 0, true, i18n("KWord's MS Write Import Filter"), Ok|Cancel, No, true), +MSWriteImportDialog :: MSWriteImportDialog(TQWidget* parent) + : KDialogBase(parent, 0, true, i18n("KWord's MS Write Import Filter"), Ok|Cancel, No, true), m_dialog(new ImportDialogUI(this)) { kapp->restoreOverrideCursor(); diff --git a/filters/kword/mswrite/ImportDialog.h b/filters/kword/mswrite/ImportDialog.h index 29cd2e6f..2b530ed1 100644 --- a/filters/kword/mswrite/ImportDialog.h +++ b/filters/kword/mswrite/ImportDialog.h @@ -31,7 +31,7 @@ class MSWriteImportDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - MSWriteImportDialog(TQWidget* tqparent=NULL); + MSWriteImportDialog(TQWidget* parent=NULL); ~MSWriteImportDialog(void); TQTextCodec* getCodec(void) const; diff --git a/filters/kword/mswrite/mswriteexport.h b/filters/kword/mswrite/mswriteexport.h index e2ab8fb4..796ce705 100644 --- a/filters/kword/mswrite/mswriteexport.h +++ b/filters/kword/mswrite/mswriteexport.h @@ -28,7 +28,7 @@ class MSWriteExport : public KoFilter TQ_OBJECT public: - MSWriteExport (KoFilter *tqparent, const char *name, const TQStringList &); + MSWriteExport (KoFilter *parent, const char *name, const TQStringList &); virtual ~MSWriteExport (); KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to); diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h index 81f9511c..65be7e7a 100644 --- a/filters/kword/mswrite/mswriteimport.h +++ b/filters/kword/mswrite/mswriteimport.h @@ -37,7 +37,7 @@ private: KWordGenerator *m_generator; public: - MSWriteImport (KoFilter *tqparent, const char *name, const TQStringList &); + MSWriteImport (KoFilter *parent, const char *name, const TQStringList &); virtual ~MSWriteImport (); KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to); diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc index 40f0bee6..ff9c8276 100644 --- a/filters/kword/oowriter/ExportFilter.cc +++ b/filters/kword/oowriter/ExportFilter.cc @@ -1281,7 +1281,7 @@ bool OOWriterWorker::makeTable( const FrameAnchor& anchor, const AnchorType anch m_contentAutomaticStyles += " <style:style"; // for frame m_contentAutomaticStyles += " style:name=\"" + escapeOOText( automaticFrameStyle ) + "\""; m_contentAutomaticStyles += " style:family=\"graphics\""; - m_contentAutomaticStyles += " style:tqparent-style-name=\"Frame\""; // ### TODO: tqparent style needs to be correctly defined + m_contentAutomaticStyles += " style:parent-style-name=\"Frame\""; // ### TODO: parent style needs to be correctly defined m_contentAutomaticStyles += ">\n"; m_contentAutomaticStyles += " <style:properties "; // ### TODO m_contentAutomaticStyles += " text:anchor-type=\"as-char\""; // ### TODO: needed? @@ -2003,7 +2003,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& m_contentAutomaticStyles += " <style:style"; m_contentAutomaticStyles += " style:name=\"" + escapeOOText(automaticStyle) + "\""; - m_contentAutomaticStyles += " style:tqparent-style-name=\"" + escapeOOText(tqlayout.styleName) + "\""; + m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(tqlayout.styleName) + "\""; m_contentAutomaticStyles += " style:family=\"paragraph\" style:class=\"text\""; m_contentAutomaticStyles += ">\n"; m_contentAutomaticStyles += " <style:properties "; diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cc index 15647164..426105e8 100644 --- a/filters/kword/oowriter/oowriterexport.cc +++ b/filters/kword/oowriter/oowriterexport.cc @@ -48,7 +48,7 @@ public: K_EXPORT_COMPONENT_FACTORY( liboowriterexport, OOWRITERExportFactory() ) -OOWRITERExport::OOWRITERExport(KoFilter */*tqparent*/, const char */*name*/, const TQStringList &) : +OOWRITERExport::OOWRITERExport(KoFilter */*parent*/, const char */*name*/, const TQStringList &) : KoFilter() { } diff --git a/filters/kword/oowriter/oowriterexport.h b/filters/kword/oowriter/oowriterexport.h index 3a4e77ff..8f4695b8 100644 --- a/filters/kword/oowriter/oowriterexport.h +++ b/filters/kword/oowriter/oowriterexport.h @@ -44,7 +44,7 @@ class OOWRITERExport : public KoFilter { TQ_OBJECT public: - OOWRITERExport(KoFilter *tqparent, const char *name, const TQStringList &); + OOWRITERExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~OOWRITERExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc index e1aeda78..eb3b5b85 100644 --- a/filters/kword/oowriter/oowriterimport.cc +++ b/filters/kword/oowriter/oowriterimport.cc @@ -207,7 +207,7 @@ void OoWriterImport::createStyles( TQDomDocument& doc ) if ( e.attributeNS( ooNS::style, "family", TQString() ) != "paragraph" ) continue; - // We use the style stack, to flatten out tqparent styles + // We use the style stack, to flatten out parent styles // Once KWord supports style inheritance, replace this with a single m_styleStack.push. // (We still need to use StyleStack, since that's what writeLayout/writeFormat read from) addStyles( &e ); @@ -266,13 +266,13 @@ void OoWriterImport::createStyles( TQDomDocument& doc ) } } -void OoWriterImport::parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement ) +void OoWriterImport::parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement ) { TQDomElement oldCurrentFrameset = m_currentFrameset; m_currentFrameset = currentFramesetElement; Q_ASSERT( !m_currentFrameset.isNull() ); TQDomElement t; - forEachElement( t, tqparent ) + forEachElement( t, parent ) { m_styleStack.save(); const TQString localName = t.localName(); @@ -706,11 +706,11 @@ void OoWriterImport::insertStyles( const TQDomElement& styles, TQDomDocument& do // OO spec 2.5.4. p68. Conversion to TQt format: see qdate.html // OpenCalcImport::loadFormat has similar code, but slower, intermixed with other stuff, // lacking long-textual forms. -void OoWriterImport::importDateTimeStyle( const TQDomElement& tqparent ) +void OoWriterImport::importDateTimeStyle( const TQDomElement& parent ) { TQString format; TQDomElement e; - forEachElement( e, tqparent ) + forEachElement( e, parent ) { const TQString ns = e.namespaceURI(); if ( ns != ooNS::number ) @@ -754,7 +754,7 @@ void OoWriterImport::importDateTimeStyle( const TQDomElement& tqparent ) TQString kdeFormat; TQDomElement e; - forEachElement( e, tqparent ) + forEachElement( e, parent ) { const TQString ns = e.namespaceURI(); if ( ns != ooNS::number ) @@ -791,7 +791,7 @@ void OoWriterImport::importDateTimeStyle( const TQDomElement& tqparent ) } #endif - TQString styleName = tqparent.attributeNS( ooNS::style, "name", TQString() ); + TQString styleName = parent.attributeNS( ooNS::style, "name", TQString() ); kdDebug(30518) << "datetime style: " << styleName << " qt format=" << format << endl; m_dateTimeFormats.insert( styleName, format ); } @@ -814,9 +814,9 @@ void OoWriterImport::addStyles( const TQDomElement* style ) { Q_ASSERT( style ); if ( !style ) return; - // this recursive function is necessary as tqparent styles can have parents themselves - if ( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) { - const TQString parentStyleName = style->attributeNS( ooNS::style, "tqparent-style-name", TQString() ); + // this recursive function is necessary as parent styles can have parents themselves + if ( style->hasAttributeNS( ooNS::style, "parent-style-name" ) ) { + const TQString parentStyleName = style->attributeNS( ooNS::style, "parent-style-name", TQString() ); TQDomElement* parentStyle = m_styles[ parentStyleName ]; if ( parentStyle ) addStyles( parentStyle ); @@ -1002,12 +1002,12 @@ static int numberOfParagraphs( const TQDomElement& frameset ) return paragCount; } -void OoWriterImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent, +void OoWriterImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent, TQDomElement& outputParagraph, TQDomElement& outputFormats, TQString& paragraphText, uint& pos) { - // Parse every child node of the tqparent + // Parse every child node of the parent // Can't use forEachElement here since we also care about text nodes - for( TQDomNode node ( tqparent.firstChild() ); !node.isNull(); node = node.nextSibling() ) + for( TQDomNode node ( parent.firstChild() ); !node.isNull(); node = node.nextSibling() ) { TQDomElement ts ( node.toElement() ); TQString textData; @@ -1850,7 +1850,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o { KURL url; url.setPath(href); // ### TODO: is this really right? - picture.setKeyAndDownloadPicture(url, 0); // ### TODO: find a better tqparent if possible + picture.setKeyAndDownloadPicture(url, 0); // ### TODO: find a better parent if possible } kdDebug(30518) << "Picture ready! Key: " << picture.getKey().toString() << " Size:" << picture.getOriginalSize() << endl; @@ -2188,9 +2188,9 @@ void OoWriterImport::appendKWordVariable(TQDomDocument& doc, TQDomElement& forma formats.appendChild(formatElement); } -void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement ) +void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement ) { - TQString tableName ( tqparent.attributeNS( ooNS::table, "name", TQString()) ); // TODO: what if empty (non-unique?) + TQString tableName ( parent.attributeNS( ooNS::table, "name", TQString()) ); // TODO: what if empty (non-unique?) kdDebug(30518) << "Found table " << tableName << endl; // In OOWriter a table is never inside a paragraph, in KWord it is always in a paragraph @@ -2225,7 +2225,7 @@ void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& tqparen uint col=0; columnLefts[0]=0.0; // Initialize left of first cell TQDomElement elem; - forEachElement( elem, tqparent ) + forEachElement( elem, parent ) { if ( elem.localName() == "table-column" && elem.namespaceURI() == ooNS::table ) { @@ -2275,10 +2275,10 @@ void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& tqparen uint row=0; uint column=0; - parseInsideOfTable(doc, tqparent, currentFramesetElement, tableName, columnLefts, row, column); + parseInsideOfTable(doc, parent, currentFramesetElement, tableName, columnLefts, row, column); } -void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement, +void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement, const TQString& tableName, const TQMemArray<double> & columnLefts, uint& row, uint& column ) { kdDebug(30518) << "parseInsideOfTable: columnLefts.size()=" << columnLefts.size() << endl; @@ -2290,7 +2290,7 @@ void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement& } TQDomElement e; - forEachElement( e, tqparent ) + forEachElement( e, parent ) { m_styleStack.save(); const TQString localName = e.localName(); diff --git a/filters/kword/oowriter/oowriterimport.h b/filters/kword/oowriter/oowriterimport.h index 18f57e68..80586a31 100644 --- a/filters/kword/oowriter/oowriterimport.h +++ b/filters/kword/oowriter/oowriterimport.h @@ -35,7 +35,7 @@ class OoWriterImport : public KoFilter Q_OBJECT TQ_OBJECT public: - OoWriterImport( KoFilter * tqparent, const char * name, const TQStringList & ); + OoWriterImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoWriterImport(); virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); @@ -50,7 +50,7 @@ private: void applyListStyle( TQDomDocument& doc, TQDomElement& layoutElement, const TQDomElement& paragraph ); void writeCounter( TQDomDocument& doc, TQDomElement& layoutElement, bool heading, int level, bool ordered ); TQDomElement parseParagraph( TQDomDocument& doc, const TQDomElement& paragraph ); - void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent, TQDomElement& kwordParagraph, TQDomElement& kwordFormats, TQString& paragraphText, uint& pos); + void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent, TQDomElement& kwordParagraph, TQDomElement& kwordFormats, TQString& paragraphText, uint& pos); // Reads from m_styleStack, writes the text properties to parentElement void writeFormat( TQDomDocument& doc, TQDomElement& parentElement, int id, int pos, int length ); // Reads from m_styleStack, writes the paragraph properties to layoutElement @@ -60,12 +60,12 @@ private: void createStyles( TQDomDocument &doc ); void createDocumentInfo( TQDomDocument &docinfo ); void createDocumentContent( TQDomDocument &doccontent, TQDomElement& mainFramesetElement ); - void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement ); + void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement ); KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc); KoFilter::ConversiontqStatus openFile(); bool createStyleMap( const TQDomDocument & styles, TQDomDocument& doc ); void insertStyles( const TQDomElement& element, TQDomDocument& doc ); - void importDateTimeStyle( const TQDomElement& tqparent ); + void importDateTimeStyle( const TQDomElement& parent ); void fillStyleStack( const TQDomElement& object, const char* nsURI, const TQString& attrName ); void addStyles( const TQDomElement* style ); void importFootnotesConfiguration( TQDomDocument& doc, const TQDomElement& elem, bool endnote ); @@ -82,8 +82,8 @@ private: const TQString& key, int type, TQDomElement& child); void appendBookmark( TQDomDocument& doc, int paragId, int pos, const TQString& name ); void appendBookmark( TQDomDocument& doc, int paragId, int pos, int endParagId, int endPos, const TQString& name ); - void parseTable( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement ); - void parseInsideOfTable( TQDomDocument &doc, const TQDomElement& tqparent, TQDomElement& currentFramesetElement, + void parseTable( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement ); + void parseInsideOfTable( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement, const TQString& tableName, const TQMemArray<double> & columnLefts, uint& row, uint& column ); static TQString kWordStyleName( const TQString& ooStyleName ); diff --git a/filters/kword/palmdoc/palmdocexport.h b/filters/kword/palmdoc/palmdocexport.h index f63bed73..fd2a1140 100644 --- a/filters/kword/palmdoc/palmdocexport.h +++ b/filters/kword/palmdoc/palmdocexport.h @@ -30,7 +30,7 @@ class PalmDocExport : public KoFilter public: - PalmDocExport(KoFilter *tqparent, const char *name, const TQStringList&); + PalmDocExport(KoFilter *parent, const char *name, const TQStringList&); PalmDocExport(); virtual ~PalmDocExport() {} diff --git a/filters/kword/palmdoc/palmdocimport.h b/filters/kword/palmdoc/palmdocimport.h index 0f934933..a97f9729 100644 --- a/filters/kword/palmdoc/palmdocimport.h +++ b/filters/kword/palmdoc/palmdocimport.h @@ -32,7 +32,7 @@ class PalmDocImport : public KoFilter public: - PalmDocImport(KoFilter *tqparent, const char *name, const TQStringList&); + PalmDocImport(KoFilter *parent, const char *name, const TQStringList&); PalmDocImport(); virtual ~PalmDocImport() {} diff --git a/filters/kword/pdf/FilterDevice.cpp b/filters/kword/pdf/FilterDevice.cpp index b47770c6..5182f188 100644 --- a/filters/kword/pdf/FilterDevice.cpp +++ b/filters/kword/pdf/FilterDevice.cpp @@ -255,7 +255,7 @@ uint Device::initImage(GfxState *state, int width, int height, { // get image tqgeometry Image image; - image.tqmask = withMask; + image.mask = withMask; computeGeometry(state, image); // check if new image @@ -263,17 +263,17 @@ uint Device::initImage(GfxState *state, int width, int height, // << " " << _currentImage.rect.left() // << " " << _currentImage.rect.right() // << " " << _currentImage.rect.bottom() -// << " " << _currentImage.tqmask << endl; +// << " " << _currentImage.mask << endl; // kdDebug(30516) << "new image " << width // << " " << image.rect.left() << " " << image.rect.right() // << " " << image.rect.top() -// << " " << image.tqmask << endl; +// << " " << image.mask << endl; if ( !_currentImage.image.isNull() && (_currentImage.image.width()!=width || !equal(image.rect.left(), _currentImage.rect.left()) || !equal(image.rect.right(), _currentImage.rect.right()) || !equal(image.rect.top(), _currentImage.rect.bottom()) - || image.tqmask!=_currentImage.tqmask) ) + || image.mask!=_currentImage.mask) ) addImage(); uint offset = @@ -335,7 +335,7 @@ void Device::drawImageMask(GfxState *state, Object *, Stream *str, int width, int height, GBool invert, GBool inlineImg) { - kdDebug(30516) << "image tqmask ! kind=" << str->getKind() + kdDebug(30516) << "image mask ! kind=" << str->getKind() << "inline=" << inlineImg << endl; if ( !_data.options().importImages ) return; diff --git a/filters/kword/pdf/FilterDevice.h b/filters/kword/pdf/FilterDevice.h index 7c4590fa..be106d8d 100644 --- a/filters/kword/pdf/FilterDevice.h +++ b/filters/kword/pdf/FilterDevice.h @@ -96,7 +96,7 @@ public: private: class Image; static void computeGeometry(GfxState *, Image &); - uint initImage(GfxState *, int width, int height, bool tqmask); + uint initImage(GfxState *, int width, int height, bool mask); void addImage(); void clear(); static DPathVector convertPath(GfxState *); @@ -112,7 +112,7 @@ private: public: TQImage image; DRect rect; - bool tqmask; + bool mask; }; Image _currentImage; typedef TQValueList<Image> ImageList; diff --git a/filters/kword/pdf/dialog.h b/filters/kword/pdf/dialog.h index 128f9b18..a5b6150a 100644 --- a/filters/kword/pdf/dialog.h +++ b/filters/kword/pdf/dialog.h @@ -82,7 +82,7 @@ class Dialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - Dialog(uint nbPages, bool isEncrypted, TQWidget *tqparent); + Dialog(uint nbPages, bool isEncrypted, TQWidget *parent); ~Dialog(); Options options() const; diff --git a/filters/kword/pdf/pdfimport.h b/filters/kword/pdf/pdfimport.h index 66b68525..9686714e 100644 --- a/filters/kword/pdf/pdfimport.h +++ b/filters/kword/pdf/pdfimport.h @@ -31,7 +31,7 @@ class PdfImport : public KoFilter Q_OBJECT TQ_OBJECT public: - PdfImport(KoFilter *tqparent, const char *name, const TQStringList&); + PdfImport(KoFilter *parent, const char *name, const TQStringList&); KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kword/pdf/xpdf/xpdf/FontFile.cc b/filters/kword/pdf/xpdf/xpdf/FontFile.cc index 28396338..73a7f1d3 100644 --- a/filters/kword/pdf/xpdf/xpdf/FontFile.cc +++ b/filters/kword/pdf/xpdf/xpdf/FontFile.cc @@ -1111,7 +1111,7 @@ void Type1CFontFile::convertToType0(const char *psName, (*outputFunc)(outputStream, "cleartomark\n", 12); } - // write the Type 0 tqparent font + // write the Type 0 parent font (*outputFunc)(outputStream, "16 dict begin\n", 14); (*outputFunc)(outputStream, "/FontName /", 11); (*outputFunc)(outputStream, psName, strlen(psName)); @@ -1572,7 +1572,7 @@ void Type1CFontFile::cvtGlyph(const Guchar *s, int n) { } i += 2; nOps = 0; - } else if (s[i] == 19) { // hinttqmask + } else if (s[i] == 19) { // hintmask // ignored if (first) { cvtGlyphWidth(nOps == 1); @@ -1580,14 +1580,14 @@ void Type1CFontFile::cvtGlyph(const Guchar *s, int n) { } if (nOps > 0) { if (nOps & 1) { - error(-1, "Wrong number of args (%d) to Type 2 hinttqmask/vstemhm", + error(-1, "Wrong number of args (%d) to Type 2 hintmask/vstemhm", nOps); } nHints += nOps / 2; } i += 1 + ((nHints + 7) >> 3); nOps = 0; - } else if (s[i] == 20) { // cntrtqmask + } else if (s[i] == 20) { // cntrmask // ignored if (first) { cvtGlyphWidth(nOps == 1); @@ -1595,7 +1595,7 @@ void Type1CFontFile::cvtGlyph(const Guchar *s, int n) { } if (nOps > 0) { if (nOps & 1) { - error(-1, "Wrong number of args (%d) to Type 2 cntrtqmask/vstemhm", + error(-1, "Wrong number of args (%d) to Type 2 cntrmask/vstemhm", nOps); } nHints += nOps / 2; @@ -3063,7 +3063,7 @@ void TrueTypeFontFile::convertToType0(const char *name, const Gushort *cidMap, "FontName currentdict end definefont pop\n", 40); } - // write the Type 0 tqparent font + // write the Type 0 parent font (*outputFunc)(outputStream, "16 dict begin\n", 14); (*outputFunc)(outputStream, "/FontName /", 11); (*outputFunc)(outputStream, name, strlen(name)); diff --git a/filters/kword/pdf/xpdf/xpdf/Gfx.cc b/filters/kword/pdf/xpdf/xpdf/Gfx.cc index 53999975..7948d78a 100644 --- a/filters/kword/pdf/xpdf/xpdf/Gfx.cc +++ b/filters/kword/pdf/xpdf/xpdf/Gfx.cc @@ -2259,7 +2259,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) { Dict *dict; int width, height; int bits; - GBool tqmask; + GBool mask; GBool invert; GfxColorSpace *colorSpace; GfxImageColorMap *colorMap; @@ -2292,15 +2292,15 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) { height = obj1.getInt(); obj1.free(); - // image or tqmask? + // image or mask? dict->lookup("ImageMask", &obj1); if (obj1.isNull()) { obj1.free(); dict->lookup("IM", &obj1); } - tqmask = gFalse; + mask = gFalse; if (obj1.isBool()) - tqmask = obj1.getBool(); + mask = obj1.getBool(); else if (!obj1.isNull()) goto err2; obj1.free(); @@ -2316,10 +2316,10 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) { bits = obj1.getInt(); obj1.free(); - // display a tqmask - if (tqmask) { + // display a mask + if (mask) { - // check for inverted tqmask + // check for inverted mask if (bits != 1) goto err1; invert = gFalse; @@ -2375,7 +2375,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) { goto err1; } - // get the tqmask + // get the mask haveMask = gFalse; dict->lookup("Mask", &maskObj); if (maskObj.isArray()) { diff --git a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc index ec76e1cc..6312caca 100644 --- a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc +++ b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc @@ -682,11 +682,11 @@ GBool JBIG2HuffmanDecoder::decodeInt(int *x, JBIG2HuffmanTable *table) { } Guint JBIG2HuffmanDecoder::readBits(Guint n) { - Guint x, tqmask, nLeft; + Guint x, mask, nLeft; - tqmask = (n == 32) ? 0xffffffff : ((1 << n) - 1); + mask = (n == 32) ? 0xffffffff : ((1 << n) - 1); if (bufLen >= n) { - x = (buf >> (bufLen - n)) & tqmask; + x = (buf >> (bufLen - n)) & mask; bufLen -= n; } else { x = buf & ((1 << bufLen) - 1); @@ -1101,7 +1101,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y, for (yy = y0; yy < y1; ++yy) { - // one byte per line -- need to tqmask both left and right side + // one byte per line -- need to mask both left and right side if (oneByte) { if (x >= 0) { destPtr = data + (y + yy) * line + (x >> 3); @@ -1151,7 +1151,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y, *destPtr = dest; } - // multiple bytes per line -- need to tqmask left side of left-most + // multiple bytes per line -- need to mask left side of left-most // byte and right side of right-most byte } else { diff --git a/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc index 453b0862..34432991 100644 --- a/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc +++ b/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc @@ -72,7 +72,7 @@ void PBMOutputDev::killPBMOutputDev(PBMOutputDev *out) { delete out; - // these have to be done *after* the XOutputDev (tqparent of the + // these have to be done *after* the XOutputDev (parent of the // PBMOutputDev) is deleted, since XOutputDev::~XOutputDev() needs // them XFreePixmap(displayA, pixmapA); diff --git a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc index 671d0599..111d8717 100644 --- a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc +++ b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc @@ -315,7 +315,7 @@ static char *prolog[] = { "} def", "/pdfImM1 {", " /pdfImBuf1 4 index 7 add 8 idiv string def", - " { currentfile pdfImBuf1 readhexstring pop } imagetqmask", + " { currentfile pdfImBuf1 readhexstring pop } imagemask", "} def", "% Level 2 image operators", "/pdfImBuf 100 string def", @@ -340,7 +340,7 @@ static char *prolog[] = { " (%-EOD-) eq { exit } if } loop", "} def", "/pdfImM {", - " fCol imagetqmask", + " fCol imagemask", " { currentfile pdfImBuf readline", " not { pop exit } if", " (%-EOD-) eq { exit } if } loop", @@ -2287,7 +2287,7 @@ void PSOutputDev::doImageL1(GfxImageColorMap *colorMap, } delete imgStr; - // imagetqmask + // imagemask } else { str->reset(); i = 0; @@ -2478,7 +2478,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap, writePS(" /DataSource { 2 copy get exch 1 add exch }\n"); // end of image dictionary - writePSFmt(">>\n%s\n", colorMap ? "image" : "imagetqmask"); + writePSFmt(">>\n%s\n", colorMap ? "image" : "imagemask"); // get rid of the array and index writePS("pop pop\n"); diff --git a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc index dc37ee21..3c58f565 100644 --- a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc +++ b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc @@ -1627,7 +1627,7 @@ XOutputDev::XOutputDev(Display *displayA, int screenNumA, XVisualInfo visualTempl; XVisualInfo *visualList; int nVisuals; - Gulong tqmask; + Gulong mask; XColor xcolor; XColor *xcolors; int r, g, b, n, m; @@ -1662,18 +1662,18 @@ XOutputDev::XOutputDev(Display *displayA, int screenNumA, depth = visualList->depth; if (visualList->c_class == TrueColor) { trueColor = gTrue; - for (tqmask = visualList->red_tqmask, rShift = 0; - tqmask && !(tqmask & 1); - tqmask >>= 1, ++rShift) ; - rMul = (int)tqmask; - for (tqmask = visualList->green_tqmask, gShift = 0; - tqmask && !(tqmask & 1); - tqmask >>= 1, ++gShift) ; - gMul = (int)tqmask; - for (tqmask = visualList->blue_tqmask, bShift = 0; - tqmask && !(tqmask & 1); - tqmask >>= 1, ++bShift) ; - bMul = (int)tqmask; + for (mask = visualList->red_mask, rShift = 0; + mask && !(mask & 1); + mask >>= 1, ++rShift) ; + rMul = (int)mask; + for (mask = visualList->green_mask, gShift = 0; + mask && !(mask & 1); + mask >>= 1, ++gShift) ; + gMul = (int)mask; + for (mask = visualList->blue_mask, bShift = 0; + mask && !(mask & 1); + mask >>= 1, ++bShift) ; + bMul = (int)mask; } else { trueColor = gFalse; } @@ -3162,7 +3162,7 @@ void XOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, XGetSubImage(display, pixmap, cx0, cy0, cw, ch, (1 << depth) - 1, ZPixmap, image, cx1, cy1); - // get tqmask color + // get mask color state->getFillRGB(&rgb); if (reverseVideo) { rgb.r = 1 - rgb.r; diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc index 5c53ade1..8376ce97 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc +++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc @@ -302,7 +302,7 @@ int XPDFCore::loadFile(GString *fileName, GString *ownerPassword, // save the modification time modTime = getModTime(doc->getFileName()->getCString()); - // update the tqparent window + // update the parent window if (updateCbk) { (*updateCbk)(updateCbkData, doc->getFileName(), -1, doc->getNumPages(), NULL); @@ -495,7 +495,7 @@ void XPDFCore::displayPage(int pageA, int zoomA, int rotateA, historyFLen = 0; } - // update the tqparent window + // update the parent window if (updateCbk) { (*updateCbk)(updateCbkData, NULL, page, -1, ""); } diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h index adc7f507..348486f0 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h +++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h @@ -229,7 +229,7 @@ private: Visual *visual; Colormap colormap; Widget shell; // top-level shell containing the widget - Widget parentWidget; // tqparent widget (not created by XPDFCore) + Widget parentWidget; // parent widget (not created by XPDFCore) Widget scrolledWin; Widget hScrollBar; Widget vScrollBar; diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc index 28e01de6..290861b9 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc +++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc @@ -393,7 +393,7 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget, XtWidgetGeometry *reply) { XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(newWidget); - // our tqparent rejected a tqgeometry request, so accept the compromise + // our parent rejected a tqgeometry request, so accept the compromise // and retqlayout if (!reply->request_mode) { if (cls->treeClass.tqlayout) { @@ -480,7 +480,7 @@ static XtGeometryResult geometryManager(Widget widget, calcSize((Widget)w, widget, &parentReq.width, &reply->height); } - // send tqgeometry request to our tqparent + // send tqgeometry request to our parent parentReq.request_mode = CWWidth | CWHeight; if (request->request_mode & XtCWQueryOnly) { parentReq.request_mode |= XtCWQueryOnly; @@ -524,7 +524,7 @@ static void changeManaged(Widget widget) { calcSize(widget, NULL, &width, &height); } - // make resize request to tqparent -- keep asking until we get a yes + // make resize request to parent -- keep asking until we get a yes // or no while (XtMakeResizeRequest(widget, width, height, &width, &height) == XtGeometryAlmost) ; @@ -629,7 +629,7 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget, calcSize((Widget)w, NULL, &width, &height); } - // make resize request to tqparent -- keep asking until we get a yes + // make resize request to parent -- keep asking until we get a yes // or no while (XtMakeResizeRequest((Widget)w, width, height, &width, &height) == XtGeometryAlmost) ; @@ -923,7 +923,7 @@ static Boolean findPositionInSubtree(XPDFTreeWidget w, int x, int y, return False; } -Widget XPDFCreateTree(Widget tqparent, char *name, +Widget XPDFCreateTree(Widget parent, char *name, ArgList argList, Cardinal numArgs) { - return XtCreateWidget(name, xpdfTreeWidgetClass, tqparent, argList, numArgs); + return XtCreateWidget(name, xpdfTreeWidgetClass, parent, argList, numArgs); } diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.h b/filters/kword/pdf/xpdf/xpdf/XPDFTree.h index 93e3fb77..d569f498 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.h +++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.h @@ -35,7 +35,7 @@ typedef struct { Widget selectedItem; } XPDFTreeSelectCallbackStruct; -extern Widget XPDFCreateTree(Widget tqparent, char *name, +extern Widget XPDFCreateTree(Widget parent, char *name, ArgList argList, Cardinal argCount); } // extern "C" diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc index a75830b8..de691914 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc +++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc @@ -1484,7 +1484,7 @@ void XPDFViewer::setupOutline() { XtManageChildren(outlineLabels, outlineLabelsLength); } -void XPDFViewer::setupOutlineItems(GList *items, Widget tqparent, +void XPDFViewer::setupOutlineItems(GList *items, Widget parent, UnicodeMap *uMap) { OutlineItem *item; GList *kids; @@ -1504,8 +1504,8 @@ void XPDFViewer::setupOutlineItems(GList *items, Widget tqparent, } n = 0; XtSetArg(args[n], XPDFNentryPosition, i); ++n; - if (tqparent) { - XtSetArg(args[n], XPDFNentryParent, tqparent); ++n; + if (parent) { + XtSetArg(args[n], XPDFNentryParent, parent); ++n; } XtSetArg(args[n], XPDFNentryExpanded, item->isOpen()); ++n; s = XmStringCreateLocalized(title->getCString()); diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h index b9b0b2da..77875c41 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h +++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h @@ -124,7 +124,7 @@ private: //----- GUI code: outline #ifndef DISABLE_OUTLINE void setupOutline(); - void setupOutlineItems(GList *items, Widget tqparent, UnicodeMap *uMap); + void setupOutlineItems(GList *items, Widget parent, UnicodeMap *uMap); static void outlineSelectCbk(Widget widget, XtPointer ptr, XtPointer callData); #endif diff --git a/filters/kword/rtf/export/rtfexport.h b/filters/kword/rtf/export/rtfexport.h index e5276f1a..060139ed 100644 --- a/filters/kword/rtf/export/rtfexport.h +++ b/filters/kword/rtf/export/rtfexport.h @@ -36,7 +36,7 @@ class RTFExport : public KoFilter { TQ_OBJECT public: - RTFExport(KoFilter *tqparent, const char *name, const TQStringList &); + RTFExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~RTFExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp index 2526a6b0..94fad697 100644 --- a/filters/kword/rtf/import/rtfimport.cpp +++ b/filters/kword/rtf/import/rtfimport.cpp @@ -1583,7 +1583,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName ) kdDebug(30515) << "Path: " << url.prettyURL() << endl; KoPicture pic; - pic.setKeyAndDownloadPicture(url, 0); // ### TODO: find a better tqparent if possible + pic.setKeyAndDownloadPicture(url, 0); // ### TODO: find a better parent if possible if (pic.isNull()) { kdError(30515) << "Import field: file is empty: " << rawFileName << endl; diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h index fd39b435..bf4f20b7 100644 --- a/filters/kword/rtf/import/rtfimport.h +++ b/filters/kword/rtf/import/rtfimport.h @@ -247,7 +247,7 @@ class RTFImport : public KoFilter TQ_OBJECT public: - RTFImport( KoFilter *tqparent, const char *name, const TQStringList& ); + RTFImport( KoFilter *parent, const char *name, const TQStringList& ); /** * Convert document from RTF to KWord format. diff --git a/filters/kword/starwriter/pole.cpp b/filters/kword/starwriter/pole.cpp index 96b3e82c..d9751e15 100644 --- a/filters/kword/starwriter/pole.cpp +++ b/filters/kword/starwriter/pole.cpp @@ -31,7 +31,7 @@ namespace POLE class Entry { public: - Entry* tqparent; + Entry* parent; std::string name; unsigned long size; unsigned start; @@ -153,7 +153,7 @@ class StorageIO unsigned long loadSmallBlock( unsigned long block, unsigned char* buffer, unsigned long maxlen ); /// construct directory tree - Entry* buildTree( Entry* tqparent, int index, const unsigned char* dirent ); + Entry* buildTree( Entry* parent, int index, const unsigned char* dirent ); std::string fullName( Entry* e ); @@ -619,7 +619,7 @@ unsigned long StorageIO::loadSmallBlock( unsigned long block, } // recursive function to construct directory tree -Entry* StorageIO::buildTree( Entry* tqparent, int index, const unsigned char* dirent ) +Entry* StorageIO::buildTree( Entry* parent, int index, const unsigned char* dirent ) { Entry* entry = (Entry*) 0L; @@ -656,12 +656,12 @@ Entry* StorageIO::buildTree( Entry* tqparent, int index, const unsigned char* di entry->size = readU32( dirent + 0x78+p ); // append as another child - entry->tqparent = tqparent; - if( tqparent ) tqparent->tqchildren.push_back( entry ); + entry->parent = parent; + if( parent ) parent->tqchildren.push_back( entry ); // check previous int prev = readU32( dirent + 0x44+p ); - if( prev >= 0 ) buildTree( tqparent, prev, dirent ); + if( prev >= 0 ) buildTree( parent, prev, dirent ); // traverse to sub int dir = readU32( dirent + 0x4C+p ); @@ -670,7 +670,7 @@ Entry* StorageIO::buildTree( Entry* tqparent, int index, const unsigned char* di // check next int next = readU32( dirent + 0x48+p ); - if( next >= 0 ) buildTree( tqparent, next, dirent ); + if( next >= 0 ) buildTree( parent, next, dirent ); return entry; } @@ -681,11 +681,11 @@ std::string StorageIO::fullName( Entry* e ) std::string result; - while( e->tqparent ) + while( e->parent ) { result.insert( 0, e->name ); result.insert( 0, "/" ); - e = e->tqparent; + e = e->parent; } // don't use specified root name (like "Root Entry") @@ -750,7 +750,7 @@ StreamIO::StreamIO( StorageIO* _io, Entry* _entry ): updateCache(); } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone StreamIO::~StreamIO() { delete[] cache_data; @@ -951,9 +951,9 @@ void Storage::leaveDirectory() if( !io ) return; if( !io->current_dir ) return; - Entry* tqparent = io->current_dir->tqparent; - if( tqparent ) if( tqparent->dir ) - io->current_dir = tqparent; + Entry* parent = io->current_dir->parent; + if( parent ) if( parent->dir ) + io->current_dir = parent; } // note: without trailing "/" @@ -993,7 +993,7 @@ Stream::Stream( StreamIO* _io ): { } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone Stream::~Stream() { delete io; diff --git a/filters/kword/starwriter/starwriterimport.h b/filters/kword/starwriter/starwriterimport.h index acb91a02..b030c2ba 100644 --- a/filters/kword/starwriter/starwriterimport.h +++ b/filters/kword/starwriter/starwriterimport.h @@ -32,7 +32,7 @@ class StarWriterImport: public KoFilter TQ_OBJECT public: - StarWriterImport(KoFilter *tqparent, const char *name, const TQStringList&); + StarWriterImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~StarWriterImport(); KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kword/wml/wmlexport.h b/filters/kword/wml/wmlexport.h index 0fbd4f45..8d3a105e 100644 --- a/filters/kword/wml/wmlexport.h +++ b/filters/kword/wml/wmlexport.h @@ -30,7 +30,7 @@ class WMLExport : public KoFilter public: - WMLExport(KoFilter *tqparent, const char *name, const TQStringList&); + WMLExport(KoFilter *parent, const char *name, const TQStringList&); WMLExport(); virtual ~WMLExport() {} diff --git a/filters/kword/wml/wmlimport.h b/filters/kword/wml/wmlimport.h index 903cb9e0..049ff8db 100644 --- a/filters/kword/wml/wmlimport.h +++ b/filters/kword/wml/wmlimport.h @@ -32,7 +32,7 @@ class WMLImport : public KoFilter public: - WMLImport(KoFilter *tqparent, const char *name, const TQStringList&); + WMLImport(KoFilter *parent, const char *name, const TQStringList&); WMLImport(); virtual ~WMLImport() {} diff --git a/filters/kword/wordperfect/export/wpexport.h b/filters/kword/wordperfect/export/wpexport.h index 4c819ba4..55f43a47 100644 --- a/filters/kword/wordperfect/export/wpexport.h +++ b/filters/kword/wordperfect/export/wpexport.h @@ -30,7 +30,7 @@ class WPExport : public KoFilter public: - WPExport(KoFilter *tqparent, const char *name, const TQStringList&); + WPExport(KoFilter *parent, const char *name, const TQStringList&); WPExport(); virtual ~WPExport() {} diff --git a/filters/kword/wordperfect/import/TextRunStyle.cxx b/filters/kword/wordperfect/import/TextRunStyle.cxx index 2860df9a..702dddb5 100644 --- a/filters/kword/wordperfect/import/TextRunStyle.cxx +++ b/filters/kword/wordperfect/import/TextRunStyle.cxx @@ -58,7 +58,7 @@ void ParagraphStyle::write(DocumentHandler &xHandler) const WPXPropertyList propList; propList.insert("style:name", msName.cstr()); propList.insert("style:family", "paragraph"); - propList.insert("style:tqparent-style-name", (*mpPropList)["style:tqparent-style-name"]->getStr()); + propList.insert("style:parent-style-name", (*mpPropList)["style:parent-style-name"]->getStr()); if ((*mpPropList)["style:master-page-name"]) propList.insert("style:master-page-name", (*mpPropList)["style:master-page-name"]->getStr()); xHandler.startElement("style:style", propList); diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.cxx b/filters/kword/wordperfect/import/WordPerfectCollector.cxx index bfcd4359..33fb4816 100644 --- a/filters/kword/wordperfect/import/WordPerfectCollector.cxx +++ b/filters/kword/wordperfect/import/WordPerfectCollector.cxx @@ -178,7 +178,7 @@ void WordPerfectCollector::_writeDefaultStyles(DocumentHandler &xHandler) TagOpenElement textBodyStyleOpenElement("style:style"); textBodyStyleOpenElement.addAttribute("style:name", "Text Body"); textBodyStyleOpenElement.addAttribute("style:family", "paragraph"); - textBodyStyleOpenElement.addAttribute("style:tqparent-style-name", "Standard"); + textBodyStyleOpenElement.addAttribute("style:parent-style-name", "Standard"); textBodyStyleOpenElement.addAttribute("style:class", "text"); textBodyStyleOpenElement.write(xHandler); TagCloseElement textBodyStyleCloseElement("style:style"); @@ -187,7 +187,7 @@ void WordPerfectCollector::_writeDefaultStyles(DocumentHandler &xHandler) TagOpenElement tableContentsStyleOpenElement("style:style"); tableContentsStyleOpenElement.addAttribute("style:name", "Table Contents"); tableContentsStyleOpenElement.addAttribute("style:family", "paragraph"); - tableContentsStyleOpenElement.addAttribute("style:tqparent-style-name", "Text Body"); + tableContentsStyleOpenElement.addAttribute("style:parent-style-name", "Text Body"); tableContentsStyleOpenElement.addAttribute("style:class", "extra"); tableContentsStyleOpenElement.write(xHandler); TagCloseElement tableContentsStyleCloseElement("style:style"); @@ -196,7 +196,7 @@ void WordPerfectCollector::_writeDefaultStyles(DocumentHandler &xHandler) TagOpenElement tableHeadingStyleOpenElement("style:style"); tableHeadingStyleOpenElement.addAttribute("style:name", "Table Heading"); tableHeadingStyleOpenElement.addAttribute("style:family", "paragraph"); - tableHeadingStyleOpenElement.addAttribute("style:tqparent-style-name", "Table Contents"); + tableHeadingStyleOpenElement.addAttribute("style:parent-style-name", "Table Contents"); tableHeadingStyleOpenElement.addAttribute("style:class", "extra"); tableHeadingStyleOpenElement.write(xHandler); TagCloseElement tableHeadingStyleCloseElement("style:style"); @@ -484,10 +484,10 @@ void WordPerfectCollector::openParagraph(const WPXPropertyList &propList, const { // we don't have to go through the fuss of determining if the paragraph style is // unique in this case, because if we are the first document element, then we - // are singular. Neither do we have to determine what our tqparent style is-- we can't + // are singular. Neither do we have to determine what our parent style is-- we can't // be inside a table in this case (the table would be the first document element //in that case) - pPersistPropList->insert("style:tqparent-style-name", "Standard"); + pPersistPropList->insert("style:parent-style-name", "Standard"); WPXString sName; sName.sprintf("FS"); @@ -502,12 +502,12 @@ void WordPerfectCollector::openParagraph(const WPXPropertyList &propList, const if (mWriterDocumentState.mbTableCellOpened) { if (mWriterDocumentState.mbHeaderRow) - pPersistPropList->insert("style:tqparent-style-name", "Table Heading"); + pPersistPropList->insert("style:parent-style-name", "Table Heading"); else - pPersistPropList->insert("style:tqparent-style-name", "Table Contents"); + pPersistPropList->insert("style:parent-style-name", "Table Contents"); } else - pPersistPropList->insert("style:tqparent-style-name", "Standard"); + pPersistPropList->insert("style:parent-style-name", "Standard"); WPXString sKey = getParagraphStyleKey(*pPersistPropList, tabStops); @@ -717,7 +717,7 @@ void WordPerfectCollector::openListElement(const WPXPropertyList &propList, cons WPXPropertyList *pPersistPropList = new WPXPropertyList(propList); pPersistPropList->insert("style:list-style-name", mpCurrentListStyle->getName()); - pPersistPropList->insert("style:tqparent-style-name", "Standard"); + pPersistPropList->insert("style:parent-style-name", "Standard"); WPXString sKey = getParagraphStyleKey(*pPersistPropList, tabStops); diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc index f462fd09..460915af 100644 --- a/filters/kword/wordperfect/import/wpimport.cc +++ b/filters/kword/wordperfect/import/wpimport.cc @@ -300,14 +300,14 @@ KoFilter::ConversiontqStatus WPImport::convert( const TQCString& from, const TQC <style:default-style style:family=\"table-row\"/>\ <style:default-style style:family=\"table-column\"/>\ <style:style style:name=\"Standard\" style:family=\"paragraph\" style:class=\"text\"/>\ -<style:style style:name=\"Text body\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"text\"/>\ -<style:style style:name=\"List\" style:family=\"paragraph\" style:tqparent-style-name=\"Text body\" style:class=\"list\"/>\ -<style:style style:name=\"Header\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\ -<style:style style:name=\"Footer\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\ -<style:style style:name=\"Caption\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\ -<style:style style:name=\"Footnote\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\ -<style:style style:name=\"Endnote\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"extra\"/>\ -<style:style style:name=\"Index\" style:family=\"paragraph\" style:tqparent-style-name=\"Standard\" style:class=\"index\"/>\ +<style:style style:name=\"Text body\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"text\"/>\ +<style:style style:name=\"List\" style:family=\"paragraph\" style:parent-style-name=\"Text body\" style:class=\"list\"/>\ +<style:style style:name=\"Header\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\ +<style:style style:name=\"Footer\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\ +<style:style style:name=\"Caption\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\ +<style:style style:name=\"Footnote\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\ +<style:style style:name=\"Endnote\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"extra\"/>\ +<style:style style:name=\"Index\" style:family=\"paragraph\" style:parent-style-name=\"Standard\" style:class=\"index\"/>\ <style:style style:name=\"Footnote Symbol\" style:family=\"text\">\ <style:properties style:text-position=\"super 58%\"/>\ </style:style>\ diff --git a/filters/kword/wordperfect/import/wpimport.h b/filters/kword/wordperfect/import/wpimport.h index 862b7683..02cd323d 100644 --- a/filters/kword/wordperfect/import/wpimport.h +++ b/filters/kword/wordperfect/import/wpimport.h @@ -43,7 +43,7 @@ class WPImport : public KoFilter public: - WPImport(KoFilter *tqparent, const char *name, const TQStringList&); + WPImport(KoFilter *parent, const char *name, const TQStringList&); WPImport(); virtual ~WPImport() {} diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp index adce4a56..f079e2a5 100644 --- a/filters/libdialogfilter/exportsizedia.cpp +++ b/filters/libdialogfilter/exportsizedia.cpp @@ -37,8 +37,8 @@ ExportSizeDia::ExportSizeDia( int width, int height, - TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, + TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("Export Filter Parameters" ), Ok|Cancel ) { kapp->restoreOverrideCursor(); diff --git a/filters/libdialogfilter/exportsizedia.h b/filters/libdialogfilter/exportsizedia.h index 2eba6ccb..6d6459cc 100644 --- a/filters/libdialogfilter/exportsizedia.h +++ b/filters/libdialogfilter/exportsizedia.h @@ -37,7 +37,7 @@ class ExportSizeDia : public KDialogBase public: ExportSizeDia( int width, int height, - TQWidget *tqparent=0L, const char *name=0L ); + TQWidget *parent=0L, const char *name=0L ); ~ExportSizeDia(); int width() const; diff --git a/filters/olefilters/lib/klaola.cc b/filters/olefilters/lib/klaola.cc index 80f57f0f..28af157c 100644 --- a/filters/olefilters/lib/klaola.cc +++ b/filters/olefilters/lib/klaola.cc @@ -512,7 +512,7 @@ TQString KLaola::Node::describe() const description += ", OLE_2"; break; case PARENT_MANAGED: - description += ", tqparent managed"; + description += ", parent managed"; break; case STRUCTURED_STORAGE: description += ", reserved 0x" + TQString::number(m_prefix, 16); diff --git a/filters/olefilters/lib/klaola.h b/filters/olefilters/lib/klaola.h index fd44aa56..ab1e95b4 100644 --- a/filters/olefilters/lib/klaola.h +++ b/filters/olefilters/lib/klaola.h @@ -124,7 +124,7 @@ public: CLSID, OLE_MANAGED_2, PARENT_MANAGED, // Marks an element as owned by the code that - // manages the tqparent storage of that element. + // manages the parent storage of that element. STRUCTURED_STORAGE, // For the exclusive use of the Structured Storage // implementation. RESERVED_FIRST, diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc index 9d1ded51..ef4f6cd0 100644 --- a/filters/olefilters/olefilter.cc +++ b/filters/olefilters/olefilter.cc @@ -19,7 +19,7 @@ DESCRIPTION When reading, the point of this module is toperform a depth-first traversal - of an OLE file. This ensures that a tqparent object is processed only after + of an OLE file. This ensures that a parent object is processed only after its child objects have been processed. */ diff --git a/filters/olefilters/olefilter.h b/filters/olefilters/olefilter.h index 0be2a8ba..80a03737 100644 --- a/filters/olefilters/olefilter.h +++ b/filters/olefilters/olefilter.h @@ -36,7 +36,7 @@ class OLEFilter : public KoEmbeddingFilter { TQ_OBJECT public: - OLEFilter(KoFilter *tqparent, const char *name, const TQStringList&); + OLEFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~OLEFilter(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/xsltfilter/export/xsltexport.h b/filters/xsltfilter/export/xsltexport.h index 24ee3044..eac9712a 100644 --- a/filters/xsltfilter/export/xsltexport.h +++ b/filters/xsltfilter/export/xsltexport.h @@ -29,7 +29,7 @@ class XSLTExport : public KoFilter TQ_OBJECT public: - XSLTExport(KoFilter *tqparent, const char *name, const TQStringList&); + XSLTExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XSLTExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index b77e9128..2f9f4fc6 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -42,14 +42,14 @@ #endif*/ /* - * Constructs a XSLTExportDia which is a child of 'tqparent', with the + * Constructs a XSLTExportDia which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidget* tqparent, const char* name_, bool modal, WFlags fl ) - : XSLTDialog( tqparent, name_, modal, fl ) +XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidget* parent, const char* name_, bool modal, WFlags fl ) + : XSLTDialog( parent, name_, modal, fl ) { int i = 0; _in = in; diff --git a/filters/xsltfilter/export/xsltexportdia.h b/filters/xsltfilter/export/xsltexportdia.h index 31491d71..9fd80870 100644 --- a/filters/xsltfilter/export/xsltexportdia.h +++ b/filters/xsltfilter/export/xsltexportdia.h @@ -47,7 +47,7 @@ class XSLTExportDia : public XSLTDialog TQStringList _namesList; public: - XSLTExportDia( KoStoreDevice*, const TQCString &format, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + XSLTExportDia( KoStoreDevice*, const TQCString &format, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~XSLTExportDia(); void setOutputFile(TQString file) { _fileOut = file; } diff --git a/filters/xsltfilter/import/xsltimport.h b/filters/xsltfilter/import/xsltimport.h index 22b89941..fead8d80 100644 --- a/filters/xsltfilter/import/xsltimport.h +++ b/filters/xsltfilter/import/xsltimport.h @@ -35,7 +35,7 @@ class XSLTImport : public KoFilter TQ_OBJECT public: - XSLTImport(KoFilter *tqparent, const char *name, const TQStringList&); + XSLTImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XSLTImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc index 0d55c309..2e278bf2 100644 --- a/filters/xsltfilter/import/xsltimportdia.cc +++ b/filters/xsltfilter/import/xsltimportdia.cc @@ -39,14 +39,14 @@ #include <xsltproc.h> /* - * Constructs a XSLTImportDia which is a child of 'tqparent', with the + * Constructs a XSLTImportDia which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* tqparent, const char* name_, bool modal, WFlags fl ) - : XSLTDialog( tqparent, name_, modal, fl ) +XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* parent, const char* name_, bool modal, WFlags fl ) + : XSLTDialog( parent, name_, modal, fl ) { int i = 0; _out = out; diff --git a/filters/xsltfilter/import/xsltimportdia.h b/filters/xsltfilter/import/xsltimportdia.h index 1b6a507b..48060638 100644 --- a/filters/xsltfilter/import/xsltimportdia.h +++ b/filters/xsltfilter/import/xsltimportdia.h @@ -47,7 +47,7 @@ class XSLTImportDia : public XSLTDialog TQStringList _namesList; public: - XSLTImportDia(KoStore*, const TQCString &format, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + XSLTImportDia(KoStore*, const TQCString &format, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~XSLTImportDia(); void setInputFile(TQString file) { _fileIn = file; } |