diff options
Diffstat (limited to 'filters')
229 files changed, 409 insertions, 409 deletions
diff --git a/filters/chalk/gmagick/magickexport.cpp b/filters/chalk/gmagick/magickexport.cpp index e56f53d2..2c49532a 100644 --- a/filters/chalk/gmagick/magickexport.cpp +++ b/filters/chalk/gmagick/magickexport.cpp @@ -39,7 +39,7 @@ MagickExport::~MagickExport() { } -KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/gmagick/magickexport.h b/filters/chalk/gmagick/magickexport.h index 46a080f4..b1b73bb5 100644 --- a/filters/chalk/gmagick/magickexport.h +++ b/filters/chalk/gmagick/magickexport.h @@ -30,7 +30,7 @@ public: virtual ~MagickExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKEXPORT_H_ diff --git a/filters/chalk/gmagick/magickimport.cpp b/filters/chalk/gmagick/magickimport.cpp index dbfe6da8..9400c5bd 100644 --- a/filters/chalk/gmagick/magickimport.cpp +++ b/filters/chalk/gmagick/magickimport.cpp @@ -41,7 +41,7 @@ MagickImport::~MagickImport() { } -KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using MagickImport!\n"; diff --git a/filters/chalk/gmagick/magickimport.h b/filters/chalk/gmagick/magickimport.h index 22bf3002..6ade3a20 100644 --- a/filters/chalk/gmagick/magickimport.h +++ b/filters/chalk/gmagick/magickimport.h @@ -30,7 +30,7 @@ public: virtual ~MagickImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKIMPORT_H_ diff --git a/filters/chalk/jpeg/kis_jpeg_export.cc b/filters/chalk/jpeg/kis_jpeg_export.cc index edfbbc02..c0eef02d 100644 --- a/filters/chalk/jpeg/kis_jpeg_export.cc +++ b/filters/chalk/jpeg/kis_jpeg_export.cc @@ -85,7 +85,7 @@ KisJPEGExport::~KisJPEGExport() { } -KoFilter::ConversiontqStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "JPEG export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/jpeg/kis_jpeg_export.h b/filters/chalk/jpeg/kis_jpeg_export.h index ea55c12c..918c44b5 100644 --- a/filters/chalk/jpeg/kis_jpeg_export.h +++ b/filters/chalk/jpeg/kis_jpeg_export.h @@ -29,7 +29,7 @@ class KisJPEGExport : public KoFilter { KisJPEGExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisJPEGExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/jpeg/kis_jpeg_import.cc b/filters/chalk/jpeg/kis_jpeg_import.cc index 2ca7c4c2..bacec679 100644 --- a/filters/chalk/jpeg/kis_jpeg_import.cc +++ b/filters/chalk/jpeg/kis_jpeg_import.cc @@ -41,7 +41,7 @@ KisJPEGImport::~KisJPEGImport() { } -KoFilter::ConversiontqStatus KisJPEGImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus KisJPEGImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using JPEGImport!\n"; diff --git a/filters/chalk/jpeg/kis_jpeg_import.h b/filters/chalk/jpeg/kis_jpeg_import.h index a32c367f..9db52292 100644 --- a/filters/chalk/jpeg/kis_jpeg_import.h +++ b/filters/chalk/jpeg/kis_jpeg_import.h @@ -28,7 +28,7 @@ class KisJPEGImport : public KoFilter { KisJPEGImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisJPEGImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui index cb405324..40a6c32a 100644 --- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui +++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui @@ -136,7 +136,7 @@ Enabling progressive will cause the image to be displayed by the browser even wh <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>61</height> diff --git a/filters/chalk/magick/magickexport.cpp b/filters/chalk/magick/magickexport.cpp index 09f351c1..8c1e3365 100644 --- a/filters/chalk/magick/magickexport.cpp +++ b/filters/chalk/magick/magickexport.cpp @@ -39,7 +39,7 @@ MagickExport::~MagickExport() { } -KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/magick/magickexport.h b/filters/chalk/magick/magickexport.h index 46a080f4..b1b73bb5 100644 --- a/filters/chalk/magick/magickexport.h +++ b/filters/chalk/magick/magickexport.h @@ -30,7 +30,7 @@ public: virtual ~MagickExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKEXPORT_H_ diff --git a/filters/chalk/magick/magickimport.cpp b/filters/chalk/magick/magickimport.cpp index b5f73d19..d3e5bbb9 100644 --- a/filters/chalk/magick/magickimport.cpp +++ b/filters/chalk/magick/magickimport.cpp @@ -41,7 +41,7 @@ MagickImport::~MagickImport() { } -KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using MagickImport!\n"; diff --git a/filters/chalk/magick/magickimport.h b/filters/chalk/magick/magickimport.h index 22bf3002..6ade3a20 100644 --- a/filters/chalk/magick/magickimport.h +++ b/filters/chalk/magick/magickimport.h @@ -30,7 +30,7 @@ public: virtual ~MagickImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKIMPORT_H_ diff --git a/filters/chalk/openexr/kis_openexr_export.cpp b/filters/chalk/openexr/kis_openexr_export.cpp index 4859f5d9..062a072f 100644 --- a/filters/chalk/openexr/kis_openexr_export.cpp +++ b/filters/chalk/openexr/kis_openexr_export.cpp @@ -57,7 +57,7 @@ KisOpenEXRExport::~KisOpenEXRExport() { } -KoFilter::ConversiontqStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to) { if (to != "image/x-exr" || from != "application/x-chalk") { return KoFilter::NotImplemented; diff --git a/filters/chalk/openexr/kis_openexr_export.h b/filters/chalk/openexr/kis_openexr_export.h index 7f0c71f9..ea62421c 100644 --- a/filters/chalk/openexr/kis_openexr_export.h +++ b/filters/chalk/openexr/kis_openexr_export.h @@ -31,7 +31,7 @@ public: virtual ~KisOpenEXRExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // KIS_OPENEXR_EXPORT_H_ diff --git a/filters/chalk/openexr/kis_openexr_import.cpp b/filters/chalk/openexr/kis_openexr_import.cpp index 974d4a67..8546edb2 100644 --- a/filters/chalk/openexr/kis_openexr_import.cpp +++ b/filters/chalk/openexr/kis_openexr_import.cpp @@ -62,7 +62,7 @@ KisOpenEXRImport::~KisOpenEXRImport() { } -KoFilter::ConversiontqStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to) { if (from != "image/x-exr" || to != "application/x-chalk") { return KoFilter::NotImplemented; diff --git a/filters/chalk/openexr/kis_openexr_import.h b/filters/chalk/openexr/kis_openexr_import.h index 8bddb4f5..8654df54 100644 --- a/filters/chalk/openexr/kis_openexr_import.h +++ b/filters/chalk/openexr/kis_openexr_import.h @@ -31,7 +31,7 @@ public: virtual ~KisOpenEXRImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // KIS_OPENEXR_IMPORT_H_ diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp index 2cef93e9..be3af8ad 100644 --- a/filters/chalk/pdf/kis_pdf_import.cpp +++ b/filters/chalk/pdf/kis_pdf_import.cpp @@ -63,7 +63,7 @@ KisPDFImport::~KisPDFImport() { } -KisPDFImport::ConversiontqStatus KisPDFImport::convert(const TQCString& , const TQCString& ) +KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQCString& ) { TQString filename = m_chain -> inputFile(); kdDebug(41008) << "Importing using PDFImport!" << filename << endl; diff --git a/filters/chalk/pdf/kis_pdf_import.h b/filters/chalk/pdf/kis_pdf_import.h index 06e22288..ffb9c79e 100644 --- a/filters/chalk/pdf/kis_pdf_import.h +++ b/filters/chalk/pdf/kis_pdf_import.h @@ -29,7 +29,7 @@ class KisPDFImport : public KoFilter{ KisPDFImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPDFImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui index 697a3e30..c91ecd99 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/filters/chalk/png/kis_png_export.cc b/filters/chalk/png/kis_png_export.cc index 8154866a..ace65954 100644 --- a/filters/chalk/png/kis_png_export.cc +++ b/filters/chalk/png/kis_png_export.cc @@ -49,7 +49,7 @@ KisPNGExport::~KisPNGExport() { } -KoFilter::ConversiontqStatus KisPNGExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisPNGExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "Png export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/png/kis_png_export.h b/filters/chalk/png/kis_png_export.h index 433b68e3..562628a9 100644 --- a/filters/chalk/png/kis_png_export.h +++ b/filters/chalk/png/kis_png_export.h @@ -29,7 +29,7 @@ class KisPNGExport : public KoFilter { KisPNGExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPNGExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/png/kis_png_import.cc b/filters/chalk/png/kis_png_import.cc index ccfe4388..dc2a6325 100644 --- a/filters/chalk/png/kis_png_import.cc +++ b/filters/chalk/png/kis_png_import.cc @@ -41,7 +41,7 @@ KisPNGImport::~KisPNGImport() { } -KoFilter::ConversiontqStatus KisPNGImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus KisPNGImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using PNGImport!\n"; diff --git a/filters/chalk/png/kis_png_import.h b/filters/chalk/png/kis_png_import.h index 3487d24d..0412e7bd 100644 --- a/filters/chalk/png/kis_png_import.h +++ b/filters/chalk/png/kis_png_import.h @@ -28,7 +28,7 @@ class KisPNGImport : public KoFilter { KisPNGImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPNGImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui index ec5e0ba8..a635c293 100644 --- a/filters/chalk/png/kis_wdg_options_png.ui +++ b/filters/chalk/png/kis_wdg_options_png.ui @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>5</height> diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index f006f913..a5b86364 100644 --- a/filters/chalk/raw/kis_raw_import.cpp +++ b/filters/chalk/raw/kis_raw_import.cpp @@ -103,7 +103,7 @@ KisRawImport::~KisRawImport() delete m_process; } -KoFilter::ConversiontqStatus KisRawImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQCString& to) { if (from != "image/x-raw" || to != "application/x-chalk") { return KoFilter::NotImplemented; diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h index 17fd576c..e02caeed 100644 --- a/filters/chalk/raw/kis_raw_import.h +++ b/filters/chalk/raw/kis_raw_import.h @@ -37,7 +37,7 @@ public: virtual ~KisRawImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); private slots: diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui index 26115762..ffd7c59d 100644 --- a/filters/chalk/raw/wdgrawimport.ui +++ b/filters/chalk/raw/wdgrawimport.ui @@ -36,7 +36,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>150</height> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>500</width> <height>20</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -408,7 +408,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp index 7a6ad9ca..59784009 100644 --- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp +++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp @@ -39,7 +39,7 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name) connect(optionswdg->flatten, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(flattenToggled( bool) ) ); setMainWidget(optionswdg); kapp->restoreOverrideCursor(); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); } KisDlgOptionsTIFF::~KisDlgOptionsTIFF() diff --git a/filters/chalk/tiff/kis_tiff_export.cc b/filters/chalk/tiff/kis_tiff_export.cc index bcd3f22e..28495ff4 100644 --- a/filters/chalk/tiff/kis_tiff_export.cc +++ b/filters/chalk/tiff/kis_tiff_export.cc @@ -50,7 +50,7 @@ KisTIFFExport::~KisTIFFExport() { } -KoFilter::ConversiontqStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "Tiff export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/tiff/kis_tiff_export.h b/filters/chalk/tiff/kis_tiff_export.h index 9efeb940..bb78fd4f 100644 --- a/filters/chalk/tiff/kis_tiff_export.h +++ b/filters/chalk/tiff/kis_tiff_export.h @@ -29,7 +29,7 @@ class KisTIFFExport : public KoFilter { KisTIFFExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisTIFFExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/tiff/kis_tiff_import.cc b/filters/chalk/tiff/kis_tiff_import.cc index 89d1763f..8c785ffe 100644 --- a/filters/chalk/tiff/kis_tiff_import.cc +++ b/filters/chalk/tiff/kis_tiff_import.cc @@ -41,7 +41,7 @@ KisTIFFImport::~KisTIFFImport() { } -KoFilter::ConversiontqStatus KisTIFFImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus KisTIFFImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using TIFFImport!\n"; diff --git a/filters/chalk/tiff/kis_tiff_import.h b/filters/chalk/tiff/kis_tiff_import.h index b9e33d06..77cfd0de 100644 --- a/filters/chalk/tiff/kis_tiff_import.h +++ b/filters/chalk/tiff/kis_tiff_import.h @@ -28,7 +28,7 @@ class KisTIFFImport : public KoFilter { KisTIFFImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisTIFFImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui index d840dc8d..b86d88ab 100644 --- a/filters/chalk/tiff/kis_wdg_options_tiff.ui +++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui @@ -711,7 +711,7 @@ You can uncheck the box if you are not using transparancy and you want to make t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/filters/chalk/xcf/xcfexport.cpp b/filters/chalk/xcf/xcfexport.cpp index b26fdba8..06bcf96f 100644 --- a/filters/chalk/xcf/xcfexport.cpp +++ b/filters/chalk/xcf/xcfexport.cpp @@ -41,7 +41,7 @@ XCFExport::~XCFExport() { } -KoFilter::ConversiontqStatus XCFExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus XCFExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "xcf export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/xcf/xcfexport.h b/filters/chalk/xcf/xcfexport.h index b8f260fb..34595b06 100644 --- a/filters/chalk/xcf/xcfexport.h +++ b/filters/chalk/xcf/xcfexport.h @@ -30,7 +30,7 @@ public: virtual ~XCFExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // XCFEXPORT_H_ diff --git a/filters/chalk/xcf/xcfimport.cpp b/filters/chalk/xcf/xcfimport.cpp index 6f07ebcf..6b81ec67 100644 --- a/filters/chalk/xcf/xcfimport.cpp +++ b/filters/chalk/xcf/xcfimport.cpp @@ -39,7 +39,7 @@ XCFImport::~XCFImport() { } -KoFilter::ConversiontqStatus XCFImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus XCFImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using XCFImport!\n"; diff --git a/filters/chalk/xcf/xcfimport.h b/filters/chalk/xcf/xcfimport.h index 434566ba..27f2cbfe 100644 --- a/filters/chalk/xcf/xcfimport.h +++ b/filters/chalk/xcf/xcfimport.h @@ -30,7 +30,7 @@ public: virtual ~XCFImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // XCFIMPORT_H_ diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc index f3ae2b13..16b617a6 100644 --- a/filters/generic_wrapper/generic_filter.cc +++ b/filters/generic_wrapper/generic_filter.cc @@ -41,7 +41,7 @@ GenericFilter::GenericFilter(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus GenericFilter::convert( const TQCString &from, const TQCString &to ) +KoFilter::ConversionStatus GenericFilter::convert( const TQCString &from, const TQCString &to ) { //find the right script to use @@ -80,7 +80,7 @@ KoFilter::ConversiontqStatus GenericFilter::convert( const TQCString &from, cons return KoFilter::NotImplemented; } -KoFilter::ConversiontqStatus GenericFilter::doImport() +KoFilter::ConversionStatus GenericFilter::doImport() { KTempFile temp(TQString("genericfilter-")); temp.setAutoDelete(true); @@ -119,7 +119,7 @@ KoFilter::ConversiontqStatus GenericFilter::doImport() return KoFilter::OK; } -KoFilter::ConversiontqStatus GenericFilter::doExport() +KoFilter::ConversionStatus GenericFilter::doExport() { return KoFilter::NotImplemented; } diff --git a/filters/generic_wrapper/generic_filter.h b/filters/generic_wrapper/generic_filter.h index 7b47406b..71448fce 100644 --- a/filters/generic_wrapper/generic_filter.h +++ b/filters/generic_wrapper/generic_filter.h @@ -36,11 +36,11 @@ public: GenericFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~GenericFilter() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: - KoFilter::ConversiontqStatus doImport(); - KoFilter::ConversiontqStatus doExport(); + KoFilter::ConversionStatus doImport(); + KoFilter::ConversionStatus doExport(); TQString m_to, m_from, m_exec; KoStore* m_out; }; diff --git a/filters/karbon/ai/aielement.cc b/filters/karbon/ai/aielement.cc index 608bdf61..023943b9 100644 --- a/filters/karbon/ai/aielement.cc +++ b/filters/karbon/ai/aielement.cc @@ -360,7 +360,7 @@ AIElement::Type AIElement::nameToType( const char* name ) const TQString AIElement::toString() const { if ( d->typ == CString ) - return TQString::tqfromLatin1( toCString() ); + return TQString::fromLatin1( toCString() ); if ( d->typ == Int ) return TQString::number( toInt() ); if ( d->typ == UInt ) diff --git a/filters/karbon/ai/aiimport.cc b/filters/karbon/ai/aiimport.cc index 4a201ec5..4e854995 100644 --- a/filters/karbon/ai/aiimport.cc +++ b/filters/karbon/ai/aiimport.cc @@ -56,7 +56,7 @@ AiImport::~AiImport() { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus AiImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/illustrator" || to != "application/x-karbon" ) diff --git a/filters/karbon/ai/aiimport.h b/filters/karbon/ai/aiimport.h index c305b536..3dd9a560 100644 --- a/filters/karbon/ai/aiimport.h +++ b/filters/karbon/ai/aiimport.h @@ -36,7 +36,7 @@ public: AiImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~AiImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); /* private: TQString m_result; */ diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc index b3df1581..a17f94da 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.cc +++ b/filters/karbon/applixgraphics/applixgraphicimport.cc @@ -133,7 +133,7 @@ APPLIXGRAPHICImport::APPLIXGRAPHICImport (KoFilter *, const char *, const TQStri * * * * ******************************************************************************/ -KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from, const TQCString& to ) { // Check MIME Types diff --git a/filters/karbon/applixgraphics/applixgraphicimport.h b/filters/karbon/applixgraphics/applixgraphicimport.h index 3e42256e..e0eff76c 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.h +++ b/filters/karbon/applixgraphics/applixgraphicimport.h @@ -32,7 +32,7 @@ public: APPLIXGRAPHICImport (KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXGRAPHICImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/karbon/eps/epsexport.cc b/filters/karbon/eps/epsexport.cc index e1bd06a5..8696e6a3 100644 --- a/filters/karbon/eps/epsexport.cc +++ b/filters/karbon/eps/epsexport.cc @@ -87,7 +87,7 @@ EpsExport::EpsExport( KoFilter*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus EpsExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/x-eps" || from != "application/x-karbon" ) @@ -102,7 +102,7 @@ EpsExport::convert( const TQCString& from, const TQCString& to ) return KoFilter::StupidError; - KoFilter::ConversiontqStatus status = KoFilter::OK; + KoFilter::ConversionStatus status = KoFilter::OK; // Ask questions about PS level etc. EpsExportDlg* dialog = new EpsExportDlg(); @@ -194,7 +194,7 @@ EpsExport::visitVDocument( VDocument& document ) static_cast<KoDocumentInfoAuthor*>( docInfo.page( "author" ) ); // Get creation date/time = "now". - TQDateTime now( TQDateTime::tqcurrentDateTime() ); + TQDateTime now( TQDateTime::currentDateTime() ); *m_stream << "%%CreationDate: (" << now.toString( Qt::LocalDate ) << ")\n" diff --git a/filters/karbon/eps/epsexport.h b/filters/karbon/eps/epsexport.h index 1313294e..f5867b43 100644 --- a/filters/karbon/eps/epsexport.h +++ b/filters/karbon/eps/epsexport.h @@ -46,7 +46,7 @@ public: EpsExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: virtual void visitVPath( VPath& composite ); diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cc index 0fefb3e0..32a0845c 100644 --- a/filters/karbon/eps/epsimport.cc +++ b/filters/karbon/eps/epsimport.cc @@ -57,7 +57,7 @@ EpsImport::~EpsImport() { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus EpsImport::convert( const TQCString& from, const TQCString& to ) { if( diff --git a/filters/karbon/eps/epsimport.h b/filters/karbon/eps/epsimport.h index 873dc169..c86be29d 100644 --- a/filters/karbon/eps/epsimport.h +++ b/filters/karbon/eps/epsimport.h @@ -36,7 +36,7 @@ public: EpsImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif diff --git a/filters/karbon/kontour/kontourimport.cpp b/filters/karbon/kontour/kontourimport.cpp index a260fd50..6e515b3f 100644 --- a/filters/karbon/kontour/kontourimport.cpp +++ b/filters/karbon/kontour/kontourimport.cpp @@ -49,7 +49,7 @@ KontourImport::~KontourImport() } -KoFilter::ConversiontqStatus KontourImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KontourImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion if ( to != "application/x-karbon" || ( from != "application/x-kontour" && from != "application/x-killustrator") ) diff --git a/filters/karbon/kontour/kontourimport.h b/filters/karbon/kontour/kontourimport.h index e140f088..92e27a09 100644 --- a/filters/karbon/kontour/kontourimport.h +++ b/filters/karbon/kontour/kontourimport.h @@ -33,7 +33,7 @@ public: KontourImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KontourImport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); protected: TQDomDocument inpdoc; diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc index 903d50a2..c3ee7b2a 100644 --- a/filters/karbon/msod/msodimport.cc +++ b/filters/karbon/msod/msodimport.cc @@ -46,7 +46,7 @@ MSODImport::~MSODImport() { } -KoFilter::ConversiontqStatus MSODImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQCString& to ) { if (to != "application/x-karbon" || from != "image/x-msod") return KoFilter::NotImplemented; @@ -175,7 +175,7 @@ void MSODImport::gotPicture( kdWarning( s_area ) << "Couldn't determine the mimetype from the extension" << endl; TQCString destMime; // intentionally empty, the filter manager will do the rest - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; partRef = embedPart( srcMime.latin1(), destMime, status, TQString::number( key ) ); m_embeddeeData = 0; diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h index 162176de..9c721882 100644 --- a/filters/karbon/msod/msodimport.h +++ b/filters/karbon/msod/msodimport.h @@ -39,7 +39,7 @@ public: const TQStringList&); virtual ~MSODImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc index 90320d7e..fba48867 100644 --- a/filters/karbon/oodraw/oodrawimport.cc +++ b/filters/karbon/oodraw/oodrawimport.cc @@ -62,7 +62,7 @@ OoDrawImport::~OoDrawImport() { } -KoFilter::ConversiontqStatus OoDrawImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OoDrawImport::convert( TQCString const & from, TQCString const & to ) { kdDebug() << "Entering Oodraw Import filter: " << from << " - " << to << endl; @@ -81,13 +81,13 @@ KoFilter::ConversiontqStatus OoDrawImport::convert( TQCString const & from, TQCS return KoFilter::FileNotFound; } - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if( pretqStatus != KoFilter::OK ) + if( preStatus != KoFilter::OK ) { m_zip->close(); delete m_zip; - return pretqStatus; + return preStatus; } /*TQDomDocument docinfo; createDocumentInfo( docinfo ); @@ -149,9 +149,9 @@ void OoDrawImport::createDocumentInfo( TQDomDocument &docinfo ) // Very related to OoWriterImport::openFile() -KoFilter::ConversiontqStatus OoDrawImport::openFile() +KoFilter::ConversionStatus OoDrawImport::openFile() { - KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content ); + KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content ); if ( status != KoFilter::OK ) { kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl; @@ -223,7 +223,7 @@ void OoDrawImport::convert() } -KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc) +KoFilter::ConversionStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc) { return OoUtils::loadAndParse( filename, doc, m_zip); } diff --git a/filters/karbon/oodraw/oodrawimport.h b/filters/karbon/oodraw/oodrawimport.h index 2b395f48..6e753d7d 100644 --- a/filters/karbon/oodraw/oodrawimport.h +++ b/filters/karbon/oodraw/oodrawimport.h @@ -43,7 +43,7 @@ public: OoDrawImport( KoFilter *parent, const char *name, const TQStringList & ); virtual ~OoDrawImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: void createDocumentInfo( TQDomDocument &docinfo ); @@ -63,8 +63,8 @@ private: double ymirror( double y ); KoRect parseViewBox( const TQDomElement& object ); - KoFilter::ConversiontqStatus openFile(); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc); + KoFilter::ConversionStatus openFile(); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc); VDocument m_document; TQDomDocument m_content; diff --git a/filters/karbon/png/pngexport.cc b/filters/karbon/png/pngexport.cc index 4de61a44..89b43d03 100644 --- a/filters/karbon/png/pngexport.cc +++ b/filters/karbon/png/pngexport.cc @@ -48,7 +48,7 @@ PngExport::PngExport( KoFilter*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus PngExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/png" || from != "application/x-karbon" ) diff --git a/filters/karbon/png/pngexport.h b/filters/karbon/png/pngexport.h index 3758daa3..df893965 100644 --- a/filters/karbon/png/pngexport.h +++ b/filters/karbon/png/pngexport.h @@ -33,7 +33,7 @@ public: PngExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~PngExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc index 2e661039..07381db8 100644 --- a/filters/karbon/svg/svgexport.cc +++ b/filters/karbon/svg/svgexport.cc @@ -67,7 +67,7 @@ SvgExport::SvgExport( KoFilter*, const char*, const TQStringList& ) m_gc.setAutoDelete( true ); } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/svg+xml" || from != "application/x-karbon" ) diff --git a/filters/karbon/svg/svgexport.h b/filters/karbon/svg/svgexport.h index 6bfe5d98..c79d1fde 100644 --- a/filters/karbon/svg/svgexport.h +++ b/filters/karbon/svg/svgexport.h @@ -52,7 +52,7 @@ public: SvgExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~SvgExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: virtual void visitVPath( VPath& composite ); diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc index 5a5e90aa..580512dc 100644 --- a/filters/karbon/svg/svgimport.cc +++ b/filters/karbon/svg/svgimport.cc @@ -54,7 +54,7 @@ SvgImport::~SvgImport() { } -KoFilter::ConversiontqStatus SvgImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus SvgImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion if( to != "application/x-karbon" || from != "image/svg+xml" ) @@ -1263,9 +1263,9 @@ void SvgImport::createText( VGroup *grp, const TQDomElement &b ) text->setName( b.attribute("id") ); if( anchor == "middle" ) - text->tqsetAlignment( VText::Center ); + text->setAlignment( VText::Center ); else if( anchor == "end" ) - text->tqsetAlignment( VText::Right ); + text->setAlignment( VText::Right ); if( offset > 0.0 ) text->setOffset( offset ); diff --git a/filters/karbon/svg/svgimport.h b/filters/karbon/svg/svgimport.h index e4e3f56a..636077a1 100644 --- a/filters/karbon/svg/svgimport.h +++ b/filters/karbon/svg/svgimport.h @@ -45,7 +45,7 @@ public: SvgImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgImport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); protected: class GradientHelper diff --git a/filters/karbon/wmf/wmfexport.cc b/filters/karbon/wmf/wmfexport.cc index a04dfc11..de929ca8 100644 --- a/filters/karbon/wmf/wmfexport.cc +++ b/filters/karbon/wmf/wmfexport.cc @@ -57,7 +57,7 @@ WmfExport::~WmfExport() { } -KoFilter::ConversiontqStatus WmfExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WmfExport::convert( const TQCString& from, const TQCString& to ) { if( to != "image/x-wmf" || from != "application/x-karbon" ) { return KoFilter::NotImplemented; diff --git a/filters/karbon/wmf/wmfexport.h b/filters/karbon/wmf/wmfexport.h index e0c9be57..b13da88f 100644 --- a/filters/karbon/wmf/wmfexport.h +++ b/filters/karbon/wmf/wmfexport.h @@ -41,7 +41,7 @@ public: WmfExport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WmfExport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: void visitVPath( VPath& composite ); diff --git a/filters/karbon/wmf/wmfimport.cc b/filters/karbon/wmf/wmfimport.cc index 23eaaa12..f7dcdcf3 100644 --- a/filters/karbon/wmf/wmfimport.cc +++ b/filters/karbon/wmf/wmfimport.cc @@ -45,7 +45,7 @@ WMFImport::~WMFImport() { } -KoFilter::ConversiontqStatus WMFImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WMFImport::convert( const TQCString& from, const TQCString& to ) { if( to != "application/x-karbon" || from != "image/x-wmf" ) return KoFilter::NotImplemented; diff --git a/filters/karbon/wmf/wmfimport.h b/filters/karbon/wmf/wmfimport.h index 21bcee74..34ee8140 100644 --- a/filters/karbon/wmf/wmfimport.h +++ b/filters/karbon/wmf/wmfimport.h @@ -36,7 +36,7 @@ public: WMFImport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WMFImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc index 228024f3..636268b7 100644 --- a/filters/karbon/xaml/xamlexport.cc +++ b/filters/karbon/xaml/xamlexport.cc @@ -60,7 +60,7 @@ XAMLExport::XAMLExport( KoFilter*, const char*, const TQStringList& ) m_gc.setAutoDelete( true ); } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus XAMLExport::convert( const TQCString& from, const TQCString& to ) { // TODO: ??? diff --git a/filters/karbon/xaml/xamlexport.h b/filters/karbon/xaml/xamlexport.h index b1a0f4fd..124ea3fd 100644 --- a/filters/karbon/xaml/xamlexport.h +++ b/filters/karbon/xaml/xamlexport.h @@ -50,7 +50,7 @@ public: XAMLExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XAMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: virtual void visitVPath( VPath& composite ); diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cc index 3a755181..cbe8ddbb 100644 --- a/filters/karbon/xaml/xamlimport.cc +++ b/filters/karbon/xaml/xamlimport.cc @@ -52,7 +52,7 @@ XAMLImport::~XAMLImport() { } -KoFilter::ConversiontqStatus XAMLImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus XAMLImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion if( to != "application/x-karbon" || from != "image/wvg+xml" ) diff --git a/filters/karbon/xaml/xamlimport.h b/filters/karbon/xaml/xamlimport.h index b61313b9..001d1dc3 100644 --- a/filters/karbon/xaml/xamlimport.h +++ b/filters/karbon/xaml/xamlimport.h @@ -43,7 +43,7 @@ public: XAMLImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XAMLImport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); protected: class GradientHelper diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc index 3e9237fb..8de11197 100644 --- a/filters/karbon/xcf/xcfexport.cc +++ b/filters/karbon/xcf/xcfexport.cc @@ -52,7 +52,7 @@ XcfExport::XcfExport( KoFilter*, const char*, const TQStringList& ) m_zoomY = 1.0; } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus XcfExport::convert( const TQCString& from, const TQCString& to ) { if( to != "image/x-xcf-gimp" || from != "application/x-karbon" ) diff --git a/filters/karbon/xcf/xcfexport.h b/filters/karbon/xcf/xcfexport.h index 82d86883..f6a7be70 100644 --- a/filters/karbon/xcf/xcfexport.h +++ b/filters/karbon/xcf/xcfexport.h @@ -40,7 +40,7 @@ public: XcfExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XcfExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); virtual void visitVDocument( VDocument& document ); virtual void visitVLayer( VLayer& layer ); diff --git a/filters/kchart/libimageexport/imageexport.cpp b/filters/kchart/libimageexport/imageexport.cpp index 5033762b..faff17ff 100644 --- a/filters/kchart/libimageexport/imageexport.cpp +++ b/filters/kchart/libimageexport/imageexport.cpp @@ -40,7 +40,7 @@ ImageExport::~ImageExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion. diff --git a/filters/kchart/libimageexport/imageexport.h b/filters/kchart/libimageexport/imageexport.h index 825b0156..d1a73abe 100644 --- a/filters/kchart/libimageexport/imageexport.h +++ b/filters/kchart/libimageexport/imageexport.h @@ -32,7 +32,7 @@ public: ImageExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~ImageExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); virtual void extraImageAttribute() {}; virtual bool saveImage( TQString fileName) = 0; virtual const char* exportFormat() = 0; diff --git a/filters/kchart/svg/svgexport.cc b/filters/kchart/svg/svgexport.cc index 8d8ad52c..1507f536 100644 --- a/filters/kchart/svg/svgexport.cc +++ b/filters/kchart/svg/svgexport.cc @@ -45,7 +45,7 @@ SvgExport::~SvgExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion. diff --git a/filters/kchart/svg/svgexport.h b/filters/kchart/svg/svgexport.h index c04c0f22..653aae9b 100644 --- a/filters/kchart/svg/svgexport.h +++ b/filters/kchart/svg/svgexport.h @@ -31,7 +31,7 @@ public: SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // __SVGEXPORT_H__ diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc index 77488fa9..a212e0af 100644 --- a/filters/kformula/latex/latexexport.cc +++ b/filters/kformula/latex/latexexport.cc @@ -46,7 +46,7 @@ LATEXExport::LATEXExport( KoFilter */*parent*/, const char */*name*/, const TQSt } -KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "text/x-tex" || from != "application/x-kformula" ) return KoFilter::NotImplemented; diff --git a/filters/kformula/latex/latexexport.h b/filters/kformula/latex/latexexport.h index 091ed125..83672fae 100644 --- a/filters/kformula/latex/latexexport.h +++ b/filters/kformula/latex/latexexport.h @@ -33,7 +33,7 @@ public: LATEXExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~LATEXExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // LATEXEXPORT_H diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc index 507c13a2..dc0c5689 100644 --- a/filters/kformula/mathml/mathmlexport.cc +++ b/filters/kformula/mathml/mathmlexport.cc @@ -46,7 +46,7 @@ MathMLExport::MathMLExport( KoFilter */*parent*/, const char */*name*/, const TQ } -KoFilter::ConversiontqStatus MathMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MathMLExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/mathml+xml" || from != "application/x-kformula" ) return KoFilter::NotImplemented; diff --git a/filters/kformula/mathml/mathmlexport.h b/filters/kformula/mathml/mathmlexport.h index a49b837b..2a442a22 100644 --- a/filters/kformula/mathml/mathmlexport.h +++ b/filters/kformula/mathml/mathmlexport.h @@ -33,7 +33,7 @@ public: MathMLExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~MathMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // MATHMLEXPORT_H diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc index 87ce2182..6e1eeebb 100644 --- a/filters/kformula/mathml/mathmlimport.cc +++ b/filters/kformula/mathml/mathmlimport.cc @@ -44,7 +44,7 @@ MathMLImport::MathMLImport(KoFilter *, const char *, const TQStringList&) { } -KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const TQCString& to ) { kdDebug( KFormula::DEBUGID ) << "From: " << from << endl; kdDebug( KFormula::DEBUGID ) << "To: " << to << endl; diff --git a/filters/kformula/mathml/mathmlimport.h b/filters/kformula/mathml/mathmlimport.h index a4a28e18..a2f54182 100644 --- a/filters/kformula/mathml/mathmlimport.h +++ b/filters/kformula/mathml/mathmlimport.h @@ -36,7 +36,7 @@ public: MathMLImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MathMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* MATHMLIMPORT_H */ diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc index c6d3611e..d1c42111 100644 --- a/filters/kformula/png/pngexport.cc +++ b/filters/kformula/png/pngexport.cc @@ -46,7 +46,7 @@ PNGExport::PNGExport( KoFilter */*parent*/, const char */*name*/, const TQString } -KoFilter::ConversiontqStatus PNGExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus PNGExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/png" || from != "application/x-kformula" ) return KoFilter::NotImplemented; diff --git a/filters/kformula/png/pngexport.h b/filters/kformula/png/pngexport.h index 8dd3de34..eb71df94 100644 --- a/filters/kformula/png/pngexport.h +++ b/filters/kformula/png/pngexport.h @@ -33,7 +33,7 @@ public: PNGExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~PNGExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // PNGEXPORT_H diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cc index 25758e82..328f1518 100644 --- a/filters/kformula/svg/svgexport.cc +++ b/filters/kformula/svg/svgexport.cc @@ -48,7 +48,7 @@ SvgExport::~SvgExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion. diff --git a/filters/kformula/svg/svgexport.h b/filters/kformula/svg/svgexport.h index 65a5cef1..0296e574 100644 --- a/filters/kformula/svg/svgexport.h +++ b/filters/kformula/svg/svgexport.h @@ -32,7 +32,7 @@ public: SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // __SVGEXPORT_H__ diff --git a/filters/kivio/imageexport/kivio_imageexport.cpp b/filters/kivio/imageexport/kivio_imageexport.cpp index cd983fe6..2339dbf0 100644 --- a/filters/kivio/imageexport/kivio_imageexport.cpp +++ b/filters/kivio/imageexport/kivio_imageexport.cpp @@ -55,7 +55,7 @@ ImageExport::ImageExport(KoFilter *, const char *, const TQStringList&) KGlobal::locale()->insertCatalogue("kofficefilters"); } -KoFilter::ConversiontqStatus ImageExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to) { if(from != "application/x-kivio") { return KoFilter::BadMimeType; diff --git a/filters/kivio/imageexport/kivio_imageexport.h b/filters/kivio/imageexport/kivio_imageexport.h index e1946f0f..498204fa 100644 --- a/filters/kivio/imageexport/kivio_imageexport.h +++ b/filters/kivio/imageexport/kivio_imageexport.h @@ -32,7 +32,7 @@ class ImageExport : public KoFilter public: ImageExport(KoFilter *, const char *, const TQStringList&); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; } diff --git a/filters/kivio/imageexport/kivio_imageexportwidget.ui b/filters/kivio/imageexport/kivio_imageexportwidget.ui index 41d73a4c..34feba57 100644 --- a/filters/kivio/imageexport/kivio_imageexportwidget.ui +++ b/filters/kivio/imageexport/kivio_imageexportwidget.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc index d40cd608..8dd96c5f 100644 --- a/filters/kpresenter/kword/kprkword.cc +++ b/filters/kpresenter/kword/kprkword.cc @@ -41,7 +41,7 @@ KprKword::KprKword(KoFilter *, const char *, const TQStringList&) : // This filter can act as an import filter for KWord and as an export // filter for KPresenter (isn't our architecture really nice ? :) // This is why we use the file-to-file method, not a TQDomDoc one. -KoFilter::ConversiontqStatus KprKword::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KprKword::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" || from!="application/x-kpresenter") return KoFilter::NotImplemented; diff --git a/filters/kpresenter/kword/kprkword.h b/filters/kpresenter/kword/kprkword.h index f4141a09..30932652 100644 --- a/filters/kpresenter/kword/kprkword.h +++ b/filters/kpresenter/kword/kprkword.h @@ -33,7 +33,7 @@ public: virtual ~KprKword() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: void convert(); diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp index b87b8635..c4ceb243 100644 --- a/filters/kpresenter/libimageexport/imageexport.cpp +++ b/filters/kpresenter/libimageexport/imageexport.cpp @@ -42,7 +42,7 @@ ImageExport::~ImageExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to) { KoDocument * document = m_chain->inputDocument(); diff --git a/filters/kpresenter/libimageexport/imageexport.h b/filters/kpresenter/libimageexport/imageexport.h index 23f45e28..5cb89622 100644 --- a/filters/kpresenter/libimageexport/imageexport.h +++ b/filters/kpresenter/libimageexport/imageexport.h @@ -32,7 +32,7 @@ public: ImageExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~ImageExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); virtual bool extraImageAttribute() { return true;}; virtual bool saveImage( TQString fileName) = 0; virtual const char* exportFormat() = 0; diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc index 0e4771cf..be986d92 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.cc +++ b/filters/kpresenter/ooimpress/ooimpressexport.cc @@ -54,7 +54,7 @@ OoImpressExport::~OoImpressExport() delete m_storeinp; } -KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from, +KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from, const TQCString & to ) { kdDebug(30518) << "Entering Ooimpress Export filter: " << from << " - " << to << endl; @@ -66,10 +66,10 @@ KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from, } // read in the KPresenter file - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if ( pretqStatus != KoFilter::OK ) - return pretqStatus; + if ( preStatus != KoFilter::OK ) + return preStatus; TQDomImplementation impl; TQDomDocument meta( impl.createDocumentType( "office:document-meta", @@ -178,7 +178,7 @@ KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from, return KoFilter::OK; } -KoFilter::ConversiontqStatus OoImpressExport::openFile() +KoFilter::ConversionStatus OoImpressExport::openFile() { m_storeinp = KoStore::createStore( m_chain->inputFile(), KoStore::Read ); diff --git a/filters/kpresenter/ooimpress/ooimpressexport.h b/filters/kpresenter/ooimpress/ooimpressexport.h index ac369192..dec5ec4c 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.h +++ b/filters/kpresenter/ooimpress/ooimpressexport.h @@ -37,11 +37,11 @@ public: OoImpressExport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoImpressExport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString & from, + virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to ); private: - KoFilter::ConversiontqStatus openFile(); + KoFilter::ConversionStatus openFile(); void exportBody( TQDomDocument & doccontent, TQDomElement & body ); void createDocumentMeta( TQDomDocument & docmeta ); diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc index 1dab566d..f7322342 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.cc +++ b/filters/kpresenter/ooimpress/ooimpressimport.cc @@ -67,7 +67,7 @@ OoImpressImport::~OoImpressImport() m_animations.clear(); } -KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQCString const & to ) { kdDebug(30518) << "Entering Ooimpress Import filter: " << from << " - " << to << endl; @@ -87,13 +87,13 @@ KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, T return KoFilter::FileNotFound; } - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if ( pretqStatus != KoFilter::OK ) + if ( preStatus != KoFilter::OK ) { m_zip->close(); delete m_zip; - return pretqStatus; + return preStatus; } TQDomDocument docinfo; @@ -129,9 +129,9 @@ KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, T } // Very related to OoWriterImport::openFile() -KoFilter::ConversiontqStatus OoImpressImport::openFile() +KoFilter::ConversionStatus OoImpressImport::openFile() { - KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content ); + KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content ); if ( status != KoFilter::OK ) { kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl; @@ -150,7 +150,7 @@ KoFilter::ConversiontqStatus OoImpressImport::openFile() return KoFilter::OK; } -KoFilter::ConversiontqStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc) +KoFilter::ConversionStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc) { return OoUtils::loadAndParse( filename, doc, m_zip); } @@ -1154,7 +1154,7 @@ void OoImpressImport::appendImage( TQDomDocument& doc, TQDomElement& e, TQDomEle // create a key for the picture TQTime time = TQTime::currentTime(); - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); TQDomElement image = doc.createElement( "KEY" ); image.setAttribute( "msec", time.msec() ); @@ -1214,7 +1214,7 @@ void OoImpressImport::appendBackgroundImage( TQDomDocument& doc, TQDomElement& e // create a key for the picture TQTime time = TQTime::currentTime(); - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); TQDomElement image = doc.createElement( "BACKPICTUREKEY" ); image.setAttribute( "msec", time.msec() ); @@ -2161,7 +2161,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } @@ -2196,7 +2196,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } diff --git a/filters/kpresenter/ooimpress/ooimpressimport.h b/filters/kpresenter/ooimpress/ooimpressimport.h index 596ca703..b187d189 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.h +++ b/filters/kpresenter/ooimpress/ooimpressimport.h @@ -46,7 +46,7 @@ public: OoImpressImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoImpressImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: void createDocumentInfo( TQDomDocument &docinfo ); @@ -96,8 +96,8 @@ private: bool parseSettings( TQDomDocument &doc, TQDomElement &helpLineElement, TQDomElement &attributeElement ); void parseHelpLine( TQDomDocument &doc,TQDomElement &helpLineElement, const TQString &text ); - KoFilter::ConversiontqStatus openFile(); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc); + KoFilter::ConversionStatus openFile(); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc); int m_numPicture; int m_numSound; diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc index 4f41aac7..0b89e187 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.cc +++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc @@ -80,7 +80,7 @@ PowerPointImport::~PowerPointImport() delete d; } -KoFilter::ConversiontqStatus PowerPointImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus PowerPointImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/mspowerpoint" ) return KoFilter::NotImplemented; diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.h b/filters/kpresenter/powerpoint/import/powerpointimport.h index ca3e7365..6b75cfb3 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.h +++ b/filters/kpresenter/powerpoint/import/powerpointimport.h @@ -39,7 +39,7 @@ Q_OBJECT public: PowerPointImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~PowerPointImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc index 990d12cd..9eae5cd8 100644 --- a/filters/kpresenter/svg/svgexport.cc +++ b/filters/kpresenter/svg/svgexport.cc @@ -48,7 +48,7 @@ SvgExport::~SvgExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert(const TQCString& from, const TQCString& to) { KoDocument * document = m_chain->inputDocument(); diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h index eafdd792..17e3d79f 100644 --- a/filters/kpresenter/svg/svgexport.h +++ b/filters/kpresenter/svg/svgexport.h @@ -32,7 +32,7 @@ public: SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // __SVGEXPORT_H__ diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc index a75cccac..2f15eeed 100644 --- a/filters/kspread/applixspread/applixspreadimport.cc +++ b/filters/kspread/applixspread/applixspreadimport.cc @@ -55,7 +55,7 @@ TQString APPLIXSPREADImport::nextLine( TQTextStream & stream ) return s; } -KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to ) { if (to != "application/x-kspread" || from != "application/x-applixspread") diff --git a/filters/kspread/applixspread/applixspreadimport.h b/filters/kspread/applixspread/applixspreadimport.h index 78deb2ca..584949d9 100644 --- a/filters/kspread/applixspread/applixspreadimport.h +++ b/filters/kspread/applixspread/applixspreadimport.h @@ -57,7 +57,7 @@ public: APPLIXSPREADImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~APPLIXSPREADImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: TQString nextLine (TQTextStream &); diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index 17e9cc65..95f4727c 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -84,7 +84,7 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /* fillTable(); - //resize(tqsizeHint()); + //resize(sizeHint()); resize( 600, 400 ); // Try to show as much as possible of the table view setMainWidget(m_dialog); diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc index 9961d218..c7a3b6c0 100644 --- a/filters/kspread/csv/csvexport.cc +++ b/filters/kspread/csv/csvexport.cc @@ -118,7 +118,7 @@ TQString CSVExport::exportCSVCell( Sheet const * const sheet, int col, int row, // The reason why we use the KoDocument* approach and not the TQDomDocument // approach is because we don't want to export formulas but values ! -KoFilter::ConversiontqStatus CSVExport::convert( const TQCString & from, const TQCString & to ) +KoFilter::ConversionStatus CSVExport::convert( const TQCString & from, const TQCString & to ) { kdDebug(30501) << "CSVExport::convert" << endl; KoDocument* document = m_chain->inputDocument(); diff --git a/filters/kspread/csv/csvexport.h b/filters/kspread/csv/csvexport.h index decdb81c..ebc8a861 100644 --- a/filters/kspread/csv/csvexport.h +++ b/filters/kspread/csv/csvexport.h @@ -38,7 +38,7 @@ class CSVExport : public KoFilter CSVExport(KoFilter * parent, const char * name, const TQStringList &); virtual ~CSVExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString & from, const TQCString & to ); + virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to ); private: TQString exportCSVCell( KSpread::Sheet const * const sheet, int col, int row, TQChar const & textQuote, TQChar delimiter ); diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc index cd93017b..e9852c61 100644 --- a/filters/kspread/csv/csvimport.cc +++ b/filters/kspread/csv/csvimport.cc @@ -57,7 +57,7 @@ CSVFilter::CSVFilter(KoFilter *, const char*, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus CSVFilter::convert( const TQCString& from, const TQCString& to ) { TQString file( m_chain->inputFile() ); KoDocument* document = m_chain->outputDocument(); diff --git a/filters/kspread/csv/csvimport.h b/filters/kspread/csv/csvimport.h index df14a756..c68ecffb 100644 --- a/filters/kspread/csv/csvimport.h +++ b/filters/kspread/csv/csvimport.h @@ -31,6 +31,6 @@ public: CSVFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~CSVFilter() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // CSVFILTER_H diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui index 8c3a72cf..5e709007 100644 --- a/filters/kspread/csv/dialogui.ui +++ b/filters/kspread/csv/dialogui.ui @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -223,7 +223,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -330,7 +330,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -472,7 +472,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -489,7 +489,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -506,7 +506,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>611</width> <height>20</height> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui index 45eb6914..a60c3d65 100644 --- a/filters/kspread/csv/exportdialogui.ui +++ b/filters/kspread/csv/exportdialogui.ui @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>96</height> @@ -375,7 +375,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -469,7 +469,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>81</height> diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc index bcbc98b8..6121baaf 100644 --- a/filters/kspread/dbase/dbaseimport.cc +++ b/filters/kspread/dbase/dbaseimport.cc @@ -48,7 +48,7 @@ DBaseImport::DBaseImport ( TQObject*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus DBaseImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus DBaseImport::convert( const TQCString& from, const TQCString& to ) { if (to != "application/x-kspread" || from != "application/x-dbase") return KoFilter::NotImplemented; diff --git a/filters/kspread/dbase/dbaseimport.h b/filters/kspread/dbase/dbaseimport.h index 39a0ac0e..293bda21 100644 --- a/filters/kspread/dbase/dbaseimport.h +++ b/filters/kspread/dbase/dbaseimport.h @@ -33,7 +33,7 @@ public: DBaseImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~DBaseImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __DBASEIMPORT_H diff --git a/filters/kspread/excel/excelexport.cc b/filters/kspread/excel/excelexport.cc index 2e2c50e7..0ecf41f7 100644 --- a/filters/kspread/excel/excelexport.cc +++ b/filters/kspread/excel/excelexport.cc @@ -13,7 +13,7 @@ ExcelExport::ExcelExport(KoFilter *, const char *, const TQStringList&) : KoFilt } -KoFilter::ConversiontqStatus ExcelExport::convert(const TQCString& from, const TQCString& to) { +KoFilter::ConversionStatus ExcelExport::convert(const TQCString& from, const TQCString& to) { // Double check that's we really what we want to do if ( ( (to != "application/excel") && (to != "application/msexcel") ) || from != "application/x-kspread") { kdWarning(0) << "Invalid mimetypes " << to << ", " << from << endl; @@ -28,37 +28,37 @@ KoFilter::ConversiontqStatus ExcelExport::convert(const TQCString& from, const T /* -KoFilter::ConversiontqStatus ExcelWorker::startDocument(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startDocument(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) { return KoFilter::OK; } */ diff --git a/filters/kspread/excel/excelexport.h b/filters/kspread/excel/excelexport.h index 029cdac1..e4b6b499 100644 --- a/filters/kspread/excel/excelexport.h +++ b/filters/kspread/excel/excelexport.h @@ -16,20 +16,20 @@ public: ExcelExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~ExcelExport() {} - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; class ExcelWorker : public KSpreadBaseWorker { public: // Implement those - //KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property); }; #endif diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc index f1bade9e..e705a933 100644 --- a/filters/kspread/excel/import/excelimport.cc +++ b/filters/kspread/excel/import/excelimport.cc @@ -107,7 +107,7 @@ ExcelImport::~ExcelImport() delete d; } -KoFilter::ConversiontqStatus ExcelImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ExcelImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/msexcel" ) return KoFilter::NotImplemented; diff --git a/filters/kspread/excel/import/excelimport.h b/filters/kspread/excel/import/excelimport.h index 5b733733..84729b4d 100644 --- a/filters/kspread/excel/import/excelimport.h +++ b/filters/kspread/excel/import/excelimport.h @@ -35,7 +35,7 @@ public: ExcelImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~ExcelImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: class Private; diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp index 8155bca5..651b7f2c 100644 --- a/filters/kspread/excel/sidewinder/excel.cpp +++ b/filters/kspread/excel/sidewinder/excel.cpp @@ -5137,7 +5137,7 @@ bool ExcelReader::load( Workbook* workbook, const char* filename ) // FIXME still unsupported: Justified, Distributed } tqalignment.setWrap( xf.textWrap() ); - format.tqsetAlignment( tqalignment ); + format.setAlignment( tqalignment ); FormatBorders borders; @@ -5953,7 +5953,7 @@ Format ExcelReader::convertFormat( unsigned xfIndex ) // FIXME still unsupported: Justified, Distributed } tqalignment.setWrap( xf.textWrap() ); - format.tqsetAlignment( tqalignment ); + format.setAlignment( tqalignment ); FormatBorders borders; diff --git a/filters/kspread/excel/sidewinder/format.cpp b/filters/kspread/excel/sidewinder/format.cpp index 29481fd0..b54f2a4c 100644 --- a/filters/kspread/excel/sidewinder/format.cpp +++ b/filters/kspread/excel/sidewinder/format.cpp @@ -644,7 +644,7 @@ FormatAlignment& Format::tqalignment() const return d->tqalignment; } -void Format::tqsetAlignment( const FormatAlignment& tqalignment ) +void Format::setAlignment( const FormatAlignment& tqalignment ) { d->tqalignment = tqalignment; } diff --git a/filters/kspread/excel/sidewinder/format.h b/filters/kspread/excel/sidewinder/format.h index dcadc1c2..1177b1bb 100644 --- a/filters/kspread/excel/sidewinder/format.h +++ b/filters/kspread/excel/sidewinder/format.h @@ -690,7 +690,7 @@ public: /** * Sets new tqalignment information for this format. */ - void tqsetAlignment( const FormatAlignment& tqalignment ); + void setAlignment( const FormatAlignment& tqalignment ); /** * Returns a reference to the borders information of this format. diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc index cccfcc9f..b5666916 100644 --- a/filters/kspread/gnumeric/gnumericexport.cc +++ b/filters/kspread/gnumeric/gnumericexport.cc @@ -938,7 +938,7 @@ void GNUMERICExport::addSummaryItem(TQDomDocument gnumeric_doc, TQDomElement sum // The reason why we use the KoDocument* approach and not the TQDomDocument // approach is because we don't want to export formulas but values ! -KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to ) { kdDebug(30521) << "Exporting GNUmeric" << endl; diff --git a/filters/kspread/gnumeric/gnumericexport.h b/filters/kspread/gnumeric/gnumericexport.h index 392f0f72..0b2b0324 100644 --- a/filters/kspread/gnumeric/gnumericexport.h +++ b/filters/kspread/gnumeric/gnumericexport.h @@ -37,7 +37,7 @@ public: GNUMERICExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~GNUMERICExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: TQDomElement GetCellStyle(TQDomDocument gnumeric_doc, KSpread::Cell* cell, int currentcolumn, int currentrow); diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc index 249258b3..b0833e87 100644 --- a/filters/kspread/gnumeric/gnumericimport.cc +++ b/filters/kspread/gnumeric/gnumericimport.cc @@ -1822,7 +1822,7 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table) */ -KoFilter::ConversiontqStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to ) +KoFilter::ConversionStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to ) { dateInit(); bool bSuccess=true; diff --git a/filters/kspread/gnumeric/gnumericimport.h b/filters/kspread/gnumeric/gnumericimport.h index b7fbd4bd..c449a599 100644 --- a/filters/kspread/gnumeric/gnumericimport.h +++ b/filters/kspread/gnumeric/gnumericimport.h @@ -39,7 +39,7 @@ class GNUMERICFilter : public KoFilter GNUMERICFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~GNUMERICFilter() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); enum borderStyle { Left, Right, Top, Bottom, Diagonal, Revdiagonal}; private: diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui index df5dcc90..cfaedfa7 100644 --- a/filters/kspread/html/exportwidget.ui +++ b/filters/kspread/html/exportwidget.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -292,7 +292,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc index 54711d8d..b81d8e22 100644 --- a/filters/kspread/html/htmlexport.cc +++ b/filters/kspread/html/htmlexport.cc @@ -76,7 +76,7 @@ const TQString strGt (">"); // The reason why we use the KoDocument* approach and not the TQDomDocument // approach is because we don't want to export formulas but values ! -KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) { if(to!="text/html" || from!="application/x-kspread") { diff --git a/filters/kspread/html/htmlexport.h b/filters/kspread/html/htmlexport.h index 09f904d3..c7007157 100644 --- a/filters/kspread/html/htmlexport.h +++ b/filters/kspread/html/htmlexport.h @@ -39,7 +39,7 @@ public: HTMLExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~HTMLExport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: /** Writes the top of the page in HTML to @par str */ void openPage( KSpread::Sheet *sheet,KoDocument *document, TQString &str); diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc index 15e8ee2a..ac725982 100644 --- a/filters/kspread/kexi/kspread_kexiimport.cc +++ b/filters/kspread/kexi/kspread_kexiimport.cc @@ -74,7 +74,7 @@ KSpreadKexiImport::~KSpreadKexiImport() //============================================================================= -KoFilter::ConversiontqStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to ) { TQPtrList<TQListViewItem> objects; TQString file( m_chain->inputFile() ); diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h index aec65889..4de3e704 100644 --- a/filters/kspread/kexi/kspread_kexiimport.h +++ b/filters/kspread/kexi/kspread_kexiimport.h @@ -76,7 +76,7 @@ class KSpreadKexiImport : public KoFilter */ virtual ~KSpreadKexiImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: KSpread::Doc *ksdoc; diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index d9d28d55..82f95406 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -196,7 +196,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>145</width> <height>0</height> diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc index 66927728..c303a59e 100644 --- a/filters/kspread/latex/export/latexexport.cc +++ b/filters/kspread/latex/export/latexexport.cc @@ -35,7 +35,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) { TQString config; diff --git a/filters/kspread/latex/export/latexexport.h b/filters/kspread/latex/export/latexexport.h index e7c0312b..1d8076eb 100644 --- a/filters/kspread/latex/export/latexexport.h +++ b/filters/kspread/latex/export/latexexport.h @@ -38,7 +38,7 @@ class LATEXExport : public KoFilter LATEXExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __LATEXExport_H__ */ diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 8c3835ed..741a9c7e 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc index ba56c229..cc7b2b46 100644 --- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc +++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc @@ -31,7 +31,7 @@ KSpreadBaseWorker::~KSpreadBaseWorker() { } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startDocument: " << it.key() << "->" << it.data() << endl; @@ -40,7 +40,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterPrope } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startInfoLog: " << it.key() << "->" << it.data() << endl; @@ -49,7 +49,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProper } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startInfoAuthor: " << it.key() << "->" << it.data() << endl; @@ -58,7 +58,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterPro } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startInfoAbout: " << it.key() << "->" << it.data() << endl; @@ -67,7 +67,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProp } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startSpreadBook: " << it.key() << "->" << it.data() << endl; @@ -76,7 +76,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterPro } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startSpreadSheet: " << it.key() << "->" << it.data() << endl; @@ -85,7 +85,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterPr } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startSpreadCell: " << it.key() << "->" << it.data() << endl; diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h index 4ba82383..13b3d380 100644 --- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h +++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h @@ -33,13 +33,13 @@ public: KSpreadBaseWorker(); virtual ~KSpreadBaseWorker(); - virtual KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property); }; #endif /* KSPREAD_BASE_WORKER_H */ diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.cc b/filters/kspread/libkspreadexport/KSpreadLeader.cc index 9ba2d874..b1b9a0aa 100644 --- a/filters/kspread/libkspreadexport/KSpreadLeader.cc +++ b/filters/kspread/libkspreadexport/KSpreadLeader.cc @@ -48,8 +48,8 @@ void Leader::setWorker(KSpreadBaseWorker *newWorker) { } -KoFilter::ConversiontqStatus Leader::convert() { - KoFilter::ConversiontqStatus status; +KoFilter::ConversionStatus Leader::convert() { + KoFilter::ConversionStatus status; // Validate the filter chain and the worker if (!m_filterChain) { @@ -122,8 +122,8 @@ KoFilter::ConversiontqStatus Leader::convert() { } -KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) { - KoFilter::ConversiontqStatus status; +KoFilter::ConversionStatus Leader::doInfo(KoDocumentInfo *info) { + KoFilter::ConversionStatus status; #if 0 // this was never used, it's been removed now // Gather data about the document log @@ -164,7 +164,7 @@ KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) { } -KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) { +KoFilter::ConversionStatus Leader::doSpreadBook(KSpreadDoc *document) { KSpreadFilterProperty docSpreadBookProperty; docSpreadBookProperty["spreadsheetcount"] = TQString::number(document->map()->count()); docSpreadBookProperty["decimalsymbol"] = document->locale()->decimalSymbol(); @@ -216,7 +216,7 @@ KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) { } -KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) { +KoFilter::ConversionStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) { KSpreadFilterProperty docSpreadSheetProperty; docSpreadSheetProperty["name"] = spreadSheet->tableName(); docSpreadSheetProperty["sizemaxx"] = TQString::number(spreadSheet->sizeMaxX()); @@ -257,7 +257,7 @@ KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) { } -KoFilter::ConversiontqStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) { +KoFilter::ConversionStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) { KSpreadFilterProperty docSpreadCellProperty; docSpreadCellProperty["column"] = TQString::number(column); docSpreadCellProperty["row"] = TQString::number(row); diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.h b/filters/kspread/libkspreadexport/KSpreadLeader.h index 7e9abfed..eee950b9 100644 --- a/filters/kspread/libkspreadexport/KSpreadLeader.h +++ b/filters/kspread/libkspreadexport/KSpreadLeader.h @@ -78,10 +78,10 @@ private: protected: KSpreadBaseWorker *getWorker() const; - KoFilter::ConversiontqStatus doSpreadCell(Cell *spreadCell, int column, int row); - KoFilter::ConversiontqStatus doSpreadSheet(Sheet *spreadSheet); - KoFilter::ConversiontqStatus doSpreadBook(Doc *document); - KoFilter::ConversiontqStatus doInfo(KoDocumentInfo *info); + KoFilter::ConversionStatus doSpreadCell(Cell *spreadCell, int column, int row); + KoFilter::ConversionStatus doSpreadSheet(Sheet *spreadSheet); + KoFilter::ConversionStatus doSpreadBook(Doc *document); + KoFilter::ConversionStatus doInfo(KoDocumentInfo *info); public: /** @@ -97,7 +97,7 @@ public: * * @return status of the conversion. */ - KoFilter::ConversiontqStatus convert(); + KoFilter::ConversionStatus convert(); }; } // namespace KSpread diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc index 9e37597c..828d817a 100644 --- a/filters/kspread/opencalc/opencalcexport.cc +++ b/filters/kspread/opencalc/opencalcexport.cc @@ -83,7 +83,7 @@ OpenCalcExport::OpenCalcExport( KoFilter *, const char *, const TQStringList & ) { } -KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from, +KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from, const TQCString & to ) { /* later... @@ -91,7 +91,7 @@ KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from, OpenCalcWorker * worker = new OpenCalcWorker(); leader->setWorker( worker ); - KoFilter::ConversiontqStatus status = leader->convert(); + KoFilter::ConversionStatus status = leader->convert(); delete worker; delete leader; @@ -227,7 +227,7 @@ bool OpenCalcExport::exportDocInfo( KoStore * store, const Doc* ksdoc ) data.appendChild( meta.createTextNode( aboutPage->subject() ) ); officeMeta.appendChild( data ); - const TQDateTime dt ( TQDateTime::tqcurrentDateTime() ); + const TQDateTime dt ( TQDateTime::currentDateTime() ); if ( dt.isValid() ) { data = meta.createElement( "dc:date" ); @@ -1073,7 +1073,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, 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() ) ); + t.appendChild( doc.createTextNode( TQDate::currentDate().toString() ) ); parent.appendChild( t ); } else if ( var == "<time>" ) diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h index 97832a9a..03cfa245 100644 --- a/filters/kspread/opencalc/opencalcexport.h +++ b/filters/kspread/opencalc/opencalcexport.h @@ -46,7 +46,7 @@ class OpenCalcExport : public KoFilter OpenCalcExport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OpenCalcExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString & from, + virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to ); private: diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 376a8f77..0fbe52e0 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -2735,7 +2735,7 @@ int OpenCalcImport::readMetaData() return result; } -KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to ) { kdDebug(30518) << "Entering OpenCalc Import filter: " << from << " - " << to << endl; @@ -2765,10 +2765,10 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ kdDebug(30518) << "Opening file " << endl; - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if ( pretqStatus != KoFilter::OK ) - return pretqStatus; + if ( preStatus != KoFilter::OK ) + return preStatus; emit sigProgress( 13 ); int tables = readMetaData(); @@ -2782,7 +2782,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ return KoFilter::OK; } -KoFilter::ConversiontqStatus OpenCalcImport::openFile() +KoFilter::ConversionStatus OpenCalcImport::openFile() { KoStore * store = KoStore::createStore( m_chain->inputFile(), KoStore::Read); @@ -2817,7 +2817,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::openFile() return KoFilter::OK; } -KoFilter::ConversiontqStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ) +KoFilter::ConversionStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ) { return OoUtils::loadAndParse( fileName, doc, m_store); } diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h index cd1f23b6..071a87ff 100644 --- a/filters/kspread/opencalc/opencalcimport.h +++ b/filters/kspread/opencalc/opencalcimport.h @@ -47,7 +47,7 @@ class OpenCalcImport : public KoFilter OpenCalcImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OpenCalcImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: @@ -111,9 +111,9 @@ class OpenCalcImport : public KoFilter void loadOasisConditionValue( const TQString &styleCondition, KSpread::Conditional &newCondition ); void loadOasisCondition( TQString &valExpression, KSpread::Conditional &newCondition ); void loadOasisValidationValue( const TQStringList &listVal, KSpread::Conditional &newCondition ); - KoFilter::ConversiontqStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ); + KoFilter::ConversionStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ); - KoFilter::ConversiontqStatus openFile(); + KoFilter::ConversionStatus openFile(); }; #endif // OpenCalc_IMPORT_H__ diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc index 9a0db4fa..920d20a7 100644 --- a/filters/kspread/qpro/qproimport.cc +++ b/filters/kspread/qpro/qproimport.cc @@ -94,7 +94,7 @@ QpImport::InitTableName(int pIdx, TQString& pResult) } } -KoFilter::ConversiontqStatus QpImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCString& to ) { bool bSuccess=true; diff --git a/filters/kspread/qpro/qproimport.h b/filters/kspread/qpro/qproimport.h index 1c3c7d85..e69d2a65 100644 --- a/filters/kspread/qpro/qproimport.h +++ b/filters/kspread/qpro/qproimport.h @@ -37,7 +37,7 @@ public: QpImport(KoFilter* parent, const char* name, const TQStringList&); virtual ~QpImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); void InitTableName(int pIdx, TQString& pResult); }; diff --git a/filters/kugar/kugarnop/kugarnopimport.cpp b/filters/kugar/kugarnop/kugarnopimport.cpp index f8ad242c..f3b132db 100644 --- a/filters/kugar/kugarnop/kugarnopimport.cpp +++ b/filters/kugar/kugarnop/kugarnopimport.cpp @@ -31,7 +31,7 @@ KugarNOPImport::KugarNOPImport( KoFilter *, const char *, const TQStringList& ) { } -KoFilter::ConversiontqStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ ) +KoFilter::ConversionStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ ) { TQFile in( m_chain->inputFile()); diff --git a/filters/kugar/kugarnop/kugarnopimport.h b/filters/kugar/kugarnop/kugarnopimport.h index 03085410..a7099bc4 100644 --- a/filters/kugar/kugarnop/kugarnopimport.h +++ b/filters/kugar/kugarnop/kugarnopimport.h @@ -28,7 +28,7 @@ class KugarNOPImport : public KoFilter public: KugarNOPImport( KoFilter *parent, const char *name, const TQStringList& ); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index 717611cd..cac51013 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -1208,7 +1208,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo) *m_streamOut << "</m>\n"; - TQDateTime now (TQDateTime::tqcurrentDateTime(Qt::UTC)); // current time in UTC + TQDateTime now (TQDateTime::currentDateTime(Qt::UTC)); // current time in UTC *m_streamOut << "<m key=\"abiword.date_last_changed\">" << escapeAbiWordText(transformToTextDate(now)) << "</m>\n"; @@ -1225,7 +1225,7 @@ ABIWORDExport::ABIWORDExport(KoFilter */*parent*/, const char */*name*/, const T KoFilter() { } -KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/x-abiword" || from != "application/x-kword" ) { @@ -1252,7 +1252,7 @@ KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, cons return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/abiword/abiwordexport.h b/filters/kword/abiword/abiwordexport.h index 550b7682..656283f8 100644 --- a/filters/kword/abiword/abiwordexport.h +++ b/filters/kword/abiword/abiwordexport.h @@ -47,6 +47,6 @@ public: ABIWORDExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~ABIWORDExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // ABIWORDEXPORT_H diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index 4815d02c..2de6d457 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -72,7 +72,7 @@ class StructureParser : public TQXmlDefaultHandler public: StructureParser(KoFilterChain* chain) : m_chain(chain), m_pictureNumber(0), m_pictureFrameNumber(0), m_tableGroupNumber(0), - m_timepoint(TQDateTime::tqcurrentDateTime(Qt::UTC)), m_fatalerror(false) + m_timepoint(TQDateTime::currentDateTime(Qt::UTC)), m_fatalerror(false) { createDocument(); structureStack.setAutoDelete(true); @@ -1757,7 +1757,7 @@ ABIWORDImport::ABIWORDImport(KoFilter */*parent*/, const char */*name*/, const T KoFilter() { } -KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to ) { if ((to != "application/x-kword") || (from != "application/x-abiword")) return KoFilter::NotImplemented; diff --git a/filters/kword/abiword/abiwordimport.h b/filters/kword/abiword/abiwordimport.h index 9ff4d764..8b8349b7 100644 --- a/filters/kword/abiword/abiwordimport.h +++ b/filters/kword/abiword/abiwordimport.h @@ -50,6 +50,6 @@ public: ABIWORDImport(); virtual ~ABIWORDImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // ABIWORDIMPORT_H diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cc index dd4550b8..4084d335 100644 --- a/filters/kword/amipro/amiproexport.cc +++ b/filters/kword/amipro/amiproexport.cc @@ -180,7 +180,7 @@ AmiProExport::AmiProExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus AmiProExport::convert( const TQCString& from, const TQCString& to ) { @@ -191,7 +191,7 @@ AmiProExport::convert( const TQCString& from, AmiProWorker* worker = new AmiProWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/amipro/amiproexport.h b/filters/kword/amipro/amiproexport.h index c9e1f5d9..bffb4362 100644 --- a/filters/kword/amipro/amiproexport.h +++ b/filters/kword/amipro/amiproexport.h @@ -35,7 +35,7 @@ class AmiProExport : public KoFilter virtual ~AmiProExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __AMIPROEXPORT_H diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc index 7f37746c..6061da20 100644 --- a/filters/kword/amipro/amiproimport.cc +++ b/filters/kword/amipro/amiproimport.cc @@ -157,9 +157,9 @@ static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout ) "\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\""; TQString linespacing; - linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) : - tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) : - tqlayout.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) : + linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) : + tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) : + tqlayout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) : TQString::number( tqlayout.linespace ); result.append( "<LAYOUT>\n" ); @@ -213,9 +213,9 @@ static TQString AmiProStyleAsXML( const AmiProStyle& style ) "left"; TQString linespacing; - linespacing = style.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) : - style.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) : - style.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) : + linespacing = style.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) : + style.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) : + style.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) : TQString::number( style.linespace ); TQString offsets; @@ -319,7 +319,7 @@ bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList format return true; } -KoFilter::ConversiontqStatus AmiProImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus AmiProImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "application/x-amipro" ) diff --git a/filters/kword/amipro/amiproimport.h b/filters/kword/amipro/amiproimport.h index ad078543..45c8cc2b 100644 --- a/filters/kword/amipro/amiproimport.h +++ b/filters/kword/amipro/amiproimport.h @@ -37,7 +37,7 @@ class AmiProImport : public KoFilter virtual ~AmiProImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __AMIPROIMPORT_H diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc index d7acc7ed..8c805111 100644 --- a/filters/kword/applixword/applixwordimport.cc +++ b/filters/kword/applixword/applixwordimport.cc @@ -85,7 +85,7 @@ APPLIXWORDImport::nextLine (TQTextStream & stream) * * * * ******************************************************************************/ -KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to ) { if (to!="application/x-kword" || from!="application/x-applixword") diff --git a/filters/kword/applixword/applixwordimport.h b/filters/kword/applixword/applixwordimport.h index ccd80df7..90333f47 100644 --- a/filters/kword/applixword/applixwordimport.h +++ b/filters/kword/applixword/applixwordimport.h @@ -50,7 +50,7 @@ public: APPLIXWORDImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXWORDImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: TQChar specCharfind (TQChar , TQChar ); diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui index 8f66942c..8ba0d757 100644 --- a/filters/kword/ascii/ExportDialogUI.ui +++ b/filters/kword/ascii/ExportDialogUI.ui @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui index fd124062..d173386f 100644 --- a/filters/kword/ascii/ImportDialogUI.ui +++ b/filters/kword/ascii/ImportDialogUI.ui @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc index 4f4fbb06..7bba005c 100644 --- a/filters/kword/ascii/asciiexport.cc +++ b/filters/kword/ascii/asciiexport.cc @@ -474,7 +474,7 @@ ASCIIExport::ASCIIExport(KoFilter*, const char*, const TQStringList&) { } -KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus ASCIIExport::convert(const TQCString& from, const TQCString& to) { if (to != "text/plain" || from != "application/x-kword") { @@ -534,7 +534,7 @@ KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const T return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result = leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result = leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/ascii/asciiexport.h b/filters/kword/ascii/asciiexport.h index af1e2e04..429ad6c8 100644 --- a/filters/kword/ascii/asciiexport.h +++ b/filters/kword/ascii/asciiexport.h @@ -31,7 +31,7 @@ public: ASCIIExport(KoFilter* parent, const char* name, const TQStringList&); virtual ~ASCIIExport() {} - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // ASCIIEXPORT_H diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc index f2a6e039..7040e9f1 100644 --- a/filters/kword/ascii/asciiimport.cc +++ b/filters/kword/ascii/asciiimport.cc @@ -195,7 +195,7 @@ void ASCIIImport::prepareDocument(TQDomDocument& mainDocument, TQDomElement& mai } -KoFilter::ConversiontqStatus ASCIIImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ASCIIImport::convert( const TQCString& from, const TQCString& to ) { if (to!="application/x-kword" || from!="text/plain") return KoFilter::NotImplemented; diff --git a/filters/kword/ascii/asciiimport.h b/filters/kword/ascii/asciiimport.h index 4d332776..b2cfcbdd 100644 --- a/filters/kword/ascii/asciiimport.h +++ b/filters/kword/ascii/asciiimport.h @@ -65,7 +65,7 @@ public: ASCIIImport(); virtual ~ASCIIImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: // not yet changed #if 0 void WriteOutTableCell( int table_no, int row, int col, Position *pos, diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cc index db9c754a..372a3b5c 100644 --- a/filters/kword/docbook/docbookexport.cc +++ b/filters/kword/docbook/docbookexport.cc @@ -782,7 +782,7 @@ bool DocBookWorker::doFullDocumentInfo ( const KWEFDocumentInfo &docInfo ) } -KoFilter::ConversiontqStatus DocBookExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus DocBookExport::convert( const TQCString& from, const TQCString& to ) { #if 0 kdError (30507) << "to = " << to << ", from = " << from << endl; diff --git a/filters/kword/docbook/docbookexport.h b/filters/kword/docbook/docbookexport.h index cf7ec804..29362aaa 100644 --- a/filters/kword/docbook/docbookexport.h +++ b/filters/kword/docbook/docbookexport.h @@ -38,6 +38,6 @@ public: DocBookExport (KoFilter *parent, const char *name, const TQStringList & ); virtual ~DocBookExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // DOCBOOKEXPORT_H diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp index 6fc353e5..bfab48ab 100644 --- a/filters/kword/hancomword/hancomwordimport.cpp +++ b/filters/kword/hancomword/hancomwordimport.cpp @@ -82,7 +82,7 @@ static inline unsigned long readU16( const void* p ) } -KoFilter::ConversiontqStatus HancomWordImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HancomWordImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/x-hancomword" ) return KoFilter::NotImplemented; diff --git a/filters/kword/hancomword/hancomwordimport.h b/filters/kword/hancomword/hancomwordimport.h index 64d279a8..f78c3a47 100644 --- a/filters/kword/hancomword/hancomwordimport.h +++ b/filters/kword/hancomword/hancomwordimport.h @@ -35,7 +35,7 @@ public: HancomWordImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~HancomWordImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: class Private; diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui index cbdc4fc2..e68cb6ab 100644 --- a/filters/kword/html/export/ExportDialogUI.ui +++ b/filters/kword/html/export/ExportDialogUI.ui @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> diff --git a/filters/kword/html/export/htmlexport.cc b/filters/kword/html/export/htmlexport.cc index f8af8e3e..28573517 100644 --- a/filters/kword/html/export/htmlexport.cc +++ b/filters/kword/html/export/htmlexport.cc @@ -61,7 +61,7 @@ HTMLExport::HTMLExport(KoFilter *, const char *, const TQStringList &) : KoFilter() { } -KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) { if ((from != "application/x-kword") || (to != "text/html")) { @@ -118,7 +118,7 @@ KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const T delete worker; return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/html/export/htmlexport.h b/filters/kword/html/export/htmlexport.h index 5de5ef6a..10617bae 100644 --- a/filters/kword/html/export/htmlexport.h +++ b/filters/kword/html/export/htmlexport.h @@ -39,7 +39,7 @@ public: HTMLExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // HTMLEXPORT_H diff --git a/filters/kword/html/import/htmlimport.cpp b/filters/kword/html/import/htmlimport.cpp index 2c403b2f..9b29320d 100644 --- a/filters/kword/html/import/htmlimport.cpp +++ b/filters/kword/html/import/htmlimport.cpp @@ -39,7 +39,7 @@ HTMLImport::HTMLImport(KoFilter *, const char*, const TQStringList &) : // 123 } -KoFilter::ConversiontqStatus HTMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLImport::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" || from!="text/html") return KoFilter::NotImplemented; diff --git a/filters/kword/html/import/htmlimport.h b/filters/kword/html/import/htmlimport.h index f7c61a41..ab2a293c 100644 --- a/filters/kword/html/import/htmlimport.h +++ b/filters/kword/html/import/htmlimport.h @@ -37,7 +37,7 @@ public: HTMLImport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // HTMLIMPORT_H diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp index ebcf3f6a..82812412 100644 --- a/filters/kword/kword1.3/import/kword13import.cpp +++ b/filters/kword/kword1.3/import/kword13import.cpp @@ -104,7 +104,7 @@ bool KWord13Import::postParse( KoStore* store, KWord13Document& doc ) return post.postParse( store, doc ); } -KoFilter::ConversiontqStatus KWord13Import::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KWord13Import::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/vnd.oasis.opendocument.text" || from != "application/x-kword" ) diff --git a/filters/kword/kword1.3/import/kword13import.h b/filters/kword/kword1.3/import/kword13import.h index 7d60dd89..77c05c23 100644 --- a/filters/kword/kword1.3/import/kword13import.h +++ b/filters/kword/kword1.3/import/kword13import.h @@ -39,7 +39,7 @@ public: KWord13Import(KoFilter *parent, const char *name, const TQStringList &); virtual ~KWord13Import() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: bool parseInfo( TQIODevice* io, KWord13Document& kwordDocument ); bool parseRoot( TQIODevice* io, KWord13Document& kwordDocument ); diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cc index f521ec9d..083f2375 100644 --- a/filters/kword/latex/export/latexexport.cc +++ b/filters/kword/latex/export/latexexport.cc @@ -36,7 +36,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) { TQString config; diff --git a/filters/kword/latex/export/latexexport.h b/filters/kword/latex/export/latexexport.h index e7c0312b..1d8076eb 100644 --- a/filters/kword/latex/export/latexexport.h +++ b/filters/kword/latex/export/latexexport.h @@ -38,7 +38,7 @@ class LATEXExport : public KoFilter LATEXExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __LATEXExport_H__ */ diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 8c3835ed..741a9c7e 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cc index f644910a..00f069cf 100644 --- a/filters/kword/latex/import/lateximport.cc +++ b/filters/kword/latex/import/lateximport.cc @@ -35,7 +35,7 @@ LATEXImport::LATEXImport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus LATEXImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXImport::convert( const TQCString& from, const TQCString& to ) { TQString config; diff --git a/filters/kword/latex/import/lateximport.h b/filters/kword/latex/import/lateximport.h index 949d7163..9c85cad0 100644 --- a/filters/kword/latex/import/lateximport.h +++ b/filters/kword/latex/import/lateximport.h @@ -38,7 +38,7 @@ class LATEXImport : public KoFilter LATEXImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __LATEXIMPORT_H__ */ diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc index 3e9a724e..b627ebd2 100644 --- a/filters/kword/libexport/KWEFKWordLeader.cc +++ b/filters/kword/libexport/KWEFKWordLeader.cc @@ -1361,7 +1361,7 @@ bool KWEFKWordLeader::loadSubFile(const TQString& fileName, TQByteArray& array) return true; } -KoFilter::ConversiontqStatus KWEFKWordLeader::convert( KoFilterChain* chain, +KoFilter::ConversionStatus KWEFKWordLeader::convert( KoFilterChain* chain, const TQCString& from, const TQCString& to) { if ( from != "application/x-kword" ) diff --git a/filters/kword/libexport/KWEFKWordLeader.h b/filters/kword/libexport/KWEFKWordLeader.h index 78ce1348..ee1d7694 100644 --- a/filters/kword/libexport/KWEFKWordLeader.h +++ b/filters/kword/libexport/KWEFKWordLeader.h @@ -38,7 +38,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader public: void setWorker ( KWEFBaseWorker *newWorker ); KWEFBaseWorker *getWorker(void) const; - KoFilter::ConversiontqStatus convert( KoFilterChain* chain, + KoFilter::ConversionStatus convert( KoFilterChain* chain, const TQCString& from, const TQCString& to); public: // ### TODO: where to put in the end? void createBookmarkFormatData( ParaData& paraData ); diff --git a/filters/kword/msword/mswordimport.cpp b/filters/kword/msword/mswordimport.cpp index 3be95f7a..714db274 100644 --- a/filters/kword/msword/mswordimport.cpp +++ b/filters/kword/msword/mswordimport.cpp @@ -41,7 +41,7 @@ MSWordImport::~MSWordImport() { } -KoFilter::ConversiontqStatus MSWordImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MSWordImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if ( to != "application/x-kword" || from != "application/msword" ) diff --git a/filters/kword/msword/mswordimport.h b/filters/kword/msword/mswordimport.h index 73a568ff..ae348fc7 100644 --- a/filters/kword/msword/mswordimport.h +++ b/filters/kword/msword/mswordimport.h @@ -33,7 +33,7 @@ public: MSWordImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~MSWordImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem ); diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index 07eb3da7..10c3abb9 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -464,7 +464,7 @@ void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::W int dist = fontSize > 20 ? 2 : 1; if (chp->fImprint) // ## no real support for imprint, we use a topleft shadow dist = -dist; - css = TQString::tqfromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist); + css = TQString::fromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist); } shadowElem.setAttribute( "text-shadow", css ); format.appendChild( shadowElem ); diff --git a/filters/kword/mswrite/ImportDialogUI.ui b/filters/kword/mswrite/ImportDialogUI.ui index db7dcc20..bed2bad1 100644 --- a/filters/kword/mswrite/ImportDialogUI.ui +++ b/filters/kword/mswrite/ImportDialogUI.ui @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -218,7 +218,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -237,7 +237,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc index 02d980ef..e6d211b9 100644 --- a/filters/kword/mswrite/mswriteexport.cc +++ b/filters/kword/mswrite/mswriteexport.cc @@ -1450,13 +1450,13 @@ public: { if (tqlayout.tqalignment == "left") // quite useless since MSWrite::Alignment::Left is the default anyway - paraProp.tqsetAlignment (MSWrite::Alignment::Left); + paraProp.setAlignment (MSWrite::Alignment::Left); else if (tqlayout.tqalignment == "right") - paraProp.tqsetAlignment (MSWrite::Alignment::Right); + paraProp.setAlignment (MSWrite::Alignment::Right); else if (tqlayout.tqalignment == "center") - paraProp.tqsetAlignment (MSWrite::Alignment::Center); + paraProp.setAlignment (MSWrite::Alignment::Center); else if (tqlayout.tqalignment == "justify") - paraProp.tqsetAlignment (MSWrite::Alignment::Justify); + paraProp.setAlignment (MSWrite::Alignment::Justify); else kdWarning (30509) << "Unknown Alignment: " << tqlayout.tqalignment << endl; } @@ -1903,7 +1903,7 @@ MSWriteExport::~MSWriteExport () { } -KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, const TQCString &to) +KoFilter::ConversionStatus MSWriteExport::convert (const TQCString &from, const TQCString &to) { kdDebug (30509) << "MSWriteExport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite " << MSWrite::Version << endl; @@ -1929,7 +1929,7 @@ KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, cons return KoFilter::OutOfMemory; } - KoFilter::ConversiontqStatus ret = leader->convert (m_chain, from, to); + KoFilter::ConversionStatus ret = leader->convert (m_chain, from, to); int errorCode = worker->getError (); delete leader; diff --git a/filters/kword/mswrite/mswriteexport.h b/filters/kword/mswrite/mswriteexport.h index 796ce705..adfbc4ba 100644 --- a/filters/kword/mswrite/mswriteexport.h +++ b/filters/kword/mswrite/mswriteexport.h @@ -31,7 +31,7 @@ public: MSWriteExport (KoFilter *parent, const char *name, const TQStringList &); virtual ~MSWriteExport (); - KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to); + KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to); }; #endif // MSWRITEEXPORT_H diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc index 379d3c01..c28c9d62 100644 --- a/filters/kword/mswrite/mswriteimport.cc +++ b/filters/kword/mswrite/mswriteimport.cc @@ -1345,7 +1345,7 @@ MSWriteImport::~MSWriteImport () delete m_device; } -KoFilter::ConversiontqStatus MSWriteImport::convert (const TQCString &from, const TQCString &to) +KoFilter::ConversionStatus MSWriteImport::convert (const TQCString &from, const TQCString &to) { kdDebug (30509) << "MSWriteImport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite " << MSWrite::Version << endl; diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h index 65be7e7a..8d59fe38 100644 --- a/filters/kword/mswrite/mswriteimport.h +++ b/filters/kword/mswrite/mswriteimport.h @@ -40,7 +40,7 @@ public: MSWriteImport (KoFilter *parent, const char *name, const TQStringList &); virtual ~MSWriteImport (); - KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to); + KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to); void sigProgress (const int value) { diff --git a/filters/kword/mswrite/structures.h b/filters/kword/mswrite/structures.h index af687b3a..5aa4f6a3 100644 --- a/filters/kword/mswrite/structures.h +++ b/filters/kword/mswrite/structures.h @@ -378,7 +378,7 @@ namespace MSWrite // convenience functions Byte getAlign (void) const { return getAlignment (); } - void setAlign (const Byte val) { tqsetAlignment (val); } + void setAlign (const Byte val) { setAlignment (val); } Short getLeftIndentFirstLine (const bool purist = false) const { diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h index 0ee985ce..bc068758 100644 --- a/filters/kword/mswrite/structures_generated.h +++ b/filters/kword/mswrite/structures_generated.h @@ -759,7 +759,7 @@ namespace MSWrite // Byte getAlignment (void) const { return m_tqalignment; } - void tqsetAlignment (const Byte val) { m_tqalignment = val; signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/); } + void setAlignment (const Byte val) { m_tqalignment = val; signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/); } Word getRightIndent (void) const { return m_rightIndent; } void setRightIndent (const Word val) { m_rightIndent = val; signalHaveSetData (m_rightIndent == Word (0), 32/*offset*/ + 16/*size*/); } diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc index ff9c8276..9287169f 100644 --- a/filters/kword/oowriter/ExportFilter.cc +++ b/filters/kword/oowriter/ExportFilter.cc @@ -2160,12 +2160,12 @@ void OOWriterWorker::declareFont(const TQString& fontName) { TQString props; - // Disabled, as TQFontInfo::tqstyleHint() cannot guess + // Disabled, as TQFontInfo::styleHint() cannot guess #if 0 TQFont font(fontName); TQFontInfo info(font); props+="style:font-family-generic=\"" - switch (info.tqstyleHint()) + switch (info.styleHint()) { case TQFont::SansSerif: default: @@ -2217,7 +2217,7 @@ TQString OOWriterWorker::makeAutomaticStyleName(const TQString& prefix, ulong& c return str2; // If it is still not unique, try a time stamp. - const TQDateTime dt(TQDateTime::tqcurrentDateTime(Qt::UTC)); + const TQDateTime dt(TQDateTime::currentDateTime(Qt::UTC)); str2 = str + "_" + TQString::number(dt.toTime_t(),16); if (m_styleMap.find(str2)==m_styleMap.end()) diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc index 209b2bec..2401508c 100644 --- a/filters/kword/oowriter/conversion.cc +++ b/filters/kword/oowriter/conversion.cc @@ -37,13 +37,13 @@ TQPair<int,TQString> Conversion::importWrapping( const TQString& oowrap ) if ( oowrap == "run-through" ) return tqMakePair( 0, TQString() ); if ( oowrap == "biggest" ) // OASIS extension - return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) ); + return tqMakePair( 1, TQString::fromLatin1( "biggest" ) ); ////if ( oowrap == "parallel" || oowrap == "dynamic" ) // dynamic is called "optimal" in the OO GUI. It's different from biggest because it can lead to parallel. // Those are not supported in KWord, let's use biggest instead - return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) ); + return tqMakePair( 1, TQString::fromLatin1( "biggest" ) ); } TQString Conversion::exportWrapping( const TQPair<int,TQString>& runAroundAttribs ) diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cc index 426105e8..aba0ee9f 100644 --- a/filters/kword/oowriter/oowriterexport.cc +++ b/filters/kword/oowriter/oowriterexport.cc @@ -52,7 +52,7 @@ OOWRITERExport::OOWRITERExport(KoFilter */*parent*/, const char */*name*/, const KoFilter() { } -KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/vnd.sun.xml.writer" || from != "application/x-kword" ) { @@ -79,7 +79,7 @@ KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, con return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/oowriter/oowriterexport.h b/filters/kword/oowriter/oowriterexport.h index 8f4695b8..bd1a0f40 100644 --- a/filters/kword/oowriter/oowriterexport.h +++ b/filters/kword/oowriter/oowriterexport.h @@ -47,6 +47,6 @@ public: OOWRITERExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~OOWRITERExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // OOWRITEREXPORT_H diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc index 5fd196f8..87e41f49 100644 --- a/filters/kword/oowriter/oowriterimport.cc +++ b/filters/kword/oowriter/oowriterimport.cc @@ -69,7 +69,7 @@ OoWriterImport::~OoWriterImport() { } -KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OoWriterImport::convert( TQCString const & from, TQCString const & to ) { kdDebug(30518) << "Entering Oowriter Import filter: " << from << " - " << to << endl; @@ -99,20 +99,20 @@ KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQ } - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); TQImage thumbnail; - if ( pretqStatus == KoFilter::OK ) + if ( preStatus == KoFilter::OK ) { // We do not care about the failure OoUtils::loadThumbnail( thumbnail, m_zip ); } - if ( pretqStatus != KoFilter::OK ) + if ( preStatus != KoFilter::OK ) { m_zip->close(); delete m_zip; - return pretqStatus; + return preStatus; } m_currentMasterPage = TQString(); @@ -535,14 +535,14 @@ TQDomElement OoWriterImport::createInitialFrame( TQDomElement& parentFramesetEle return frameElementOut; } -KoFilter::ConversiontqStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc) +KoFilter::ConversionStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc) { return OoUtils::loadAndParse( filename, doc, m_zip); } -KoFilter::ConversiontqStatus OoWriterImport::openFile() +KoFilter::ConversionStatus OoWriterImport::openFile() { - KoFilter::ConversiontqStatus status=loadAndParse("content.xml", m_content); + KoFilter::ConversionStatus status=loadAndParse("content.xml", m_content); if ( status != KoFilter::OK ) { kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl; @@ -1817,7 +1817,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href.mid(1)); - KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); picture.setKey(key); if (!m_zip) @@ -1966,7 +1966,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } const TQDate date(dt.date()); @@ -1995,7 +1995,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } diff --git a/filters/kword/oowriter/oowriterimport.h b/filters/kword/oowriter/oowriterimport.h index 80586a31..4de60534 100644 --- a/filters/kword/oowriter/oowriterimport.h +++ b/filters/kword/oowriter/oowriterimport.h @@ -38,7 +38,7 @@ public: OoWriterImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoWriterImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem ); @@ -61,8 +61,8 @@ private: void createDocumentInfo( TQDomDocument &docinfo ); void createDocumentContent( TQDomDocument &doccontent, TQDomElement& mainFramesetElement ); void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement ); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc); - KoFilter::ConversiontqStatus openFile(); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc); + KoFilter::ConversionStatus openFile(); bool createStyleMap( const TQDomDocument & styles, TQDomDocument& doc ); void insertStyles( const TQDomElement& element, TQDomDocument& doc ); void importDateTimeStyle( const TQDomElement& parent ); diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp index 65a83518..89af187c 100644 --- a/filters/kword/palmdoc/palmdb.cpp +++ b/filters/kword/palmdoc/palmdb.cpp @@ -38,9 +38,9 @@ PalmDB::PalmDB() setName( "Unnamed" ); setAttributes( 0 ); setVersion( 0 ); - setCreationDate( TQDateTime::tqcurrentDateTime() ); - setModificationDate( TQDateTime::tqcurrentDateTime() ); - setLastBackupDate( TQDateTime::tqcurrentDateTime() ); + setCreationDate( TQDateTime::currentDateTime() ); + setModificationDate( TQDateTime::currentDateTime() ); + setLastBackupDate( TQDateTime::currentDateTime() ); setType( TQString() ); setCreator( TQString() ); @@ -73,11 +73,11 @@ bool PalmDB::load( const char* filename ) // read and encode database name // The name field is 32 bytes long, and is NUL terminated. - // Use the length parameter of tqfromLatin1() anyway. + // Use the length parameter of fromLatin1() anyway. TQ_UINT8 name[32]; for(int k = 0; k < 32; k++) stream >> name[k]; - m_name = TQString::tqfromLatin1( (char*) name, 31 ); + m_name = TQString::fromLatin1( (char*) name, 31 ); // read database attribute TQ_UINT16 attr; @@ -121,12 +121,12 @@ bool PalmDB::load( const char* filename ) // read and encode database type TQ_UINT8 dbt[4]; stream >> dbt[0] >> dbt[1] >> dbt[2] >> dbt[3]; - m_type = TQString::tqfromLatin1( (char*) dbt, 4 ); + m_type = TQString::fromLatin1( (char*) dbt, 4 ); // read and encode database creator TQ_UINT8 dbc[4]; stream >> dbc[0] >> dbc[1] >> dbc[2] >> dbc[3]; - m_creator = TQString::tqfromLatin1( (char*) dbc, 4 ); + m_creator = TQString::fromLatin1( (char*) dbc, 4 ); // read unique id seed TQ_UINT32 idseed; diff --git a/filters/kword/palmdoc/palmdoc.cpp b/filters/kword/palmdoc/palmdoc.cpp index 791fa356..72bb0434 100644 --- a/filters/kword/palmdoc/palmdoc.cpp +++ b/filters/kword/palmdoc/palmdoc.cpp @@ -106,7 +106,7 @@ bool PalmDoc::load( const char* filename ) // if the text is not compressed, simply append as string if( format == 1 ) - setText( TQString::tqfromLatin1( rec.data(),rec.count() ) ); + setText( TQString::fromLatin1( rec.data(),rec.count() ) ); // done m_result = OK; @@ -120,7 +120,7 @@ bool PalmDoc::save( const char* filename ) setCreator( "REAd" ); // "touch" the database :-) - setModificationDate( TQDateTime::tqcurrentDateTime() ); + setModificationDate( TQDateTime::currentDateTime() ); // Palm record size is always 4 KB unsigned recsize = 4096; diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cc index 5e18ff6f..9b748fa7 100644 --- a/filters/kword/palmdoc/palmdocexport.cc +++ b/filters/kword/palmdoc/palmdocexport.cc @@ -115,7 +115,7 @@ PalmDocExport::PalmDocExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from, +KoFilter::ConversionStatus PalmDocExport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion @@ -125,7 +125,7 @@ KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from, PalmDocWorker* worker = new PalmDocWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/palmdoc/palmdocexport.h b/filters/kword/palmdoc/palmdocexport.h index fd2a1140..4c09946b 100644 --- a/filters/kword/palmdoc/palmdocexport.h +++ b/filters/kword/palmdoc/palmdocexport.h @@ -35,7 +35,7 @@ class PalmDocExport : public KoFilter virtual ~PalmDocExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __PALMDOCEXPORT_H diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc index 98cd7629..54056085 100644 --- a/filters/kword/palmdoc/palmdocimport.cc +++ b/filters/kword/palmdoc/palmdocimport.cc @@ -46,7 +46,7 @@ PalmDocImport::PalmDocImport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus PalmDocImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "application/vnd.palm" ) diff --git a/filters/kword/palmdoc/palmdocimport.h b/filters/kword/palmdoc/palmdocimport.h index a97f9729..77b4cc73 100644 --- a/filters/kword/palmdoc/palmdocimport.h +++ b/filters/kword/palmdoc/palmdocimport.h @@ -37,7 +37,7 @@ class PalmDocImport : public KoFilter virtual ~PalmDocImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: diff --git a/filters/kword/pdf/pdfdocument.cpp b/filters/kword/pdf/pdfdocument.cpp index ffe27e1c..80ec92d0 100644 --- a/filters/kword/pdf/pdfdocument.cpp +++ b/filters/kword/pdf/pdfdocument.cpp @@ -38,7 +38,7 @@ Document::Document() : _file(0), _object(0), _fileStream(0), _document(0), _device(0) {} -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus Document::init(const TQString &name, const TQString &ownerPassword, const TQString &userPassword) { diff --git a/filters/kword/pdf/pdfdocument.h b/filters/kword/pdf/pdfdocument.h index c54606f4..b2da781f 100644 --- a/filters/kword/pdf/pdfdocument.h +++ b/filters/kword/pdf/pdfdocument.h @@ -43,7 +43,7 @@ class Document Document(); ~Document() { clear(); } - KoFilter::ConversiontqStatus init(const TQString &name, + KoFilter::ConversionStatus init(const TQString &name, const TQString &ownerPassword, const TQString &userPassword); void clear(); diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp index bee3e39a..e2aa72e8 100644 --- a/filters/kword/pdf/pdfimport.cpp +++ b/filters/kword/pdf/pdfimport.cpp @@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY(libpdfimport, PdfImportFactory()) PdfImport::PdfImport(KoFilter *, const char *, const TQStringList&) {} -KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from, +KoFilter::ConversionStatus PdfImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion @@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from, return KoFilter::NotImplemented; // read file - KoFilter::ConversiontqStatus result + KoFilter::ConversionStatus result = _doc.init(m_chain->inputFile(), TQString(), TQString()); if ( result!=KoFilter::OK ) return result; diff --git a/filters/kword/pdf/pdfimport.h b/filters/kword/pdf/pdfimport.h index 9686714e..53ca8f97 100644 --- a/filters/kword/pdf/pdfimport.h +++ b/filters/kword/pdf/pdfimport.h @@ -33,7 +33,7 @@ class PdfImport : public KoFilter public: PdfImport(KoFilter *parent, const char *name, const TQStringList&); - KoFilter::ConversiontqStatus + KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); private: diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc index 2fa566fa..6fefe85e 100644 --- a/filters/kword/rtf/export/ExportFilter.cc +++ b/filters/kword/rtf/export/ExportFilter.cc @@ -967,10 +967,10 @@ void RTFWorker::writeFontData(void) } #else else - // TQFontInfo:tqstyleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out. + // TQFontInfo:styleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out. { TQFontInfo info(*it); - switch (info.tqstyleHint()) + switch (info.styleHint()) { case TQFont::SansSerif: default: diff --git a/filters/kword/rtf/export/rtfexport.cc b/filters/kword/rtf/export/rtfexport.cc index 15ff976b..6f23530b 100644 --- a/filters/kword/rtf/export/rtfexport.cc +++ b/filters/kword/rtf/export/rtfexport.cc @@ -57,7 +57,7 @@ RTFExport::RTFExport(KoFilter *, const char *, const TQStringList &) : KoFilter() { } -KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus RTFExport::convert( const TQCString& from, const TQCString& to ) { if ((from != "application/x-kword") || (to != "text/rtf" && to != "application/msword" )) { @@ -77,7 +77,7 @@ KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQ return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain, from,to ); + KoFilter::ConversionStatus result=leader->convert(m_chain, from,to ); delete leader; delete worker; diff --git a/filters/kword/rtf/export/rtfexport.h b/filters/kword/rtf/export/rtfexport.h index 060139ed..5218e4c5 100644 --- a/filters/kword/rtf/export/rtfexport.h +++ b/filters/kword/rtf/export/rtfexport.h @@ -39,7 +39,7 @@ public: RTFExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~RTFExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // RTFEXPORT_H diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp index 94fad697..5bfadbcb 100644 --- a/filters/kword/rtf/import/rtfimport.cpp +++ b/filters/kword/rtf/import/rtfimport.cpp @@ -309,7 +309,7 @@ RTFImport::RTFImport( KoFilter *, const char *, const TQStringList& ) fnnum=0; } -KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCString& to ) { // This filter only supports RTF to KWord conversion if ((from != "text/rtf") || (to != "application/x-kword")) @@ -911,7 +911,7 @@ void RTFImport::setEnumProperty( RTFProperty *property ) void RTFImport::setFontStyleHint( RTFProperty* property ) { - font.tqstyleHint = TQFont::StyleHint( property->value ); + font.styleHint = TQFont::StyleHint( property->value ); } void RTFImport::setPictureType( RTFProperty* property ) @@ -1321,7 +1321,7 @@ void RTFImport::parseFontTable( RTFProperty * ) if (token.type == RTFTokenizer::OpenGroup) { font.name = TQString(); - font.tqstyleHint = TQFont::AnyStyle; + font.styleHint = TQFont::AnyStyle; font.fixedPitch = 0; } else if (token.type == RTFTokenizer::PlainText) @@ -1344,7 +1344,7 @@ void RTFImport::parseFontTable( RTFProperty * ) // Use TQt to look up the closest matching installed font TQFont qFont( font.name ); qFont.setFixedPitch( (font.fixedPitch == 1) ); - qFont.setStyleHint( font.tqstyleHint ); + qFont.setStyleHint( font.styleHint ); for(;!qFont.exactMatch();) { int space=font.name.findRev(' ', font.name.length()); @@ -1362,7 +1362,7 @@ void RTFImport::parseFontTable( RTFProperty * ) else fontTable.insert( state.format.font, newFontName ); font.name.truncate( 0 ); - font.tqstyleHint = TQFont::AnyStyle; + font.styleHint = TQFont::AnyStyle; font.fixedPitch = 0; } } @@ -1538,8 +1538,8 @@ void RTFImport::parsePicture( RTFProperty * ) // Add anchor to rich text destination addAnchor( frameName ); - // It is safe, as we call tqcurrentDateTime only once for each picture - const TQDateTime dt(TQDateTime::tqcurrentDateTime()); + // It is safe, as we call currentDateTime only once for each picture + const TQDateTime dt(TQDateTime::currentDateTime()); // Add pixmap or clipart (key) pictures.addKey( dt, idStr, pictName ); @@ -1614,7 +1614,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName ) // Add anchor to rich text destination addAnchor( frameName ); - // It is safe, as we call tqcurrentDateTime only once for each picture + // It is safe, as we call currentDateTime only once for each picture const TQDateTime dt( pic.getKey().lastModified() ); // Add picture key diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h index bf4f20b7..2003b508 100644 --- a/filters/kword/rtf/import/rtfimport.h +++ b/filters/kword/rtf/import/rtfimport.h @@ -93,7 +93,7 @@ struct RTFTab struct RTFFont { TQString name; - TQFont::StyleHint tqstyleHint; + TQFont::StyleHint styleHint; int fixedPitch; int number; }; @@ -255,7 +255,7 @@ public: * @param to the mimetype for KWord * @return true if the document was successfully converted */ - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); /** * Skip the keyword, as we do not need to do anything with it diff --git a/filters/kword/starwriter/starwriterimport.cc b/filters/kword/starwriter/starwriterimport.cc index a9bd80d3..104e08f9 100644 --- a/filters/kword/starwriter/starwriterimport.cc +++ b/filters/kword/starwriter/starwriterimport.cc @@ -58,7 +58,7 @@ StarWriterImport::~StarWriterImport() { } -KoFilter::ConversiontqStatus StarWriterImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus StarWriterImport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion // When 4.x is supported, use also: || (from != "application/x-starwriter") diff --git a/filters/kword/starwriter/starwriterimport.h b/filters/kword/starwriter/starwriterimport.h index b030c2ba..f71a71ed 100644 --- a/filters/kword/starwriter/starwriterimport.h +++ b/filters/kword/starwriter/starwriterimport.h @@ -34,7 +34,7 @@ class StarWriterImport: public KoFilter public: StarWriterImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~StarWriterImport(); - KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); private: // most important OLE streams diff --git a/filters/kword/starwriter/status.html b/filters/kword/starwriter/status.html index 6919c589..d7667e6c 100644 --- a/filters/kword/starwriter/status.html +++ b/filters/kword/starwriter/status.html @@ -7,7 +7,7 @@ <META NAME="GENERATOR" CONTENT="Quanta Plus"> </HEAD> <BODY> - <H2 align="center">tqStatus of the</H2> + <H2 align="center">Status of the</H2> <H1 align="center">StarWriter 5.x filter for KWord</H1> <P>Author: <A HREF="mailto:info@marcozanon.com">Marco Zanon</A> diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc index 92908c57..10837ba1 100644 --- a/filters/kword/wml/wmlexport.cc +++ b/filters/kword/wml/wmlexport.cc @@ -145,7 +145,7 @@ WMLExport::WMLExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from, +KoFilter::ConversionStatus WMLExport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion @@ -155,7 +155,7 @@ KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from, WMLWorker* worker = new WMLWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/wml/wmlexport.h b/filters/kword/wml/wmlexport.h index 8d3a105e..2f81c897 100644 --- a/filters/kword/wml/wmlexport.h +++ b/filters/kword/wml/wmlexport.h @@ -35,7 +35,7 @@ class WMLExport : public KoFilter virtual ~WMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WMLEXPORT_H diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc index e44c10ae..a92290d9 100644 --- a/filters/kword/wml/wmlimport.cc +++ b/filters/kword/wml/wmlimport.cc @@ -231,7 +231,7 @@ void WMLConverter::parse( const char* filename ) } -KoFilter::ConversiontqStatus WMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WMLImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "text/vnd.wap.wml" ) diff --git a/filters/kword/wml/wmlimport.h b/filters/kword/wml/wmlimport.h index 049ff8db..1c169af1 100644 --- a/filters/kword/wml/wmlimport.h +++ b/filters/kword/wml/wmlimport.h @@ -37,7 +37,7 @@ class WMLImport : public KoFilter virtual ~WMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WMLIMPORT_H diff --git a/filters/kword/wordperfect/export/wpexport.cc b/filters/kword/wordperfect/export/wpexport.cc index 43a688c3..619d5d47 100644 --- a/filters/kword/wordperfect/export/wpexport.cc +++ b/filters/kword/wordperfect/export/wpexport.cc @@ -47,7 +47,7 @@ WPExport::WPExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus WPExport::convert( const TQCString& from, const TQCString& to ) { @@ -69,7 +69,7 @@ WPExport::convert( const TQCString& from, KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/wordperfect/export/wpexport.h b/filters/kword/wordperfect/export/wpexport.h index 55f43a47..16e81a1b 100644 --- a/filters/kword/wordperfect/export/wpexport.h +++ b/filters/kword/wordperfect/export/wpexport.h @@ -35,7 +35,7 @@ class WPExport : public KoFilter virtual ~WPExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WPEXPORT_H diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc index 460915af..09fc4d5c 100644 --- a/filters/kword/wordperfect/import/wpimport.cc +++ b/filters/kword/wordperfect/import/wpimport.cc @@ -227,7 +227,7 @@ WPImport::WPImport( KoFilter *, const char *, const TQStringList& ): KoFilter() { } -KoFilter::ConversiontqStatus WPImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if(to!= "application/vnd.sun.xml.writer" || from != "application/wordperfect" ) diff --git a/filters/kword/wordperfect/import/wpimport.h b/filters/kword/wordperfect/import/wpimport.h index 02cd323d..3fc52796 100644 --- a/filters/kword/wordperfect/import/wpimport.h +++ b/filters/kword/wordperfect/import/wpimport.h @@ -48,7 +48,7 @@ class WPImport : public KoFilter virtual ~WPImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WPIMPORT_H diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc index 9a4ac58b..cac0783f 100644 --- a/filters/liboofilter/ooutils.cc +++ b/filters/liboofilter/ooutils.cc @@ -499,7 +499,7 @@ void OoUtils::createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo) } } -KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store ) +KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store ) { kdDebug(30518) << "loadAndParse: Trying to open " << fileName << endl; @@ -508,13 +508,13 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& fileName, TQD kdWarning(30519) << "Entry " << fileName << " not found!" << endl; return KoFilter::FileNotFound; } - KoFilter::ConversiontqStatus converttqStatus = loadAndParse( m_store->device(),doc, fileName ); + KoFilter::ConversionStatus convertStatus = loadAndParse( m_store->device(),doc, fileName ); m_store->close(); - return converttqStatus; + return convertStatus; } -KoFilter::ConversiontqStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName) +KoFilter::ConversionStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName) { TQXmlInputSource source( io ); // Copied from TQDomDocumentPrivate::setContent, to change the whitespace thing @@ -538,7 +538,7 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument } -KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip) +KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip) { kdDebug(30519) << "Trying to open " << filename << endl; @@ -562,12 +562,12 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& filename, TQD const KZipFileEntry* f = static_cast<const KZipFileEntry *>(entry); kdDebug(30519) << "Entry " << filename << " has size " << f->size() << endl; TQIODevice* io = f->device(); - KoFilter::ConversiontqStatus converttqStatus = loadAndParse( io,doc, filename ); + KoFilter::ConversionStatus convertStatus = loadAndParse( io,doc, filename ); delete io; - return converttqStatus; + return convertStatus; } -KoFilter::ConversiontqStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip ) +KoFilter::ConversionStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip ) { const TQString filename( "Thumbnails/thumbnail.png" ); kdDebug(30519) << "Trying to open thumbnail " << filename << endl; diff --git a/filters/liboofilter/ooutils.h b/filters/liboofilter/ooutils.h index 70de64c8..a668d961 100644 --- a/filters/liboofilter/ooutils.h +++ b/filters/liboofilter/ooutils.h @@ -80,14 +80,14 @@ namespace OoUtils void importTextPosition( const TQString& text_position, TQString& value, TQString& relativetextsize ); void createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store ); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store ); /// Load an OASIS thumbnail - KoFilter::ConversiontqStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip ); + KoFilter::ConversionStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip ); // Internal - KoFilter::ConversiontqStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName); + KoFilter::ConversionStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName); } #endif /* OOUTILS_H */ diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc index ef4f6cd0..fafefdbd 100644 --- a/filters/olefilters/olefilter.cc +++ b/filters/olefilters/olefilter.cc @@ -69,7 +69,7 @@ OLEFilter::~OLEFilter() delete docfile; } -KoFilter::ConversiontqStatus OLEFilter::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus OLEFilter::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" && to!="application/x-kspread" && @@ -153,7 +153,7 @@ void OLEFilter::slotSavePart( if ( srcMime == KMimeType::defaultMimeType() ) kdWarning( s_area ) << "Couldn't determine the mimetype from the extension" << endl; - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; TQCString destMime( mimeType.latin1() ); storageId = TQString::number( embedPart( srcMime.latin1(), destMime, status, nameIN ) ); diff --git a/filters/olefilters/olefilter.h b/filters/olefilters/olefilter.h index 80a03737..f8c6203d 100644 --- a/filters/olefilters/olefilter.h +++ b/filters/olefilters/olefilter.h @@ -39,7 +39,7 @@ public: OLEFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~OLEFilter(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); public slots: void commSlotDelayStream( const char* delay ); diff --git a/filters/xsltfilter/export/xsltdialog.ui b/filters/xsltfilter/export/xsltdialog.ui index a52e922c..ff542dc3 100644 --- a/filters/xsltfilter/export/xsltdialog.ui +++ b/filters/xsltfilter/export/xsltdialog.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>xsltList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/xsltfilter/export/xsltexport.cc b/filters/xsltfilter/export/xsltexport.cc index 545ffde2..b1d9d84e 100644 --- a/filters/xsltfilter/export/xsltexport.cc +++ b/filters/xsltfilter/export/xsltexport.cc @@ -40,7 +40,7 @@ XSLTExport::XSLTExport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus XSLTExport::convert( const TQCString& from, const TQCString&) +KoFilter::ConversionStatus XSLTExport::convert( const TQCString& from, const TQCString&) { if(from != "application/x-kword" && from != "application/x-kontour" && from != "application/x-kspread" && diff --git a/filters/xsltfilter/export/xsltexport.h b/filters/xsltfilter/export/xsltexport.h index eac9712a..b9947255 100644 --- a/filters/xsltfilter/export/xsltexport.h +++ b/filters/xsltfilter/export/xsltexport.h @@ -32,6 +32,6 @@ public: XSLTExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XSLTExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __XSLTEXPORT_H__ */ diff --git a/filters/xsltfilter/import/xsltdialog.ui b/filters/xsltfilter/import/xsltdialog.ui index a52e922c..ff542dc3 100644 --- a/filters/xsltfilter/import/xsltdialog.ui +++ b/filters/xsltfilter/import/xsltdialog.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>xsltList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cc index e73bdf18..ee3fdf70 100644 --- a/filters/xsltfilter/import/xsltimport.cc +++ b/filters/xsltfilter/import/xsltimport.cc @@ -36,7 +36,7 @@ XSLTImport::XSLTImport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus XSLTImport::convert( const TQCString&, const TQCString& to ) +KoFilter::ConversionStatus XSLTImport::convert( const TQCString&, const TQCString& to ) { TQString config; diff --git a/filters/xsltfilter/import/xsltimport.h b/filters/xsltfilter/import/xsltimport.h index fead8d80..eac5e73c 100644 --- a/filters/xsltfilter/import/xsltimport.h +++ b/filters/xsltfilter/import/xsltimport.h @@ -38,7 +38,7 @@ class XSLTImport : public KoFilter XSLTImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XSLTImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; |