diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc index 424e346d..c0219836 100644 --- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc +++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc @@ -62,8 +62,8 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF */ // Load all colorspace modules - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ColorSpace"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); if (offers.empty()) { diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc index 043bf4e3..85099877 100644 --- a/chalk/core/kis_exif_value.cc +++ b/chalk/core/kis_exif_value.cc @@ -340,10 +340,10 @@ TQDomElement ExifValue::save(TQDomDocument& doc) UByteArray value = asUndefined(); TQByteArray data; data.setRawData((char*)value.data(), value.size()); - TQByteArray tqencodedData; - KCodecs::base64Encode( data, tqencodedData ); + TQByteArray encodedData; + KCodecs::base64Encode( data, encodedData ); data.resetRawData( (char*)value.data(), value.size()); - elmt.setAttribute("value", TQString(tqencodedData)); + elmt.setAttribute("value", TQString(encodedData)); } break; case EXIF_TYPE_SSHORT: diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc index 54e730a7..33b68a5b 100644 --- a/chalk/core/kis_fill_painter.cc +++ b/chalk/core/kis_fill_painter.cc @@ -209,7 +209,7 @@ struct FillSegment { // FillSegment* parent; }; -typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus; +typedef enum { None = 0, Added = 1, Checked = 2 } Status; KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) { if (m_width < 0 || m_height < 0) { @@ -260,9 +260,9 @@ KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) { stack.push(new FillSegment(startX, startY/*, 0*/)); - tqStatus* map = new tqStatus[m_size]; + Status* map = new Status[m_size]; - memset(map, None, m_size * sizeof(tqStatus)); + memset(map, None, m_size * sizeof(Status)); int progressPercent = 0; int pixelsDone = 0; int currentPercent = 0; emit notifyProgressStage(i18n("Making fill outline..."), 0); diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc index b7c8383e..53f17ea8 100644 --- a/chalk/core/kis_filter_registry.cc +++ b/chalk/core/kis_filter_registry.cc @@ -40,8 +40,8 @@ KisFilterRegistry::KisFilterRegistry() Q_ASSERT(KisFilterRegistry::m_singleton == 0); KisFilterRegistry::m_singleton = this; - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Filter"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc index 012f2027..7d5de556 100644 --- a/chalk/core/kis_paintop_registry.cc +++ b/chalk/core/kis_paintop_registry.cc @@ -43,8 +43,8 @@ KisPaintOpRegistry::KisPaintOpRegistry() Q_ASSERT(KisPaintOpRegistry::m_singleton == 0); KisPaintOpRegistry::m_singleton = this; - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Paintop"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Paintop"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index 69c6edca..8aa43e5a 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -645,7 +645,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor - + @@ -4485,7 +4485,7 @@ in the constructor, you have to call loadAsync. - + diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui index 3e381bbe..56f9e1c7 100644 --- a/chalk/plugins/filters/blur/wdgblur.ui +++ b/chalk/plugins/filters/blur/wdgblur.ui @@ -32,7 +32,7 @@ Expanding - + 40 20 @@ -49,7 +49,7 @@ Expanding - + 20 16 @@ -76,13 +76,13 @@ 0 - + 16 0 - + 16 32767 diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui index 513912ea..4e1bdf43 100644 --- a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui +++ b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui @@ -66,7 +66,7 @@ layer, the current layer will be used. Expanding - + 20 40 diff --git a/chalk/plugins/filters/cimg/wdg_cimg.ui b/chalk/plugins/filters/cimg/wdg_cimg.ui index 397e52e6..09d4e323 100644 --- a/chalk/plugins/filters/cimg/wdg_cimg.ui +++ b/chalk/plugins/filters/cimg/wdg_cimg.ui @@ -42,7 +42,7 @@ Expanding - + 51 20 diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui index ad1c062e..c3c5afc6 100644 --- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui +++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui @@ -29,7 +29,7 @@ Expanding - + 61 20 @@ -79,7 +79,7 @@ Expanding - + 20 50 diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui index 525b221c..ba89fd8f 100644 --- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui +++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui @@ -29,7 +29,7 @@ Expanding - + 61 20 @@ -95,7 +95,7 @@ Expanding - + 20 50 diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index 1e576f66..2e849658 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -50,13 +50,13 @@ 0 - + 250 20 - + 250 20 @@ -84,13 +84,13 @@ 0 - + 254 254 - + 254 254 @@ -116,13 +116,13 @@ kCurve - + 250 250 - + 250 250 @@ -143,13 +143,13 @@ 0 - + 20 250 - + 20 250 @@ -253,7 +253,7 @@ Expanding - + 131 20 diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui index 8d95814c..c2955071 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -65,13 +65,13 @@ 0 - + 0 20 - + 32767 20 @@ -134,13 +134,13 @@ 0 - + 20 0 - + 20 32767 diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui index 03c0e336..9426d92c 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui @@ -69,7 +69,7 @@ Expanding - + 21 20 @@ -115,7 +115,7 @@ Expanding - + 24 20 @@ -134,7 +134,7 @@ Expanding - + 20 40 @@ -153,7 +153,7 @@ Expanding - + 20 20 diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index c14bd51a..78259420 100644 --- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -55,7 +55,7 @@ Expanding - + 20 101 diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui index 6ee2631a..25705322 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui +++ b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui @@ -29,7 +29,7 @@ Expanding - + 20 90 @@ -46,7 +46,7 @@ Expanding - + 16 20 @@ -118,7 +118,7 @@ Expanding - + 16 20 @@ -135,7 +135,7 @@ Expanding - + 51 20 diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui index 841b78fb..15dcff1f 100644 --- a/chalk/plugins/filters/levelfilter/wdg_level.ui +++ b/chalk/plugins/filters/levelfilter/wdg_level.ui @@ -20,13 +20,13 @@ 0 - + 0 0 - + 32767 32767 @@ -70,13 +70,13 @@ histview - + 256 256 - + 256 256 @@ -98,7 +98,7 @@ ingradient - + 256 20 @@ -134,7 +134,7 @@ MinimumExpanding - + 25 20 @@ -162,7 +162,7 @@ MinimumExpanding - + 25 20 @@ -204,7 +204,7 @@ outgradient - + 256 20 @@ -240,7 +240,7 @@ MinimumExpanding - + 50 20 @@ -274,7 +274,7 @@ Expanding - + 21 20 @@ -291,7 +291,7 @@ Expanding - + 20 20 diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui index 3bafae01..2741e116 100644 --- a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui +++ b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui @@ -73,7 +73,7 @@ Expanding - + 21 20 @@ -90,7 +90,7 @@ Expanding - + 20 21 diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc index 81ee1448..72c0675b 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc @@ -124,7 +124,7 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c KisColorSpace * cs = src->colorSpace(); - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); srand ((uint) dt.secsTo(Y2000)); diff --git a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui index c9ce3acf..934d465f 100644 --- a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui +++ b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui @@ -37,7 +37,7 @@ Expanding - + 20 50 @@ -98,7 +98,7 @@ Expanding - + 16 20 diff --git a/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui index faf74dd4..c2181eb8 100644 --- a/chalk/plugins/filters/unsharp/wdgunsharp.ui +++ b/chalk/plugins/filters/unsharp/wdgunsharp.ui @@ -84,7 +84,7 @@ Expanding - + 21 20 @@ -115,7 +115,7 @@ Expanding - + 20 21 diff --git a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui index b8132262..e56f4760 100644 --- a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui +++ b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui @@ -29,7 +29,7 @@ Expanding - + 60 20 @@ -46,7 +46,7 @@ Expanding - + 20 60 diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc index 1ec16561..20850018 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc @@ -68,7 +68,7 @@ KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent) m_darken = new TQCheckBox(i18n("Darken"), m_optionsWidget); m_curveControl = new WdgBrushCurveControl(m_optionsWidget); TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); - moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui index 89207a50..bca19dce 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -183,7 +183,7 @@ Expanding - + 20 20 diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc index c5f4e6eb..2ab83813 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc @@ -77,7 +77,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet) m_curveControl->tabWidget->setTabToolTip(m_curveControl->tabWidget->page(2), i18n("Modifies the rate. Bottom is 0% of the rate top is 100% of the original rate.")); TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); - moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); } else { diff --git a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui index 7675b875..0da52d4e 100644 --- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui +++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui @@ -47,13 +47,13 @@ 0 - + 200 0 - + 200 32767 diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui index 8d3bf1d8..7f929231 100644 --- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui +++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui @@ -185,7 +185,7 @@ Expanding - + 20 16 diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui index 2cf6806e..445231f7 100644 --- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui +++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui @@ -197,7 +197,7 @@ Expanding - + 20 21 diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc index 1d2c4d61..552e4c40 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -187,7 +187,7 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * setCaption(i18n("Color Range")); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); if (m_dev->image()->undo()) m_transaction = new KisSelectedTransaction(i18n("Select by Color Range"), m_dev); diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui index 67c6028b..6dba5c01 100644 --- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -176,7 +176,7 @@ Expanding - + 20 40 diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index 6f9af1c6..31163eb7 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc @@ -47,7 +47,7 @@ DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys()); diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index fedb1fd1..ddb47f47 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -46,7 +46,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, m_page = new WdgDropshadow(this, "dropshadow"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); KConfig * cfg = KGlobal::config(); m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) ); diff --git a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui index 69aae624..2354cfbc 100644 --- a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui +++ b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui @@ -116,7 +116,7 @@ Expanding - + 200 20 @@ -144,7 +144,7 @@ Expanding - + 200 20 @@ -169,7 +169,7 @@ Expanding - + 190 20 @@ -194,7 +194,7 @@ Expanding - + 120 31 diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index 60313cb2..bdda9901 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -56,7 +56,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* ))); // Initialize configWidgetHolder m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal ); - //m_widget->configWidgetHolder->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); + //m_widget->configWidgetHolder->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); // Initialize preview widget if (m_view->canvasSubject()->currentImg() && m_view->canvasSubject()->currentImg()->activeDevice()) @@ -64,8 +64,8 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() ); } connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); - resize( tqminimumSizeHint()); - m_widget->previewWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); + resize( minimumSizeHint()); + m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW); m_labelNoCW->hide(); @@ -94,7 +94,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, activeLayer->paintDevice()); if(m_currentConfigWidget != 0) { - //m_currentConfigWidget->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui index 4b812770..03972a16 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui +++ b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui @@ -49,7 +49,7 @@ 0 - + 0 0 diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc index 90acf130..0ceb3dd4 100644 --- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc +++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc @@ -47,7 +47,7 @@ DlgHistogram::DlgHistogram( TQWidget * parent, const char * name) setCaption(i18n("Histogram")); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); } DlgHistogram::~DlgHistogram() diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui index 320b7d7a..0c5c5a9d 100644 --- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui +++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui @@ -56,7 +56,7 @@ Preferred - + 20 20 @@ -75,7 +75,7 @@ 0 - + 200 0 @@ -103,7 +103,7 @@ Preferred - + 20 21 @@ -124,7 +124,7 @@ 0 - + 256 150 diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc index 8a656752..6ee07f30 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc @@ -58,7 +58,7 @@ DlgImageSize::DlgImageSize( TQWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); unblockAll(); diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc index 6d24d60a..d084060b 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc @@ -59,7 +59,7 @@ DlgLayerSize::DlgLayerSize( TQWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); unblockAll(); diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui index 1686fe97..854dcd0a 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui @@ -51,7 +51,7 @@ Expanding - + 65 20 @@ -68,7 +68,7 @@ Expanding - + 65 20 @@ -123,7 +123,7 @@ Expanding - + 121 20 diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc index bb21f6f7..300161a8 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc @@ -45,7 +45,7 @@ DlgBorderSelection::DlgBorderSelection( TQWidget * parent, const char * name) : Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc index 5e327aa8..566dabc4 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc @@ -45,7 +45,7 @@ DlgGrowSelection::DlgGrowSelection( TQWidget * parent, const char * name) : sup Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc index b69b998f..5b4c8747 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc @@ -45,7 +45,7 @@ DlgShrinkSelection::DlgShrinkSelection( TQWidget * parent, const char * name) : Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc index dafb6669..e4a3386d 100644 --- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc @@ -49,7 +49,7 @@ DlgPerfTest::DlgPerfTest( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index 03bd6b52..9440a8fe 100644 --- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc @@ -49,7 +49,7 @@ DlgRotateImage::DlgRotateImage( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui index 884776f1..450f8fda 100644 --- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -48,7 +48,7 @@ Expanding - + 20 20 @@ -79,7 +79,7 @@ Expanding - + 41 20 @@ -110,7 +110,7 @@ Expanding - + 31 20 @@ -219,7 +219,7 @@ Expanding - + 20 91 diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h index eb8fa60a..5c0951a8 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h @@ -44,7 +44,7 @@ public: KSnapshotThumb(TQWidget *parent, const char *name = 0) : TQLabel(parent, name) { - tqsetAlignment(AlignHCenter | AlignVCenter); + setAlignment(AlignHCenter | AlignVCenter); } virtual ~KSnapshotThumb() {} diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui index 34643902..65ae3c99 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui +++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui @@ -23,7 +23,7 @@ lblImage - + 200 130 @@ -76,7 +76,7 @@ The image can be dragged to another application or document to copy the full scr Expanding - + 16 16 @@ -167,7 +167,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b Expanding - + 156 16 @@ -225,7 +225,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b Expanding - + 20 31 diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index ec5ba7cc..7d6e52f4 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -161,8 +161,8 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), - TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); } diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc index 99078d0f..3da5db51 100644 --- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc +++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc @@ -43,7 +43,7 @@ DlgSeparate::DlgSeparate( const TQString & imageCS, m_page = new WdgSeparations(this, "separate_image"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); m_page->lblColormodel->setText(layerCS); m_page->grpOutput->hide(); diff --git a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui index f1eeeaa2..7e611f67 100644 --- a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui +++ b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui @@ -82,7 +82,7 @@ Expanding - + 20 16 diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc index a2c43aa9..afaedeeb 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -50,7 +50,7 @@ DlgShearImage::DlgShearImage( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui index 848eb328..6facd42a 100644 --- a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui +++ b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui @@ -56,7 +56,7 @@ shearAngleY - + 32767 100 diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui index 65f20e23..41553bd2 100644 --- a/chalk/plugins/viewplugins/variations/wdg_variations.ui +++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui @@ -64,13 +64,13 @@ 0 - + 150 150 - + 150 150 @@ -95,13 +95,13 @@ 0 - + 150 150 - + 150 150 @@ -268,7 +268,7 @@ Expanding - + 20 187 @@ -287,7 +287,7 @@ 0 - + 32767 556 @@ -322,13 +322,13 @@ 0 - + 150 150 - + 150 150 @@ -364,13 +364,13 @@ 0 - + 150 150 - + 150 150 @@ -406,13 +406,13 @@ 0 - + 150 150 - + 150 150 @@ -460,13 +460,13 @@ 0 - + 540 556 - + 540 556 @@ -497,13 +497,13 @@ 150 - + 150 150 - + 150 150 @@ -574,13 +574,13 @@ 0 - + 150 150 - + 150 150 @@ -632,13 +632,13 @@ 0 - + 150 150 - + 150 150 @@ -671,13 +671,13 @@ 0 - + 150 150 - + 150 150 @@ -710,13 +710,13 @@ 0 - + 150 150 - + 150 150 @@ -787,13 +787,13 @@ 0 - + 150 150 - + 150 150 @@ -829,13 +829,13 @@ 0 - + 150 150 - + 150 150 diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cc index cfe6905d..09955e9e 100644 --- a/chalk/ui/imageviewer.cc +++ b/chalk/ui/imageviewer.cc @@ -35,7 +35,7 @@ ImageViewer::ImageViewer(TQWidget *widget, const char * name) , m_image(TQPixmap()) { m_label = new TQLabel( viewport()); - tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); setCursor(KisCursor::handCursor()); addChild(m_label); } diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc index 0bc9ae08..2ef11147 100644 --- a/chalk/ui/kis_birdeye_box.cc +++ b/chalk/ui/kis_birdeye_box.cc @@ -203,7 +203,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name) hl->addWidget(m_exposureLabel); m_exposureDoubleWidget = new KisDoubleWidget(-10, 10, this); - m_exposureDoubleWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + m_exposureDoubleWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); hl->addWidget(m_exposureDoubleWidget); TQToolTip::add(m_exposureDoubleWidget, i18n("Select the exposure (stops) for HDR images")); l->addItem(new TQSpacerItem(0, 1, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding)); diff --git a/chalk/ui/kis_canvas_painter.cc b/chalk/ui/kis_canvas_painter.cc index ed5be01d..9b3666e8 100644 --- a/chalk/ui/kis_canvas_painter.cc +++ b/chalk/ui/kis_canvas_painter.cc @@ -184,7 +184,7 @@ void KisCanvasWidgetPainter::setWorldXForm(bool /*enable*/) { } -const TQWMatrix& KisCanvasWidgetPainter::tqworldMatrix() const +const TQWMatrix& KisCanvasWidgetPainter::worldMatrix() const { return m_defaultWorldMatrix; } @@ -501,11 +501,11 @@ void KisCanvasWidgetPainter::drawText(const TQRect& /*r*/, int /*flags*/, const { } -void KisCanvasWidgetPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisCanvasWidgetPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) { } -void KisCanvasWidgetPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisCanvasWidgetPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) { } @@ -833,10 +833,10 @@ void KisCanvasPainter::setWorldXForm(bool enable) } } -const TQWMatrix& KisCanvasPainter::tqworldMatrix() const +const TQWMatrix& KisCanvasPainter::worldMatrix() const { if (m_canvasWidgetPainter != 0) { - return m_canvasWidgetPainter->tqworldMatrix(); + return m_canvasWidgetPainter->worldMatrix(); } return m_defaultWorldMatrix; } @@ -1378,17 +1378,17 @@ void KisCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text } } -void KisCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags) +void KisCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags) { if (m_canvasWidgetPainter != 0) { - m_canvasWidgetPainter->tqdrawTextItem(x, y, ti, textflags); + m_canvasWidgetPainter->drawTextItem(x, y, ti, textflags); } } -void KisCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) +void KisCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) { if (m_canvasWidgetPainter != 0) { - m_canvasWidgetPainter->tqdrawTextItem(p, ti, textflags); + m_canvasWidgetPainter->drawTextItem(p, ti, textflags); } } diff --git a/chalk/ui/kis_canvas_painter.h b/chalk/ui/kis_canvas_painter.h index 9a719eea..a5ad2d84 100644 --- a/chalk/ui/kis_canvas_painter.h +++ b/chalk/ui/kis_canvas_painter.h @@ -78,7 +78,7 @@ public: virtual void setViewport(int x, int y, int w, int h); virtual void setWorldXForm(bool); - virtual const TQWMatrix&tqworldMatrix() const; + virtual const TQWMatrix&worldMatrix() const; virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); virtual void saveWorldMatrix(); @@ -168,8 +168,8 @@ public: virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); @@ -241,7 +241,7 @@ public: void setViewport(int x, int y, int w, int h); void setWorldXForm(bool); - const TQWMatrix&tqworldMatrix() const; + const TQWMatrix&worldMatrix() const; void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); void saveWorldMatrix(); @@ -331,8 +331,8 @@ public: void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc index d52f5ec9..702ec210 100644 --- a/chalk/ui/kis_clipboard.cc +++ b/chalk/ui/kis_clipboard.cc @@ -145,7 +145,7 @@ KisPaintDeviceSP KisClipboard::clip() if(cbData && cbData->provides(mimeType)) { - TQBuffer buffer(cbData->tqencodedData(mimeType)); + TQBuffer buffer(cbData->encodedData(mimeType)); KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType ); KisProfile *profile=0; @@ -243,7 +243,7 @@ TQSize KisClipboard::clipSize() if(cbData && cbData->provides(mimeType)) { - TQBuffer buffer(cbData->tqencodedData(mimeType)); + TQBuffer buffer(cbData->encodedData(mimeType)); KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType ); KisProfile *profile=0; diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc index 4d2103d8..b691295c 100644 --- a/chalk/ui/kis_color_cup.cc +++ b/chalk/ui/kis_color_cup.cc @@ -81,7 +81,7 @@ void KisColorCup::slotClicked() emit changed(m_color); } -TQSize KisColorCup::tqsizeHint() const +TQSize KisColorCup::sizeHint() const { return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)). expandedTo(TQApplication::globalStrut()); @@ -93,24 +93,24 @@ void KisColorCup::drawButtonLabel( TQPainter *painter ) TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this ); r.rect(&x, &y, &w, &h); - int margin = 2; //tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this ); + int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this ); x += margin; y += margin; w -= 2*margin; h -= 2*margin; if (isOn() || isDown()) { - x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } - qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL); + qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL); if ( m_color.isValid() ) painter->fillRect( x+1, y+1, w-2, h-2, m_color ); if ( hasFocus() ) { TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); } } diff --git a/chalk/ui/kis_color_cup.h b/chalk/ui/kis_color_cup.h index 2cf9ddef..8c7fd2b5 100644 --- a/chalk/ui/kis_color_cup.h +++ b/chalk/ui/kis_color_cup.h @@ -72,7 +72,7 @@ signals: public: - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc index 1cdd309c..f5227eee 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cc +++ b/chalk/ui/kis_dlg_adj_layer_props.cc @@ -102,7 +102,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, m_layerName = new KLineEdit(page, "m_layerName"); m_layerName->setText(layerName); - m_layerName->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); + m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); hl->addWidget(m_layerName, 0, 1); connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc index 13caff98..0594659b 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cc +++ b/chalk/ui/kis_dlg_adjustment_layer.cc @@ -105,7 +105,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget); m_labelNoConfigWidget->hide(); - resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); m_currentConfigWidget = 0; diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc index 5c136738..2d5e8a90 100644 --- a/chalk/ui/kis_dlg_apply_profile.cc +++ b/chalk/ui/kis_dlg_apply_profile.cc @@ -42,7 +42,7 @@ KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name) m_page = new WdgApplyProfile(this); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); // XXX: This is BAD! (bsar) fillCmbProfiles(KisID("RGBA", "")); diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc index ca6a1b72..ac8e14a3 100644 --- a/chalk/ui/kis_dlg_image_properties.cc +++ b/chalk/ui/kis_dlg_image_properties.cc @@ -58,7 +58,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent, m_image = image; setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); m_page->txtName->setText(image->name()); m_page->m_createButton->hide(); diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index a19edebe..f898b497 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -77,7 +77,7 @@ GeneralTab::GeneralTab( TQWidget *_parent, const char *_name ) KisConfig cfg; - m_cmbtqCursorShape->setCurrentItem(cfg.cursorStyle()); + m_cmbCursorShape->setCurrentItem(cfg.cursorStyle()); grpDockability->setButton(cfg.dockability()); numDockerFontSize->setValue((int)cfg.dockerFontSize()); } @@ -86,14 +86,14 @@ void GeneralTab::setDefault() { KisConfig cfg; - m_cmbtqCursorShape->setCurrentItem( cfg.getDefaultCursorStyle()); + m_cmbCursorShape->setCurrentItem( cfg.getDefaultCursorStyle()); grpDockability->setButton(cfg.getDefaultDockability()); numDockerFontSize->setValue((int)(cfg.getDefaultDockerFontSize())); } enumCursorStyle GeneralTab::cursorStyle() { - return (enumCursorStyle)m_cmbtqCursorShape->currentItem(); + return (enumCursorStyle)m_cmbCursorShape->currentItem(); } enumKoDockability GeneralTab::dockability() @@ -388,7 +388,7 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const m_page = new WdgTabletDeviceSettings(this); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); for (TQ_INT32 axis = 0; axis < settings.numAxes(); axis++) { TQString axisString; diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index e8bf5ba8..dc5beadf 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -359,7 +359,7 @@ void KisFilterManager::slotApplyFilter(int i) widgetLayout->addWidget(m_lastWidget, 0 , 0); - m_lastDialog->container()->setMinimumSize(m_lastWidget->tqminimumSize()); + m_lastDialog->container()->setMinimumSize(m_lastWidget->minimumSize()); refreshPreview(); diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc index f2d63cc3..0112ceb0 100644 --- a/chalk/ui/kis_filters_listview.cc +++ b/chalk/ui/kis_filters_listview.cc @@ -154,7 +154,7 @@ void KisFiltersListView::init() setCaption(i18n("Filters List")); setItemsMovable(false); setSelectionMode(TQIconView::Single); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding )); + setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding )); setMinimumWidth(160); } diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index cda77d68..10d20796 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -57,7 +57,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe ) { TQWidget::paintEvent( pe ); TQPixmap pixmap( width(), height() ); - pixmap.fill( tqcolorGroup().background() ); + pixmap.fill( colorGroup().background() ); TQPainter painter( &pixmap ); painter.setPen( TQt::black ); painter.drawRect( MARGIN, MARGIN, width() - 2 * MARGIN, height()- 2 * MARGIN - HANDLE_SIZE ); @@ -77,7 +77,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe ) height()- HANDLE_SIZE - MARGIN, tqRound( ( m_selectedSegment->endOffset() - m_selectedSegment->startOffset() )*(double)(width()-12) ), HANDLE_SIZE ); - painter.fillRect( selection, TQBrush( tqcolorGroup().highlight() ) ); + painter.fillRect( selection, TQBrush( colorGroup().highlight() ) ); } TQPointArray triangle(3); diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc index 1375cacc..108d60fe 100644 --- a/chalk/ui/kis_int_spinbox.cc +++ b/chalk/ui/kis_int_spinbox.cc @@ -81,7 +81,7 @@ void KisIntSpinbox::init(int val) l->insertStretch(0, 1); d->m_numinput = new KIntSpinBox(0, 100, 1, val, 10, this, "KisIntSpinbox::KIntSpinBox"); - d->m_numinput->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); + d->m_numinput->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); d->m_numinput->setSuffix("%"); l->addWidget( d->m_numinput ); diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index 424c405d..e9a1bf2d 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -68,7 +68,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char vbox->setAutoAdd(true); m_lst = new WdgLayerBox(this); - setMinimumSize(m_lst->tqminimumSizeHint()); + setMinimumSize(m_lst->minimumSizeHint()); TQToolTip::add(m_lst->bnAdd, i18n("Create new layer")); diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui index ca238b60..2b866c2f 100644 --- a/chalk/ui/kis_matrix_widget.ui +++ b/chalk/ui/kis_matrix_widget.ui @@ -104,7 +104,7 @@ Expanding - + 20 41 @@ -121,7 +121,7 @@ Expanding - + 21 20 diff --git a/chalk/ui/kis_opengl_canvas_painter.cc b/chalk/ui/kis_opengl_canvas_painter.cc index 6ae12305..e6551f81 100644 --- a/chalk/ui/kis_opengl_canvas_painter.cc +++ b/chalk/ui/kis_opengl_canvas_painter.cc @@ -317,7 +317,7 @@ void KisOpenGLCanvasPainter::setWorldXForm(bool /*enable*/) { } -const TQWMatrix& KisOpenGLCanvasPainter::tqworldMatrix() const +const TQWMatrix& KisOpenGLCanvasPainter::worldMatrix() const { return m_defaultWorldMatrix; } @@ -809,11 +809,11 @@ void KisOpenGLCanvasPainter::drawText(const TQRect& /*r*/, int /*flags*/, const { } -void KisOpenGLCanvasPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisOpenGLCanvasPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) { } -void KisOpenGLCanvasPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisOpenGLCanvasPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) { } diff --git a/chalk/ui/kis_opengl_canvas_painter.h b/chalk/ui/kis_opengl_canvas_painter.h index 47983ce2..24f2e2e2 100644 --- a/chalk/ui/kis_opengl_canvas_painter.h +++ b/chalk/ui/kis_opengl_canvas_painter.h @@ -85,7 +85,7 @@ public: virtual void setViewport(int x, int y, int w, int h); virtual void setWorldXForm(bool); - virtual const TQWMatrix&tqworldMatrix() const; + virtual const TQWMatrix&worldMatrix() const; virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); virtual void saveWorldMatrix(); @@ -175,8 +175,8 @@ public: virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index a424d9ac..63766599 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -78,7 +78,7 @@ KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth, minSize += TQSize(cellSize); setMinimumSize(minSize); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); } KisPaletteView::~KisPaletteView() diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index 2feb74c8..892686b3 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -76,7 +76,7 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) m_view = new KisPaletteView(this, 0, minWidth, cols); tqlayout->addWidget( m_view ); - //setFixedSize(tqsizeHint()); + //setFixedSize(sizeHint()); connect(combo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetPalette(const TQString &))); diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui index f1b52244..8e7bf40a 100644 --- a/chalk/ui/kis_previewwidgetbase.ui +++ b/chalk/ui/kis_previewwidgetbase.ui @@ -20,7 +20,7 @@ 0 - + 0 0 @@ -56,13 +56,13 @@ 0 - + 200 150 - + 1000 1000 diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cc index 4233bc11..6de1aac3 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.cc +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cc @@ -224,9 +224,9 @@ void KisTQPaintDeviceCanvasPainter::setWorldXForm(bool enable) m_painter.setWorldXForm(enable); } -const TQWMatrix& KisTQPaintDeviceCanvasPainter::tqworldMatrix() const +const TQWMatrix& KisTQPaintDeviceCanvasPainter::worldMatrix() const { - return m_painter.tqworldMatrix(); + return m_painter.worldMatrix(); } void KisTQPaintDeviceCanvasPainter::setWorldMatrix(const TQWMatrix& matrix, bool combine) @@ -481,17 +481,17 @@ void KisTQPaintDeviceCanvasPainter::drawLineSegments(const TQPointArray& pointAr void KisTQPaintDeviceCanvasPainter::drawPolyline(const TQPointArray& pointArray, int index, int npoints) { - m_painter.tqdrawPolyline(pointArray, index, npoints); + m_painter.drawPolyline(pointArray, index, npoints); } void KisTQPaintDeviceCanvasPainter::drawPolygon(const TQPointArray& pointArray, bool winding, int index, int npoints) { - m_painter.tqdrawPolygon(pointArray, winding, index, npoints); + m_painter.drawPolygon(pointArray, winding, index, npoints); } void KisTQPaintDeviceCanvasPainter::drawConvexPolygon(const TQPointArray& pointArray, int index, int npoints) { - m_painter.tqdrawConvexPolygon(pointArray, index, npoints); + m_painter.drawConvexPolygon(pointArray, index, npoints); } void KisTQPaintDeviceCanvasPainter::drawCubicBezier(const TQPointArray& pointArray, int index) @@ -614,14 +614,14 @@ void KisTQPaintDeviceCanvasPainter::drawText(const TQRect& r, int flags, const T #endif // USE_QT4 } -void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags) +void KisTQPaintDeviceCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags) { - m_painter.tqdrawTextItem(x, y, ti, textflags); + m_painter.drawTextItem(x, y, ti, textflags); } -void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) +void KisTQPaintDeviceCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) { - m_painter.tqdrawTextItem(p, ti, textflags); + m_painter.drawTextItem(p, ti, textflags); } TQRect KisTQPaintDeviceCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const TQString& text, int len, TQTextParag **intern) diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.h b/chalk/ui/kis_qpaintdevice_canvas_painter.h index 0dca7322..cef260b4 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.h +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.h @@ -80,7 +80,7 @@ public: virtual void setViewport(int x, int y, int w, int h); virtual void setWorldXForm(bool); - virtual const TQWMatrix&tqworldMatrix() const; + virtual const TQWMatrix&worldMatrix() const; virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); virtual void saveWorldMatrix(); @@ -170,8 +170,8 @@ public: virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc index 44e86cae..327f09d7 100644 --- a/chalk/ui/kis_ruler.cc +++ b/chalk/ui/kis_ruler.cc @@ -184,8 +184,8 @@ void KisRuler::drawRuler() return; p.begin(m_pixmapBuffer); - p.setPen(tqcolorGroup().text()); - p.setBackgroundColor(tqcolorGroup().base()); + p.setPen(colorGroup().text()); + p.setBackgroundColor(colorGroup().base()); p.eraseRect(0, 0, m_pixmapBuffer->width(), m_pixmapBuffer->height()); switch (m_unit) { diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc index d6e600af..039e4190 100644 --- a/chalk/ui/kis_tool.cc +++ b/chalk/ui/kis_tool.cc @@ -58,7 +58,7 @@ TQWidget* KisTool::createOptionWidget(TQWidget* parent) d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent); d->optionWidget->setCaption(d->uiname); - d->optionWidget->tqsetAlignment(TQt::AlignCenter); + d->optionWidget->setAlignment(TQt::AlignCenter); return d->optionWidget; } diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc index 51eb1407..bc478d4e 100644 --- a/chalk/ui/kis_tool_dummy.cc +++ b/chalk/ui/kis_tool_dummy.cc @@ -98,7 +98,7 @@ TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent) { m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent); m_optionWidget->setCaption(i18n("No Active Tool")); - m_optionWidget->tqsetAlignment(TQt::AlignCenter); + m_optionWidget->setAlignment(TQt::AlignCenter); return m_optionWidget; } diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc index e7696f0b..045b43f9 100644 --- a/chalk/ui/kis_tool_registry.cc +++ b/chalk/ui/kis_tool_registry.cc @@ -37,8 +37,8 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0; KisToolRegistry::KisToolRegistry() { // Load all modules: color models, paintops, filters - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Tool"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Tool"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 4455f17d..eecfa659 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -313,8 +313,8 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this); // Load all plugins - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ViewPlugin"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; for(iter = offers.begin(); iter != offers.end(); ++iter) @@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *) } KisImageSP img = currentImg(); - TQ_INT32 scrollBarExtent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent); + TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent); TQ_INT32 drawH; TQ_INT32 drawW; TQ_INT32 docW; @@ -962,7 +962,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect) for (unsigned int i = 0; i < rects.count(); i++) { TQRect er = rects[i]; - gc.fillRect(er, tqcolorGroup().mid()); + gc.fillRect(er, colorGroup().mid()); } wr &= TQRect(0, 0, img->width(), img->height()); } @@ -1014,7 +1014,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect) } // paintGuides(); } else { - gc.fillRect(vr, tqcolorGroup().mid()); + gc.fillRect(vr, colorGroup().mid()); } } } @@ -1066,7 +1066,7 @@ void KisView::paintOpenGLView(const TQRect& canvasRect) glDrawBuffer(GL_BACK); - TQColor widgetBackgroundColor = tqcolorGroup().mid(); + TQColor widgetBackgroundColor = colorGroup().mid(); glClearColor(widgetBackgroundColor.red() / 255.0, widgetBackgroundColor.green() / 255.0, widgetBackgroundColor.blue() / 255.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 542e257d..771e1ff8 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -238,7 +238,7 @@ void KoBirdEyePanel::slotUpdate(const TQRect & r) TQPainter painter(&m_thumbnail); - painter.fillRect(thumbnailRect, tqcolorGroup().mid()); + painter.fillRect(thumbnailRect, colorGroup().mid()); painter.drawImage(thumbnailRect.x(), thumbnailRect.y(), thumbnailImage); } } @@ -583,7 +583,7 @@ void KoBirdEyePanel::renderView() TQPainter painter(&m_viewBuffer); - painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), tqcolorGroup().mid()); + painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), colorGroup().mid()); if (!m_thumbnail.isNull()) { diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 96e1e032..8393ccff 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -142,9 +142,9 @@ public: { m_img = m_item->tooltipPreview(); m_timer.start( 15000, true ); - if( !isVisible() || tqsizeHint() != size() ) + if( !isVisible() || sizeHint() != size() ) { - resize( tqsizeHint() ); + resize( sizeHint() ); position(); } if( !isVisible() ) @@ -168,8 +168,8 @@ public: { TQPixmap buf( width(), height() ); TQPainter p( &buf ); - buf.fill( tqcolorGroup().background() ); - p.setPen( tqcolorGroup().foreground() ); + buf.fill( colorGroup().background() ); + p.setPen( colorGroup().foreground() ); p.drawRect( buf.rect() ); TQSimpleRichText text( m_item->tooltip(), TQToolTip::font() ); @@ -188,12 +188,12 @@ public: p.translate( m_img.width() + 10, 0 ); } - text.draw( &p, 0, 0, rect(), tqcolorGroup() ); + text.draw( &p, 0, 0, rect(), colorGroup() ); painter->drawPixmap( 0, 0, buf ); } - virtual TQSize tqsizeHint() const + virtual TQSize sizeHint() const { if( !m_item ) return TQSize( 0, 0 ); @@ -217,7 +217,7 @@ public: void position() { const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() ); - const TQSize size = tqsizeHint(); + const TQSize size = sizeHint(); const int width = size.width(), height = size.height(); const TQRect tmp = m_item->rect(); const TQRect irect( m_list->viewport()->mapToGlobal( m_list->contentsToViewport(tmp.topLeft()) ), tmp.size() ); diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 6b957a26..31a044f2 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -50,7 +50,7 @@ void SqueezedComboBoxTip::maybeTip( const TQPoint &pos ) TQListBoxItem* selectedItem = listBox->itemAt( pos ); if (selectedItem) { - TQRect positionToolTip = listBox->tqitemRect( selectedItem ); + TQRect positionToolTip = listBox->itemRect( selectedItem ); TQString toolTipText = m_originalWidget->itemHighlighted(); if (!toolTipText.isNull()) tip(positionToolTip, toolTipText); @@ -90,7 +90,7 @@ bool SqueezedComboBox::contains( const TQString& _text ) const return false; } -TQSize SqueezedComboBox::tqsizeHint() const +TQSize SqueezedComboBox::sizeHint() const { constPolish(); TQFontMetrics fm = fontMetrics(); diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h index 03a1cdb9..50f4bc77 100644 --- a/chalk/ui/squeezedcombobox.h +++ b/chalk/ui/squeezedcombobox.h @@ -117,9 +117,9 @@ public: TQString itemHighlighted( ); /** - * Sets the tqsizeHint() of this widget. + * Sets the sizeHint() of this widget. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private slots: void slotTimeOut(); diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui index 00683ca9..632a0398 100644 --- a/chalk/ui/wdgautobrush.ui +++ b/chalk/ui/wdgautobrush.ui @@ -129,13 +129,13 @@ 0 - + 16 0 - + 16 32767 @@ -242,13 +242,13 @@ 0 - + 16 0 - + 16 32767 @@ -291,7 +291,7 @@ 0 - + 95 95 @@ -332,7 +332,7 @@ Expanding - + 20 0 diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui index 94a8a137..3a2ca629 100644 --- a/chalk/ui/wdgautogradient.ui +++ b/chalk/ui/wdgautogradient.ui @@ -45,7 +45,7 @@ 0 - + 32767 30 @@ -129,7 +129,7 @@ 0 - + 30 30 @@ -184,7 +184,7 @@ 0 - + 30 30 diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index 2b2b7910..d0078c8b 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -71,13 +71,13 @@ txtX - + 50 0 - + 50 32767 @@ -105,13 +105,13 @@ txtY - + 50 0 - + 50 32767 @@ -137,7 +137,7 @@ Expanding - + 20 20 @@ -158,13 +158,13 @@ 0 - + 75 75 - + 200 75 @@ -186,7 +186,7 @@ toolbar - + 32767 32 diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index 6f9e41e6..b9912a79 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -47,7 +47,7 @@ 0 - + 0 20 @@ -295,7 +295,7 @@ The different rendering intent methods will affect only what is shown on screen, Expanding - + 20 16 diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index dba17dac..bc6f898a 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -119,7 +119,7 @@ Expanding - + 40 20 @@ -138,7 +138,7 @@ 0 - + 50 50 @@ -158,7 +158,7 @@ Expanding - + 40 20 diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui index 7936f20b..4783a4a1 100644 --- a/chalk/ui/wdgcustompattern.ui +++ b/chalk/ui/wdgcustompattern.ui @@ -65,7 +65,7 @@ Expanding - + 40 20 @@ -84,7 +84,7 @@ 0 - + 50 50 @@ -104,7 +104,7 @@ Expanding - + 40 20 diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui index 64b33f16..3a32af21 100644 --- a/chalk/ui/wdgdisplaysettings.ui +++ b/chalk/ui/wdgdisplaysettings.ui @@ -29,7 +29,7 @@ Expanding - + 20 50 @@ -75,7 +75,7 @@ Expanding - + 121 31 diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 53f3ef90..21732922 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -40,7 +40,7 @@ &Cursor tqshape: - m_cmbtqCursorShape + m_cmbCursorShape @@ -65,7 +65,7 @@ - m_cmbtqCursorShape + m_cmbCursorShape @@ -148,7 +148,7 @@ Expanding - + 41 20 @@ -165,7 +165,7 @@ Expanding - + 20 41 diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui index 18c1f528..23ba8ba7 100644 --- a/chalk/ui/wdggridsettings.ui +++ b/chalk/ui/wdggridsettings.ui @@ -29,7 +29,7 @@ Expanding - + 20 31 @@ -57,7 +57,7 @@ Expanding - + 16 20 @@ -192,7 +192,7 @@ Expanding - + 34 20 @@ -294,13 +294,13 @@ 0 - + 16 0 - + 16 32767 @@ -357,7 +357,7 @@ Expanding - + 41 20 @@ -427,7 +427,7 @@ Expanding - + 20 20 diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui index d977802e..d276a2cf 100644 --- a/chalk/ui/wdglayerbox.ui +++ b/chalk/ui/wdglayerbox.ui @@ -42,7 +42,7 @@ 0 - + 0 10 @@ -84,13 +84,13 @@ bnAdd - + 22 22 - + 18 18 @@ -110,13 +110,13 @@ bnLower - + 22 22 - + 18 18 @@ -136,13 +136,13 @@ bnRaise - + 22 22 - + 18 18 @@ -162,13 +162,13 @@ bnProperties - + 22 22 - + 18 18 @@ -191,7 +191,7 @@ Expanding - + 20 20 @@ -202,13 +202,13 @@ bnDelete - + 22 22 - + 18 18 diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index dd310483..19740160 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -137,7 +137,7 @@ Expanding - + 131 61 @@ -332,7 +332,7 @@ Expanding - + 480 21 @@ -359,7 +359,7 @@ Expanding - + 21 0 diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui index 3654031b..3f8797d1 100644 --- a/chalk/ui/wdgpalettechooser.ui +++ b/chalk/ui/wdgpalettechooser.ui @@ -45,7 +45,7 @@ Expanding - + 255 20 diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui index c8e4404b..1d3110d5 100644 --- a/chalk/ui/wdgperformancesettings.ui +++ b/chalk/ui/wdgperformancesettings.ui @@ -61,7 +61,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be Expanding - + 81 20 @@ -93,7 +93,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be m_swappiness - + 600 32767 @@ -127,7 +127,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be Expanding - + 20 139 diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui index 90f59a33..2a21e377 100644 --- a/chalk/ui/wdgpressuresettings.ui +++ b/chalk/ui/wdgpressuresettings.ui @@ -26,7 +26,7 @@ Expanding - + 21 89 diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui index 563c7dbc..2c485c4d 100644 --- a/chalk/ui/wdgshapeoptions.ui +++ b/chalk/ui/wdgshapeoptions.ui @@ -35,7 +35,7 @@ Expanding - + 20 16 @@ -85,7 +85,7 @@ Expanding - + 21 20 diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui index f9dfaac6..091997bf 100644 --- a/chalk/ui/wdgtabletdevicesettings.ui +++ b/chalk/ui/wdgtabletdevicesettings.ui @@ -29,7 +29,7 @@ Expanding - + 21 90 diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui index 29ff9dbb..34688d5d 100644 --- a/chalk/ui/wdgtabletsettings.ui +++ b/chalk/ui/wdgtabletsettings.ui @@ -91,7 +91,7 @@ Expanding - + 21 90 diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index 5e5d5dac..114c4baa 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -47,7 +47,7 @@ lineEdit - + 120 0 @@ -120,7 +120,7 @@ Minimum - + 121 20 @@ -137,7 +137,7 @@ Minimum - + 20 31 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 Expanding - + 20 61 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 @@ Fixed - + 20 20 @@ -141,7 +141,7 @@ Expanding - + 31 20 @@ -176,7 +176,7 @@ Fixed - + 20 20 @@ -235,7 +235,7 @@ Expanding - + 51 20 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 @@ Expanding - + 20 5 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 @@ 0 - + 200 150 @@ -304,7 +304,7 @@ Expanding - + 500 20 @@ -321,7 +321,7 @@ Expanding - + 20 120 @@ -408,7 +408,7 @@ Expanding - + 41 20 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 Expanding - + 20 16 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( 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 @@ Expanding - + 20 40 @@ -81,7 +81,7 @@ Expanding - + 60 21 @@ -103,7 +103,7 @@ Expanding - + 70 20 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 @@ Expanding - + 106 20 @@ -123,7 +123,7 @@ Expanding - + 20 60 @@ -223,7 +223,7 @@ 0 - + 30 32767 @@ -313,7 +313,7 @@ Expanding - + 51 21 @@ -330,7 +330,7 @@ Expanding - + 51 21 @@ -472,7 +472,7 @@ Expanding - + 468 20 @@ -489,7 +489,7 @@ Expanding - + 468 20 @@ -506,7 +506,7 @@ Expanding - + 611 20 @@ -523,7 +523,7 @@ Expanding - + 71 20 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 @@ Expanding - + 106 20 @@ -156,7 +156,7 @@ Expanding - + 20 96 @@ -375,7 +375,7 @@ 0 - + 30 32767 @@ -469,7 +469,7 @@ Expanding - + 0 81 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 @@ Expanding - + 40 20 @@ -124,7 +124,7 @@ Expanding - + 330 20 @@ -271,7 +271,7 @@ Expanding - + 16 20 @@ -292,7 +292,7 @@ Expanding - + 20 16 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 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 @@ Expanding - + 145 0 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 @@ Expanding - + 20 0 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 == "