From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- filters/chalk/tiff/kis_dlg_options_tiff.cpp | 2 +- filters/chalk/tiff/kis_tiff_export.cc | 2 +- filters/chalk/tiff/kis_tiff_export.h | 2 +- filters/chalk/tiff/kis_tiff_import.cc | 2 +- filters/chalk/tiff/kis_tiff_import.h | 2 +- filters/chalk/tiff/kis_tiff_writer_visitor.cpp | 2 +- filters/chalk/tiff/kis_wdg_options_tiff.ui | 30 +++++++++++++------------- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'filters/chalk/tiff') diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp index 59784009..7a6ad9ca 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(); - setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); + tqsetSizePolicy(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 28495ff4..bcd3f22e 100644 --- a/filters/chalk/tiff/kis_tiff_export.cc +++ b/filters/chalk/tiff/kis_tiff_export.cc @@ -50,7 +50,7 @@ KisTIFFExport::~KisTIFFExport() { } -KoFilter::ConversionStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversiontqStatus 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 bb78fd4f..9efeb940 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::ConversionStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversiontqStatus 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 8c785ffe..89d1763f 100644 --- a/filters/chalk/tiff/kis_tiff_import.cc +++ b/filters/chalk/tiff/kis_tiff_import.cc @@ -41,7 +41,7 @@ KisTIFFImport::~KisTIFFImport() { } -KoFilter::ConversionStatus KisTIFFImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversiontqStatus 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 77cfd0de..b9e33d06 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::ConversionStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp index da399a53..681e66b7 100644 --- a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp +++ b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp @@ -63,7 +63,7 @@ namespace { return true; } - KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ; + KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ; return false; } diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui index 29038890..d840dc8d 100644 --- a/filters/chalk/tiff/kis_wdg_options_tiff.ui +++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui @@ -51,7 +51,7 @@ - layout10 + tqlayout10 @@ -119,7 +119,7 @@ - layout7 + tqlayout7 @@ -283,13 +283,13 @@ You can uncheck the box if you are not using transparancy and you want to make t Quality: - + AlignTop - layout5 + tqlayout5 @@ -329,7 +329,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - layout4_2 + tqlayout4_2 @@ -350,7 +350,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Best - + AlignVCenter|AlignRight @@ -405,7 +405,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Compress: - + AlignTop @@ -418,7 +418,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - layout5_2 + tqlayout5_2 @@ -456,7 +456,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - layout4 + tqlayout4 @@ -481,7 +481,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Small - + AlignVCenter|AlignRight @@ -608,7 +608,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Compress: - + AlignTop @@ -621,7 +621,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - layout5_2_2 + tqlayout5_2_2 @@ -659,7 +659,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - layout4_3 + tqlayout4_3 @@ -684,7 +684,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Small - + AlignVCenter|AlignRight @@ -711,7 +711,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Expanding - + 20 16 -- cgit v1.2.1